2873 files changed, 0 insertions, 1273577 deletions
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 5d4ce997d6..0000000000
--- a/.cvsignore
+++ /dev/null
@@ -1,26 +0,0 @@
-ABOUT-NLS
-Makefile
-Makefile.in
-aclocal.m4
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-install-sh
-intl
-libtool
-ltconfig
-ltmain.sh
-missing
-mkinstalldirs
-stamp-h
-stamp-h.in
-stamp.h
-xlibtool
-xltmain.sh
-evolution.spec
-xml-i18n-*
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 832444b195..0000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,84 +0,0 @@
-Evolution was written by:
-
-Addressbook
-	Arturo Esponosa <arturo@nuclecu.unam.mx> (Original Gnomecard author)
-	Nat Friedman <nat@ximian.com>
-	Chris Lahey <clahey@ximian.com>
-	Chris Toshok <toshok@ximian.com>
-	Jon Trowbridge <trow@ximian.com>
-
-Artwork
-	Tuomas Kuosmanen <tigert@ximian.com>
-	Jakub Steiner <jimmac@ximian.com>
-
-Calendar
-	Seth Alves <seth@ximian.com>
-	Eric Busboom <eric@softwarestudio.org> (libical author)
-	Arturo Esponosa <arturo@nuclecu.unam.mx> (Gnomecal contributor)
-	Damon Chaplin <damon@ximian.com>
-	Federico Mena-Quintero <federico@ximian.com>
-	Rodrigo Moya <rodrigo@ximian.com>
-	Jesse Pavel <jesse@ximian.com>
-	JP Rosevear <jpr@ximian.com>
-	Russell Steinthal <rms39@columbia.edu> (Gnomecal maintainer)
-
-Documentation
-	Kevin Breit <mrproper@ximian.com>
-	Aaron Weber <aaron@ximian.com>
-
-Mailer
-	Radek Doulik <rodo@ximian.com>
-	Larry Ewing <lewing@ximian.com>
-	Bertrand Guiheneuf <bertrand@ximian.com>
-	Jason Leach <jleach@ximian.com>
-	Matt Loper <matt@ximian.com>
-	Ettore Perazzoli <ettore@ximian.com>
-	Jeff Stedfast <fejj@ximian.com>
-	Jon Trowbridge <trow@ximian.com>
-	Peter Williams <peterw@ximian.com>
-	Dan Winship <danw@ximian.com>
-	Michael Zucchi <notzed@ximian.com>
-
-Notes
-	Anders Carlsson <andersca@gnu.org>
-
-Pilot
-	JP Rosevear <jpr@ximian.com>
-
-Shell
-	Miguel de Icaza <miguel@ximian.com>
-	Jason Leach <jleach@ximian.com>
-	Ettore Perazzoli <ettore@ximian.com>
-
-Translations
-	Akira TAGOH <tagoh@gnome.gr.jp>
-	Andraz Tori <andraz.tori1@guest.arnes.si>
-	Andreas Hyden <a.hyden@cyberpoint.se>
-	Arjan Scherpenisse <acscherp@wins.uva.nl>
-	Clara Tattoni <clara.tattoni@libero.it>
-	Fatih Demir <kabalak@gmx.net>
-	Gediminas Paulauskas <menesis@delfi.lt>
-	GNOME PL Team <translators@gnome.pl>
-	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-	H�ctor Garc�a Alvarez <hector@scouts-es.org>
-	Jes�s Bravo �lvarez <jba@pobox.com>
-	Keld Simonsen <keld@dkuug.dk>
-	Kjartan Maraas <kmaraas@gnome.org>
-	Matthias Warkus <mawa@iname.com>
-	Spiros Papadimitriou <spapadim+@cs.cmu.edu>
-	Sung-Hyun Nam <namsh@kldp.org>
-	Szabolcs BAN <shooby@gnome.hu>
-	Tiago Ant�o <tiagoantao@bigfoot.com>
-	Valek Filippov <frob@df.ru>
-	Vincent Renardias <vincent@redhat.com>
-	Yuri Syrota <rasta@renome.rovno.ua>
-
-UI
-	Anna Dirks <anna@ximian.com>
-
-Widgets
-	Damon Chaplin <damon@ximian.com>
-	Miguel de Icaza <miguel@ximian.com>
-	Chris Lahey <clahey@ximian.com>
-	Federico Mena-Quintero <federico@ximian.com>
-	Chris Toshok <toshok@ximian.com>
diff --git a/COPYING b/COPYING
deleted file mode 100644
index d60c31a97a..0000000000
--- a/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/COPYING-DOCS b/COPYING-DOCS
deleted file mode 100644
index b42936beb3..0000000000
--- a/COPYING-DOCS
+++ /dev/null
@@ -1,355 +0,0 @@
-		GNU Free Documentation License
-		   Version 1.1, March 2000
-
- Copyright (C) 2000  Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-0. PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-written document "free" in the sense of freedom: to assure everyone
-the effective freedom to copy and redistribute it, with or without
-modifying it, either commercially or noncommercially.  Secondarily,
-this License preserves for the author and publisher a way to get
-credit for their work, while not being considered responsible for
-modifications made by others.
-
-This License is a kind of "copyleft", which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-
-1. APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work that contains a
-notice placed by the copyright holder saying it can be distributed
-under the terms of this License.  The "Document", below, refers to any
-such manual or work.  Any member of the public is a licensee, and is
-addressed as "you".
-
-A "Modified Version" of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A "Secondary Section" is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject.  (For example, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The "Invariant Sections" are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.
-
-The "Cover Texts" are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.
-
-A "Transparent" copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, whose contents can be viewed and edited directly and
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup has been designed to thwart or discourage
-subsequent modification by readers is not Transparent.  A copy that is
-not "Transparent" is called "Opaque".
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML designed for human modification.  Opaque formats include
-PostScript, PDF, proprietary formats that can be read and edited only
-by proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML produced by some word processors for output
-purposes only.
-
-The "Title Page" means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, "Title Page" means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-
-2. VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-
-3. COPYING IN QUANTITY
-
-If you publish printed copies of the Document numbering more than 100,
-and the Document's license notice requires Cover Texts, you must enclose
-the copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a publicly-accessible computer-network location containing a complete
-Transparent copy of the Document, free of added material, which the
-general network-using public has access to download anonymously at no
-charge using public-standard network protocols.  If you use the latter
-option, you must take reasonably prudent steps, when you begin
-distribution of Opaque copies in quantity, to ensure that this
-Transparent copy will remain thus accessible at the stated location
-until at least one year after the last time you distribute an Opaque
-copy (directly or through your agents or retailers) of that edition to
-the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-
-
-4. MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct
-   from that of the Document, and from those of previous versions
-   (which should, if there were any, be listed in the History section
-   of the Document).  You may use the same title as a previous version
-   if the original publisher of that version gives permission.
-B. List on the Title Page, as authors, one or more persons or entities
-   responsible for authorship of the modifications in the Modified
-   Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has less than five).
-C. State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.
-D. Preserve all the copyright notices of the Document.
-E. Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.
-F. Include, immediately after the copyright notices, a license notice
-   giving the public permission to use the Modified Version under the
-   terms of this License, in the form shown in the Addendum below.
-G. Preserve in that license notice the full lists of Invariant Sections
-   and required Cover Texts given in the Document's license notice.
-H. Include an unaltered copy of this License.
-I. Preserve the section entitled "History", and its title, and add to
-   it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page.  If
-   there is no section entitled "History" in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.
-J. Preserve the network location, if any, given in the Document for
-   public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions
-   it was based on.  These may be placed in the "History" section.
-   You may omit a network location for a work that was published at
-   least four years before the Document itself, or if the original
-   publisher of the version it refers to gives permission.
-K. In any section entitled "Acknowledgements" or "Dedications",
-   preserve the section's title, and preserve in the section all the
-   substance and tone of each of the contributor acknowledgements
-   and/or dedications given therein.
-L. Preserve all the Invariant Sections of the Document,
-   unaltered in their text and in their titles.  Section numbers
-   or the equivalent are not considered part of the section titles.
-M. Delete any section entitled "Endorsements".  Such a section
-   may not be included in the Modified Version.
-N. Do not retitle any existing section as "Endorsements"
-   or to conflict in title with any Invariant Section.
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section entitled "Endorsements", provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-
-5. COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections entitled "History"
-in the various original documents, forming one section entitled
-"History"; likewise combine any sections entitled "Acknowledgements",
-and any sections entitled "Dedications".  You must delete all sections
-entitled "Endorsements."
-
-
-6. COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-
-
-7. AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, does not as a whole count as a Modified Version
-of the Document, provided no compilation copyright is claimed for the
-compilation.  Such a compilation is called an "aggregate", and this
-License does not apply to the other self-contained works thus compiled
-with the Document, on account of their being thus compiled, if they
-are not themselves derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one quarter
-of the entire aggregate, the Document's Cover Texts may be placed on
-covers that surround only the Document within the aggregate.
-Otherwise they must appear on covers around the whole aggregate.
-
-
-8. TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License provided that you also include the
-original English version of this License.  In case of a disagreement
-between the translation and the original English version of this
-License, the original English version will prevail.
-
-
-9. TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-
-10. FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
-
-
-ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-      Copyright (c)  YEAR  YOUR NAME.
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the GNU Free Documentation License, Version 1.1
-      or any later version published by the Free Software Foundation;
-      with the Invariant Sections being LIST THEIR TITLES, with the
-      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-      A copy of the license is included in the section entitled "GNU
-      Free Documentation License".
-
-If you have no Invariant Sections, write "with no Invariant Sections"
-instead of saying which ones are invariant.  If you have no
-Front-Cover Texts, write "no Front-Cover Texts" instead of
-"Front-Cover Texts being LIST"; likewise for Back-Cover Texts.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index ea5539987f..0000000000
--- a/ChangeLog
+++ /dev/null
@@ -1,7466 +0,0 @@
-2001-12-13  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: check for alloca.h.
-
-2001-12-12  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #16358, No man page for Evolution.]
-
-	* data/Makefile.am (man_MANS): Install the man page.
-
-	* data/evolution.1: New man page for Evolution.
-
-2001-12-10  JP Rosevear  <jpr@ximian.com>
- 
-	* configure.in: use UTF-8 as the char set when testing pilot link
- 
-2001-12-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/evolution.desktop.in (_Name): "Ximian Evolution", not
-	"Evolution".
-
-2001-12-11  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Up VERSION to 1.1.0.99.
-
-2001-12-06  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: s/PREVIEW_VERSION/VERSION_COMMENT
-
-2001-12-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Add a AC_DEFINE for PREVIEW_RELEASE which is a
-	string that will be appended to the X-Mailer header.
-
-2001-11-21  Jeffrey Stedfast  <fejj@ximian.com>
- 
-	* README: Updated. Don't say that the user needs to copy their
-	mozilla database files into ~/evolution, since Evolution now
-	builds it's own default database files if they don't exist and
-	also remove instructions for building with OpenSSL.
- 
-	* acconfig.h: Remove HAVE_OPENSSL define
- 
-	* configure.in: Remove checks for OpenSSL libraries.
- 
-2001-11-20  Wang Jian  <lark@linux.net.cn>
-
-	* configure.in(ALL_LINGUAS): Re-Added zh_CN. It is checked 
-	against gettext 0.10.40 and 0.10.35 without any problem. 
-	Please contact me if anyone wants to disable it (AGAIN).
-
-2001-11-19  Abel Cheung  <maddog@linuxhall.org>
-
-	* configure.in: I will keep adding zh_TW to ALL_LINGUAS before
-	  somebody is willing to tell me why it is deleted without
-	  reason. It was checked against newest gettext (0.10.40) and
-	  older gettext (0.10.35) without any problem. A few
-	  translations are not removed from ALL_LINGUAS even though
-	  they failed in msgfmt checking.
-
-2001-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Updated.
-
-	* configure.in: 0.99.2.  Require gtkhtml 0.16.1 and GAL 0.18.1.
-
-2001-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Redone with the bug #s from Bugzilla.
-
-2001-11-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* NEWS: Calendar/tasks NEWS.
-
-2001-11-13  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: restore cflags and ldflags properly
-
-2001-11-12  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: save the ldflags properly
-
-2001-11-09  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Check to make sure pilot-link has the charset
-	conversion stuff enabled
-
-2001-11-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* tools/killev: Chop the output from `uname -s'.  Thanks to
-	Michael Gerdts for suggesting the fix.
-
-2001-11-09  Abel Cheung  <maddog@linux.org.hk>
-
-	* configure.in: Re-added zh_TW to ALL_LINGUAS. Translator keep
-	  complaining to me, and waste a month before discovering it was
-	  disabled while I know nothing about it. Please at least complain
-	  to me if it's gettext problem.
-
-2001-11-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Up to 0.99.1 for snapshot purposes.
-
-2001-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Upgrade version number to 0.99.0.  Require GtkHTML
-	0.16 and GAL 0.18.
-
-2001-11-05  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS: Small update
-
-2001-11-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Updated.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/evolution.desktop.in (Icon): evolution.png instead of
-	evolution-icon.png.
-
-2001-10-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Update version to 0.17.100.
-
-2001-10-31  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS (Conduits): update
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add oaf to MAILER_CFLAGS and MAILER_LIBS too.
-
-2001-10-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS (Mailer): Updated mailer NEWS.
-
-2001-10-30    <NotZed@Ximian.com>
-
-	* NEWS (Mailer): My mailer news.
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add oaf to the BONOBO_VFS_GNOME_CFLAGS too.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* NEWS (Calendar): Calendar NEWS.
-
-2001-10-30  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add oaf to the BONOBO_GNOME_LIBS,
-	BONOBO_GNOME_CFLAGS, BONOBO_HTML_GNOME_LIBS,
-	BONOBO_HTML_GNOME_CFLAGS.
-
-2001-10-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in: Require GAL version 0.15.99.10.  I know you all
-	love this.
-
-2001-10-30  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: require gtkhtml version 0.15.99.2
-
-2001-10-29  Damon Chaplin  <damon@ximian.com>
-
-	* configure.in (ALL_LINGUAS): added en_AU (copied en_GB).
-
-2001-10-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Require gal 0.15.99.9.
-
-2001-10-30  <notzed@ximian.com>
-
-	* configure.in: Move the configure version number check down
-	a bit for gtkhtml/gal, c'ause i'm sick of fixing a manual
-	patch i have every bloody time the version changes.
-
-2001-10-29  Joe Shaw  <joe@ximian.com>
-
-	* configure.in: Require gal 0.15.99.8
-
-	* addressbook/backend/ebook/e-card-simple.c,
-	addressbook/gui/component/addressbook-storage.c,
-	addressbook/gui/widgets/e-addressbook-view.c,
-	calendar/gui/e-calendar-table.c,
-	calendar/gui/e-itip-control.c,
-	calendar/gui/e-meeting-model.c,
-	calendar/gui/itip-utils.c,
-	calendar/gui/print.c,
-	calendar/gui/alarm-notify/alarm-notify-dialog.c,
-	filter/rule-editor.c,
-	mail/mail-config.c,
-	mail/mail-folder-cache.c,
-	mail/mail-format.c,
-	mail/mail-local.c,
-	mail/mail-ops.c,
-	mail/mail-vfolder.c,
-	shell/e-local-storage.c,
-	shell/e-summary-storage.c: Change includes of
-	e-util/e-unicode-i18n.h to gal/util/e-unicode-i18n.h
-
-	* e-util/Makefile.am: Don't build e-unicode-i18n.[ch] anymore.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Added my addressbook changes.
-
-2001-10-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* AUTHORS: Add Larry and Radek.
-
-2001-10-30  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: require gtkhtml version 0.15.99.1
-
-2001-10-29  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: added calendar/importers/Makefile
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.15.99.7.
-
-2001-10-28  JP Rosevear  <jpr@ximian.com>
-
-	* data/Makefile.am: no need to use destdir
-
-2001-10-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.15.99.6.
-
-2001-10-27  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Change the help string on "--enable-nntp" to
-	mention the fact that NNTP support is incomplete and unsupported.
-	If the user doesn't pass --enable-nntp, don't mention NNTP at all
-	in the summary at the end. Also, mention which SSL library is
-	being used when SSL support is enabled, and don't mention anything
-	about S/MIME since it doesn't work.
-
-2001-10-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: GAL 0.15.99.5.
-
-2001-10-26  Kevin Breit  <mrproper@ximian.com>
-
-	* AUTHORS: Updated my email address.
-
-2001-10-26    <NotZed@Ximian.com>
-
-	* configure.in: Bump gal requirement.
-
-2001-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: and add a way to get some more spew about the
-	commands we're executing.
-
-2001-10-23  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: use eq instead of ==.
-
-2001-10-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required GAL to 0.15.99.3 so EEntry's
-	"draw_button" argument can be used in
-	addressbook/gui/component/select-names/e-select-names.c.
-
-2001-10-22  Damon Chaplin  <damon@ximian.com>
-
-	* configure.in: bumped required GAL to 0.15.99.2.
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* acconfig.h: HAVE_KDE_APPLNK.
-
-	* configure.in (EVO_CHECK_LIB): AC_DEFINE `HAVE_KDE_APPLNK' in the
-	case in which the kde applnk dir is found.  Also fix the logic
-	with the checking so it doesn't get fooled.
-
-2001-10-22  JP Rosevear  <jpr@ximian.com>
-
-	* data/Makefile.am: include destdir in the path of the kde desktop
-	installation dir
-
-2001-10-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* data/Makefile.am [HAVE_KDE_APPLNK]: Install `evolution.desktop'
-	in the `KDE_APPLNK_DIR'.
-
-	* configure.in: New option `--with-kde-applnk-path'.  Define the
-	`HAVE_KDE_APPLNK' Automake conditional, and the `KDE_APPLNK_DIR'
-	value.
-
-2001-10-19  Dan Winship  <danw@ximian.com>
-
-	* tools/Makefile.am (EXTRA_DIST): Merge the two EXTRA_DIST
-	declarations together so they both happen.
-
-2001-10-18  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: use a new fangled perl script that queries oaf for
-	interfaces we want to kill.
-
-2001-10-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.15.99.1
-	for use in evolution-addressbook-export.
-
-	* tools/.cvsignore: Added evolution-addressbook-clean,
-	evolution-addressbook-export, evolution-addressbook-import, and
-	.libs.
-
-	* tools/Makefile.am: Added evolution-addressbook-clean,
-	evolution-addressbook-export, and evolution-addressbook-import.
-
-	* tools/evolution-addressbook-clean.in: Main script to clean up
-	the local contact database.
-
-	* tools/evolution-addressbook-export.c: Exports the local
-	addressbook to the specified file
-	(--output-file).  If no --output-file is given, writes out to a
-	unique file in the /tmp directory.  In either case, prints the
-	filename to stdout.
-
-	* tools/evolution-addressbook-import.c: Imports the specified file
-	(--input-file) to the local addressbook.
-
-2001-10-18  Wang Jian  <lark@linux.net.cn>
-
-	* configure.in(ALL_LINGUAS): Added zh_CN for Simplified Chinese.
-
-2001-10-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Wrote Addressbook news.
-
-2001-10-12  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: kill evolution-ldif-importer.
-
-2001-10-11  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in (AC_OUTPUT): Fix the order of the help/ subdirs.
-	These must be sorted as a preorder walk for a tree!
-
-2001-10-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.16.99.
-
-2001-10-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.16.  Require GtkHTML 0.15 or later and GAL 0.14
-	or later.  Also, make $with_nspr_includes default to
-	`/usr/include/nspr' instead of `/usr/include/mozilla' and
-	$with_nss_includes to `/usr/include/moznss' instead of
-	`/usr/include/mozilla'.
-
-2001-10-10  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Added info about the shell, plus some minor fixes for
-	consistency.
-
-2001-10-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Updated.
-
-2001-10-09  Federico Mena Quintero  <federico@ximian.com>
-
-	* NEWS (Calendar): Calendar NEWS.
-
-2001-10-09    <NotZed@Ximian.com>
-
-	* NEWS (Mailer): Updated for beta 6.
-
-2001-10-09  Rodrigo Moya <rodrigo@ximian.com>
-
-	* configure.in: add libart to list of libraries to use in
-	EXTRA_GNOME_CFLAGS/LIBS, which is needed for latest libart versions
-
-2001-10-09  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: AC_OUTPUT(default_user/local/Makefile) before
-	AC_OUTPUT()ing the other subdirs of `default_user/local'.  Fix
-	pointed out by Dmitry G. Mastrukov <dmitry@fitmark.net>.
-
-2001-10-07  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Remove movemail check, since it's not relevant any
-	more.
-
-2001-10-05  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: Bumped required version of gtkhtml to 0.14.99.1
-
-2001-10-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.13.99.1.
-
-2001-10-01  Aaron Weber <aaron@ximian.com>
-
-	* help/C/Makefile.am: removed an extraneous tab.
-	
-2001-10-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.15.99.
-
-2001-10-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.15.  Require gal 0.13 and gtkhtml 0.14.
-
-2001-10-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Added more news.
-
-2001-09-30  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (nspr_libs): Order the linkline to be the same as
-	the order in Mozilla (it is suggested that they be in this order).
-	(nss_libs): Same.
-
-2001-09-27  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Remove references to the "compose" program, since
-	that functionality went into the shell.
-	(AC_OUTPUT): Sort and remove duplicates.
-
-	* cmdline/*: gone
-
-2001-09-26  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Added a flag to enable pedantic PGP/MIME - this is
-	not recommended for end-users. It is mostly meant for testing
-	purposes.
-
-2001-09-26  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: make sure the solaris network libs get added to
-	the LDAP link line before we test for openldap.  Thanks to Frank
-	Belew for finding this.
-
-2001-09-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.12.99.0.
-
-2001-09-21  Nat Friedman  <nat@ximian.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): Changed to 99.
-	(VERSION): Added ".$EVOLUTION_MICRO_VERSION" suffix.
-
-2001-09-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version to 0.14.  Depend on gal >= 0.12,
-	gtkhtml >= 0.13.
-
-2001-09-21  Michael Zucchi  <NotZed@Ximian.com>
-
-	* NEWS (Mail): Updated.
-
-2001-09-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Added more NEWS items here.
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Remove dead directory from AC_OUTPUT
-
-2001-09-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Updated required version of gal to 0.11.99.4.
-
-2001-09-14  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: remove unneeded conditionals
-
-2001-09-13  Yanko Kaneti  <yaneti@declera.com>
-
-	* configure.in (ALL_LINGUAS): Added bg to ALL_LINGUAS.
-
-2001-09-13  Larry Ewing  <lewing@ximian.com>
-
-	* data/evolution.mime: override the gnome-vfs.mime to match .vcf
-	as text/x-vcard.
-
-2001-09-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: temporarily disable zh_TW
-
-2001-09-10  Abel Cheung  <maddog@linux.org.hk>
-
-	* configure.in: Added "zh_TW" to ALL_LINGUAS.
-
-2001-09-07  Dan Winship  <danw@ximian.com>
-
-	* configure.in: one-line OpenSSL fix from Yanko Kaneti
-	<yaneti@declera.com>
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	* README: Updated slightly.
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes by Neil Conway <neilconway@home.com, as per #8090.]
-
-	* configure.in: Fix the error message if scrollkeeper is not found.
-
-	* README: A bunch of minor fixes, tweaks and cleanups.
-
-2001-09-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #8089, Undocumented Scrollkeeper dependency.]
-
-	* README: Add scrollkeeper 0.1.4 to the list of dependencies.
-
-2001-09-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Only check for OpenSSL if we were not able to find
-	Mozilla's NSS libraries.
-
-2001-09-04  Peter Williams  <peterw@ximian.com>
-
-	* omf-install/Makefile.am (install-data-local): Don't put
-	$(srcdir) in the file path twice.
-
-2001-09-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped the required version of gal to 0.11.99.2.
-
-2001-08-31  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* configure.in: Bumped required version of GAL to 0.11.3
-	(for g_utf8_collate)
-
-2001-08-24  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch from Nike Gerdts <michael.gerdts@usa.alcatel.com> for
-	#6882, DB3_CFLAGS and DB3_LDFLAGS order messes up CPPFLAGS and
-	LDFLAGS.]
-
-	* configure.in: Put DB3_CFLAGS before the already-defined CPPFLAGS
-	instead of after them; likewise, put DB3_LDADD before the already
-	defined LDADD.
-
-2001-08-24  Dan Winship  <danw@ximian.com>
-
-	* configure.in: We don't need to check for both bonobo-conf 0.11
-	AND bonobo-conf 0.2.
-
-2001-08-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: 0.13.99.
-
-2001-08-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump requirements to GAL 0.11, bonobo-conf 0.11,
-	GtkHTML 0.12.  Don't autogen
-	`doc/devel/executive-summary/Makefile'.  Bump version number to
-	0.13.
-
-2001-08-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS (Global): Added.
-
-2001-08-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Updated NEWS for addressbook.
-
-2001-08-21  Peter Williams  <peterw@ximian.com>
-
-	* NEWS (Mail): Updated some more.
-
-2001-08-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS: Updated.
-
-2001-08-20  Jon Trowbridge  <trow@ximian.com>
-
-	* configure.in: Require gal 0.10.99.5.
-
-2001-08-19  Aaron Weber  <aaron@ximian.com>
-
-	*Makefile.am: added "help" to subdirs.
-	
-2001-08-19  Chris Toshok  <toshok@ximian.com>
-
-	* omf-install/Makefile.am (scrollkeeper_localstate_dir) use
-	$(SCROLLKEEPER_LOCALSTATE_DIR), and not something based on
-	evolution's local state dir.  this should fix the core dumps
-	during install on freebsd and solaris.
-
-	* configure.in (GLIB_CONFIG): use $GLIB_CONFIG if it's set,
-	otherwise default to glib-config.  a cheap solution to get this
-	working on freebsd (where they have glib12-config, but not
-	glib-config.)  also, switch all `glib-config`s to `$GLIB_CONFIG`.
-	(SCROLLKEEPER_LOCALSTATE_DIR): use scrollkeeper-config to figure
-	this out, and AC_SUBST so omf-install/Makefile.am can use it.
-
-2001-08-17  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Move the libical compile order.
-
-2001-08-16  "Big Iain" Holmes  <iain@ximian.com>
-
-	* configure.in: Add widgets/e-timezone-dialog/Makefile
-
-2001-08-16  Jason Leach  <jleach@ximian.com>
-
-	* AUTHORS: I know what you did last summer!
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* configure.in: Require gal 0.10.99.3.
-
-2001-08-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* README: Some info on adding --localstatedir to the configure
-	options.
-	* Makefile.am: Added omf-install to the build.
-	* configure.in: Adjust for the move of the user docs.
-	
-2001-08-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* configure.in: Addded missing dirs to the build. Add checks for
-	scrollkeeper and jw to get the docs building on later Red Hat's.
-	* omf-install/*: Added this for integration with scrollkeeper.
-	
-2001-08-14  Dan Winship  <danw@ximian.com>
-
-	* configure.in (LDAP_LIBS): Remove an obvious typo reported by
-	Miles
-
-2001-08-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* README: Be truthful about the versions of libs we need.
-	
-2001-08-10  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: if libldap.la is there, default to static linking
-	of openldap.  if it's not, default to dynamic.  also, provide
-	--with-static-ldap for users that want to override these defaults.
-
-2001-08-09  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: link statically with OpenLDAP.
-
-2001-08-09  Jon Trowbridge  <trow@ximian.com>
-
-	* configure.in: Require GAL 0.10.99.2.
-
-2001-08-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* tools/killev: Added #!/bin/sh
-
-2001-08-08  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Don't link to libnssckbi3 when linking to nss.
-
-2001-08-08  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update pilot information
-
-2001-08-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require gal 0.10.99.1 or greater.
-
-2001-08-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fixes #5594, "killev doesn't kill all evolution processes".]
-
-	* tools/killev: Added bonobo-moniker-xmldb, gnome-gtkhtml-editor
-	and gnome-spell-component.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version number to 0.12.99.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Ooops.  We want GAL >= 0.10.0 and GtkHTML >=
-	0.11.0.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Remove `$EVOLUTION_MICRO_VERSION' from `VERSION'.
-	(EVO_CHECK_LIB): 
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Bump version number to 0.12.0.
-
-2001-07-31  Ettore Perazzoli  <ettore@ximian.com>
-
-	* NEWS: Added info about the shell changes and slightly changed
-	the formatting for the addressbook ones.
-
-	* configure.in: Require GtkHTML 0.10.0 and GAL 0.9.0.
-
-2001-07-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* NEWS (Addressbook): Updated NEWS for addressbook.
-
-2001-07-31  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: bump required version of gtkhtml to 0.10.99.
-
-2001-07-20  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Bump to 0.11.99
-
-2001-07-17  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Fix up the "exactly version N" case of EVO_CHECK_LIB
-
-2001-07-16  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Changed to use test -h instead of -L for checking
-	/var/mail vs /var/spool/mail
-
-2001-07-13  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS: more updates
-
-2001-07-13  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS (Mail): Merged mine and Peter's entries.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* NEWS: Start new entry
-
-2001-07-11  Peter Williams  <peterw@ximian.com>
-
-	* acconfig.h: Add HAVE_BROKEN_SPOOL here.
-
-2001-07-10  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (have_nss_includes): Fix nss include check to work.
-
-2001-07-11  Not Zed  <NotZed@Ximian.com>
-
-	* configure.in: Added option --with-broken-spool for solaris mbox
-	spool format.
-
-2001-07-10  Marius Andreiana  <mandreiana@yahoo.com>
-
-	* configure.in: Added ro (Romanian) to ALL_LINGUAS
-
-2001-07-05  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (SYSTEM_MAIL_DIR): Make sure /var/mail
-	isn't a symbolic link such as on Red Hat 7.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Upped the required version of gal.
-
-2001-07-03  Dietmar Maurer  <dietmar@ximian.com>
-
-	* *: use bonobo-conf everywhere
-	
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* configure.in (MAILER_LIBS):
-	(MAILER_CFLAGS): added bonobo_conf.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Made evolution depend on bonobo-conf 0.2.
-
-2001-07-02  Larry Ewing  <lewing@ximian.com>
-
-	* configure.in: Check for gtkhtml 0.9.99.1. 
-
-2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Check for libGal 0.8.99.7.
-
-2001-07-02  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (evolution_db_version): s,AC_DEFINE,AC_DEFINE_UNQUOTED
-	to make these not totally useless.
-
-2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (SUBDIRS): Build the composer after the addressbook,
-	as it needs some CORBA stuff from the latter.
-
-2001-06-30  Federico Mena Quintero  <federico@ximian.com>
-
-	* tools/killev: Added evolution-alarm-notify.
-
-2001-06-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require GAL 0.8.99.6.
-
-2001-06-29  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Add `camel/tests/mime-filter/Makefile' to the
-	`AC_OUTPUT()' list.
-
-2001-06-27  Peter Williams  <peterw@ximian.com>
-
-	* configure.in (gal): Bump required gal version for new accessors
-	in ETree.
-
-2001-06-24  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add addressbook/gui/contact-list-editor, and
-	correct path of contact-editor.
-
-2001-06-21  Rodrigo Moya <rodrigo@gnome-db.org>
-
-	* libwombat/: added new directory for the libwombat library, which
-	will contain the implementation of all CORBA interfaces defined
-	in the wombat.idl file
-
-2001-06-21  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Fix the OpenLDAP check to default to "no" if you
-	don't specify anything.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* docs/C/usage-sync: Reworded a little bit for more descrip.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* doc/C/usage-calendar.sgml: Documented categorizing an event.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* doc/C/usage-mail.sgml: Updated Bcc: example
-
-2001-06-20  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Change --enable-ldap to --with-openldap, allow a
-	path prefix as an argument. Add some libtooly goodness to the
-	libldap check in case it depends on ssl libraries.
-
-2001-06-19  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Tweak the db3 header check to like our RH7 build
-	machine again.
-
-2001-06-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* libversit/vcc.y (LexBuf): Changed buf to an int here.
-	(lexGetQuotedPrintable): Changed cur to an int here.
-
-2001-06-18  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Add "--with-db3" to fill in both
-	--with-db3-includes and --with-db3-libs. Make them get cached
-	properly so you don't need to specify it every time. Simplify some
-	code.
-
-	* acconfig.h: Add #defines for the current supported db3 version
-	so that when we change it we don't have to hunt all of them down
-
-2001-06-18  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Check the modes on $system_mail_dir and set up
-	variables for camel/Makefile to make camel-lock-helper
-	setuid/setgid.
-
-2001-06-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: One slight db3 check correction
-
-2001-06-11  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: fix typo in -ldb3 check.
-
-2001-06-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Update db3 configure checks for RedHat. /me beats
-	a sleeping cat to death
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped required version of gal to 0.8.99.2.
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Added addressbook/gui/merging/Makefile.
-
-2001-06-08  Jason Leach  <jleach@ximian.com>
-
-	* my-evolution/Makefile.am (INCLUDES): builddir != srcdir fix.
-
-2001-06-08  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Byebye executive-summary, hello my-evolution
-
-	* configure.in: Remove all the executive-summary Makefiles. Add the
-	my-evolution.
-
-2001-06-08  Jon Trowbridge  <trow@ximian.com>
-
-	* AUTHORS: Vanity, thy name is trow.
-
-2001-06-05  JP Rosevear  <jpr@ximian.com>
-
-	* config.log: Bump version to 0.10.99
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* README: Included information about db3.
-
-	* acconfig.h: Added HAVE_DB_H and HAVE_DB3_DB_H.
-
-	* configure.in: Added various checks for db3 libraries and
-	includes.  Of note are the new configure options
-	--with-db3-includes=PREFIX and --with-db3-libs=PREFIX to specify
-	the location for your db3 library.
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in (GTKHTML_DATADIR): Use --moddatadir to derive this.
-
-2001-05-30  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Bump gal dependency to 0.8.99.1
-
-2001-05-29  JP Rosevear  <jpr@ximian.com>
-
-	* README: update version requirements
-
-2001-05-23  Dan Winship  <danw@ximian.com>
-
-	* README: Remove reference to verify-evolution-install.sh since it
-	doesn't work any more.
-
-	* configure.in (EVO_CHECK_LIB): allow this to take a max version
-	too, mostly so we can bound the allowable gal versions for
-	releases, but also to require libxml < 2.0.
-	(OpenSSL): Fixicate to work on NetBSD (OpenSSL in /usr, no libdl).
-
-2001-05-23  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* tools/killev: s/evolution-vcard-import/evolution-vcard-importer
-	
-2001-05-22  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Create MAILER_CFLAGS and MAILER_LIBS so that we
-	don't have the same libs multiple times in the libtool
-	command-line.
-
-2001-05-20  Duncan Mak  <duncan@ximian.com>
-
-	* tools/killev (sysname): Add in evolution-vcard-importer as part
-	of the list of processes to kill in killev.
-
-2001-05-18  Jon Trowbridge  <trow@ximian.com>
-
-	* Makefile.am (SUBDIRS): Changed build order.  Now addressbook
-	gets built before mail.
-
-2001-05-15  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Create CAMEL_CFLAGS and CAMEL_LIBS so that we
-	don't have to link in all sorts of unnecessary garbage from GNOME
-	that we don't need.
-
-2001-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev: add the importers.
-
-2001-05-14  Kevin Breit  <battery841@mediaone.net>
-
-	* doc/C/evolution-C.omf: added file for Scrollkeeper
-
-2001-05-09  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add the nspr includes to the list of includes used
-	to test for NSS headers, and don't assume -lpthread in the
-	nss/nspr libs - use PTHREAD_LIB.
-
-2001-05-09  Iain Holmes  <iain@ximian.com>
-
-	* tools/killev: Added rdf-summary killing stuff from R Burton
-	(r.burton@180sw.com)
-
-2001-05-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: OpenSSL LDFLAGS also needs to include -lcrypt
-
-2001-05-08  Iain Holmes  <iain@ximian.com>
-
-	* Makefile.am: Add the importers subdir.
-
-	* configure.in: Make the importers/Makefile
-
-2001-05-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped check for gal to 0.7.99.3.
-
-2001-05-04  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* acconfig.h: undef HAVE_SSL and HAVE_OPENSSL
-
-	* configure.in: Check for OpenSSL.
-
-2001-05-05  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* configure.in: upped required gtkhtml version to 0.9.3, even that is
-	not enough for idl changes.
-	* README: you need LIB_XML_1_BRANCH. updated all version requirements
-	from configure.in
-
-2001-04-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Don't autogen
-	`executive-summary/widgets/Makefile', as that subdir doesn't get
-	distributed anymore.
-
-2001-04-26  Dan Winship  <danw@ximian.com>
-
-	* README: We no longer depend on libunicode.
-
-	* configure.in: Remove check for libunicode. Remove unicode cflags
-	and libs from all CFLAGS and LIBS variables. Add GAL_LIBS for
-	things that need to depend on just gal (for gunicode).
-
-	* configure.in: Check for gethostbyname_r so e_gethostbyname_r
-	will DTRT.
-	
-2001-04-24  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Bump up the gal requirement
-
-2001-04-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Don't autogen the the Makefile for the importer
-	docs.
-
-	* Makefile.am (SUBDIRS): Build the docs last.
-
-2001-04-21  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (have_nspr_libs): We need to link in more than just
-	libnspr4, we also need libpthread.
-	(have_nss_libs): Don't forget to add nsprlibs to the LDFLAGS.
-
-2001-04-21  Duncan Mak  <duncan@ximian.com>
-
-	* art/Makefile.am (images_DATA): Added in composer-message.png.
-
-2001-04-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: `mail/importers/Makefile' must come after
-	`mail/Makefile'.
-
-2001-04-16  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (SUBDIRS): Add `doc'.
-
-	* configure.in: Check for Editor.idl using `$GNOME_PATH' as well.
-
-2001-04-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Updated the required version of gal to 0.6.99.0.
-
-2001-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: Check if gethostbyname_r take five params
-
-	* acconfig.h: add GETHOSTBYNAME_R_FIVE_ARGS 
-
-2001-04-10  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* AUTHORS: /me is a translator.
-	* configure.in (EVO_CHECK_LIB): fail with AC_MSG_ERROR, not echo &&
-	exit 1.
-
-2001-04-10  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in (EVOLUTION_DIR): create the makefile in
-	camel/tests/smime
-
-2001-04-08  Chris Toshok  <toshok@ximian.com>
-
-	* tools/killev (sysname): add some more 16 character versions for
-	freebsd.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* AUTHORS: Brag.
-	
-2001-04-04  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* art/evolution-today-mini.png: converted from exec-16-summary.xpm,
-	removed the latter.
-	* art/evolution-trash.png, art/evolution-trash-mini.png: images for
-	trash folder, one converted from deleted_message.xpm, another from mc.
-	* art/Makefile.am: install.
-
-2001-04-02  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* README (SSL): Remind users that they will currently have to copy
-	their cert database from their mozilla directory into ~/evolution.
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* art/Makefile.am: added missing (new) files.
-
-2001-03-30  Dan Winship  <danw@ximian.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): Bump this to 10. (We
-	forgot to do this before branching *again*...)
-
-2001-03-28  Dan Winship  <danw@ximian.com>
-
-	* README: add a bit mentioning that if configure claims you don't
-	have something installed when you think you do, that it's probably
-	because you installed it in the wrong prefix, or because you need
-	a -devel package.
-
-	* configure.in: Add a new macro EVO_CHECK_LIB that checks for a
-	gnome-config-based library of a given version or later, correctly,
-	and if doesn't find it, suggests that you consult the README. Fix
-	the various library checks to use this. Meanwhile, remove a bunch
-	of old cruft and reorganize a little.
-
-	* acconfig.h: Remove cruft
-
-2001-03-28  Jon Trowbridge  <trow@ximian.com>
-
-	* AUTHORS: In a burst of egomania, added myself.
-
-2001-03-26  Radek Doulik  <rodo@ximian.com>
-
-	* configure.in: create camel/misc/Makefile
-
-2001-03-22  Dan Winship  <danw@ximian.com>
-
-	* README: Update xml-i18n-tools version
-
-2001-03-22  Jakub Steiner <jimmac@ximian.com>
-
-	* art/new-message.xpm: file->new->mail message
-	* art/folder.xpm: file->new->folder
-	* art/new_appointment.xpm: file->new->appontment
-	* art/print-preview.xpm: file->print preview
-	* art/configure_16_calendar.xpm: for the tools menu
-
-2001-03-22  Jakub Steiner <jimmac@ximian.com>
-
-	* art/splash.png: move it a bit up so the icons fit better
-
-2001-03-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped gal requirement to 0.5.99.11.
-
-2001-03-22  Jakub Steiner <jimmac@ximian.com>
-
-	* art/configure_16_folder.xpm, configure_16_mail.xpm,
-	copy_16_message.xpm, edit.xpm, encrypt.xpm,
-	evo-16-address-conduit.png, evo-16-calendar-conduit.png,
-	evo-16-todo-conduit.png, exec-16-summary.xpm, import.xpm,
-	print.xpm, reply_to_all.xpm, reply.xpm, save.xpm,
-	send-receive.xpm, work_offline.xpm, find_contact.xpm,
-	send-24-receive.png, evo-48-calendar-conduit.png,
-	evo-48-todo-conduit.png, import.png, send-48-receive.png,
-	move_message.xpm, all_contacts.xpm, forward.xpm,
-	configure_16_addressbook.xpm, Makefile.am,
-	evo-48-address-conduit.png: renamed icons to make Miguel's
-	speedups possible
-	* art/evolution-inbox.png: color coded one
-	* art/envelope.png: reverted back to the non-color coded one
-	* art/evolution-contacts-plain.png: non-color coded one for
-	the "new contact" dialogue
-	
-2001-03-21  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Require bison, not yacc (for vcc.y)
-
-2001-03-20  Miguel de Icaza  <miguel@ximian.com>
-
-	* art/Makefile.am (images_DATA): Added all the new icons to the
-	distribution.
-
-2001-03-20  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: More fixes for NSPR and NSS checks - use fixed it
-	to use AC_CHECK_HEADERS instead of AC_CHECK_FILES. Also made it
-	not default the nspr lib path to /usr/lib/mozilla which may not be
-	in the user's library path when checking for nspr libs.
-
-2001-03-20  Jakub Steiner <jimmac@ximian.com>
-
-	* art/48_send-receive.png: send-receive for the s/r dialog
-	* art/24_send-receive.png: send-receive to replace the
-	fetch-mail-doggie
-	* art/16_send-receive.xpm: send-receive for (future) menu
-	item
-	* art/16_import.xpm: for the file menu
-	* art/16_work_offline.xpm: for the file menu
-	* AUTHORS: so I can show off
-	* art/splash.png: making radek famous ;)
-	* art/envelope.png, evolution-calendar.png, evolution-contacts.png, 
-	evolution-tasks.png, evolution-today.png: 
-	 new concept of color coded apps:
-	    - mailer: 		#efb43e
-	    - calendar:		#bab5ab
-	    - contacts: 	#9794ab
-	    - tasks:		#6e9e6e
-	    - exec. summary:	#c4757e
-	
-2001-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Fix ettore's fix ;-)
-
-2001-03-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Bumped gal requirement to 0.5.99.8.
-
-2001-03-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Make sure we never define `NSPR_CFLAGS' or
-	`NSS_CFLAGS' as just "-I".
-
-2001-03-19  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* NEWS: pulled from the 0.9 release.
-
-2001-03-18  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Updated the checks for NSS and NSPR
-
-2001-03-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* README: Added directions on how to build with SSL support.
-
-	* configure.in: Updated the checks for NSS and NSPR
-
-2001-03-16  Jakub Steiner <jimmac@ximian.com>
-
-	* art/48_import.png: for the import druid
-
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Bump gal requirement to 0.5.99.7
-
-2001-03-15  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* configure.in: create doc/devel/executive-summary/Makefile
-	* evolution.png: moved to art/.
-	* evolution.desktop: moved to data/.
-	* Makefile.am: reflect those moves.
-	* art/*.xpm: moved 8 files from calendar/gui here.
-	* art/Makefile.am: added moved files.
-	distribute *.xpm, install *.png and *view.xpm.
-
-2001-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Updated to AC_SUBST the NSPR/NSS flags.
-
-2001-03-14  Dan Winship  <danw@ximian.com>
-
-	* README: Pull up some of the clarifications from the 0.9 branch
-
-2001-03-13  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add -lresolv to LDAP_LIBS if it's there.
-
-2001-03-13  Iain Holmes  <iain@ximian.com>
-
-	* configure.in: Added the mail/importers dir.
-
-2001-03-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* README: Rearranged some of the dependencies to try to get them
-	into a more correct order (needed for people building all of these
-	packages by hand).
-
-2001-03-12  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update
-
-2001-03-09  Dan Winship  <danw@ximian.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): Hm... probably would be
-	clever to be calling this 0.9 rather than 0.8, since it's almost
-	0.10.
-
-2001-03-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* libversit/vcc.y: Changed int to char when returning a character
-	from a stream (since it needs to be able to hold EOF.)
-
-2001-03-07  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Removed --enable-assbarn-security and replaced it
-	with the real options:
-	--with-nspr-includes=PREFIX
-	--with-nspr-libs=PREFIX
-	--with-nss=PREFIX
-
-	* acconfig.h: #undef HAVE_NSS
-
-2001-03-07  Ettore Perazzoli  <ettore@ximian.com>
-
-	* configure.in: Require GAL 0.5.99.6 or later.
-
-2001-03-07  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* shell/main: /* xgettext:no-c-format */ before the welcome
-	message.
-	* configure.in: Don't try to generate a Makefile in
-	camel/providers/vee as it's empty.
-	
-2001-03-05  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update pilot instructions
-
-2001-03-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.4.
-
-2001-03-04  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Reorganize a bit to get rid of warnings about
-	AC_TRY_COMPILE being used before AC_ISC_POSIX
-
-2001-03-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Added views/addressbook/Makefile.
-
-2001-03-02  JP Rosevear  <jpr@ximian.com>
-
-	* art/Makefile.am: install conduit icons
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: add logic to make sure we're building against OpenLDAP >= 2
-
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* Makefile.am (SUBDIRS), configure.in: Added views stuff.
-
-2001-03-01  Dan Winship  <danw@ximian.com>
-
-	* configure.in: Redo the Kerberos stuff again to deal with the
-	stuff currently on my machine. I think it should deal with both
-	the MIT and KTH versions of both krb4 and krb5 now.
-
-2001-03-01  Jakub Steiner <jimmac@ximian.com>
-
-	* art/48_evo-address-conduit.png: 48^2 version of the
-	addressbook pilot conduit. (for the new control center)
-	* art/16_evo-address-conduit.png: 16x16 version for current
-	gnomecc
-	* art/48_evo-todo-conduit.png: for new gnomecc
-	* art/16_evo-todo-conduit.png: for old gnomecc
-	* art/48_evo-calendar-conduit.png: for new gnomecc
-	* art/16_evo-calendar-conduit.png: for old gnomecc
-
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.2.
-
-2001-02-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.1.
-
-2001-02-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Check for gal 0.5.99.0.
-
-2001-02-14  Dan Winship  <danw@ximian.com>
-
-	* various .cvsignore files: Ignore generated .oaf files
-
-2001-02-13  JP Rosevear  <jpr@ximian.com>
-
-	* art/Makefile.am: install new files
-
-	* art/*view.xpm: add files from calendar/gui
-
-2001-02-11  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: rework ldap check logic so it'll work to
-	--disable-ldap if you've previously configured with --enable-ldap.
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt> 
-
-	* data/evolution.keys, evolution.desktop: removed, they are generated.
-	* data/evolution.keys.in, evolution.desktop.in: new untranslated files.
-	* data/evolution.desktop: removed, it duplicates above. 
-	* Makefile.am, data/Makefile.am: reflect above changes, merge 
-	translations. 
-
-2001-02-09  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* configure.in: Added hacks to check for Mozilla libs like nspr
-	and nss that we will need for SSL and S/MIME.
-
-2001-02-09  Michael Meeks  <michael@ximian.com>
-
-	* configure.in: depend on bonobo >= 0.36
-
-2001-02-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Upped the version number of gal required to 0.5.
-
-2001-02-07  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update to latest requirements
-
-2001-02-05  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* .cvsignore: Added xml-* files.
-
-2001-02-05  Gustavo Maciel Dias Vieira  <gdvieira@zaz.com.br>
-
-	* configure.in (ALL_LINGUAS): Added pt_BR to ALL_LINGUAS.
-
-2001-02-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Require version 0.4.99.8 of gal.
-
-2001-02-03  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in: Make sure we have gnome-libs 1.2.9 or higher.
-
-2001-02-01  Chris Toshok  <toshok@ximian.com>
-
-	* configure.in: allow --enable/disable-ldap.
-
-2001-02-01  Jason Leach  <jasonleach@usa.net>
-
-	* tools/killev: Fix this script to make it work with Solaris.
-	Patch from Louise Miller.
-
-2001-01-29  Eskil Heyn Olsen  <eskil@eazel.com>
-
-	reviewed by: JP Rosevear  <jpr@ximian.com>
-
-	* acconfig.h:
-	Added the ENABLE_NNTP define
-	
-	* configure.in:
-	Fixed the NNTP m4 section.
-
-2001-01-29  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
-
-	* configure.in: added sk to ALL_LINGUAS.
-	* evolution.desktop: added Slovak messages.
-
-2001-01-27  Jason Leach  <jasonleach@usa.net>
-
-	* configure.in (AC_OUTPUT): remove
-	widgets/shortcut-bar/Makefile from here.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Upped the required version of gal in evolution.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* art/Makefile.am (images_DATA): Add the missing .xpm files.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* art/Makefile.am (images_DATA): Add `24_find_contacts.xpm',
-	`16_print_xpm', `16_configure_addressbook'.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* art/Makefile.am (images_DATA): Add `24_all_contacts.xpm'.
-
-2001-01-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Upped the required version of gal in evolution.
-
-2001-01-22  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* art/splash.png: From the "Ideas from the shower" department:
-	new splash screen.
-
-2001-01-17  JP Rosevear  <jpr@ximian.com>
-
-	* README: Update package requirements
-
-2001-01-19  Jason Leach  <jasonleach@usa.net>
-
-	* configure.in: Changed a leftover $with_x_mailer to
-	$with_sub_version.  Made it so that if $with_sub_version isn't
-	specified, we don't try to output it, and also corrected the way
-	SUB_VERSION is defined.
-
-2001-01-18  Federico Mena Quintero  <federico@ximian.com>
-
-	* Makefile.am: Um, why was the doc directory removed from SUBDIRS?
-
-2001-01-17  Larry Ewing  <lewing@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): add the
-	doc/devel/importer/Makefile as a target.
-
-2001-01-17  Ettore Perazzoli  <ettore@ximian.com>
-
-	* acconfig.h: Add `SUB_VERSION', remove `XMAILER_VERSION'.
-
-	* configure.in: Removed `--with-x-mailer' option; replaced with a
-	more generic `--with-sub-version' option.  So, don't define
-	`X_MAILER'; instead, define `SUB_VERSION'.
-
-2001-01-16  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: add --enable-nntp switch.  default is no.
-
-2001-01-16  Dan Winship  <danw@ximian.com>
-
-	* configure.in, acconfig.h: Add --with-x-mailer to set the version
-	string that appears in the X-Mailer header.
-
-2001-01-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* configure.in: Changed the required version of gal.
-
-2001-01-15  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* art/16_copy_message.xpm, art/16_move_message.xpm: icons for the 
-	Message->Move/Copy to folder -menu entries.
-
-2001-01-15  Tuomas Kuosmanen  <tigert@ximian.com>
-
-	* art/evolution-calendar-mini.png: New version of calendar icon that
-	looks more like a calendar and not a dictionary or something :)
-
-	Btw, the icons get scaled for some reason, even though that is
-	not necessary as all of those should be 16x16 pixels. Can anyone look 
-	into this? 
-
-2001-01-15  Dietmar Maurer  <dietmar@ximian.com>
-
-	* *.c: changed the signature of the property_bag get/set
-	functions.
-
-2001-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* configure.in: remove old config message
-
-2001-01-14  Damon Chaplin  <damon@helixcode.com>
-
-	* tools/evolution-move-tasks: new script to move tasks from the
-	Calendar folder to the new Tasks folder, so people won't lose tasks.
-	This can be deleted after a few releases.
-
-	* tools/Makefile.am (bin_SCRIPTS): added above.
-
-	* configure.in: added default_user/local/Tasks/Makefile to AC_OUTPUT.
-
-2001-01-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* config.h.in: Removed GPG stuff.
-
-	* acconfig.h: Take out all refs to PGP and GPG stuff.
-
-	* configure.in: Take out the PGP/GPG detection stuff.
-
-2001-01-12  Federico Mena Quintero  <federico@ximian.com>
-
-	* configure.in: Suggest what to do if gtk-doc is not found.
-
-2001-01-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Make evolution depend on the new version of gal.
-
-2001-01-12  Dan Winship  <danw@ximian.com>
-
-	* MAINTAINERS, AUTHORS, README: Ximianize. Also update the README
-	a bit and mention the OAF stable branch.
-
-2001-01-11  Dan Winship  <danw@helixcode.com>
-
-	* art/priority-high.xpm: Add a white outline around the "!" so it
-	still shows up clearly in selected rows when your theme selection
-	color is reddish. (Problem pointed out by Federico.)
-
-2001-01-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: At the end of the configure process, report
-	whether the documentation files will be built or not.
-
-2001-01-10  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/move-message.png, art/move-message.png: New versions.
-
-2001-01-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added calendar/gui/alarm-notify/Makefile.
-
-2001-01-05  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/evolution-contacts-mini.png: This looks more pretty.
-
-2001-01-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Removed camel/providers/mbox/Makefile and
-	camel/providers/mh/Makefile.
-
-2001-01-01  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require bonobo 0.31
-
-2000-12-24  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: If we find threads ok, then always turn on
-	ENABLE_THREADS.
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* NEWS (Addressbook): Added a bit of addressbook NEWS.
-
-	* configure.in: Updated the gal check to require gal 0.4.
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/mail-new.xpm, art/mail-read.xpm, art/mail-replied.xpm: Moved
-	these images each up one pixel.
-
-2000-12-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* NEWS: Update.
-
-2000-12-14  JP Rosevear  <jpr@helixcode.com>
-
-	* NEWS: Update
-
-2000-12-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/splash.png: New splash from Jimmac.
-
-2000-12-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* README: Removed mention of ETable and EText in widgets
-	directory.
-
-2000-12-12  Dan Winship  <danw@helixcode.com>
-
-	* README: Mention the gconf stable branch.
-
-2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Updated the required version of gal.
-
-2000-12-07  Radek Doulik  <rodo@helixcode.com>
-
-	* configure.in (GTKHTML_LIBS): renamed HTMLEditor.idl to
-	Editor.idl
-
-2000-12-06  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* data/evolution.keys: Added some Norwegian translations.
-	
-2000-12-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Increased the required version of gal.
-
-2000-12-05  JP Rosevear  <jpr@helixcode.com>
-
-	* README: minor tweak
-
-2000-12-05  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added camel/tests/stream/Makefile.am.
-
-2000-12-01  Dan Winship  <danw@helixcode.com>
-
-	* README: gnome-vfs depends on gconf, so add that.
-
-2000-11-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Bumped required gal version to 0.2.99.4 for
-	e_str_make_safe.
-
-	* README: Added some necessary :'s in the pilot-link cvs stuff.
-
-2000-11-30  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* calendar/gui/main.c, executive-summary/component/main.c, mail/main.c,
-	shell/main.c, notes/main.c,
-	addressbook/gui/component/addressbook-factory.c:
-	removed #ifdef ENABLE_NLS/#endif on Miguel's request.
-
-2000-11-29  JP Rosevear  <jpr@helixcode.com>
-
-	* README: Update pilot info
-
-2000-11-29  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Bump required gal version to 0.2.99.3 for iconv
-	changes
-
-2000-11-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* COPYING-DOCS: Added a copy of the GNU Free Documentation
-	License.
-
-	* Makefile.am (EXTRA_DIST): Added COPYING-DOCS.
-
-2000-11-28  JP Rosevear  <jpr@helixcode.com>
-
-	* acconfig.h: Add USE_FLOCK, USE_FCNTL, USE_FLOCK
-
-	* configure.in: Auto* magic for various camel locking types
-
-2000-11-28  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in (AC_OUTPUT): Added camel/tests/folder/Makefile
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* AUTHORS: Update - hopefully I assigned blame correctly :-)
-
-	* MAINTAINERS: ditto
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Correct the bonobo version error message
-
-	* README: Update
-
-2000-11-24  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added camel/tests stuff to output macro.
-
-2000-11-14  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added local provider dir to output macro.
-
-2000-11-21  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Check for libgpgme. (Support not added to mail
-	yet.)
-
-2000-11-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): Removed the
-	default_user/local/Tasks/Makefile until the relevant files are on
-	CVS.
-
-2000-11-18  Miguel de Icaza  <miguel@helixcode.com>
-
-	* Added widgets/menus that contains the gal-view-menus.c code from
-	Gal that depended on Bonobo.
-
-	* configure.in: Update list of Makefiles;  
-
-	* widgets/Makefile.am: Update.
-
-2000-11-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Update the gal reqiurement version.
-
-2000-11-10  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require Bonobo >= 0.29, due to the XSync
-	fix.
-
-2000-11-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Require gal 0.2.99.1.
-
-2000-11-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Require gal 0.2.1.3
-
-2000-11-06  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (GTKHTML_LIBS): ${prefix} doesn't get defaulted
-	until the end of configure, so check if it's "NONE" and use
-	${ac_default_prefix} if so.
-
-2000-11-06  Radek Doulik  <rodo@helixcode.com>
-
-	* configure.in (GTKHTML_LIBS): also look for HTMLEditor.idl in
-	${prefix}/share/gtkhtml
-
-2000-11-03  Radek Doulik  <rodo@helixcode.com>
-
-	* configure.in (BONOBO_HTML_GNOME_CFLAGS): raise required version
-	number to 0.8
-	added check for HTMLEditor.idl file
-
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Require gal 0.2.1.2.
-
-2000-11-02  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require Bonobo-0.27+
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* addressbook/ename/.cvsignore, addressbook/gui/minicard/.cvsignore,
-	calendar/doc/.cvsignore, widgets/e-paned/.cvsignore,
-	widgets/e-table/.cvsignore, widgets/e-text/.cvsignore: added these
-	files.
-	* calendar/gui/.cvsignore, composer/.cvsignore,
-	executive-summary/.cvsignore, executive-summary/component/.cvsignore,
-	po/.cvsignore: added some files to ignore.
-
-	* addressbook/gui/component/addressbook-factory.c, mail/main.c,
-	shell/main.c, calendar/gui/main.c, notes/main.c,
-	executive-summary/component/main.c: call *textdomain() only if
-	ENABLE_NLS is defined.
-
-2000-11-01  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* configure.in: added lt to ALL_LINGUAS.
-	
-2000-10-30  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: fix up printing of kerberos configuration status
-
-2000-10-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Require gal cvs version.
-
-2000-10-27    <jpr@helixcode.com>
-
-	* tools/killev: Kill executive summary components
-
-2000-10-25  Iain Holmes  <iain@helixcode.com>
-
-	* configure.in: Added executive-summary stuff
-
-	* Makefile.am: Added the executive-summary subdirs.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* notes/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
-
-	* configure.in: set localedir here to use in Makefiles.
-	(AM_GNOME_GETTEXT doesn't actually always set it to
-	$(datadir)/locale).
-
-2000-10-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Updated the gal check to check for gal 0.2.1.
-
-2000-10-22  Robert Brady  <rwb197@zepler.org>
-
-	* configure.in: Added "en_GB" to ALL_LINGUAS.
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* notes/component-factory.c (control_activate_cb): 
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* NEWS (General, Addressbook): Updated NEWS for addressbook and
-	ETable.
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Updated the gal check to check for gal 0.2.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in (EVOLUTION_MICRO_VERSION): 6.
-
-	* Makefile.am (EXTRA_DIST): Remove `evolution.spec.in'.
-	(dist-hook:): Removed.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* notes/component-factory.c (control_activate, control_deactivate),
-	(create_view): cripple, not worth updating to new UI code.
-
-2000-10-17  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/splash.png: This looks happier than the dark piece of rusty
-	metal. And the Big Dig in Boston is ugly looking too. Finnish
-	road poles are much more cool!
-
-2000-10-15  Peter Williams  <peterw@helixcode.com>
-
-	* tools/verify-evolution-install.sh (libcamelvee): Check
-	for linkage against version 0.5 libcamelvee, not version 0.3.
-	This should track with the version of Evolution itself.
-	(rm -f $ldddfile): Remove a temporary file.
-
-2000-10-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* configure.in: Added "nn" to ALL_LINGUAS.
-	
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* art/Makefile.am (images_DATA): Add `splash.png'.
-
-2000-10-14  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/splash.png: umm.. it's a splash screen image.
-
-2000-10-11  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Fix bonobo error message
-
-2000-10-11  Jesse Pavel		<jpavel@helixcode.com>
-
-	* data/evolution.keys: Added support for the text/calendar and
-	text/x-calendar MIME types.
-
-2000-10-10  Gediminas Paulauskas  <menesis@delfi.lt>
-
-	* configure.in: Added lt to ALL_LINGUAS.
-
-2000-10-10  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* calendar/gui/recur.xpm: Updated round-we-go-thingy icon..
-
-2000-10-06  Chris Toshok  <toshok@helixcode.com>
-
-	* art/empty.xpm: make it transparent instead of white.
-
-2000-10-06  Christophe Merlet  <christophe@merlet.net>
-
-	* *.desktop: Added french strings.
-
-2000-10-05  Dan Winship  <danw@helixcode.com>
-
-	* tools/Makefile.am (EXTRA_DIST): Add verify-evolution-install.sh
-	to EXTRA_DIST
-
-2000-10-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Check for isblank
-
-	* config.h.in: 
-	* acconfig.h: #undef HAVE_ISBLANK
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Bump Bonobo requirement to >= 0.20
-
-2000-10-05  Iain Holmes  <iain@helixcode.com>
-
-	* executive-summary/*: Added the executive summary stuff.
-
-	* ui/evolution-executive-summary.xml: New.
-
-	* art/add-service.png: New icon.
-
-2000-10-03  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* ui/evolution-addressbook-ldap.xml,
-	* ui/evolution-addressbook.xml,
-	* ui/evolution-calendar.xml,
-	* ui/evolution-contact-editor.xml:
-	Fixed typo `_decr' -> `_descr', so some missing tooltips will appear.
-	Also fixed some typos in descr values.
-
-2000-09-29  Peter Williams  <peterw@helixcode.com>
-
-	* ui/Makefile.am (XML_FILES): Install the new evolution-subscribe.xml
-	file.
-
-2000-09-29  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/evolution-mail.xml: add a Settings/Manage Subscriptions...
-	menu item.
-
-	* ui/evolution-subscribe.xml: add a File/Close menu item.
-
-2000-09-28  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/evolution-subscribe.xml: add a FolderSearch control, and
-	change "Refresh" to "RefreshList".
-
-2000-09-27  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/evolution-subscribe.xml: add an Refresh List button..
-
-2000-09-27  Chris Toshok  <toshok@helixcode.com>
-
-	* ui/Makefile.am (XML_FILES): add evolution-subscribe.xml.
-
-	* ui/evolution-subscribe.xml: new file.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* ui/evolution-mail.xml: Moved the (un)select all menu items over
-	to the Edit menu - this looks nicer.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* ui/evolution-mail.xml: Added some new menu items to the Message
-	menu like (un)select all and moved "mark as read" to the Message
-	menu.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Moved addressbook/ename to e-util/ename so
-	generate e-util/ename/Makefile and don't generate
-	addressbook/ename/Makefile
-
-2000-09-23  Tuomas Kuosmanen  <tigert@localhost>
-
-	* art/attachment.xpm
-	* art/add-attachment.png: OOPS. The attachment.xpm was not the one 
-	I thought, so I accidentally replaced the paperclip icon in the mail
-	list column, which wasnt my intention. I hope this works now. The old 
-	one is back, instead the toolbar icon to add attachment is now called
-	"add-attachment.png" as you can see also from above. Bummer. Sorry :)
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* libversit/vcc.y: Fixed some warnings.  Fixed a bug where quoted
-	printable fields were reading in semi-colons that should have been
-	field separators.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ui/Makefile.am: Added evolution-addressbook-ldap.xml.
-
-	* ui/evolution-addressbook-ldap.xml: New file.  (A Variation on
-	evolution-addressbook.xml)
-
-	* ui/evolution-addressbook.xml: Added View All and Stop buttons.
-
-2000-09-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* ui/evolution-calendar.xml: Removed the AboutCalendar stuff.
-
-	* ui/evolution.xml: Fix mis-spelling of "calendar".
-
-2000-09-21  Michael Meeks  <michael@helixcode.com>
-
-	* notes/component-factory.c (control_activate): upd.
-
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ui/.cvsignore: Added a cvsignore file here.
-
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ui/Makefile.am (XML_FILES): Added evolution-contact-editor.xml.
-
-	* ui/evolution-contact-editor.xml: New file for the UI for the
-	evolution contact editor.
-
-2000-09-20  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/attachment.xpm
-	* art/send.png: new icons for "compose mail" dialog...
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: alter the krb4 check a bit to deal with configure
-	cache suckage. (If you do AC_CHECK_LIB with the same library and
-	function name but different LDFLAGS, it will still use the result
-	of the previous check. So use a different function the second
-	time.)
-
-2000-09-18  Dan Winship  <danw@helixcode.com>
-
-	* README: add gal as a dependency
-
-2000-09-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* art/score-*.xpm: stupid looking icons for use with displaying
-	scores in the message-list view. These need a makeover BADLY ;-)
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added check for gnome-app-lib.  Removed
-	directories that have been moved to gal.
-
-2000-09-15  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, evolution.spec.in: remove spec file. We haven't
-	been keeping it up to date, and it's only good for RH anyway, and
-	if people really want a spec file they can get it from our SRPMs.
-
-2000-09-07  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Require Bonobo 0.19
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added widgets/e-reflow/Makefile.  Replaced
-	addressbook/gui/minicard/Makefile with
-	addressbook/gui/widgets/Makefile.
-
-2000-09-13  Tuomas Kuosmanen  <tigert@localhost>
-
-	* art/pin.png: added icon for the folder tree "pin down" button
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* NEWS (Calendar): Pilot stuff
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: The notes subdir isn't actually used, so remove
-	it.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: 0.5.
-
-2000-09-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* NEWS (Mailer): Added Sent/Outbox feature descriptions
-
-2000-09-12  Dan Winship  <danw@helixcode.com>
-
-	* NEWS (Mailer): add most (but not all) 0.5 Mailer features
-
-	* configure.in: s/Sentbox/Sent/
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* art/Makefile.am (buttonsdir): Install the new button icons into
-	`$(datadir)/images/evolution/buttons'.
-
-2000-09-11  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* art/fetch-mail.png
-	* art/compose-message.png
-	* art/reply.png
-	* art/reply-to-all.png
-	* art/forward.png
-	* art/move-message.png
-	* art/copy-message.png: New icons for the main window toolbar
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* NEWS: Added 0.5 changes for ETable and Addressbook.
-
-2000-09-07  Dan Winship  <danw@helixcode.com>
-
-	* README: Add a mention of the verify-evolution-install.sh script
-	in tools/.
-
-2000-09-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	Reversed my last change as it broke configure, how do I get it so
-	that we can do folders with spaces in the name!?
-
-2000-09-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Renamed default_user/local/Sentbox to
-	default_user/local/Sent\ Mail as Ettore and Danw are picky about
-	folder names 
-
-2000-09-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added calendar/conduits/Makefile,
-	calendar/conduits/calendar/Makefile and
-	calendar/conduits/todo/Makefile to the list of makefiles to
-	output.
-
-2000-09-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Add default_user/local/Sentbox/Makefile to the
-	list of makefiles to output
-
-2000-08-31  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (kerberos): Check and see if krb_sendauth needs
-	prototyping. (#define NEED_KRB_SENDAUTH_PROTO). Also check
-	for a libkrb that doesn't need -ldes.
-
-	* acconfig.h: #undef it
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* configure.in: AC_DEFINE(USING_GNOME_PRINT_0_20)
-
-	* acconfig.h: #undef that
-
-2000-08-30  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in: Robustify the kerberos checks.
-
-2000-08-29  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: decruft
-
-2000-08-28  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in: Added Portuguese (pt) to ALL_LINGUAS
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Require oafized bonobo
-
-2000-08-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Ahem.  If you add dependencies on libraries, make
-	sure things still build.  Fixed the libunicode foo.
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.c (_get_position_from_xy): Don't crash on illegal string
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.c (e_text_event): Use e_utf8_from_gtk_event_key
-	to translate GDK_KEY_PRESS to insertable UTF-8 string
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* announcement-0.4.1.txt: Updated dependency list.
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.c: Use byte based UTF-8 syntax
-	
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* announcement-0.4.1.txt: Announcement message
-
-2000-08-19  Mathieu Lacage <mathieu@gnu.org>
-
-	Fixes compile for non-standard prefixes. Mainly in idl
-	compilation where -I`gnome-config --datadir`/idl is replaced
-	by `gnome-config --cflags idl` (ugly but it works at least)
-	and add some random _CFLAGS here and there and _LIBS for linking.
-	* addressbook/gui/component/select-names/Makefile.am
-	* composer/Makefile.am
-	* e-util/Makefile.am
-	* filter/Makefile.am
-	* mail/Makefile.am
-	* shell/Makefile.am
-	* widgets/e-text/Makefile.am
-	
-
-2000-08-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Added code
-	to make handle position persist across resizes.
-
-2000-08-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Fixed a warning.
-
-2000-08-20  arik devens  <arik@helixcode.com>
-
-	* widgets/e-text/Makefile.am (INCLUDES): added UNICODE_CFLAGS
-	support so that compiling in an alternate prefix works.
-
-2000-08-19  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* widgets/e-text/e-text.h: Commented out Suckfont, added EFont
-	* widgets/e-text/e-text.c: Ported to UTF-8
-
-2000-08-18  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (gnome-vfs): Check for new enough gnome-vfs
-	(needs gnome_vfs_mime_get_default_action_without_fallback)
-
-2000-08-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Generate
-	doc/devel/calendar/cal-util/Makefile.
-
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in: Check for db1/db.h too, which is what
-	RH 7.0 uses for the old db headers. Patch from Kenny Graunke
-	<kwg@teleport.com>
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: offer --enable-pilot-conduits to add pilot
-	conduits if the user wants them.
-
-2000-08-13  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Fix the name of the binary to look for for PGP5
-
-2000-08-12  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: Check for Bonobo 0.17
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added addressbook/gui/search/Makefile.
-
-2000-08-12  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, README: Depend on gnome-vfs 0.3
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/.cvsignore, widgets/e-text/Makefile.am,
-	widgets/e-text/e-entry-test.c: Added a test for the EEntry widget.
-
-2000-08-09  Dan Winship  <danw@helixcode.com>
-
-	* data/evolution.keys: New file containing MIME keys for
-	Evolution. Currently just the addressbook minicard display.
-
-	* data/Makefile.am (mime_DATA): add evolution.keys
-
-2000-08-09  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): Remove the warning about camel-async.
-
-2000-08-08  Peter Williams  <peterw@helixcode.com>
-
-	* Makefile.am (SUBDIRS): Reenable the calendar. Oops.
-
-2000-08-05  Dan Winship  <danw@helixcode.com>
-
-	* tools/verify-evolution-install.sh: Look for oafinfo files in
-	oaf's prefix, not gnome-libs's. Allow binaries to be installed
-	anywhere in $PATH.
-
-	* configure.in, README: Update the README and the text of the
-	Bonobo configure check to match reality. Remove the 0.15 vs
-	0.15-and-a-half check since we require post-0.16 now.
-
-2000-08-03  JP Rosevear  <jpr@helixcode.com>
-
-	* configure.in: Remove gconf check
-
-2000-08-03 Alastair McKinstry <mckinstry@computer.org>
-
-	* configure.in (ALL_LINGUAS): Add Irish translation
-
-2000-08-02  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in: update for BonoboX
-
-2000-08-02  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Add camel/providers/nntp
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made clicking choose the right
-	character even if show_borders is on.
-
-2000-08-01  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: Add checks for GPG, PGP 5 and PGP 2.
-	Only record the first one found.
-
-2000-08-01  Damon Chaplin  <damon@helixcode.com>
-
-	* configure.in (AC_OUTPUT): removed calendar/doc/*
-
-2000-08-01  Not Zed  <NotZed@HelixCode.com>
-
-	* configure.in: Added mh provider.
-
-2000-07-27  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Check for gconf_client_get_default (gconf 0.5 vs
-	newer)
-
-2000-07-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Bump version number to 0.3.
-
-2000-07-26  Peter Williams  <peterw@helixcode.com>
-
-	* widgets/e-table/e-table-scrolled.c (right_click_proxy): Default
-	the return value to 0.
-
-2000-07-25  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: some unrelated changes: check for mkdtemp,
-	gnome_vfs_mime_get_default_action_without_fallback, and a
-	setuid/setgid movemail binary.
-
-	* acconfig.h: add MOVEMAIL_PATH
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added addressbook/conduit/Makefile.
-
-2000-07-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made focus in not change your selection
-	position.
-
-2000-07-21  Szabolcs BAN <shooby@gnome.hu>
-
-	* calendar/gui/event-editor.c: Typo fix
-
-2000-07-20  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (THREADS_CFLAGS): Make threads mandatory
-	again.
-
-2000-07-19  Fatih Demir	<kabalak@gmx.net>
-	
-	* evolution.desktop & data/evolution.desktop: Added
-		the Turkish desktop entries.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (EVOLUTION_DIR): Typo fix.
-
-	* configure.in (AC_OUTPUT): Added the doc/devel Makefiles.
-	(EVOLUTION_DIR): Substitute EVOLUTION_DIR for the top_srcdir.
-	Added checks for gtk-doc.
-
-2000-07-13  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* configure.in (end): Bigass warnings for camel-async branch
-	(remove them later).
-
-2000-07-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Make gnome-print-0.20 mandatory.  We will bail out
-	with CVS HEAD versions to avoid breakage.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Version 0.2.
-
-	* configure.in: Reverse the GtkHTML check.
-
-2000-07-10  Jeffrey Stedfast <fejj@helixcode.com>
-
-	* configure.in: Updated to check for required GtkHTML and
-	gnome-print
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Remove the conduits stuff for now.  They depend on
-	CVS gnome-pilot, and this is not good for the release.
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* README: updates
-
-2000-07-10  Seth Alves  <alves@hungry.com>
-
-	* configure.in: added makefiles for calendar conduits
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Add a check for Bonobo 0.15 vs Bonobo post-0.15
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Don't draw quite as large a "flat_box".
-	If draw_borders is TRUE, cause the cursor to change even if not
-	editing.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-entry.c: Removed some border padding and set
-	the "draw_borders" argument of the contained GtkText.
-
-	* widgets/e-text/e-text.c, widget/e-text/e-text.h: Added a
-	"draw_borders" argument which, if set, makes the EText look more
-	like a GtkEntry.
-
-2000-07-09  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-contacts.png: updated so it has better contrast
-	against the background.
-
-	* art/evolution-contacts-small.png: Fits the style of the new contacts
-	icon, this is a sigle card.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text-model.c (e_text_model_real_get_text):
-	Return "" instead of NULL.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/Makefile.am: Fixed EXTRA_DIST for make distcheck.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-entry.c: Set "anchor" and "fill_clip_rectangle"
-	arguments.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added
-	"fill_clip_rectangle" argument which describes whether to accept
-	clicks throughout the clipping rectangle.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-entry.c: Fixed some typos.
-
-2000-07-07  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-contacts.png: Changed icon (hi ettore)
-	The old handshake one was a little too firm handshake..
-	this is a rolodex icon..
-
-2000-07-07  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: make pthreads not required again, since they
-	aren't, and remove widgets/e-toolbar/Makefile from AC_OUTPUT since
-	that dir doesn't exist any more.
-
-2000-07-06  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in (AC_OUTPUT): remove the default_user Directories
-	dir.
-
-2000-07-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am, libical/configure.in: Fixed some make distcheck
-	errors.
-
-2000-07-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in (GNOME_VFS_CFLAGS): Define.
-	(GNOME_VFS_LIBS): Define.
-
-2000-07-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Add
-	`addressbook/gui/component/select-names/Makefile' to the
-	`AC_OUTPUT()' list.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/Makefile.am: Added e-entry.c and e-entry.h.
-
-	* widgets/e-text/e-entry.c, widgets/e-text/e-entry.h: New files to
-	be a widget containing a text item.
-
-	* widgets/e-text/e-text.c: Fixed some spacing.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* notes/component-factory.c (owner_set_cb): Get an
-	EvolutionShellClient instead of an Evolution_Shell to match the
-	changes in libeshell.
-
-2000-06-29  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in:  Re-enable GNOME_PILOT_CHECK.
-	Change AC_MSG_CHECKING([For...]) to [for...]. It's the little
-	things that matter.
-
-2000-06-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: `AM_PATH_GCONF'.
-
-2000-06-27  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* configure.in (ctime_r): Check for whether ctime_r takes
-	two (Linux) or three (Solaris) arguments.
-	(AC_OUTPUT): Don't create notes/Makefile twice.
-
-	* acconfig.h: Add CTIME_R_THREE_ARGS to the list.
-	
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Calculate height including if
-	clip_height is set to -1.
-	
-2000-06-26  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* configure.in (THREADS_CFLAGS): Add option --enable-broken-threads
-	to turn on the threading stuff in evolution-mail. Defaults to no.
-
-	* acconfig.h: Add USE_BROKEN_THREADS to the list.
-	
-2000-06-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Use `glib-config' instead of `$GLIB_CONFIG' as the
-	latter is not actually defined anywhere.
-
-2000-06-25  Peter Williams  <peterw@helixcode.com>
-
-	* configure.in (pthread stuff): Make threads required due
-	to threaded evolution-mail. Subst in the THREADS_LIBS et
-	al.
-
-	* tests/Makefile.am: Remove USE_THREADS conditional as we
-	always use threads now.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Fixed some vertical scroll bugs.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Fix a bug with intial vertical scroll.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* notes/e-note.c, widgets/meeting-time-sel/e-meeting-time-sel.c,
-	widgets/shortcut-bar/e-icon-bar.c: Removed the usage of "x" and
-	"y" arguments to EText.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed the
-	"x" and "y" arguments to EText.   Added vertical scrolling.
-
-2000-06-20  Damon Chaplin  <damon@helixcode.com>
-
-	* widgets/meeting-time-sel/e-meeting-time-sel-item.c: 
-	* widgets/meeting-time-sel/e-meeting-time-sel.c: fixed a few warnings.
-
-2000-06-17  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made EText use the font from the
-	canvas's style if one isn't set.
-
-2000-06-17  Damon Chaplin  <damon@helixcode.com>
-
-	* widgets/meeting-time-sel/*: updated to use EText items rather than
-	GtkEntry widgets and added support for adding new rows.
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* README: bye bye goad
-
-2000-06-14  Damon Chaplin  <damon@helixcode.com>
-
-	* README (http): added command to co ORBit.
-
-2000-06-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Added IMAP into the build
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* notes/Makefile.am (SHELL_OBJS): Removed.
-	(evolution_notes_LDADD): Link with
-	`$(top_builddir)/shell/libeshell.a'.
-
-2000-06-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* widgets/Makefile.am (SUBDIRS): build `misc' before everything
-	else.
-
-	* Makefile.am: Install `evolution.png' and `evolution.desktop'
-	where appropriate.
-
-	* evolution.png: New.  For now, it's just a copy of
-	`art/evolution-inbox.png'.
-
-	* evolution.desktop: New.
-
-2000-06-10  Zbigniew Chyla  <chyla@buy.pl>
-
-	* configure.in: Added pl (Polish) to ALL_LINGUAS
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Added new directory `shell/glade'.
-
-2000-06-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Added a
-	"quantum" argument for making the panes move in jumps.
-
-2000-06-07  Anders Carlsson  <andersca@gnu.org>
-
-	* configure.in:  Create notes/Makefile
-
-	* notes/*: Add preliminary yellow sticky notes.
-
-2000-06-05	Mathieu Lacage	<mathieu@gnome.org>
-
-	* addressbook/contact-editor/Makefile.am: make it 
-	compile: add proper bonobo linking params.
-	* addressbook/gui/minicard/Makefile.am: idem.
-	* wombat/Makefile.am: add BONOBO_VFS_GNOME_CFLAGS.
-	cleanup some useless includes and libs.
-
-2000-06-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in (ALL_LINGUAS): Add `it' and `de'.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Released Evolution 0.1.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* tests/test-movemail.c: Reverted removal of e_setup_base_dir.
-
-2000-06-02  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in: Added pt (Portuguese) to ALL_LINGUAS
-
-2000-06-02  Dan Winship  <danw@helixcode.com>
-
-	* README: Update dependencies. Rewrite the GOAD vs OAF thing some
-	more to reflect OAF's new ascendency. Make the fact that you don't
-	need pilot stuff clearer. Add some new directories to the
-	directory layout section.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/misc/e-clipped-label.c: Free the finish data.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* tests/test-movemail.c (main): Don't call e_setup_base_dir.
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (AC_OUTPUT): add doc, doc/C
-
-	* Makefile.am (SUBDIRS): add doc
-
-2000-05-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* widgets/misc/e-scroll-frame.[ch]: Imported GtkScrollFrame from
-	EOG and renamed it to EScrollFrame.
-
-	* widgets/misc/Makefile.am (libemiscwidgets_a_SOURCES): Added
-	e-scroll-frame.[ch].
-
-2000-05-30  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* widgets/e-paned/e-vpaned.c (e_vpaned_handle_shown): Show the
-	handle even if the requisition for the child is zero.
-	* widgets/e-paned/e-hpaned.c (e_hpaned_handle_shown): Likewise.
-
-2000-05-26  H�ctor Garc�a Alvarez <hector@scouts-es.org>
-
-        * configure.in: Added Spanish language
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-vpaned.c: Fixed a
-	bug where we were resizing a non-existent window.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Made
-	the handlebar disappear if either side is empty, hidden, or
-	requests 0 size.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added widgets/e-paned/Makefile.
-
-	* tests/ui-tests/message-browser.c: Switched from GtkPaned to
-	EPaned.
-
-	* widgets/Makefile.am: Added e-paned directory.
-
-	* widgets/e-paned/, widgets/e-paned/.cvsignore,
-	widgets/e-paned/Makefile.am, widgets/e-paned/e-hpaned.c,
-	widgets/e-paned/e-hpaned.h, widgets/e-paned/e-paned.c,
-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c,
-	widgets/e-paned/e-vpaned.h: New widget based completely on
-	GtkPaned from 1.4.  This will be more advanced soon.
-
-2000-05-22  Jeff Stedfast  <fejj@helixcode.com>
-
-	* configure.in: Readded camel/providers/smtp 
-
-2000-05-22  Szabolcs BAN <shooby@gnome.hu>
-
-	* configure.in: Added Hungarian language
-
-2000-05-18  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (AC_OUTPUT): add camel/providers/vee
-
-2000-05-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* art/Makefile.am: Install the mini icons.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: add --with-purify-options support, and default it
-	to what we at helix need
-
-Tue May 16 06:11:40 2000  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-calendar-mini.png art/evolution-inbox-mini.png
- 	art/evolution-tasks-mini.png art/evolution-contacts-mini.png
- 	art/evolution-notes-mini.png: new mini-icons for the tree view
-	of folders and stuff.
-
-2000-05-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added calendar/gui/dialogs/Makefile.am.
-
-2000-05-10  Matt Loper  <matt@helixcode.com>
-
-	* README: Added version and availability of required libunicode
-	library.
-
-2000-05-10  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Update versions needed for gnome-print, bonobo,
-	and gtkhtml.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* HACKING: We need a HACKING file.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Removed dist-hook section.
-
-	* configure.in: Set the version number.  Added a check for gnome
-	window icons.  Removed a bunch of unused Makefiles.
-
-	* tools/Makefile.am: Created a proper EXTRA_DIST section.
-
-	* widgets/e-text/Makefile.am: Added
-	e-text-event-processor-types.h.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/Makefile.am: Added briefcase.png to get installed.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Remove the tooltip callback when
-	destroyed.
-
-2000-05-09  Matt Loper  <matt@helixcode.com>
-
-	* calendar/pcs/cal-backend.c (cal_backend_add_cal): Return nothing
-	for a 'void' function.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widget/e-text/e-text.c, widgets/e-text/e-text.h: Added an
-	activate signal.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-	
-	* configure.in: Added new Directories section for the default_user.
-
-2000-05-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Updated for the new `default_user' directory
-	setup.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: check for purify.
-
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added a
-	"changed" signal that gets sent whenever the text changes.
-
-2000-05-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* Added `--enable-purify' flag.
-
-2000-05-05  Chris Toshok <toshok@helixcode.com>
-	
-	* shell/Makefile.am: add support for building purified evolution.
-
-	* shell/.cvsignore: ignore evolution.pure
-
-2000-05-05  Chris Toshok <toshok@helixcode.com>
-
-	* addressbook/backend/ebook/.cvsignore,
-	addressbook/contact-editor/.cvsignore,
-	addressbook/gui/component/.cvsignore,
-	addressbook/gui/minicard/.cvsignore,
-	addressbook/printing/.cvsignore,
-	calendar/cal-client/.cvsignore,
-	calendar/gui/.cvsignore,
-	calendar/pcs/.cvsignore,
-	filter/.cvsignore,
-	mail/.cvsignore,
-	shell/.cvsignore,
-	tests/.cvsignore,
-	widgets/e-table/.cvsignore,
-	widgets/e-text/.cvsignore,
-	widgets/meeting-time-sel/.cvsignore,
-	widgets/shortcut-bar/.cvsignore,
-	wombat/.cvsignore: ignore the .pure directory
-
-2000-05-04  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: Oops. The Kerberos check was succeeding when it
-	shouldn't have (and thus breaking the pop3 build for "normal"
-	people). Fix.
-
-2000-05-03  Michael Meeks  <michael@helixcode.com>
-
-	* configure.in (xmlversion): Fix to remove older 'libxml' prefix.
-
-2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* configure.in: Do not output `doc/Makefile' because there is
-	nothing to generate it from.
-
-2000-05-02  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: add some minimal Kerberos checking.
-	This isn't intended to be generically useful at this point, it's
-	just there to give me a second POP auth mechanism to play with.
-
-	Also remove a bit of cruft, and reorganize configure.in a bit.
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test13.c: And here too.
-
-	* tests/test2.c (main): REmoved gmime-utils.h
-
-	* tests/Makefile.am (LDADD): Add libeutil to default link line.
-	(test_movemail_LDADD): Fixed order for libutil linking.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* tests/Makefile.am: set G_LOG_DOMAIN.
-	* tests/ui-tests/Makefile.am: same.
-	* widgets/e-text/Makefile.am: same.
-	* widgets/meeting-time-sel/Makefile.am: same.
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c (main): *sigh* moved back to sync api.
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c (search_cb): Try deleting messages ...
-	(main): Fix for provider api changes.
-
-2000-05-01  Anders Carlsson  <andersca@gnu.org>
-
-	* configure.in: Check if bonobo uses oaf, so you don't
-	need to specify --enable-oaf.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* acconfig.h: New configured #define `USING_OAF'.
-
-	* configure.in: Added `--enable-oaf' option and corresponding
-	`OAF_LIBS' and `OAF_FLAGS' variables.  Code friendly provided by
-	Maciej Stachowiak <mjs@eazel.com>.
-
-2000-04-27  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test10.c: Fix for removal of camelmimebodypart, and changes
-	to recipient stuff.
-
-	* tests/test1.c: Fix for removal of camelmimebodypart, and changes
-	to recipient stuff.
-
-2000-04-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Added addressbook/ename/Makefile.
-
-2000-04-27  Matt Loper  <matt@helixcode.com>
-
-	* configure.in: added tools/Makefile.
-
-	* Makefile.am: Added tools.
-
-	* tools/: New directory for tools relating to evolution.
-
-	* tools/killev: New script for killing all evolution-related
-	stuff.
-
-        * tools/Makefile.am: New file.
-	
-	* tools/.cvsignore: New file.
-
-2000-04-26  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test13.c (main): And here too.
-
-	* tests/test2.c (main): Same here.
-
-	* tests/test1.c (main): Change for removed simpledatawrapper.
-
-2000-04-26  Matt Loper  <matt@helixcode.com>
-
-	* tests/.cvsignore: Added test13.
-
-	* default_user/.cvsignore: New file.
-
-	* widgets/e-text/e-text.c (e_text_destroy): Kill text->timer and
-	text->timeout on destroy.
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* tests: Update for the camel changes.
-
-	* Makefile.am (SUBDIRS): Remove tests. They aren't terribly
-	useful/interesting any more for the most part, and they frequently
-	don't compile.
-
-2000-04-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made the tooltip show up in the correct
-	place and configuration when using the "max_lines", "anchor"
-	(untested), or "justification" arguments.
-
-From a patch by Iain Holmes <ih@csd.abdn.ac.uk>
-	
-	* widgets/e-text/e-text-event-processor-emacs-like.c,
-	widget/e-text/e-text-event-processor-types.h,
-	widgets/e-text/e-text.c, widgets/e-text/e-text.h: Changed C-w and
-	C-y to control the X clipboard.  Added double and triple click
-	events.
-
-2000-04-24  Fatih Demir	<kabalak@gmx.net>
-
-	* configure.in : Added tr to ALL_LINGUAS .
-
-2000-04-24  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test13.c (main): Fixed for method movements.
-
-	* tests/test3.c (main): Removed from build, data-wrapper-repository removed.
-
-2000-04-23  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test2.c (main): Changed to use construct_from_stream.
-
-	* tests/test1.c (main): Chagned to use construct_from_stream.
-
-2000-04-24  Matt Loper  <matt@helixcode.com>
-
-	* default_user/Makefile.am: new file.
-
-	* default_user/Main_Shortcuts.xml: New file; is used to fill the
-	shortcut bar's "main shortcuts" pane.
-
-	* default_user/Other_Shortcuts.xml: New file, used to fill the
-	shortcut bar's "other shortcuts" pane.
-
-	* default_user/Inbox.mbox: New file. This is the first message a
-	new user will see when they fire up Evolution. Needs work.
-
-	* Makefile.am: added default_user directory.
-	* configure.in: same.
-
-2000-04-23  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test10.c: Removed some unecessary includes.  From
-	Ali Abdin <aliabdin@aucegypt.edu>
-	(create_sample_mime_message): Changed for date api change.
-
-	* tests/Makefile.am (noinst_PROGRAMS): Put test10 back.
-
-2000-04-22  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test1.c (main): Changed for date api change.
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c: Fixed some headers.
-
-	* tests/Makefile.am (noinst_PROGRAMS): Removed test9.
-	(noinst_PROGRAMS): Removed test12, temporarirly (nntp not being
-	built).
-	Removed test10.
-
-2000-04-20  Yukihiro Nakai <nakai@gnome.gr.jp>
-
-	* configure.in: Add Japanese to ALL_LINGUAS
-
-2000-04-19  Dan Winship  <danw@helixcode.com>
-
-	* README: More detail on exactly what versions of what libraries
-	are needed.
-
-2000-04-18  Dan Winship  <danw@helixcode.com>
-
-	* tests/*: remove camel-log references
-
-2000-04-17  Dan Winship  <danw@helixcode.com>
-
-	* configure.in (xmlpatch): Require gnome-xml 1.8.7 (or later,
-	but not 2.0). xmlParseMemory's behavior in 1.8.7 is incompatible
-	with its behavior in 1.8.6 and earlier.
-
-	* tests/test-url.c: New program to test CamelURL
-
-2000-04-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/test-card.c,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/contact-editor/e-contact-editor.c: Added
-	orginizational unit, nickname, and internet free-busy fields.
-
-	* addressbook/contact-editor/contact-editor.glade: Renamed some
-	incorrectly named fields.
-
-2000-04-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/test-card.c,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/gui/minicard/e-minicard.c: Added orginization and role
-	fields.
-
-	* addressbook/contact-editor/contact-editor.glade,
-	addressbook/contact-editor/e-contact-editor-strings.h: Renamed
-	some incorrectly named fields.
-
-	* addressbook/contact-editor/e-contact-editor.c: Added
-	orginization and role fields as well as hooking up the birth date
-	field.
-
-	* addressbook/gui/minicard/e-minicard-view.c: Added a missing include.
-
-2000-04-15  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/gui/component/addressbook.c
-	(search_entry_activated): New function. Gets called when the quick
-	search entry is called on to perform a search.
-	(make_quick_search_widget): New function; returns a "quick search"
-	widget.
-	(control_activate): During the construction of the toolbar, a
-	"quick search" widget is included.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* tests/.cvsignore: add test12
-
-	* tests/test12.c (main): add test for nntp stuff.
-
-	* tests/Makefile.am (noinst_PROGRAMS): same.
-
-
-2000-04-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-backend-ldap.c,
-	addressbook/contact-editor/e-contact-editor.c: Added a note field.
-
-2000-04-15  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-cursor.h: #include
-	"addressbook/backend/ebook" to make sure we pick up the right
-	addressbook.h.  Butt ugly, but at least it makes it possible for
-	me to build Evolution.
-
-	* addressbook/gui/minicard/Makefile.am (INCLUDES): Use
-	`$(builddir)' so that we pick up the IDL-generated includes
-	correctly.
-	* addressbook/backend/pas/Makefile.am: Likewise.  Also use
-	`$(srcdir)'.
-
-	* addressbook/backend/ebook/Makefile.am: Use `$(srcdir)' so that
-	it works with builddir != srcdir.
-	* addressbook/backend/pas/Makefile.am: Likewise.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_ensure_connected): don't ldap_simple_bind_s if
-	the ldap_open failed, and fix warnings.
-	(pas_backend_ldap_build_all_cards_list): don't do search if the
-	ensure_connected failed, and fix warnings.
-	(pas_backend_ldap_search): same.
-	(poll_ldap): fix warnings.
-	(pas_backend_ldap_process_get_book_view): same.
-	(pas_backend_ldap_get_vcard): same.
-	(pas_backend_ldap_load_uri): same.
-
-	* configure.in: quiet configure in the case where it can't find
-	ldap libs.
-
-2000-04-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/contact-editor/e-contact-editor.c (extract_info):
-	Check for 0 length fields when building the outgoing ECard.
-
-2000-04-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/pas/pas-book-view.c: Give correct warnings.
-
-	* addressbook/backend/ebook/e-card.c (e_card_set_arg): g_strdup
-	url and title.
-
-2000-04-13  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/contact-editor/e-contact-editor.c
-	(fill_in_info): reflect the title attribute in the contact editor.
-	(extract_info): same.
-
-	* addressbook/backend/pas/pas-backend-ldap.c: add the title attribute.
-
-	* addressbook/gui/minicard/test-reflow.c: add a title.
-
-	* addressbook/gui/minicard/e-minicard.c (remodel): add support for
-	the title attribute.
-
-	* addressbook/backend/ebook/e-card.c (e_card_get_vcard): save out
-	the title to the vcard.
-
-	* addressbook/backend/ebook/test-card.c: add title field foo to
-	the test.
-
-	* addressbook/backend/ebook/e-card.c: reflect the title field.
-
-	* addressbook/backend/ebook/e-card.h: un-#if 0 the title field.
-
-	* addressbook/backend/pas/pas-backend-ldap.c (poll_ldap): new
-	function that polls ldap for more search responses.
-	(pas_backend_ldap_search): use the async search interface and
-	register an idle call to poll for the responses.
-	(view_destroy): make sure to g_source_remove the idle id.
-
-2000-04-12  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c (entry_compare):
-	rework this function to use a table mapping search field names to
-	vcard properties and extra information (such as whether or not the
-	property is a list.)
-	
-	* addressbook/backend/pas/pas-backend-ldap.c
-	(construct_email_list): new function, to build the ECardList for
-	email addresses.
-	(construct_phone_list): new function, to build the ECardList for
-	phone numbers.
-	(pas_backend_ldap_search): use a table mapping ldap attributes to
-	ecard properties, and use the special list construction functions
-	if the property calls for it.  general cleanup.  added a comment
-	about not calling ber_free if there was a decoding error.
-
-
-2000-04-12  Matt Loper  <matt@helixcode.com>
-
-	* art/Makefile.am: Add tigert's contact-dlg-related images.
-
-	* addressbook/contact-editor/e-contact-editor.c (_add_images): Add
-	tigert's images.
-
-	* addressbook/contact-editor/Makefile.am: add EVOLUTION_IMAGES.
-
-2000-04-12  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/house.png, art/malehead.png, art/cellphone.png, 
-	art/briefcase.png, art/envelope.png, art/globe.png:
-	New icons for the contact manager.. more to follow once I get 
-	around to do more artist work..
-
-2000-04-12  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_build_all_cards_list): delay the setting of the
-	ldap variable until we've ensured we were connected.  Also, set
-	the search limit to LDAP_MAX_SEARCH_RESPONSES (we'll eventually
-	want a user setting here i assume.)
-	(pas_backend_ldap_search): same here, and also send back lists of
-	CARDS_PER_VIEW_NOTIFICATION length in each
-	pas_book_view_notify_add call.  also, don't call ber_free if there
-	was a decoding error, since the ldap library frees it for us.
-
-2000-04-11  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (have_pthread): Properly use AC_ARG_WITH
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* wombat/Makefile.am (wombat_LDADD): add LDAP_LIBS here.
-
-	* configure.in: check for -lldap and -llber and if both are
-	present include ldap support in the pas/wombat.
-
-	* addressbook/backend/pas/Makefile.am (libpas_la_SOURCES): include
-	pas-backend.ldap.c if ENABLE_LDAP.
-
-	* addressbook/backend/pas/pas-backend-ldap.c: get searching
-	working (converting between the sexp and ldap stuff.)
-
-	* wombat/wombat.c (setup_pas): register the ldap pas backend if
-	HAVE_LDAP is defined.
-
-2000-04-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Changed AC_DEFUN to AC_DEFINE.
-
-	* acconfig.h: Added HAVE_TIMEZONE and HAVE_TM_GMTOFF.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* configure.in: check for timezone as a variable (as it is in
-	linux, but not in freebsd or netbsd.)
-
-2000-04-11  Larry Ewing  <lewing@helixcode.com>
-
-	* widgets/e-table/e-cell-toggle.c (etog_draw): update for new
-	gdk-pixbuf.  Added a disabled chuck of code to do alpha blending
-	on pixmaps.
-
-2000-04-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Moved some logic a bit.  Minor changes.
-
-00-04-11  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* widgets/e-text/e-text.c
-	(e_text_set_args): Recalculate bounds when width or clip_width changes.
-	(tooltip_event): Forward clicks on the tooltip onto the text item.
-	(_do_tooltip): Correct the origin co-ordinates to the items co-ords.
-	(e_text_point): Return 0 when the mouse is on the item.
-	(_do_tooltip): Make the tooltip obey the parent items
-	line_wrap and max_lines.
-
-00-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(get_e_card_prop): new function, taking code from func_contains to
-	get string properties.
-	(entry_compare): new function generic, taking strstr-like function
-	as a parameter.
-	(func_contains): rewrite function to use entry_compare.
-	(is_helper): new helper function to map strcmp to a strstr-like
-	function.
-	(func_is): new function, implementing "is" for searches.
-	(endswith_helper): new function.
-	(func_endswith) new function, implementing "endswith" for
-	searches.
-	(beginswith_helper): new function.
-	(func_beginswith): new function, implementing "beginswith" for
-	searches.
-	(compare_email): new function for searching all email addresses of
-	a contact.
-	(compare_phone): new function for searching all phone numbers of a
-	contact.
-	(compare_address): new function for searching all addresses of a
-	contact (unimplemented as yet).
-	(entry_compare): add support for searching the list items "email",
-	"phone" and "address".
-	(vcard_matches_search): free the esexp_result.
-	(entry_compare): we want comparison functions to take 2 args.
-
-2000-04-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/gui/minicard/e-minicard-view.c: This was setting
-	E_REFLOW(view)->items to NULL too soon.  Fixed now.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_search): remove spew.
-	(pas_backend_file_process_create_card): move the sync to the
-	earliest possible point after the db operation.
-	(pas_backend_file_process_remove_card): same.
-	(pas_backend_file_process_modify_card): same, and call
-	pas_book_respond_modify, not pas_book_respond_remove, here.
-
-	* addressbook/gui/component/addressbook.c (card_deleted_cb): new
-	function.
-	(delete_contact_cb): wire up button to call
-	e_minicard_view_remove_selection.
-
-	* addressbook/gui/minicard/e-minicard-view.c
-	(e_minicard_view_remove_selection): fix warning, and stick "view"
-	in the name.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book-view.c,
-	addressbook/backend/ebook/e-book.c: Changed some incorrect
-	gtk_object_refs and gtk_object_unrefs into bonobo_object_refs and
-	bonobo_object_unrefs.
-
-	* addressbook/backend/pas/pas-card-cursor.c: Changed a
-	gtk_object_destroy to a gtk_object_unref.
-
-	* addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h: Set a list pointer to
-	NULL after freeing its contents.  Added
-	e_minicard_view_remove_selection function.
-
-	* addressbook/gui/minicard/e-reflow.c: Set a list pointer to NULL
-	after freeing its contents.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/gui/component/addressbook.c (find_contact_cb):
-	implement braindead dialog to input the query string for the view.
-
-	also, change all callbacks to get the EMinicardView instead of the
-	EBook.
-
-	* addressbook/gui/minicard/e-minicard-view.c
-	(e_minicard_view_get_arg): add missing break.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h: Added a "query"
-	argument to the e-minicard-view.  Documented all the arguments to
-	the e-minicard-view.
-
-2000-04-10  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/gui/minicard/e-minicard-view.c (get_view): change
-	the empty search string ("") to the valid (contains "full_name" "").
-
-	* wombat/Makefile.am (wombat_LDADD): reorder so libeutil.la comes
-	after libpas (since it uses the sexp stuff now.)
-
-	* addressbook/backend/pas/Makefile.am (INCLUDES): add
-	-I$(top_srcdir)/addressbook/backend/ebook
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(view_destroy): free the search context and unref the sexp.
-	(string_to_dbt): save the zero byte of strings, so we don't have
-	to g_strndup everywhere.
-	(func_contains): new function, implementing the (contains) search
-	function.
-	(vcard_matches_search): generic predicate to tell whether or not a
-	vcard entry matches the current book view.
-	(pas_backend_file_search): rip some of this code out of
-	get_book_view (the portion building the list of cards) and make it
-	use the e-sexp stuff.
-	(pas_backend_file_process_create_card): use vcard_matches_search
-	to only notify if the card will appear in the view.
-	(pas_backend_file_process_remove_card): use vcard_matches_search
-	to only notify if the card will be removed from the view.
-	(pas_backend_file_process_modify_card): use vcard_matches_search
-	to notify if the modified card was added, removed, or changed in
-	the view.
-	
-2000-04-10  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (GNOME_PRINT_CFLAGS): Update to support
-	--disable-threads correctly.
-
-2000-04-10  Chris Toshok  <toshok@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): use view != NULL instead
-	of checking db_error when we call pas_book_respond_get_book_view)
-
-2000-04-10  Dan Winship  <danw@helixcode.com>
-
-	* configure.in: check for mkstemp
-
-2000-04-10  Damon Chaplin  <damon@helixcode.com>
-
-	* configure.in (AC_OUTPUT): removed libical stuff since it has its
-	own configure.in.
-
-2000-04-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book-view.c: Fixed a bug where I was
-	sending the wrong information to some callbacks.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Added an e_card_duplicate
-	function.  Made ids get stored in vcards.  Made sure to delete the
-	url if it exists.
-
-	* addressbook/backend/pas/Makefile.am: Made pas include
-	addressbook/backend/ebook/ in the search path.
-
-	* addressbook/backend/pas/pas-backend-file.c: Fixed some bugs and
-	made the create card function store the generated id in the card
-	being saved.
-
-	* addressbook/backend/pas/pas-book-view.c: Fixed a double free
-	bug.
-
-	* addressbook/contact-editor/e-contact-editor.c: Fixed some bugs.
-	Made the contact editor actually return a valid card when
-	gtk_object_get(editor, "card", ...) is called.
-
-	* addressbook/contact-editor/e-contact-editor.h: Fixed a copy and
-	paste error.
-
-	* addressbook/gui/component/addressbook.c: Made this get the card
-	properly.
-
-	* addressbook/gui/minicard/Makefile.am: Made this include
-	contact-editor directory in the search path and link against
-	libecontacteditor so that double clicking can open a dialog.
-
-	* addressbook/gui/minicard/e-minicard.c: Fixed some small bugs.
-	Made double clicking open a contact editor dialog if this minicard
-	is contained in a minicard view.  (It needs the minicard view to
-	get the EBook to save to.
-
-	* wombat/Makefile.am: Link wombat against libebook, since
-	pas-backend-file now uses ECard.
-
-2000-04-09  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/gui/component/addressbook.c (control_activate): Make
-	"New Contact" menuitem add a card with new_contact_cb().
-	
-	* addressbook/Makefile.am: Compile contact-editor, _then_ gui,
-	since the gui now depends on the contact editor (shouldn't the
-	contact-editor directory be moved into 'gui'?).
-
-	* addressbook/gui/component/addressbook.c (card_added_cb): New
-	function. Gets called when a card is successfully added via the
-	contact-editor.
-	(new_contact_cb): New function. Gets called when a user clicks the
-	"new contact" button on the toolbar, and creates a contact-editor
-	to edit a new contact entry.
-	(control_activate): Call gnome_app_fill_toolbar_with_data()
-	instead of gnome_app_fill_toolbar(), so that our toolbar can find
-	the right book to add a new card to.
-	(addressbook_factory): On an "activate" signal, send the book up
-	to control_activate_cb.
-
-	* addressbook/gui/component/addressbook-factory.c (init_bonobo):
-	Call glade_gnome_init(), so that our contact-editor (which
-	requires glade) doesn't barf.
-
-	* addressbook/gui/component/Makefile.am: added the contact-editor
-	to our libraries and include files.
-
-	* addressbook/contact-editor/e-contact-editor.c
-	(e_contact_editor_new): Set "card" gtk property to the passed-in
-	card property.
-
-	* addressbook/gui/component/addressbook.c (addressbook_factory):
-	Added gtk_widget_push/pop_colormap/visual, which I assume is
-	necessary for canvas use.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/contact-editor/Makefile.am,
-	addressbook/contact-editor/e-contact-editor.c,
-	addressbook/contact-editor/e-contact-editor.h,
-	addressbook/contact-editor/test-editor.c: Made the contact editor
-	load from an ECard.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/gui/minicard/e-minicard.c: Added support for the URL
-	field.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c (e_card_get_vcard): Fixed a
-	small typo.
-
-2000-04-08  Dan Winship  <danw@helixcode.com>
-
-	* art/Makefile.am: pixmap_DATA should have been images_DATA (after
-	pixmapdir was renamed to imagesdir)
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/gui/minicard/.cvsignore,
-	addressbook/gui/minicard/Makefile.am,
-	addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h,
-	addressbook/gui/minicard/e-minicard.c,
-	addressbook/gui/minicard/e-minicard.h,
-	addressbook/gui/minicard/e-reflow-sorted.c,
-	addressbook/gui/minicard/e-reflow-sorted.h,
-	addressbook/gui/minicard/e-reflow.c,
-	addressbook/gui/minicard/e-reflow.h,
-	addressbook/gui/minicard/test-minicard-view.c,
-	addressbook/gui/minicard/test-reflow.c,
-	widgets/e-minicard/.cvsignore, widgets/e-minicard/Makefile.am,
-	widgets/e-minicard/e-minicard-label.c,
-	widgets/e-minicard/e-minicard-label.h,
-	widgets/e-minicard/e-minicard-view.c,
-	widgets/e-minicard/e-minicard-view.h,
-	widgets/e-minicard/e-minicard.c, widgets/e-minicard/e-minicard.h,
-	widgets/e-minicard/e-reflow-sorted.c,
-	widgets/e-minicard/e-reflow-sorted.h,
-	widgets/e-minicard/e-reflow.c, widgets/e-minicard/e-reflow.h,
-	widgets/e-minicard/test-minicard-label.c,
-	widgets/e-minicard/test-minicard-view.c,
-	widgets/e-minicard/test-minicard.c,
-	widgets/e-minicard/test-reflow.c: CVS move mistake.  Fixed the
-	correct changes in the correct places.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* art/Makefile.am: pixmap_DATA isn't defined so don't use it as a variable.
-
-	* addressbook/gui/component/,
-	addressbook/gui/component/.cvsignore, addressbook/gui/Makefile.am,
-	addressbook/gui/component/addressbook-factory.c,
-	addressbook/gui/component/addressbook.c,
-	addressbook/gui/component/addressbook.gnorba,
-	addressbook/gui/component/addressbook.h: New directory to proivde
-	the component for contact management.  Simply uses an e-minicard-view.
-
-	* addressbook/gui/minicard/e-minicard-view.c,
-	addressbook/gui/minicard/e-minicard-view.h: New subclass of
-	e-reflow-sorted that takes an EBook and uses it to compute the
-	card data to display.
-
-	* addressbook/gui/minicard/e-minicard.c,
-	addressbook/gui/minicard/e-minicard.h: This now backends to a
-	ECard instead of a ETableModel.
-
-	* addressbook/gui/minicard/e-reflow.c,
-	addressbook/gui/minicard/e-reflow.h: This now has a virtualized
-	add method.
-
-	* addressbook/gui/minicard/e-reflow-sorted.c,
-	addressbook/gui/minicard/e-reflow-sorted.h: New subclass of
-	e-reflow that allows the data to be sorted on the fly.
-
-	* addressbook/gui/minicard/test-minicard-view.c: New test to test
-	the new minicard view.
-
-	* addressbook/gui/minicard/test-reflow.c: Uses the new ECard
-	backend of the e-minicard.
-
-	* addressbook/gui/minicard/.cvsignore,
-	addressbook/gui/minicard/Makefile.am: Added new test.  Fixed
-	dependencies.  Added new files.
-
-	* addressbook/gui/, addressbook/gui/Makefile.am,
-	addressbook/gui/.cvsignore: New directory for addressbook gui
-	bits.  Added subdirectories.  Created an initial .cvsignore.
-
-	* addressbook/Makefile.am (SUBDIRS): Removed demo and added gui.
-
-	* addressbook/backend/pas/pas-backend-file.c: Added code to do
-	notification on bookviews when changes in the backend are made.
-
-	* addressbook/backend/pas/pas-book-view.c,
-	addressbook/backend/pas/pas-book-view.h: Added helper functions to
-	notify the view about the addition or modification of a single
-	card.  Fixed a mistaken extra free.
-
-	* addressbook/backend/ebook/e-card-list-iterator.h: Fixed
-	incorrect parent class.
-
-	* addressbook/backend/ebook/test-client.c: Made this accept an
-	optional parameter that specifies the vcard to add.
-
-	* configure.in: Replaced widgets/e-minicard/Makefile and
-	addressbook/demo/Makefile with addressbook/gui/minicard/Makefile
-	and addressbook/gui/component/Makefile respectively.
-
-	* widgets/Makefile.am: Removed e-minicard since it's being moved
-	to addressbook/gui/minicard.
-
-	* widgets/e-text/e-text.c: Fixed the border width around tooltips
-	and made the main tooltip area yellow.
-
-2000-04-08  Dan Winship  <danw@helixcode.com>
-
-	* configure.in, acconfig.h: add SYSTEM_MAIL_DIR
-
-2000-04-08  Jesus Bravo Alvarez  <jba@pobox.com>
-
-	* configure.in (ALL_LINGUAS): Added Galician (gl).
-
-2000-04-07  Jeffrey Stedfast  <fejj@stampede.org>
-	* configure.in: Modified to create camel/providers/smtp/Makefile
-
-2000-04-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Made text tooltips appear in place.
-	Iain figured out that to get them to not appear, we hide the
-	tooltip when the mouse leaves the tooltip window, not the canvas
-	item (this works because the tooltip window always covers the
-	canvas item completely.)
-
-2000-04-07  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/demo/addressbook.c (control_activate_cb): New
-	function. Called when the control is (de)activated.
-	(control_activate): New function; called when the control is
-	activated, and sets up toolbar/menu times.
-	(control_deactivate): New function; removes those toolbar/menu
-	items.
-	(do_nothing_cb): Does nothing :-)
-	(addressbook_factory): Hook up to control_activate_cb().
-
-2000-04-07  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): correctly (well,
-	untested) implement.
-	(view_destroy): new function.
-
-2000-04-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/demo.c, addressbook/demo/addressbook-widget.c:
-	Changed calls to e_cell_text_new to match new function signature.
-
-2000-04-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* art/Makefile.am (images_DATA): Renamed from pixmaps to images. 
-
-2000-04-05  Matt Loper  <matt@helixcode.com>
-
-	* README: Added wombat.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text-test.c: Got rid of some runtime errors.
-	Changed to "fixed" font so that it will work on everyone's
-	machine.  Added a white background rectangle.  Made resizing the
-	window resize the contained text item.  Changed to using affines
-	(e_canvas_item_move_absolute) instead of "x" and "y" attributes.
-	Set the text in the entries so that they match the original values
-	of the displayed text object.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard/e-minicard.c: Fixed some referencing and
-	lifetime issues.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Removed an unnecessary get_bounds call.
-
-	(From a patch by Iain Holmes <ih@csd.abdn.ac.uk>)
-
-	* widgets/e-text/e-text.c: Made tooltips look more like the
-	underlying text.  Made tooltips show up more consistently.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/Makefile.am, addressbook/demo/e-test-model.c,
-	addressbook/demo/e-test-model.h: Changed this to backend to an
-	ebook.
-
-	* addressbook/backend/ebook/e-card-iterator.c,
-	addressbook/backend/ebook/e-card-iterator.h,
-	addressbook/backend/ebook/e-card-list-iterator.c,
-	addressbook/backend/ebook/e-card-list.c,
-	addressbook/backend/ebook/e-card-list.h,
-	addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Fixed const correctness and
-	changed a couple of functions to be external.
-	
-	* addressbook/Makefile.am: Fixed subdir ordering.
-
-2000-04-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book-view.c: Fixed an incorrect
-	function.
-
-	* addressbook/backend/ebook/e-book-view.h,
-	addressbook/backend/ebook/e-book.h: Fixed some incorrect function
-	pointer declarations.
-
-	* addressbook/backend/ebook/e-card-iterator.c,
-	addressbook/backend/ebook/e-card-iterator.h,
-	addressbook/backend/ebook/e-card-list-iterator.c,
-	addressbook/backend/ebook/e-card-list-iterator.h,
-	addressbook/backend/ebook/e-card-list.c,
-	addressbook/backend/ebook/e-card-list.h,
-	addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/test-card.c: Built new iterator system
-	for getting fields with multiple entries.
-
-	* addressbook/backend/ebook/Makefile.am: Added new files
-	addressbook/backend/ebook/e-card-iterator.c,
-	addressbook/backend/ebook/e-card-iterator.h,
-	addressbook/backend/ebook/e-card-list-iterator.c,
-	addressbook/backend/ebook/e-card-list-iterator.h,
-	addressbook/backend/ebook/e-card-list.c, and
-	addressbook/backend/ebook/e-card-list.h.
-
-2000-04-04  Yuri Syrota  <rasta@renome.rovno.ua>
-
-	* configure.in: Added uk to ALL_LINGUAS.
-
-2000-04-04  Andreas Hyden  <a.hyden@cyberpoint.se>
-
-	* configure.in: Added no and sv to ALL_LINGUAS.
-
-2000-04-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-cursor.h,
-	addressbook/backend/ebook/e-card.c: A bit of clean up.
-	
-	* addressbook/backend/ebook/e-book-types.h,
-	addressbook/backend/ebook/e-book-view-listener.c,
-	addressbook/backend/ebook/e-book-view-listener.h,
-	addressbook/backend/ebook/e-book-view.c,
-	addressbook/backend/ebook/e-book-view.h,
-	addressbook/backend/pas/pas-book-view.c,
-	addressbook/backend/pas/pas-book-view.h: New files for live views.
-
-	* addressbook/backend/ebook/Makefile.am,
-	addressbook/backend/ebook/e-book-listener.c,
-	addressbook/backend/ebook/e-book-listener.h,
-	addressbook/backend/ebook/e-book.c,
-	addressbook/backend/ebook/e-book.h,
-	addressbook/backend/ebook/test-client-list.c,
-	addressbook/backend/ebook/test-client.c,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-book.c,
-	addressbook/backend/pas/pas-book.h,
-	addressbook/backend/idl/addressbook.idl: Added live views and
-	searching to the interface (neither is working yet.)
-
-2000-04-01  Matt Loper  <matt@helixcode.com>
-
-	* tests/.cvsignore: Added test-movemail.
-
-	* art/.cvsignore: New file.
-
-2000-03-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/demo.c, addressbook/demo/addressbook-widget.c:
-	Added some missing gtk_object_refs.
-
-2000-03-30  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_build_all_cards_list): Get first card (with
-	R_FIRST) on first seq().
-
-2000-03-30  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-ldap.h: new-file
-	* addressbook/backend/pas/pas-backend-ldap.c: new file
-
-2000-03-30  Dan Winship  <danw@helixcode.com>
-	
-	* configure.in:
-	* Makefile.am:
-	* art/Makefile.am: install new shortcut bar pixmaps.
-
-2000-03-30  Tuomas Kuosmanen  <tigert@gimp.org>
-
-	* art/evolution-calendar.png art/evolution-inbox.png 
-	art/evolution-tasks.png	art/evolution-contacts.png 
-	art/evolution-notes.png evolution-today.png:
-	added some artwork for the main shortcutbar.. someone
-	could stick them in it.
-
-2000-03-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-cursor.c: Fixed management of
-	the corba-cursor object by calling CORBA_Object_duplicate on it on
-	e-card-cursor creation and calling CORBA_Object_release on
-	e-card-cursor destruction.  Also, properly free string returned
-	from Evolution_CardCursor_get_nth function.
-
-2000-03-29  Matt Loper  <matt@helixcode.com>
-
-	* addressbook/backend/ebook/test-client.c (get_cursor_cb): Added
-	some debugging.
-
-	* addressbook/backend/ebook/e-book-listener.c: Added inline
-	documentation for exposed functions.
-	* addressbook/backend/ebook/e-card-cursor.c: same.
-	* addressbook/backend/ebook/e-card.c: same.
-
-	* Makefile.am: add calendar compilation back in.
-
-	* addressbook/backend/pas/pas-book-factory.c
-	(PAS_BOOK_FACTORY_GOAD_ID): changed to
-	"evolution:addressbook-server".
-
-	* addressbook/backend/pas/Makefile.am: no need to install a
-	.gnorba file from here, as the wombat.gnorba file in
-	evolution/wombat will do its job.
-
-	* addressbook/backend/ebook/test-client.c (ebook_create): if
-	ebook_new fails, print a warning and return.
-
-	* addressbook/backend/ebook/e-book.c (CARDSERVER_GOAD_ID): changed
-	to "evolution:addressbook-server".
-
-	* wombat/wombat.c: Changed headerfile path.
-
-	* wombat/Makefile.am: Use relative paths to libraries in the build
-	tree, rather than requiring libraries (such as libpcs) to already
-	be installed.
-
-2000-03-28  Matt Loper  <matt@helixcode.com>
-
-	* wombat/Makefile.am: new file.
-
-	* wombat/wombat.gnorba: Cleaned up.
-
-	* wombat/wombat.c (setup_pcs): filled in the rest.
-	
-	* Makefile.am: added wombat.
-
-	* wombat/wombat.gnorba: new file.
-
-	* wombat/.cvsignore: new file.
-
-	* wombat/wombat.c (setup_pcs): fill out this function some.
-
-	* configure.in: added wombat.
-
-2000-03-28  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-card-cursor.c (create_cursor): use
-	g_new0 to allocate the BonoboObjectServant.
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_build_all_cards_list): remove unnecessary
-	strdup/free.
-
-2000-03-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/pas/pas-backend-file.c: Removed an infinite
-	loop.
-
-	* addressbook/backend/ebook/test-client-list.c: New test that
-	doesn't add an extra database item.
-
-	* addressbook/backend/ebook/Makefile.am,
-	addressbook/backend/ebook/.cvsignore: Added test-client-list.
-
-2000-03-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/pas/pas-card-cursor.c: Fixed memory
-	allocation.
-
-	* addressbook/backend/pas/pas-backend-file.c: Fixed memory
-	allocation.  Made database stuff not do an extra entry.
-
-	* addressbook/backend/ebook/test-client.c: Add test for
-	get_all_cards functionality.  Changed database name to test.db.
-
-	* addressbook/backend/ebook/e-card-cursor.c: Changed bonobo_object
-	to gtk_object in a couple of places.
-
-2000-03-28  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_create_unique_id): create id's for entries using
-	the following format: ("pas-id-%08lX%08X", time(NULL), c++).
-	
-2000-03-27  Dan Winship  <danw@helixcode.com>
-
-	* tests/test-movemail.c: new test program. Can be used to copy POP
-	mail into your evolution inbox.
-
-2000-03-27  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_get_vcard): remove unneeded g_strdup;
-	(get_length): implement function.
-	(get_nth): implement function.
-	(cursor_destroy): free up the internal glist of vcards, and fix
-	warning.
-	(pas_backend_file_build_all_cards_list): new function, to build up
-	the list of cards in the db.
-	(pas_backend_file_process_get_all_cards): call
-	pas_backend_file_build_+all_cards_list, and fix warning.
-
-2000-03-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/test-card.c: Fixed some warnings.
-
-	* addressbook/backend/ebook/test-client.c: Added a section to test
-	cursors and returning an id when adding.
-
-	* addressbook/backend/ebook/e-card-pairs.h: Removed the address
-	pairs since they were added to e-card.c.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Made the set_id function take
-	a const char *.
-
-	* addressbook/backend/ebook/e-book-listener.c,
-	addressbook/backend/ebook/e-book-listener.h,
-	addressbook/backend/ebook/e-book.c,
-	addressbook/backend/ebook/e-book.h,
-	addressbook/backend/idl/addressbook.idl,
-	addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-book.c,
-	addressbook/backend/pas/pas-book.h: Added a get_all_cards function
-	and made the response to the create_card function include the card
-	id.
-
-	* addressbook/backend/ebook/Makefile.am: Added e-card-cursor.c and
-	e-card-cursor.h.
-
-	* addressbook/backend/ebook/e-card-cursor.c,
-	addressbook/backend/ebook/e-card-cursor.h: New class for proxying
-	to an Evolution_CardCursor.
-
-	* addressbook/backend/pas/Makefile.am: Added pas-card-cursor.c and
-	pas-card-cursor.h.
-
-	* addressbook/backend/pas/pas-card-cursor.c,
-	addressbook/backend/pas/pas-card-cursor.h: New bonobo class for
-	making an Evolution_CardCursor server.
-
-2000-03-27  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test9.c (main): This test is basically now invalid.
-	* tests/test11.c (main): Fix for async search api.  Probably works.
-	Removed camel-mbox-*.h headers, should be private.
-
-2000-03-27  Tuomas Kuosmanen  <tigert@gimp.org>
-	* art/attachment.xpm art/mail-new.xpm art/mail-read.xpm
-	art/mail-replied.xpm art/mark.xpm art/meeting.xpm
-	art/priority-high.xpm art/priority-low.xpm
-
-	Added some new icons for the message-list view..
-
-2000-03-26  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* configure.in: check for db_185.h (present in newer db
-	distributions.)
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_create_unique_id): new function.
-	(pas_backend_file_process_create_card): call
-	pas_backend_file_create_unique_id and pas_book_notify_add (if the
-	db->put was successful).  also, sync out db.
-	(pas_backend_file_process_remove_card): call
-	pas_book_notify_remove if the db->del was successful, and sync out
-	db.
-	(pas_backend_file_process_modify_card): call
-	pas_book_notify_change if db->put was successful, and sync out db.
-	(string_to_dbt): new function.
-	(pas_backend_file_process_create_card): use string_to_dbt
-	(pas_backend_file_process_remove_card): likewise
-	(pas_backend_file_process_modify_card): likewise
-	(pas_backend_file_get_vcard): likewise
-	(pas_backend_file_upgrade_db): new function, to upgrade a db file
-	if we change the data format.
-	(pas_backend_file_maybe_upgrade_db): check db version vs. current
-	code version, and upgrade it necessary.
-	(pas_backend_file_load_uri): call pas_backend_file_maybe_upgrade.
-
-2000-03-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/test-client.c: Load an ECard instead
-	of a VCard and then get the VCard from that ECard.  Just tests
-	ECard and the client stuff at the same time.  Also, replaces
-	carriage returns with newlines.
-
-	* addressbook/backend/ebook/e-book.c: Fixed a small parity error.
-
-2000-03-25  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/ebook/test-client.c: create a card and then
-	look it up.
-
-2000-03-26  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): add db calls to flesh out
-	the interface.  hardcoded id that needs to change, once we decide
-	how we're going to create it.
-	(pas_backend_file_process_remove_card): add db calls to flesh out
-	the interface.
-	(pas_backend_file_process_modify_card): likewise
-	(pas_backend_file_process_check_connection): likewise
-	(pas_backend_file_get_vcard): likewise
-	(pas_backend_file_load_uri): likewise
-
-2000-03-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-book.c: Set the card id properly
-	when retrieving a card.
-
-2000-03-22  NotZed  <NotZed@HelixCode.com>
-
-	* e-util/e-sexp.h: Formatting cleanup.
-
-2000-03-07  NotZed  <NotZed@HelixCode.com>
-
-	* e-util/Makefile.am (libeutil_la_SOURCES): s-sexp.h -> e-sexp.h.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Added the ability to set the
-	card's id (and made getting it work correctly also.)
-
-2000-03-25  Chris Toshok  <toshok@laptoph.xtoph.org>
-
-	* addressbook/backend/ebook/e-book.c (e_book_pop_op): pass GList*
-	as second parameter to g_list_remove_link, not the data pointer.
-
-2000-03-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card-types.h: Removed the
-	address->description field.
-	
-	* addressbook/backend/ebook/e-card.c: Added VCard output and
-	the use of GtkArguments.
-
-	* addressbook/backend/ebook/test-card.c: Updated this to use the
-	GtkArguments.
-
-	* addressbook/backend/ebook/e-book.c: Fixed a memory leak.
-
-2000-03-25  Matt Loper  <matt@helixcode.com>
-
-	* ebook/e-book.c,
-	ebook/e-book.h,	
-	ebook/e-book.h,		
-	ebook/e-card-fields.h,
-	ebook/e-card.h,
-	ebook/e-commerce.h: old, removed. Up-to-date EBook stuff is kept
-	in addressbook/backend/ebook.
-
-2000-03-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h,
-	addressbook/backend/ebook/e-card-types.h,
-	addressbook/backend/ebook/e-card-pairs.h,
-	addressbook/backend/ebook/test-card.c: Added parsing and testing
-	for name, full name, birthday, telephone, email, and street
-	address properties.
-
-2000-03-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/backend/ebook/.cvsignore,
-	addressbook/backend/pas/.cvsignore,
-	addressbook/backend/idl/.cvsignore,
-	addressbook/backend/.cvsignore: Updated .cvsignore files.
-
-2000-03-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/Makefile.am, configure.in: Added the
-	addressbook/backend directory.
-
-	* addressbook/backend/Makefile.am: Removed the libversit directory
-	as it's now included in the base evolution directory.
-
-	* addressbook/backend/ebook/e-card-pairs.h,
-	addressbook/backend/ebook/Makefile.am: Changed the place where
-	libversit is looked for.
-
-	* addressbook/backend/ebook/e-book-listener.c: Fixed some
-	indentation.
-
-	* addressbook/backend/ebook/e-card-pairs.h,
-	addressbook/backend/ebook/e-card-types.h: Commented out some code
-	to get this to compile.
-
-	* addressbook/backend/ebook/e-card.c,
-	addressbook/backend/ebook/e-card.h: Turned this into a GTK+
-	object.
-
-	* addressbook/backend/pas/pas.c,
-	addressbook/backend/ebook/test-client.c: Include gnome.h and
-	gnorba.h.
-
-	* addressbook/backend/idl/addressbook.idl: Include Bonobo.idl
-	instead of bonobo-unknown.idl.
-
-	* addressbook/backend/pas/pas-backend-file.c,
-	addressbook/backend/pas/pas-book.c,
-	addressbook/contact-editor/test-editor.c,
-	addressbook/contact-editor/e-contact-editor.c,
-	addressbook/printing/e-contact-print.c,
-	addressbook/printing/test-contact-print-style-editor.c,
-	addressbook/printing/test-print.c: Killed some warnings.
-
-2000-03-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c: Changed gnome_canvas_item_grab_focus to
-	e_canvas_item_grab_focus.
-
-2000-03-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/addressbook-widget.c: Make background pixmap
-	get properly set to NULL.
-
-2000-03-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added the
-	ability to access the text event processor.
-
-2000-03-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/addressbook-widget.c: Made the addressbook
-	component look in the users home directory for the addressbook.xml
-	file.
-
-2000-03-20  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/.cvsignore: added filter.
-
-	* addressbook/demo/.cvsignore: added test-addressbook.
-
-2000-03-17 Elliot Lee <sopwith@redhat.com>
-	* calendar/cal-client/Makefile.am,
-	calendar/cal-util/Makefile.am, calendar/gui/Makefile.am,
-	calendar/pcs/Makefile.am, mail/Makefile.am,
-	widgets/e-text/Makefile.am: Fix for srcdir != builddir.
-
-2000-03-14  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am (SUBDIRS): build shell before mail, since mail
-	relies on the shell idl files being compiled.
-
-2000-03-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/demo/Makefile.am: Added files for addressbook bonobo
-	component.  Changed non bonobo version to compile as
-	test-addressbook.
-
-	* addressbook/demo/addressbook.c,
-	addressbook/demo/addressbook.gnorba,
-	addressbook/demo/addressbook.h,
-	addressbook/demo/addressbook-factory.c,
-	addressbook/demo/addressbook-widget.c,
-	addressbook/demo/addressbook-widget.h: New factory to create an
-	addressbook bonobo component.
-
-2000-03-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/.cvsignore: Added e-text-test.
-
-	* addressbook/demo/e-test-model.c,
-	addressbook/demo/e-test-model.h: A model storing data in an array
-	of Address objects.
-
-	* addressbook/demo/demo.c: Changed to use
-	addressbook/demo/e-test-model.c and
-	addressbook/demo/e-test-model.h.
-
-	* addressbook/demo/Makefile.am: Added e-test-model.c and
-	e-test-model.h.
-
-2000-03-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/Makefile.am: Rearranged SUBDIRS for dependencies.
-
-	* widgets/e-text/e-text-model.c, widgets/e-text-model.h: New
-	object which stores a piece of text data.  All methods are
-	virtual.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Modified this
-	to use an ETextModel for its data.
-
-	* widgets/e-text/Makefile.am: Added e-text-model.c and e-text-model.h.
-
-	* widgets/e-minicard/test-minicard-label.c: Made this work again.
-
-	* widgets/e-minicard/e-minicard.c,
-	widgets/e-minicard/e-minicard.h: Made this use an ETableModel to
-	get its data.
-
-	* widgets/e-minicard/e-minicard-label.c,
-	widgets/e-minicard/e-minicard-label.h: Added the ability to set
-	the text model used for the contained text widget.
-
-	* widgets/e-minicard/Makefile.am: Added e-table since e-minicard
-	is now dependent on an e-table-model for its data.
-
-	* addressbook/demo, addressbook/demo/.cvsignore,
-	addressbook/demo/Makefile.am, addressbook/demo/demo.c,
-	addressbook/demo/spec: A new program to test ETable and EMinicard
-	integration.
-
-	* configure.in: Added addressbook/demo/Makefile.
-
-	* addressbook/Makefile.am: Added the demo/ subdirectory.
-
-2000-03-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard/e-minicard.c,
-	widgets/e-minicard/e-minicard-label.c,
-	widgets/e-minicard/e-minicard-label.h,
-	widgets/e-minicard/e-reflow.c, widgets/e-minicard/test-reflow.c,
-	widgets/e-text/e-text.c, widgets/e-text/e-text.h: Adapted to use
-	the new e-canvas reflow system.
-
-2000-03-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added a
-	"break_characters" argument.  It lets you define a set of
-	characters which should cause optional linebreaks to occur.  Made
-	setting the "clip_height" argument to -1 mean no height clipping.
-	Moved calling the "resize" signal into an idle handler to avoid
-	reentering the canvas update loop.  Made EText recalc bounds if
-	the affine has changed.  Fixed up tooltip_count (this counts the
-	number of ENTER and LEAVE events.)
-
-	* widgets/e-text/e-text-test.c: Got rid of a few warnings.
-
-	* widgets/e-minicard/e-minicard-label.h: Reindent a few lines.
-
-	* widgets/e-minicard/e-minicard.c,
-	widgets/e-minicard/e-minicard-label.c: Switch from using "x" and
-	"y" to set the children's position to using
-	e_canvas_item_move_absolute.
-
-2000-03-05  Matt Loper  <matt.loper@splashtech.com>
-
-	* tests/ui-tests/message-browser.c: Commenting added.
-	(on_url_data_requested): renamed from "on_url_requested", to
-	reflect that a stream of data is what's actually being asked for.
-	(hydrate_persist_stream_from_gstring): New function.
-	(camel_stream_to_gstring): New function.
-	(on_object_requested): Cleaned up.
-
-2000-03-04  bertrand  <bertrand@helixcode.com>
-
-	* tests/ui-tests/Makefile.am: add bonobo to the build 
-	process.
-
-	* tests/ui-tests/message-browser.c (main): 
-	initialize Bonobo. Use bonobo_main.
-	(get_gtk_html_contents_window): set signal handlers
-	for url requests and objects requests.
-	(on_object_requested): answer to object requests.
-
-2000-03-03  bertrand  <bertrand@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (main): initialize
-	gdkrgb. Push visual/colormap.
-	(on_url_requested): in the case where a camel url is requested, 
-	write the camel stream to gtkhtml. 
-
-	* tests/ui-tests/Makefile.am (filter_LDADD): add
-	gnomeprint in the lib list. 
-
-2000-03-01  Ettore Perazzoli  <ettore@helixcode.com>
-	
-	* configure.in: Build `filter/Makefile'.  Added check for GtkHTML.
-	Set `GTKHTML_CFLAGS' and `GTKHTML_LIBS' to the appropriate values
-	for linking with GtkHTML.
-
-2000-03-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added calendar/idl/Makefile,
-	calendar/cal-client/Makefile, and calendar/pcs/Makefile to the
-	list of files to generate.
-
-2000-02-29  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* widgets/e-text/e-text.c: Don't show the tooltip if the text is being
-	editted or isn't clipped. Remove the tooltip when editting starts.
-
-	* widgets/e-text/Makefile.am: Build the test program
-
-2000-02-29  NotZed  <NotZed@HelixCode.com>
-
-	* tests/ui-tests/Makefile.am (filter_LDADD): Added test program.
-
-	* tests/ui-tests/filterdescription.xml, saveoptions.xml: Data
-	files for test program.
-
-	* tests/ui-tests/filter.c (main): Test program for filter ui.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-
-	* widgets/e-minicard/Makefile.am (INCLUDES): Fixed references to
-	eutil.
-
-	* Makefile.am (SUBDIRS): Build e-util before other stuff.
-	(SUBDIRS): Build filter after camel.
-
-2000-02-28  Chris Lahey  <clahey@umich.edu>
-
-	* widgets/e-text/e-text.c: Compilation error.
-
-2000-02-28  Chris Lahey  <clahey@umich.edu>
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Updated these
-	to use the canvas ::update system properly.
-
-2000-02-24  Dan Winship  <danw@helixcode.com>
-
-	* acconfig.h:
-	* configure.in: define SENDMAIL_PATH with the path to sendmail.
-
-2000-02-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text.c, widgets/e-text.h, e-text-event-processor.c,
-	e-text-event-processor.h, e-text-event-processor-emacs-like.c,
-	e-text-event-processor-emacs-like.h,
-	e-text-event-processor-types.h: This were moved to widgets/e-text/
-	a while ago but never removed.  They have now been removed.
-
-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed some
-	warnings from this file.  Made tooltips disappear when you're
-	finished with them.
-
-	* widgets/e-minicard/test-reflow.c,
-	widgets/e-minicard/test-minicard.c,
-	widgets/e-minicard/test-minicard-label.c: Commented out unused
-	about_callback functions.
-
-	* widgets/e-minicard/e-reflow.c: Made e-reflow pass an EFocus to
-	its e-minicard children.
-
-	* widgets/e-minicard/e-minicard.c: Made e-minicard take and return
-	an EFocus for its "has_focus" argument.  This makes shift-tab work properly.
-
-	* widgets/e-minicard/e-minicard-label.c: Made e-minicard-label take and return
-	an EFocus for its "has_focus" argument.  Made the font that
-	e-minicard-label uses only be allocated once.
-	
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (on_link_clicked): stop
-	sscanf() abuse.
-
-	* tests/Makefile.am: changed references to libibex.a to
-	libibex.la.
-
-	* libical/src/libical/.cvsignore: Added *.lo, *.la, and .libs.
-	* libical/src/libicalss/.cvsignore: same.
-
-	* tests/.cvsignore: Added test11.
-
-	* libical/Makefile.in: autogenerated file removed from cvs, and
-	added to .cvsignore.
-	* libical/src/Makefile.in: same.
-	* libical/src/libical/Makefile.in: same.
-	* libical/src/libicalss/Makefile.in: same.
-
-2000-02-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/message-browser.c (on_link_clicked): 
-	uggly hack to test part saving and
-	b64 streams.
-
-2000-02-21  Dan Winship  <danw@helixcode.com>
-
-	* tests/test10.c:
-	* tests/test11.c: update for camel changes
-
-2000-02-20  Matt Loper  <matt@helixcode.com>
-
-	* tests/Makefile.am: Changed dependencies on libibex.la to
-	libibex.a. In test9_LDADD, placed libcamelmbox.la before
-	libibex.la, as the former requires the latter.
-
-2000-02-20  Iain Holmes  <ih@csd.abdn.ac.uk>
-
-	* widgets/e-text/e-text.[ch] (_do_tooltip): Show the text of the item,
-	in a tooltip style.
-	(e_text_event): Add a timeout on the Enter and remove it on the Leave
-	events.
-
-	* e-text-test.c: New file to test e-text items.
-	
-2000-02-20  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: added ABOUT-NLS.  
-	* ABOUT-NLS: removed.
-	
-2000-02-19  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (on_link_clicked): When a link
-	is clicked, indicate the link with a dialog.
-
-	* libical/src/test/.cvsignore: Added Makefile.
-
-	* libical/.cvsignore: Added Makefile, configure, config.status.
-
-	* libical/src/.cvsignore: New file.
-
-	* libical/Makefile: autogenerated file removed from cvs.
-	* libical/configure: same. 
-	* libical/config.status: same.
-	* libical/src/Makefile: same.
-	* libical/src/test/Makefile: same.
-
-	* widgets/e-minicard/.cvsignore: Added minicard-label-test,
-	minicard-test, and reflow-test.
-
-	* shell/.cvsignore: added files autogenerated from Evolution.idl.
-
-	* libversit/.cvsignore: Added .libs, vcc.c, vcc.lo, vobject.lo,
-	vcaltmp.lo, libversit.la
-
-	* libical/src/test/.cvsignore: New file.
-
-	* libical/src/libical/.cvsignore: New file.
-
-	* libical/src/libicalss/.cvsignore: New file.
-
-	* libical/.cvsignore: New file, with config.log in it.
-
-	* tests/ui-tests/message-browser.c: minor cleanup.
-
-	* tests/ui-tests/.cvsignore: added message-browser.
-
-2000-02-18  NotZed  <NotZed@HelixCode.com>
-
-	* tests/test11.c (main): Use a relative path to the mbox provider
-	module.
-
-2000-02-18  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (filename_to_camel_msg): Call
-	camel_data_wrapper_set_input_stream, rather than
-	camel_data_wrapper_construct_from_stream.  For the whole message,
-	allow someone to see the header ("to", "from", etc.).  Clicking on
-	tree items to see their elements, now works also.
-
-2000-02-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* configure.in: Make gnomeui the last library on the command line,
-	as its path is the one most likely to hold other old libraries
-	(libxml) and we need newer versions.
-	
-	(BONOBO_VFS_GNOME_CFLAGS): Add libical to the
-	AC_CONFIG_SUBDIRS 
-
-	(BONOBO_HTML_GNOME_CFLAGS): VFS checking needs to
-	go before we rquery them. 
-
-	Use the new method for gnome-print
-	checking instead of the old crufty gtk+ based one that nobody can
-	debug.  ever.
-	
-2000-02-16  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (tree_selection_changed): New
-	callback function, which will later change the main html window to
-	reflect the newly-selected tree item.
-	(get_gtk_html_contents_window): New function. Gets the content
-	part of a message.
-	(get_gtk_html_header_window): New function. Will get the header
-	part of a message, when applicable.
-
-	* camel/camel-formatter.c (str_tolower): Now returns a new string,
-	rather than changing it in place.
-	(initialize_camel_formatter): New function; gives a root
-	CamelDataWrapper and a stream to a CamelFormatter.
-	(camel_formatter_wrapper_to_html): New function. Translates any
-	CamelDataWrapper into html.
-	(lookup_unique_id): Allows the root object to be a
-	CamelDataWrapper, which is more general than the previously
-	required CamelMimeMessage.
-
-
-2000-02-14  NotZed  <notzed@zedzone.helixcode.com>
-
-	* configure.in (EXTRA_GNOME_CFLAGS): Add libunicode to CFLAGS/LIBS.
-
-2000-02-13  NotZed  <notzed@zedzone.helixcode.com>
-
-	* configure.in: Added check for libunicode.
-
-	* Makefile.am (SUBDIRS): Added libibex.
-
-	* tests/test11.c (main): New test, tests search api.
-
-2000-02-13  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/test-multipart-mixed.msg: New rfc822 file, which
-	crashes message-browser.
-
-	* tests/ui-tests/message-browser.c (get_gtk_html_window): Takes a
-	CamelMimeMessage as a param, rather than a filename.
-	(main): Puts our windows in an hpane rather than a vbox. Also
-	opens a file dlg box if a filename wasn't given as a first param.
-
-	* camel/camel-stream-fs.c (_init_with_name): Set stream_fs->fd to
-	-1 if we fail to load the file.
-	(camel_stream_fs_new_with_name): If stream_fs->fd is -1, return
-	NULL. These changes make it so that a CamelStreamFs won't be
-	created if you give it a bogus filename; they may be replaced once
-	exception handling is in place.
-
-	* tests/ui-tests/message-browser.c (handle_tree_item): Expand tree
-	items.
-	(mime_message_to_html): New function; translates a
-	CamelMimeMessage into two strings (one for the header, and one for
-	the body).
-	(get_gtk_html_window): New function; fills out a window with
-	html. The html is taken from a processed rfc822 file, via a
-	CamelFormatter.
-
-	* camel/camel-formatter.c: Added assertions.
-	(handle_text_html): Don't call text_to_html on something that's
-	already html.
-	(multipart_foreach): function deleted.
-
-	* tests/ui-tests/message-browser.c: Added preliminary support for
-	the viewing of messages via gtkhtml. Lots of commenting. 
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/contact-editor/e-contact-editor.c: Fixed the
-	location the first time you see the drop down menus for changing
-	which phone, email, or snail mail address you see.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.c (e_text_event): Made a click on a text
-	widget set the cursor properly.
-
-2000-02-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text/e-text.h: Removed some arguments from the .h that
-	will never be implemented.
-
-
-2000-02-10  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_init): 
-	default the text/* mime types to CamelSimpleDataWrapper so
-	that Michael can use get_stream. 
-
-2000-02-10  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/camel-simple-data-wrapper-stream.h: The superclass is
-	actually a seekable stream, not just a stream.
-
-2000-02-10  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/Makefile.am (THREAD_RELATED_TESTS): don't 
-	build thread related tests if evolution has been
-	compiled with no thread support.
-
-	* configure.in (have_pthread): allow user to enable/disable
-	thread support at configure time
-	(EXTRA_GNOME_CFLAGS): 
-	(EXTRA_GNOME_LIBS): thread support is directly 
-	included in this variable if enabled. No more
-	EXTRA_GNOME_CFLAGS_THREADS
-	Other special support should be added in 
-	EXTRA_GNOME_LIBS and EXTRA_GNOME_CFLAGS
-	instead of redefining a new variable 
-	each time we want to add a new lib. 
-	(bonobo, ....)
-
-	* camel/camel.c (camel_init): only try to initialize threads if
-	we enabled threads support. 
-
-	* tests/ui-tests/Makefile.am (message_browser_LDADD): use
-	EXTRA_GNOME_LIBS
-
-	* configure.in (have_pthread): remove HAVE_PTHREADS
-	variable. Define ENABLE_THREADS instead.
-
-	* camel/Makefile.am: use ENABLE_THREADS not HAVE_PTHREADS
-	to test if we build thread relateed code. 
-
-	* tests/Makefile.am: use EXTRA_GNOME_LIBS, 
-	not EXTRA_GNOME_LIBS_THREADS
-
-2000-02-10  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/hash-table-utils.c (g_strcase_hash): Removed a bizarre
-	comparison construct for converting case.
-
-2000-02-09  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_init):
-	Uses case-insensitive compares.
-
-	* camel/gmime-content-field.c (gmime_content_field_new): Uses
-	case-insensitive compares.
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_init):
-	Use case-insensitive mime types.
-
-	* camel/camel-simple-data-wrapper-stream.c (read): Increment the
-	copy source address to match the data read offset.
-	(seek): Actually implement the seek.
-
-	* camel/camel-mime-part-utils.c
-	(camel_mime_part_store_stream_in_buffer): If we get a -1 read,
-	DONT update the total bytes, and try and truncate the array in
-	reverse.  Eek.
-
-	* camel/camel-mime-part.c (camel_mime_part_encoding_from_string):
-	This was DEFINETLEY not the right way to do it. strncmp!=strcmp
-	(camel_mime_part_encoding_to_string): Handle the default case.
-	: include string.h for strcmp() etc.
-
-2000-02-09  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/test-multipart-alt.msg: New test file; run
-	message-browser on it, and it will crash.
-
-2000-02-09  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/message-browser.c (handle_tree_item): 
-	show the item. 
-	(handle_tree_item): show the containers and the containees
-	(get_message_tree_ctrl): call handle_tree_item
-	on the message itself
-
-	* camel/camel-mime-message.c (camel_mime_message_init): 
-	set the mime type to "mime/message".
-	--- THIS IS NOT THE CONTENT TYPE ---
-
-	* camel/camel-mime-body-part.c (camel_mime_body_part_init): 
-	set the mime type to "body-part". 
-	--- THIS IS NOT THE CONTENT TYPE ---
-
-	* camel/camel-data-wrapper.c (camel_data_wrapper_set_mime_type): 
-	mime_type is const. 
-	(_set_input_stream): really set the input stream
-	(_set_output_stream): really set the output stream
-	various other typo fixes.
-
-	* tests/ui-tests/message-browser.c: various typo
-	fixes in the ctree construction. 
-
-	* camel/string-utils.c (string_trim): fix braindead
-	trailing trim bug.
-
-	* camel/gmime-content-field.c (gmime_content_field_construct_from_string): 
-	strip the leading and trailing quotes when constructing the 
-	content field. This should be done in a more generic 
-	RFC822 approach, but this fixes a bug that prevent
-	matt from analysing some multipart messages.
-
-	* camel/camel-data-wrapper.h: reorganize the 
-	deprecated and new methods. 
-
-	* camel/providers/mbox/camel-mbox-folder.c 
-	(_check_get_or_maybe_generate_summary_file): 
-	Use "From " as the message separating string. 
-	
-	* camel/providers/mbox/camel-mbox-folder.c (_append_message): 
-	set the mode when creating the mbox file. 	
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): 
-	ditto
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	ditto
-
-2000-02-09  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c (print_usage_and_quit): Minor
-	cleanup.
-
-2000-02-09  NotZed  <notzed@zedzone.helixcode.com>
-
-	* camel/camel-simple-data-wrapper-stream.c (class_init): Actually
-	initialise the class.  It simple couldn't have worked before.
-	(camel_simple_data_wrapper_stream_construct): Commented out code
-	which crashes just to get something working, memory corruption??
-
-2000-02-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* configure.in: Add new Makefiles to Makefile list.
-
-	* widgets/e-text/Makefile.am: Build libetext.
-
-	* widgets/e-minicard/Makefile.am: Build libeminicard and test
-	programs.
-
-	* widgets/Makefile.am: Remove all e-text and e-minicard code and
-	add them to the SUBDIRS list.
-
-2000-02-08  Matt Loper  <matt@helixcode.com>
-
-	* tests/ui-tests/message-browser.c: New file; shows a message in
-	tree format, where multipart's have multiple leaves.
-
-	* camel/camel-formatter.c: Changed references from
-	'multipart/alternate' to 'multipart/alternative'.
-
-	* tests/test-formatter.c (convert_to_html_and_print): Use the
-	buffer length of the stream to create strings which are then
-	printed, rather than printing the stream (which might not have a
-	trailing \0) directly.
-
-	* camel/camel-formatter.c (str_tolower): New function; makes a
-	string lowercase.
-
-	* tests/test-formatter.c (convert_to_html_and_print): Fixed call
-	to 'camel_formatter_mime_message_to_html' to contain correct
-	params.
-
-	* camel/camel-formatter.c: New member to 'CamelFormatterPrivate',
-	'attachments', will be used to let the caller know which items
-	should be treated as attachments (as opposed to objects which are
-	inline to the body).
-	(text_to_html): name changed from 'encode_entities'. Also now
-	converts newlines to <br> tags.
-	(camel_formatter_mime_message_to_html): Now takes two output
-	streams -- one for the header, and one for the body.
-	(get_bonobo_tag_for_object): New function; tries to make a tag out
-	of (1) the leaf of a mime message and (2) a bonobo object that can
-	handle its mime type, but can return NULL if it fails to find the
-	mime type.
-	(handle_vcard): New function; will write out a vcard as html.
-
-2000-02-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text.h, widgets/e-text.c: Added line wrap and a max
-	number of lines (max number of lines is only obeyed if text is not
-	being edited).
-
-2000-02-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/printing/e-contact-print.c: Removed an unneccessary
-	include of libhnj.  All uses of libhnj are commented out.
-
-2000-02-07  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c (mime_part_to_html): function deleted.
-
-	* tests/test-formatter.c (print_usage_and_quit): New function,
-	which gives usage information.
-
-	* camel/camel-formatter.c: made the 'stream' a member of the
-	CamelFormatter class, so that streams don't have to be explicitly
-	sent as a param where a CamelFormatter is also sent..
-	(handle_text_plain): Use 'encode_entities' to change '<' to
-	'&gt;', etc.
-
-2000-02-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-formatter.c (find_preferred_displayable_body_part_in_multipart_alternative): 
-	(mime_part_to_html): typo fix : 
-	use find_preferred_displayable_body_part_in_multipart_alternative
-	instead of the other names. Allows camel to have no undefined symbols. 
-
-2000-02-02  Matt Loper  <matt@helixcode.com>
-
-	* tests/test-formatter.c: New file; intended to test the
-	CamelFormatter class.
-
-	* camel/camel-formatter.c: Lots of cleanup, commenting, some new
-	functions, and a really basic skeleton for getting bonobo objects
-	into the html.
-	(encode_entities): New function, stolen from Daniel Velliard.
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/printing/e-contact-print-style-editor.h,
-	addressbook/printing/e-contact-print-style-editor.c,
-	addressbook/printing/test-contact-print-style-editor.c: Files to
-	load the contact print style editor from the glade file.  Doesn't
-	really do anything yet.
-
-	* addressbook/printing/Makefile.am: Added style editor stuff.
-
-	* addressbook/printing/e-contact-print.glade: Changed a bit.
-	Fixed an out of place widget.
-
-	* addressbook/printing/.cvsignore: Added
-	contact-print-style-editor-test.
-
-	* addressbook/printing/smallbook.ecps: Fixed up the values to
-	match the new types.
-
-	* addressbook/printing/medbook.ecps,
-	addressbook/printing/phonelist.ecps: Added two new printing
-	styles.
-
-	* addressbook/printing/e-contact-print.h: Fixed an incorrect
-	comment.
-	
-	* addressbook/printing/e-contact-print.c: Added columns and letter
-	tabs.  Tweaked spacing all over the place.  Fixed card height
-	function so that column wrapping is always done correctly.  Added
-	pulling of style information from a file.  Added line wrapping
-	within each text field.
-
-	* addressbook/printing/e-contact-print-types.h: Added a type field
-	for different types of print styles.
-
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text.c (e_text_command): Handle the grab and ungrab
-	command instead of doing focus by hand.  This fixes a problem
-	related to the scroll wheel.
-	(e_text_command): Reset the blink timer in many more command
-	situations so that the cursor blinks less when you're interacting
-	with it.
-
-	* widgets/e-text-event-processor-emacs-like.c: Send the grab focus
-	command when starting a selection and the ungrab focus command
-	when ending it.
-
-	* widgets/e-text-event-processor-types.h: Added grab command type
-	so that the event processor can tell the widget to grab the focus.
-
-	* widgets/e-reflow.c: Redefined all sizes using #defines so that
-	they can be tweaked later.  Added scroll wheel handling and set up
-	adjustment increments so that the scroll bars will work correctly.
-
-	* widgets/e-minicard.h: Added minicard focus type enum.  This
-	doesn't mean anything yet, but it will later be used to say which
-	direction the focus is coming from (below for shift-tab, above for
-	tab.)
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard-label.c, widgets/e-minicard.c: Use
-	e_canvas_item_grab_focus so that it will work with old versions of
-	gnome-canvas.
-
-	* widgets/e-canvas.c, widgets/e-canvas.h: Finished working around
-	focus bugs.
-
-2000-01-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/test-reflow.c: Set the minimum_width.
-
-	* widgets/e-reflow.h, widgets/e-reflow.c: Added one more column
-	line so that the right edge of the reflow will have a line.  Also
-	added a minimum_width so that even if the reflow is thinner than
-	the window, when you resize it larger all the lines are drawn.
-
-2000-01-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-reflow.h, widgets/e-reflow.c: Added an arrow cursor
-	for the draggable columns.  Made the clickable column area
-	larger.  
-
-	* widgets/e-text.h, widgets/e-text.c: Added an I beam cursor for
-	the text item when it is editable.
-
-	* widgets/e-minicard-label.c: Forward enter and leave
-	notifications to the contained editable text item.
-
-2000-01-26  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c: By looking up a mimetype in a
-	hashtable, we can now get a handler function for an arbitrary
-	mimetype.
-
-2000-01-25  Mathieu Lacage <mathieu@advogato.org>
-
-	* .cvsignore s: cvs shutup. 
-
-2000-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-reflow.c, widgets/e-minicard.c: Handle shift-tab
-	properly now.
-
-	* widgets/e-minicard-label.c: Reindented some areas.
-
-	* widgets/test-reflow.c: Use e-canvas.  Set the back pixmap to
-	NULL for the canvas so that scrolling won't flash grey.
-
-	* widgets/e-canvas.c, widgets/e-canvas.h: These subclass
-	GnomeCanvas to work around a few bugs so that evolution will work
-	well with old versions of gnome-libs.
-
-	* widgets/Makefile.am: Added e-canvas.c and e-canvas.h.
-
-	* addressbook/contact-editor/contact-editor.glade: Not much
-	change.  Mostly internal reorganization by glade itself.
-
-2000-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* addressbook/printing/smallbook.ecps: Example contact printing
-	style.  Not used yet.
-
-	* addressbook/printing/e-contact-print.glade: A glade file for
-	editing contact printing styles.  Not used yet.
-
-	* addressbook/printing/test-print.c: Test file for printing.
-
-	* addressbook/printing/e-contact-print.c,
-	addressbook/printing/e-contact-print.h,
-	addressbook/printing/e-contact-print-types.h,
-	addressbook/printing/Makefile.am, addressbook/printing/.cvsignore:
-	New files for contact printing support.
-
-	* addressbook/Makefile.am (SUBDIRS): Add printing.
-
-	* configure.in: Check for gnome-print.  Build the
-	addressbook/printing Makefile.
-
-2000-01-24  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-data-wrapper.h: 
-	* camel/camel-data-wrapper.c 
-	(_set_input_stream): 
-	(_get_input_stream): 
-	(_set_output_stream): 
-	(_get_output_stream): 
-	The CamelDataWrapper can now be provided with input and
-	output streams, so that nothing has to be kept in memory. 
-	
-	* camel/camel-stream.c (camel_stream_class_init): 
-	added the "data_available" signal.
-	
-
-2000-01-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Added the gnome-pilot and capplet checks; they
-	will likely be reworked for the Evolution framework, but for now
-	the calendar/ directory needs them.
-
-	* configure.in: Added checks for gnome-vfs.
-
-2000-01-24  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-seekable-stream.c: 
-	* camel/camel-seekable-stream.h: 
-	new files. 
-	
-	* camel/camel-simple-data-wrapper-stream.h:  parent class is now
-	CamelSeekableStream
-	* camel/camel-stream-buffered-fs.h: idem
-	* camel/camel-stream-buffered-fs.c: idem
-	* camel/camel-stream-mem.h: idem
-	* camel/camel-stream-mem.c: idem
-	(_seek): change declaration
-	* camel/camel-stream-fs.c: parent class is now
-	CamelSeekableStream
-	(_seek): change declaration
-
-	* camel/camel-stream-fs.h: parent class is now
-	CamelSeekableStream
-	
-	* camel/camel-stream-fs.[ch]: converted all 
-	gint64 variables into guint32. 
-	
-	
-	* camel/camel-stream-fs.c (_read): fix stupid bug.
-	(_write): ditto. 
-
-	* camel/camel-exception.c (camel_exception_new): don't
-	forget to clean the exception when creating it. 
-
-	* camel/camel-recipient.c (camel_recipient_table_add_list): 
-	add recipient_list to the recipients, not recipients_list. 
-	I don't know what that variable was doing here. 
-
-
-2000-01-24  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c (write_header_info_to_stream): new
-	function, broken out from 'camel_formatter_make_html'.
-	(write_mimepart_to_stream): same.
-	(find_text_body_part_in_multipart_related): new function.
-	(camel_formatter_make_html): Now tries to deal with
-	multipart/related, multipart/alternate, and text/(plain|html).
-
-
-2000-01-23  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-store.c (camel_store_get_session): 
-	added a public get_session method.
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	(camel_mbox_load_summary): load/save message sizes in the summary file
-
-	* camel/providers/mbox/camel-mbox-summary.h: 
-	added a size field to the message information 
-	structure. 
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	copy message size to the mbox summary information too. 
-	
-	* camel/camel-stream-fs.c (_seek): updated to 
-	work with bounded fs streams. 
-	(_write): ditto.
-	(_read): ditto.
-
-	* camel/camel-stream-fs.h (struct ): 
-	added the cur_pos, inf_bound and sup_bound
-	members to allow for bounded fs stream. 
-
-	* camel/camel-stream-fs.c (_set_bounds): new func.
-	(_init_with_fd_and_bounds): idem.
-	(_init_with_name_and_bounds): idem. 
-	New functions to allow the usage of bounded fs streams.
-
-	The bounded fs stream allow, for example, to make a stream
-	from a message stored in an mbox file. 
-	
-	
-2000-01-22  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_check_get_or_maybe_generate_summary_file): 
-	use the real summary file path instead of a 
-	stupid hardcoded one. Fixes yet another bug.
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	don't forget to copy the date too. Fix a very annoying bug.
-
-	* camel/providers/mbox/camel-mbox-folder.c (_append_message): 
-	implemented. A lot of fixes too. Works now. 
-	(_get_uid_list): implemented.
-
-2000-01-21  bertrand  <bertrand@helixcode.com>
-
-	* tests/test10.c:
-	test the mbox provider. 
-
-	* camel/camel-folder.c (_set_name): 
-	if camel_folder_get_mode returns an
-	exception, return it instead of
-	overriding it with a new one.
-	(camel_folder_is_open): make the is_open
-	method public.
-	(_set_name): use the is_open instead of
-	get_mode.
-	(_set_name): set the fullname even in the case 
-	where the folder has no parent.
-	(_set_name): use %c, not %d to add the 
-	separator char into the full path.
-
-	* camel/camel-store.c: add exception handling everywhere in
-	the store related functions arguments. 
-	* camel/providers/mbox/camel-mbox-folder.c: idem
-	* camel/providers/mbox/camel-mbox-folder.h: idem
-	* camel/providers/mbox/camel-mbox-store.h: idem
-
-	* camel/providers/mbox/Makefile.am (libcamelmbox_la_SOURCES): 
-	added camel-mbox-provider.c to the mbox provider
-	sources. 
-
-	* camel/providers/mbox/camel-mbox-provider.c: 
-	provider registration code.
-
-	* camel/providers/mbox/camel-mbox-folder.c (_get_message_count): implemented
-	(_append_message): implemented
-
-	* camel/providers/mbox/camel-mbox-parser.c (initialize_buffer): 
-	use \0 to mark the end of the buffer.
-	(read_next_buffer_chunk): ditto.
-	(read_header): test the presence of a \0 instead of
-	reading the eof field
-	(read_message_begining): idem.
-	(camel_mbox_parse_file): idem.
-	Remove the eof field from the parser
-	structure. 
-	(read_next_buffer_chunk): removed some nasty bugs
-	again. 
-
-	
-2000-01-21  Federico Mena Quintero  <federico@helixcode.com>
-	
-	* libversit/vcc.y: Removed the VFS crap; my mistake, it should not
-	go here.
-
-	* configure.in: Added yacc requirements for libversit.
-
-2000-01-21  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c (camel_formatter_make_html): added a
-	CamelMimeMessage as a param to this function, and removed it as a
-	member of the object.
-
-2000-01-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in (AC_OUTPUT): Added libversit/Makefile and
-	calendar/Makefile.
-
-	* Makefile.am (SUBDIRS): Added libversit and calendar.
-
-2000-01-20  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	compute and return the file size. 
-
-
-2000-01-20  Matt Loper  <matt@helixcode.com>
-
-	* camel/camel-formatter.c, camel/camel-formatter.h: New
-	files. You'll be able to use a CamelFormatter to get
-	html-formatted versions of a CamelMimeMessage.
-	
-2000-01-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text-event-processor-types.h: Changed some line
-	spacing.
-
-	* widgets/test-reflow.c: Connected to the resize signal of the
-	reflow.
-
-	* widgets/e-minicard.c: Made width argument set function only
-	update if width is different.
-
-	* widgets/e-reflow.h, widgets/e-reflow.c: Added draggable column dividers.
-
-	* addressbook/contact-editor/test-editor.c: Open two dialogs for
-	more interesting testing.
-
-	* addressbook/contact-editor/e-contact-editor.h,
-	addressbook/contact-editor/e-contact-editor.c: Modified to use
-	glade.  Added menus to change which phone/address/email entries to
-	view.  Added images to the dialog.
-
-	* addressbook/contact-editor/e-contact-editor-strings.h,
-	addressbook/contact-editor/contact-editor.glade: Glade files for
-	the contact editor dialog.
-
-	* addressbook/contact-editor/Makefile.am: Added images and added
-	glade stuff.
-
-	* addressbook/contact-editor/arrow.png,
-	addressbook/contact-editor/briefcase.png,
-	addressbook/contact-editor/netfreebusy.png,
-	addressbook/contact-editor/netmeeting.png: Image files for the
-	contact editor dialog.
-
-2000-01-19  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_get_message_count): 
-	implemented.
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	(camel_mbox_load_summary): save/load the next uid. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	Compute the next available uid. 
-	* camel/providers/mbox/camel-mbox-folder.c (_create): 
-	(_check_get_or_maybe_generate_summary_file): 
-	Set and use the next_uid field properly. 
-	* camel/providers/mbox/camel-mbox-summary.h: added
-	an extra field to store the next available uid. 
-
-	* camel/providers/mbox/camel-mbox-folder.c 
-	(_check_get_or_maybe_generate_summary_file): 
-	routine called when the folder is opened. 
-	Reads or creates the summary file. 
-	(_create): initialize the internal summary 
-	structure. 
-	(_close): save the summary file on closing. 
-	(_init_with_store): initialize mbox specific
-	folder members. 
-
-2000-01-18  bertrand  <bertrand@helixcode.com>
-
-	* tests/test9.c:
-	tests for summary and parsing process of mbox files. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): do
-	not use case insensitive comp to detect message separators. Kill 
-	some nasty bugs in netscape file parsing,
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	don't use g_array_append but write directly inside the
-	array data instead. Better performance and bug fix. 
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_load_summary): 
-	fix the name and bugs. 
-
-	* camel/camel-folder-summary.h: update the class
-	method definition to match the public defs. 
-
-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): 
-	(mbox_load_summary): summary file read/write routines. 
-
-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): 
-	routine to construct the summary after the mbox
-	file has been parsed and the x-evolution fields
-	inserted. 
-
-2000-01-17  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): 
-	dont use the x_evolution field but rather the uid to 
-	determine the presence of "X-Evolution" in the mail. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	parse the status and uid values if the x-evolution
-	has been found. 
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_xev_parse_header_content): 
-	return the parsed status field correctly. 
-
-	* camel/providers/mbox/camel-mbox-utils.h: 
-	fixed bad prototype.
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	parse and store the "To:" header.
-
-	* camel/providers/mbox/camel-mbox-parser.h: 
-	added a "to" field 
-
-	* camel/camel-folder-summary.c: 
-	create the arrays here. 
-
-	* camel/camel-folder-summary.h: the list of 
-	summary information is no longer a GList but 
-	rather a GArray.
-
-2000-01-17  Chrsitopher James Lahey  <clahey@helixcode.com>
-
-	* head.png, phone.png, email.png, web.png, snailmail.png: Images
-	for e-contact-editor.c.
-
-	* addressbook/contact-editor/text-editor.c: Test program
-	for contact editor widget.
-
-	* addressbook/contact-editor/e-contact-editor.c,
-	addressbook/contact-editor/e-contact-editor.h: Contact editor
-	widget files.
-
-	* addressbook/contact-editor/.cvsignore,
-	addressbook/contact-editor/Makefile.am: New directory for contact
-	editor files.
-
-	* addressbook/.cvsignore, addressbook/Makefile.am: New directory
-	for addressbook files.
-
-	* widgets/.cvsignore: Added reflow-test.
-
-	* Makefile.am (SUBDIRS): Added addressbook subdirectory.
-
-	* configure.in, widgets/Makefile.am: Removed widgets/toolbar from
-	SUBDIRS since the lack of content was preventing it from
-	compiling.
-
-	* widgets/e-text.c, widgets/e-text.h: Fixed a crashing bug.
-
-2000-01-17  bertrand  <bertrand@helixcode.com>
-
-	* tests/test9.c (main): test for the mbox utils.
-
-2000-01-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* configure.in: Add the gnomecanvaspixbuf argument to gnome-config
-	invocations.
-
-2000-01-17  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): 
-	(copy_file_chunk): 
-	(camel_mbox_xev_write_header_content): 
-	(string_to_flag): 
-	(flag_to_string): 
-	(string_to_uid): 
-	(uid_to_string): 
-	A bunch of new funcs to handle x-evolution 
-	private header field. 
-	(copy_file_chunk): fixed a nasty bug. 
-	(camel_mbox_write_xev): create the copy file descriptor
-	with the proper arguments. Exceptions implememnted.
-	(camel_mbox_write_xev): changed the way bytes are counted. 
-	No more uses the message size cause it did not take into
-	account the message separators characters. 
-	(camel_mbox_write_xev): hopefully fixed the last bugs. 
-	works ok now. 
-	
-
-2000-01-15  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.c 
-	(camel_mbox_parse_file): 
-	store the end of headers position. 
-	
-	* camel/providers/mbox/camel-mbox-parser.h: 
-	added the end_of_header_position to locate the 
-	begining of the mail body. 
-	
-
-	* camel/providers/mbox/camel-mbox-utils.c (uid_to_string): 
-	(string_to_uid): 
-	(flag_to_string): 
-	(string_to_flag): 
-	new functions to handle uids and
-	flags in the X-Evolution header. 
-	(camel_mbox_xev_parse_header_content): 
-	new function to parse an X-Evolution 
-	header. 
-	(camel_mbox_xev_write_header_content): 
-	new function to write the X-Evolution 
-	header. 
-
-2000-01-13  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.c (read_next_buffer_chunk): 
-	eof is true when no more chars are available, not 
-	when we've read the entire file. 
-	(initialize_buffer): ditto.
-	(read_message_begining): documented.
-	(read_header): ditto.
-	(new_message_detected): ditto.
-	(advance_n_chars): ditto.
-	(goto_next_char): ditto.
-	(read_next_buffer_chunk): ditto.
-	(initialize_buffer): ditto.
-	(parser_free): ditto.
-	(new_parser): ditto.
-
-2000-01-12    <clahey@galapagos.helixcode.com>
-
-	* widgets/e-text-event-processor-types.h,
-	widgets/e-text-event-processor-emacs-like.c, widgets/e-text.c,
-	widgets/e-text.h: Added selection and clipboard support.  Added up
-	and down arrow keys.  Fixed choice of font colors for the
-	selection to be based on the current style.
-
-	* widgets/e-minicard.c: Caused a click to grab the focus.  Changed
-	the fake information added.
-
-	* widgets/e-minicard-label.c: Forward mouse events to the field
-	EText item.
-
-2000-01-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-canvas-utils.c, widgets/e-canvas-utils.h:
-	e_canvas_item_move_absolute is just a helper function not supplied
-	by the gnome_canvas.[ch] I put it here so that multiple items can
-	use it.
-
-	* widgets/e-reflow.c, widgets/e-reflow.h: This item contains a
-	number of other items and places them into multiple columns.  The
-	items contained must support a number of arguments and signals to
-	allow the reflow to interact with them.
-
-	* widgets/test-reflow.c: This is a test program for e-reflow.
-
-	* widgets/e-text.c, widgets/e-text.h: Added properly drawn
-	selected text.  Added some preliminary code for X selection
-	handling and cut & paste.
-
-	* widgets/e-minicard.c, widgets/e-minicard.h: Added ARG_HAS_FOCUS
-	handling.  Made label display random for more interesting tests of
-	multiple cards.  Tweaked sizing information for better display.
-
-	* widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added
-	ARG_HAS_FOCUS handling.
-
-	* widgets/Makefile.am: Added the reflow test and reflow files.
-
-2000-01-12  bertrand  <bertrand@helixcode.com>
-
-	* camel/providers/mbox/camel-mbox-parser.h (camel_mbox_parse_file): 
-	Added the prototype of camel_mbox_parse_file. 
-
-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): 
-	updated in-line documentation.
-
-	* tests/Makefile.am (noinst_PROGRAMS): 
-	remove non updated tests from the build 
-	process. 
-
-	* corrected a bunch of bugs 
-	
-	* camel/providers/mbox/camel-mbox-parser.c 
-	(camel_mbox_parse_file): 
-	parser the subject and date.
-	
-
-	* camel/providers/mbox/camel-mbox-parser.c 
-	(camel_mbox_parse_file): added the ability to 
-	follow the parsing progression. 
-	
-	* camel/providers/mbox/camel-mbox-parser.h: 
-	parse the x-evolution field. 
-
-	* camel/Makefile.am (libcamel_la_SOURCES): 
-	disabled gmime-rfc2047 as it depends on libunicode
-	and is not used for the moment. 
-
-2000-01-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-minicard.c, widgets/e-minicard.h: Added a resize
-	signal for when the card changes height.  Made it so that when you
-	press tab inside of a field, it goes to the next field.
-
-	* widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added a
-	resize signal for when the label changes height.
-
-	* widgets/e-text.c, widgets/e-text.h: Added a resize signal for
-	multiple lines.  Added scrolling based on cursor position.
-
-	* widgets/Makefile.am: Removed an extraneous build target.
-
-2000-01-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/e-text-event-processor-emacs-like.c: Blocked the tab key
-	from getting inserted into the buffer since the renderer doesn't
-	know what a tab is.
-
-	* widgets/e-text.c, widgets/e-text.h: Fixed a memory leak.  Added
-	a blinking cursor and scrolling for the text item.
-
-2000-01-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/test-minicard.c: Removed some code which got in the way
-	of testing properly.
-
-	* widgets/e-minicard-label.c (e_minicard_label_realize): Made the
-	field text item editable.
-
-	* widgets/Makefile.am: Added e-text-event-process*.[ch].
-
-	* widgets/e-text.c, widgets/e-text.h: Changed these to support
-	editing.
-
-	* widgets/e-text-event-processor.c,
-	widgets/e-text-event-processor.h,
-	widgets/e-text-event-processor-types.h,
-	widgets/e-text-event-processor-emacs-like.c,
-	widgets/e-text-event-processor-emacs-like.h: These are a new pair
-	of classes which handle all events from the text item and convert
-	them into commands.
-
-
-2000-01-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* widgets/Makefile.am: Added minicard and text stuff.
-
-	* widgets/e-minicard.c, widgets/e-minicard.h,
-	widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added
-	canvas items for the minicard view in the contact manager.
-
-	* widgets/test-minicard.c, widgets/test-minicard-label.c: Tests
-	for the minicard items.
-
-	* widgets/e-text.h, widgets/e-text.c: New canvas item.  Based on
-	GnomeCanvasText.  Adds ellipsis capabilities.  Used in
-	e-minicard*.[ch].
-
-	* widgets/.cvsignore: Added minicard-test and minicard-label-test.
-
-2000-01-06  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in: Add Bonobo detection, Bonobo flags for compilation
-	for the components and the shell.
-
-2000-01-06 Elliot Lee <sopwith@redhat.com>
-	* composer/Makefile.am, widgets/e-table/Makefile.am: Work with
-	builddir != srcdir
-
-2000-01-05  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (EXTRA_GNOME_CFLAGS_THREADS,
-	EXTRA_GNOME_LIBS_THREADS): New variables that hold the thread
-	version of the compile/link lines.
-
-1999-11-20  Miguel de Icaza  <miguel@gnu.org>
-
-	* configure.in (PACKAGE): Raise warning level.
-
-2000-01-04  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_list_subfolders): 
-	in the io_error label does not return before the 
-	list has been freed.
-
-2000-01-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/mbox/camel-mbox-folder.c (_list_subfolders): 
-	detects netscape ".sdb" folders as well as simple 
-	non-suffixed folders (as the ones used in pine).
-	
-
-	* camel/string-utils.c (string_prefix): 
-	finished implementation. 
-	(string_prefix): added a boolean flag to indicate if the 
-	suffix has been found. When the suffix does not match, 
-	return NULL.
-
-1999-12-26 bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-exception.c (camel_exception_setv): 
-	new function. Allow printf-like description
-	string constructions. 
-
-	* camel/camel-exception.h: cosmetic changes.
-
-        * camel/providers/mbox/camel-mbox-store.h:
-        * camel/providers/mbox/camel-mbox-store.c:
-        * camel/providers/mbox/camel-mbox-folder.h:
-        * camel/providers/mbox/camel-mbox-folder.c:
-        More work on the mbox provider.
-
-
-1999-12-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/mbox/camel-mbox-store.h: 
-	* camel/providers/mbox/camel-mbox-store.c: 
-	* camel/providers/mbox/camel-mbox-folder.h: 
-	* camel/providers/mbox/camel-mbox-folder.c: 
-	part of the mbox provider.
-
-1999-12-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (_set_name): 
-	check that the folder is closed or raise an exception.
-	(_set_name): unset the name fields as soon as possible, 
-	even if an exception is raised.
-
-	* configure.in:
-	build mbox provider Makefile
-	
-	* camel/Makefile.am (SUBDIRS): 
-	re-enable providers compilation
-
-1999-12-19  Damon Chaplin  <damon@karuna.freeserve.co.uk>
-
-	* configure.in (AC_OUTPUT): added widgets/meeting-time-sel/Makefile
-
-1999-12-19  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-utils.c: include camel-log.h
-	to avoid unresolved symbols.
-
-1999-12-18  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_get_summary): 
-	documented.
-
-	* camel/camel-folder-pt-proxy.c (_append_message): 
-	updated to take the change on append into account.
-
-	* camel/camel-folder.h: 
-	updated class def concerning append.
-	* camel/camel-folder.c 
-	(camel_folder_append_message): documented. 
-	(camel_folder_append_message): don't return the 
-	message number. Use specific methods instead.
-	(_append_message): idem.
-
-	(_delete): use 	exception mechanism.
-	(camel_folder_delete): idem.
-	(_delete_messages): idem.
-	(camel_folder_delete_messages): idem.
-	(_get_parent_folder): idem.
-	(camel_folder_get_parent_folder): idem.
-	(_get_parent_store): idem.
-	(_get_mode): idem.
-	(camel_folder_get_parent_store): idem.
-	(camel_folder_get_mode): idem.
-	(_list_subfolders): idem.
-	(camel_folder_list_subfolders): idem.
-	(_expunge): idem.
-	(camel_folder_expunge): idem.
-	(_has_message_number_capability): idem.
-	(camel_folder_has_message_number_capability): idem.
-	(_get_message_by_number): idem.
-	(camel_folder_get_message_by_number): idem.
-	(camel_folder_get_message_count): idem.
-	(_list_permanent_flags): idem.
-	(camel_folder_list_permanent_flags): idem.
-	(_copy_message_to): idem.
-	(camel_folder_copy_message_to): idem.
-	(camel_folder_has_summary_capability): idem.
-	(camel_folder_get_summary): idem.
-	(camel_folder_has_uid_capability): idem.
-	(camel_folder_get_message_uid): idem.
-	(_get_message_uid_by_number): idem.
-	(camel_folder_get_message_uid_by_number): idem.
-	(camel_folder_get_message_by_uid): idem.
-	(camel_folder_get_uid_list): idem.
-
-1999-12-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (_set_name): 
-	use exception mechanism.
-	(camel_folder_set_name): idem.
-	(camel_folder_set_full_name): idem.
-	(_get_name): idem.
-	(camel_folder_get_name): idem.
-	(_get_full_name): idem.
-	(camel_folder_get_full_name): idem.
-	(_can_hold_folders): idem.
-	(_can_hold_messages): idem.
-	(_exists): idem.
-	(camel_folder_exists): idem.
-	(_is_open): idem.
-	(_get_subfolder): idem.
-	(camel_folder_get_subfolder): idem.
-
-	* camel/camel-exception.c (camel_exception_clear): 
-	New function. Clear an exception.
-	(camel_exception_get_id): 
-	New function. 
-	(camel_exception_get_description): 
-	New function. 
-
-	* camel/camel-folder.c (_set_name): 
-	Use the exception system. When the folder
-	has no parent, don't set its full name 
-	field.
-
-	
-1999-12-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_expunge): 
-	(_expunge): 
-	* camel/camel-folder-pt-proxy.c (_expunge): 
-	changed the return value. Now returns the list 
-	of expunged messages
-
-	* camel/camel-folder.c (_init_with_store): 
-	cleaned up. Use the exception system now.
-	(_open): ditto.
-	(camel_folder_open): ditto.
-	(camel_folder_open_async): ditto.
-	(_close):  ditto.
-	(camel_folder_close):  ditto.
-	(camel_folder_close_async): ditto.
-
-	* camel/camel-exception.c (camel_exception_set): 
-	When no exception is given, do nothing, just
-	return. 
-	(camel_exception_set): documented.
-	(camel_exception_new): idem.
-	(camel_exception_free): idem.
-	(camel_exception_xfer): idem.
-	
-
-	* camel/camel-folder.c:
-	* camel/camel-folder.h: more clean-ups. 
-	Removed message list related code. 
-	This was braindead design. 
-	
-
-	* camel/camel-folder-utils.c (camel_aml_expunge_messages): 
-	implemented. The routines in this file will be
-	called by providers to handle the list of
-	message already standing in memory. 
-
-1999-12-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-utils.c: 
-	* camel/camel-folder-utils.h: 
-	New files, misc utilities for the 
-	folder providers. Includes active message
-	list utilities. 
-
-	
-	* camel/camel-folder.c (_has_message_number_capability): 
-	(camel_folder_has_message_number_capability): 
-	Added this to know if a folder provides 
-	number-based message access.
-
-	* camel/camel-folder.c (_get_message_count): 
-	added warning when called directly.
-	(_append_message): ditto
-	(_open_async):  ditto
-	(_close_async):  ditto
-	(_delete_messages): ditto 
-	(_expunge):  ditto
-	(_get_message_by_number):  ditto
-	(_get_message_uid):  ditto
-	(_get_message_uid_by_number):  ditto
-	(_get_message_by_uid):  ditto
-	(_get_uid_list):  ditto
-
-	
-	* camel/camel-folder-pt-proxy.c (_open_async): 
-	(_open): 
-	(_close_async): 
-	(_close): 
-	(camel_folder_pt_proxy_class_init): 
-	update 
-	(_get_message_by_number): 
-	Update to reflect changes in CamelFolder
-
-	* camel/camel-folder.h: 
-	* camel/camel-folder.c (_get_subfolder): 
-	(camel_folder_get_subfolder): 
-	The CamelFolder::get_folder is renamed to 
-	get_subfolder as it is more intuitive. 
-
-	* camel/camel-folder.c (_get_message_by_number): 
-	(camel_folder_get_message_by_number): 
-	* camel/camel-folder.h 
-	(camel_folder_get_message_by_number): 
-	The get_message method is now named
-	get_message_by_number for consistency
-	with the _by_uid methods.
-
-	* camel/camel-folder.[ch]: 
-	 clean-ups. 
-
-1999-12-13  Nat Friedman  <nat@helixcode.com>
-
-	* ebook/e-book.h: New file.
-	* ebook/e-book.c: New file.
-	* ebook/e-card.h: New file.
-	* ebook/e-card-fields.h: New file.
-	* ebook/e-commerce.h: New file. :-)
-
-1999-12-08  Ettore Perazzoli  <ettore@gnu.org>
-
-	* tests/test1.c (main): Removed the strdup()s, which are not
-	deeded anymore.
-
-	* camel/camel-mime-message.c (_set_subject): `subject' made const.
-	(camel_mime_message_set_subject): Likewise.
-	(_set_from): `from' made const.
-	(camel_mime_message_set_from): Likewise.
-	(_set_reply_to): Made `reply_to' const.
-	(camel_mime_message_set_reply_to): Likewise.
-	(_set_set_received_date): Made `received_date' const.
-	(camel_mime_message_set_reply_to): Likewise.
-	(_set_field): `value' made const.  Also, strdup the string before
-	assigning.
-
-	* camel/camel-mime-message.h: Virtual methods changed to use const
-	strings when setting header values.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* composer/Makefile.am (EXTRA_DIST): Added `$(glade_DATA)'.
-
-	* camel/Makefile.am (EXTRA_DIST): Added
-	`$(libcamel_extra_sources)'.
-	(libcamelinclude_HEADERS): Added `gmime-base64.h'.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* camel/camel-mime-message.c (_write_to_stream): Removed extra ':'
-	in the `Mime-Version' header.
-
-	* tests/ui-tests/msg-composer-test.c: Removed.
-
-	* Makefile.am (SUBDIRS): Added `composer'.
-
-	* configure.in: Create `composer/Makefile'.
-
-	* camel/camel-simple-data-wrapper-stream.c
-	(camel_simple_data_wrapper_stream_construct): Updated accordingly.
-	(camel_simple_data_wrapper_stream_new): Updated accordingly.
-	* camel/camel-stream-data-wrapper.c
-	(camel_stream_data_wrapper_construct): Updated accordingly.
-
-	* camel/camel-data-wrapper.h: Replaced `IS_CAMEL...()' type check
-	macro name with `CAMEL_IS...()'.
-	* camel/camel-folder-pt-proxy.h: Likewise.
-	* camel/camel-folder-summary.h: Likewise. 
-	* camel/camel-folder.h: Likewise. 
-	* camel/camel-medium.h: Likewise. 
-	* camel/camel-mime-body-part.h: Likewise.
-	* camel/camel-mime-message.h: Likewise. 
-	* camel/camel-mime-part.h: Likewise. 
-	* camel/camel-multipart.h: Likewise. 
-	* camel/camel-service.h: Likewise. 
-	* camel/camel-session.h: Likewise. 
-	* camel/camel-simple-data-wrapper-stream.h: Likewise. 
-	* camel/camel-simple-data-wrapper.h: Likewise.
-	* camel/camel-store.h: Likewise.
-	* camel/camel-stream-buffered-fs.h: Likewise.
-	* camel/camel-stream-data-wrapper.h: Likewise. 
-	* camel/camel-stream-fs.h: Likewise. 
-	* camel/camel-stream-mem.h: Likewise. 
-	* camel/camel-stream.h: Likewise. 
-
-	* tests/test1.c (main): Updated to match the `RECIPIENT_TYPE'
-	changes.
-
-	* camel/camel-mime-message.h: Changed `RECIPIENT_TYPE_TO',
-	`RECIPIENT_TYPE_CC' and `RECIPIENT_TYPE_BCC' into
-	`CAMEL_RECIPIENT_TYPE_TO', `CAMEL_RECIPIENT_TYPE_CC' and
-	`CAMEL_RECIPIENT_TYPE_BCC', respectively.
-
-1999-11-17  Ettore Perazzoli  <ettore@gnu.org>
-
-	* camel/camel-mime-message.c (_write_to_stream): Write
-	"Mime-Version: 1.0" to the stream.
-
-	* tests/test1.c: If executed with a file name parameter, attach a
-	file with with that name to the email without loading it into
-	core, thus demonstrating usage of my latest changes.
-
-	* camel/camel-mime-part.c (_set_encoding): Updated to use
-	`CamelMimePartEncodingType'.
-	(camel_mime_part_set_encoding): Likewise.
-	(_get_encoding): Likewise.
-	(camel_mime_part_get_encoding): Likewise.
-	(_write_content_to_stream): Honour the `encoding' member.
-	(_construct_from_stream): Made static.
-	(camel_mime_part_encoding_to_string): New function.
-	(_write_to_stream): Write the encoding string using it.
-	(camel_mime_part_init): Set encoding to
-	`CAMEL_MIME_PART_ENCODING_DEFAULT'.
-	(_finalize): Don't free `encoding' anymore.
-	(camel_mime_part_encoding_from_string): New function.
-	(_parse_header_pair): Use it.
-
-	* camel/camel-mime-part.h: New enum `CamelMimePartEncodingType'.
-	Member `encoding' of `struct _CamelMimePart' changed from `gchar
-	*' to `CamelMimePartEncodingType'.  All the encoding-related
-	methods changed to use this type instead of `gchar *'.
-
-	* camel/gmime-base64.c (gmime_encode_base64): Got it to work.
-
-	* camel/Makefile.am (libcamel_la_SOURCES): Compile
-	`gmime-base64.c'.
-
-	* camel/gmime-base64.h: New, previously missing, header.
-
-	* camel/camel-stream-data-wrapper.c: New file implementing the
-	`CamelStreamDataWrapper' class.
-	* camel/camel-stream-data-wrapper.h: Corresponding header.
-
-	* camel/camel-simple-data-wrapper.c: Implemented the `get_stream'
-	virtual method.
-	(_get_stream): New function implementing the method.
-	(camel_simple_data_wrapper_class_init): Install it in the class
-	struct.
-	(camel_simple_data_wrapper_init): New function initializing the
-	`stream' member to NULL,
-	(camel_simple_data_wrapper_class_init): Set it as the
-	GtkObjectInitFunc.
-
-	* camel/camel-simple-data-wrapper.h: New member `stream' in
-	`struct _CamelSimpleDataWrapper'.
-
-	* camel/camel-simple-data-wrapper-stream.c: New file implementing
-	the `CamelSimpleDataWrapperStream' class.
-	* camel/camel-simple-data-wrapper-stream.h: Corresponding header.
-
-	* camel/camel-data-wrapper.c (camel_data_wrapper_get_stream): New
-	function.
-	(_get_stream): New private function, just returning NULL.
-	(camel_data_wrapper_class_init): Install it as the default
-	`get_stream' virtual method.
-
-	* camel/camel-data-wrapper.h: New virtual method `get_stream' in
-	`CamelDataWrapperClass'.
-	(camel_data_wrapper_get_stream): New function prototype.
-
-1999-11-05  Ettore Perazzoli  <ettore@gnu.org>
-
-	* tests/ui-tests/msg-composer-test.c: New file for testing the
-	`EMsgComposer' widget.
-	* tests/ui-tests/Makefile.am (noinst_PROGRAMS): Compile it.  Do
-	not compile `store_listing' for now because it's currently broken.
-	(INCLUDES): Added the `widgets' source directory to the include
-	path list.
-	(LDADD): Removed the MH dependency; link with
-	`libevolutionwidgets.la' from the `widgets' directory.
-
-	* configure.in: Create `widgets/Makefile'.
-
-	* camel/gmime-rfc2047.c (rfc2047_clean): Removed C++-like comment.
-	* camel/camel-folder.c (camel_folder_get_message_uid_by_number):
-	Likewise.
-	* camel/gmime-content-field.c (gmime_content_field_get_parameter):
-	Likewise.
-	* camel/camel.c (camel_init): Likewise.
-	* camel/camel-provider.c (camel_provider_register): Likewise.
-	* camel/camel-multipart.c (_construct_from_stream): Likewise.
-	* camel/camel-mime-part.c (_write_content_to_stream): Likewise.
-	* camel/camel-medium.c (camel_medium_class_init): Likewise.
-
-	* camel/camel-data-wrapper.h (camel_data_wrapper_get_type): Make
-	prototype non-static.
-
-	* camel/Makefile.am (libcamelinclude_HEADERS): Move
-	`camel-exception-list.def' from `EXTRA_DIST' to
-	`libcamelinclude_HEADERS'.
-
-	* camel/camel.h: Do not #include <config.h>.
-	* camel/data-wrapper-repository.h: Likewise.
-
-1999-11-05  Ettore Perazzoli  <ettore@gnu.org>
-
-	* tests/Makefile.am (INCLUDES): Add `-I$(top_srcdir)'.
-
-1999-10-13  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_close): the 
-	folder->close method is now asynchronous.
-
-	* camel/camel-folder-pt-proxy.c (_folder_open_cb): 
-	(_open): 
-	(_folder_open_cb): 
-	(_open): 
-	open/close method implemented in the thread proxy
-	folder. More to come.
-
-	* camel/camel-exception.c (camel_exception_xfer): 
-	new utility func.
-
-	* camel/camel-marshal-utils.c: some new marshallers
-
-	* camel/camel-folder-pt-proxy.c: Some explanations
-	on the thread proxy system.
-
-1999-10-11  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-marshal-utils.c: 
-	camel/camel-marshal-utils.h:
-	Handles operation marshalling. 
-	
-	* camel/camel-thread-proxy.c: 
-	camel/camel-thread-proxy.h: 
-	new files. Generic proxy system.
-	  
-	* camel/camel-folder-pt-proxy.c 
-	moved all proxy related code in dedicated files.
-	
-	(camel_folder_pt_proxy_init): 
-	removed proxy initialisation code
-	(_finalize): 
-	removed proxy finalization code
-
-
-	* camel/camel-exception.c 
-	(camel_exception_new): 
-	(camel_exception_set): 
-	(camel_exception_free): 
-	New funcs.
-
-1999-09-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_async_close): 
-	implemented.
-
-	* configure.in:
-	Check pthreads.
-
-	* camel/Makefile.am: 
-	camel-folder-pt-proxy.c is only compiled
-	when pthreads are available.
-	
-	* camel/camel-folder-pt-proxy.c:
-	Signal proxying implemenatation. 
-	(_signal_marshaller_server_side): 
-	(_signal_marshaller_client_side): 
-	(_init_signals_proxy): 
-	Code not is tested and has to be best 
-	explained as it uses threads conditions and
-	gtk signal system.
-	(_thread_notification_catch): notify pending signals
-	as well as thread availability.
-
-1999-09-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_op_exec_or_plan_for_exec): 
-	completed
-
-	Binch of new funcs:
-	(_maybe_run_next_op): 
-	Called by the watch notification when 
-	a threaded op is completed
-	(_thread_notification_catch): 
-	notification watch call back
-	(_init_notify_system): 
-	set up the notification channel
-	(notify_availability): 
-	called by threads before completion.
-
-1999-09-18  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_op_exec_or_plan_for_exec): 
-	new func. Try to exec an operation in a thread
-	or queue it if a thread is already busy.
-
-	* camel/camel-op-queue.c (camel_op_queue_set_service_availability): 
-	(camel_op_queue_get_service_availability): 
-	new funcs. 
-
-	* camel/camel-op-queue.c (camel_op_new): 
-	(camel_op_free): 
-	new funcs. Uses glib mem chunks.
-	
-
-1999-09-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder-pt-proxy.c (_init_with_store): 
-	added notify io_channel.
-
-	* camel/camel-op-queue.h: 
-	* camel/camel-op-queue.c: 
-	New object. Operation queue. Meant to be used in 
-	non-blocking proxy objects.
-	(camel_op_queue_run_next_op): new func. 
-	run the next operation.
-
-1999-09-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/Makefile.am (libcamel_la_SOURCES): 
-	added camel-folder-pt-proxy.[ch] to the build
-	process.
-
-	* camel/camel-folder-pt-proxy.c (_init_with_store): 
-	started implementation of the pthread-based 
-	folder proxy.
-	
-
-1999-09-08  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/mh-summary.c 
-	(mh_load_summary): 
-	(mh_save_summary): 
-	(mh_create_summary): 
-	implemented summary (files) for MH folders.
-	
-	* camel/providers/MH/camel-mh-folder.c 
-	(_get_message_by_uid): implemented.
-	(camel_mh_folder_class_init): 
-	(_get_message_uid): implemented
-
-	* camel/camel-folder.c (camel_folder_has_uid_capability): 
-	(camel_folder_get_message_uid): 
-	(camel_folder_get_message_uid_by_number): 
-	(camel_folder_get_message_by_uid): 
-	(camel_folder_get_uid_list): 
-	Documented UID methods.
-	(camel_folder_get_message_uid_by_number): 
-	const'ified uid.
-	(camel_folder_get_message_by_uid): idem
-	removed stupid camel_folder_get_message_uid_by_number
-	method.
-	
-	* tests/ui-tests/store_listing.c (close_all): 
-	close all open folders and stores. (necessary
-	for UID list saving ).
-
-	* camel/providers/MH/mh-uid.c (mh_generate_uid_list): 
-	fix: store UID list in CamelMHFolder object.
-
-	* camel/providers/MH/camel-mh-folder.c (_open): 
-	read or create UID list.
-	(_close): save UID list.
-
-1999-09-07  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/md5-utils.c (md5_get_digest_from_file): 
-	correct parameter decl (const)
-
-	* camel/md5-utils.h: typo.
-
-	* camel/providers/MH/mh-uid.c 
-	More work on UID stuff for MH.
-	(mh_save_uid_list): 
-	(mh_load_uid_list): 
-	(mh_generate_uid_list): 
-	new funcs. Manage on-disk uid list.
-	
-	* camel/providers/MH/mh-utils.c (mh_is_a_message_file): 
-	Util routines live here now.
-
-	* camel/md5-utils.c 
-	Documented all funcs.
-	
-	(md5_get_digest_from_stream): 
-	correct typo.
-	(md5_get_digest_from_file): 
-	same typo corrected.
-	
-
-	* camel/md5-utils.h : 
-	raw routines are declared public now.
-	Md5 use has to be versatile.
-
-	* camel/providers/MH/mh-uid.c (mh_uid_get_for_file): 
-	new func. Returns an UID for an MH message.
-		
-1999-09-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-
-	* camel/md5-utils.h:
-	* camel/md5-utils.c:
-	changed names to follow camel style.
-	(md5_get_digest_from_stream): 
-	new methods.
-	(md5_get_digest_from_file): 
-	new function : get file md5 signature. 
-	To be used in providers code.
-
-	* camel/md5-utils.c: imported md5 coding 
-	routine from rpm. Compiles.
-	
-
-1999-09-05  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_has_uid_capability): 
-	(camel_folder_get_message_uid): 
-	(camel_folder_get_message_uid_by_number): 
-	(camel_folder_get_message_by_uid): 
-	(camel_folder_get_uid_list): 
-	Basic UID framework.
-	
-	* devel-docs/misc/ref_and_id_proposition.txt:
-	New revision. Some fixes.
-
-	* camel/camel-folder.h (struct _CamelFolder): added 
-	uid_capability field.
-	
-
-	* camel/camel-folder.c (camel_folder_close): publicized
-	the close method.
-
-	* tests/ui-tests/store_listing.c (show_folder_messages): 
-	use folder summary instead of opening all messages.
-	(show_folder_messages): re-enabled old CPU/Mem consumming
-	method. Useful for pop3 for instance.
-
-	* camel/providers/MH/camel-mh-folder.c (_create_summary): 
-	basic and highly non-efficient summary implementation.
-	Should be seen as a proof of concept only.
-	subfolder summary still has to be implemented.
-	
-	* camel/providers/maildir/camel-maildir-folder.c (_init_with_store): 
-	hasn't summary for the moment. 
-	* camel/providers/maildir/camel-maildir-folder.c
-	cosmetic changes.
-	
-
-1999-09-04  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_create_summary):
-	started summary implementation.
-	(_open): correct use of open.
-
-	* camel/camel-folder.c (camel_folder_get_summary): 
-	get folder associated summary object.
-
-	* camel/Makefile.am:
-	added summary files build
-
-	* camel/camel-folder-summary.[ch]: 
-	basic summary framework
-
-1999-09-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/camel/Makefile.am:
-	sgml doc has camel-recipient now.
-
-	* camel/camel-recipient.c (camel_recipient_foreach_recipient_type): 
-	added in-line documentation.
-
-1999-09-02  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/maildir: Added (experimental) maildir 
-	provider written by Jukka Zitting <hukka@greywolves.org>
-	
-	* camel/providers/Makefile.am (SUBDIRS): build maildir
-	provider.
-
-	* camel/camel-provider.c (camel_provider_get_for_protocol):
-	bug fix. patch from  Jukka Zitting <hukka@greywolves.org>
-
-	* camel/camel-mime-message.c (_write_one_recipient_to_stream): 
-	changed decl to fit CRLFunc. 
-	(_write_recipients_to_stream): 
-	calls camel_recipient_foreach_recipient_type now.
-
-	* camel/camel-recipient.c (camel_recipient_foreach_recipient_type): 
-	new convinience function. Iterate over all recipient types.
-
-	* camel/gmime-utils.c (gmime_write_header_table_to_stream): 
-	s/write_header_table_to_stream/gmime_write_header_table_to_stream/
-	(gmime_write_header_with_glist_to_stream): 
-	s/write_header_with_glist_to_stream/gmime_write_header_with_glist_to_stream/
-
-1999-09-01  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (_finalize): 
-	(_add_recipient): 
-	(_remove_recipient): 
-	(_get_recipients): now use CamelRecipientTable
-	
-	* camel/gmime-content-field.c: 
-	(gmime_content_field_unref): test if object 
-	to free is non void.
-
-	* camel/camel-folder.c (_finalize): 
-	(_set_name): 
-	* camel/camel-mime-part.c (_finalize): 
-	(_set_description): 
-	(_set_disposition): 
-	* camel/camel-service.c (_finalize): 
-	* camel/camel-stream-fs.c (_finalize): 
-	* camel/gmime-content-field.c: 
-	(gmime_content_field_construct_from_string): 
-
-	* camel/url-util.c (g_url_free): 
-
-	When using g_free (obj) don't test if obj != NULL
-	g_free () already do that. Thanks to elerium for
-	the feedback.
-
-1999-08-30  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-recipient.c (camel_recipient_get): 
-	(camel_recipient_remove): 
-	(camel_recipient_add): 
-	new func. More work on new independant recipient code. 
-
-1999-08-29  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* MAINTAINERS: updated my e-mail address. 
-
-1999-08-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (camel_mime_part_set_text): 
-	text parameter declared const
-
-	* camel/camel-mime-part-utils.c (camel_mime_part_store_stream_in_buffer): 
-	actually test correctly nb_bytes_read_chunk is >0
-
-	* camel/gstring-util.c: 
-	* camel/gmime-content-field.c: 
-	* camel/providers/MH/camel-mh-folder.c:
-	* camel/camel-stream-fs.c:
-	include string.h
-
-	* camel/camel-stream-mem.c (_write): return 
-	the numver of written bytes.
-
-	* camel/camel-stream-buffered-fs.c (_eos): 
-	return sthg
-
-	* camel/camel-stream.c (default_camel_seek): 
-	return something.
-
-1999-08-26  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_get_content_object): 
-	contruct the content from the buffer before calling
-	CamelMedium implementation.
-	(_construct_from_stream): Do not construct the content 
-	by default, just store the content bytes in 
-	a temporary buffer. Content will be constructed only
-	at caller request (when calling CamelMedium::get_content_object)
-	Providers with better access to the messages (mbox/MH ...)
-	will have to provider lighter implementation, that is
-	shall not read content at all unless the caller asks
-	for it (again with get_content).
-
-	* camel/camel-mime-part-utils.c: new file, groups
-	mime-part related utils. Meant to be used by providers
-	subclassing MimeMessage.
-	(camel_mime_part_construct_headers_from_stream): 
-	(camel_mime_part_construct_content_from_stream): 
-	no more useless temporary hash table. 
-
-	* camel/camel-mime-part.c (_construct_from_stream): calls
-	mime-part-utils functions now.
-
-	* camel/gmime-utils.c (_store_header_pair_from_string): 
-	do not use hash table to store header, use an array instead.
-
-1999-08-25  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c: now descend from CamelMedium.
-
-	* tests/test1.c (main): all headers must be strdup'ed
-	(main): unref created objects
-
-	* camel/camel-medium.c (_set_content_object): 
-	(_get_content_object): these methods are 
-	in CamelMedium now.
-
-1999-08-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-medium.c (camel_medium_class_init): 
-	new class. Will handle all sort of information media 
-	(Mime mail messages, Lotus Notes  mail messages, 
-	postit notes, faxes, who knows .... :)
-	CamelMimePart will inherit from it.
-
-	* camel/camel-mime-part.c (_set_disposition): 
-	(_set_description):
-	description and disposition parameters are now const.
-	 
-
-	* camel/gmime-content-field.c (gmime_content_field_free): added
-	assertion code.
-
-	* camel/providers/MH/camel-mh-folder.c (_get_message): 
-	uses buffered stream.
-
-	* camel/camel-stream-buffered-fs.c:
-	new stream to accelerate file ops.
-
-1999-08-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream-fs.c (camel_stream_fs_new_with_name): 
-	name parameter is const. This fixes a bug in destroy ()
-
-1999-08-18  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* camel/gmime-rfc2047.c: more work on encoder.
-
-1999-08-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream.c (camel_stream_read): 
-	return the number of bytes read. 
-	How can this have ever worked ?
-	(camel_stream_flush): don't return anything.
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	mem leak fixed.
-
-1999-08-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c:
-	Now has a popup menu on mailbox tree to allow
-	easier tests. Implemented the copy stuff.
-	Works well for the MH provider :)))
-
-	* camel/providers/MH/camel-mh-folder.c (_copy_message_to): 
-	Test MH provider fast copy implemented.
-	
-	
-1999-08-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_expunge): 
-	moved the active list readjustment code here.
-	Much saner, providers won't have to worry about
-	that.
-	(_copy_message_to): new method.
-
-	* camel/providers/MH/camel-mh-folder.c (_expunge): 
-	no more active list readjustment stuff.
-
-	* camel/camel-folder.h: the expunge virtual no more
-	returns a list of expunged messages. Now providers
-	only have to set the expunge flag on the expunged
-	messages.
-
-	* camel/camel-folder.c (camel_folder_get_message): 
-	moved the caching code here. Finally, I don't want
-	providers to crash the libs with a bad message cache
-	implementation. 
-	(_close): do not call the CamelFolder virtual expunge 
-	method directly, use camel_folder_expunge() instead.
-	(camel_folder_expunge): added the want_list param. 
-	The client can decide if it wants the expunged message
-	list or not. If yes, it'll have to unref the messages 
-	itself.
-
-1999-08-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c (delete_selected_messages): 
-	(expunge_selected_folders): 
-	Implemented deletion/expunge mechanism. 
-
-	* camel/camel-folder.c (_get_message): 
-	Added some debug info.
-
-	* camel/providers/MH/camel-mh-folder.c (_expunge): 
-	implemented and tested.
-
-	* camel/camel-mime-message.c (_set_flag): 
-	changed the old braindead implementation.
-	boolean are inserted in the flag hash 
-	table casted as gpointers.
-	
-
-	* camel/camel-mime-message.c: indentation fix
-	
-
-1999-08-13  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (_get_message): default implementation
-	to be called first by providers methods. It looks in the
-	folder message list (in memory) to see if the message has
-	not already been retrieved, and in this case, returns 
-	the same CamelMimeMessage object
-
-	* camel/providers/MH/camel-mh-folder.c (_get_message): set
-	message->message_number correctly.
-
-	* camel/camel-folder.h (struct _CamelFolder): 
-	New field (message_list) which will hold a 
-	reference on each message obtained by the folder,
-	which is necessary in order for the caching procedure
-	to work (Getting the same message from a folder twice
-	will return the same CamelMimeMessage object).
-	
-	* camel/camel-folder.c (camel_folder_get_message): 
-	When the store retreives a message put it in its
-	message list.
-	(_finalize): free message list.
-
-	* ChangeLog: fix typo (parmanent)
-
-	* camel/camel-folder.c (_get_permanent_flag_list): 
-	(camel_folder_get_permanent_flag_list): 
-	new method, returns the list of permanent
-	flags supported by the folder.
-
-	* camel/camel-mime-message.c (_get_flag_list): 
-	(camel_mime_message_get_flag_list): new method,
-	return the list of flag name used by this message.
-
-	* camel/hash-table-utils.c (g_strcase_equal): 
-	(g_strcase_hash): those two func go here now.
-
-	* camel/hash_table_utils.c (hash_table_generic_free): 
-	free a (gpointer, gpointer) hash table pair.
-
-	* camel/camel-mime-message.c (camel_mime_message_init): use
-	case insensitive hash table functions. 
-	(_set_flag): 
-	(camel_mime_message_set_flag): 
-	(_get_flag): 
-	(camel_mime_message_get_flag): 
-	Use const for flag name, they are now
-	duplicated.
-
-1999-08-12  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c (show_folder_messages): 
-	remove stupid debug code.
-	(add_mail_store): use camel_session_get_store instead
-	of creating MH store directly.
-	(main): load MH provider.
-
-	* camel/camel-provider.c (camel_provider_register_as_module): 
-	register new provider.
-	(camel_provider_get_for_protocol): 
-	Now, implementation is correct.
-
-	* camel/camel-store.c (_finalize): 
-	* camel/camel-store.h (struct _CamelStore): 
-	further disabled url_name field use. 
-	URL will be generated dynamically.
-
-	* camel/camel-session.c (camel_session_get_store_for_protocol): 
-	compilation and runtime fixes.
-
-	* camel/providers/MH/camel-mh-store.c (_init): 
-	synced with CamelStore.
-
-	* camel/camel-store.c (_init): 
-	in CamelStore::init, url_name is now const.
-	disabled url_name copy.
-
-	* camel/camel-session.c (camel_session_get_store): 
-	new function: returns a store for an URL. 
-	(camel_session_get_store_for_protocol): 
-	new functionc: returns a store for a given 
-	store protocol (as IMAP/POP/MH ...)
-	* camel/string-utils.c (g_strcase_equal): 
-	(g_strcase_hash): case insensitive hash table
-	funcs.
-
-	* camel/camel-session.c (camel_session_init): hash table
-	keys are case insensitive.
-
-	* camel/camel-provider.c (camel_provider_get_for_protocol): 
-	new function, returns the last registered 
-	provider for a protocol.
-
-	* camel/providers/MH/camel-mh-provider.c: 
-	new file. MH provider registration stuff.
-
-	* camel/camel-provider.c (camel_provider_register_as_module): 
-	load a provider from a shared object (plugin).
-	(camel_provider_register): register a provider 
-	"by hand". Used for statically defined providers.
-
-	* tests/test7.c: new test.
-	tests providers loading framework.
-
-1999-08-11  
-
-	* camel/camel-service.c (_finalize): 
-	* camel/camel-stream-fs.c (_finalize): 
-	(_destroy): close file descriptor.
-	* camel/camel-stream-mem.c (_finalize): 
-	* camel/camel-store.c (_finalize): 
-	* camel/camel-folder.c (_finalize): 
-	* camel/camel-multipart.c (_finalize): 
-	* camel/camel-simple-data-wrapper.c (_finalize): 
-	* camel/camel-mime-part.c (_finalize): 
-	implemented destructors.
-	
-
-	* camel/gmime-content-field.c (gmime_content_field_ref): 
-	(gmime_content_field_unref): 
-	New reference mechanism for GMimeContentField objects.
-
-	* camel/camel-data-wrapper.c (_finalize): 
-	Started implementing destructors.
-
-	* camel/camel-mime-part.c (_construct_from_stream): 
-	* camel/gmime-content-field.c (gmime_content_field_write_to_stream): 
-	* camel/camel-multipart.c (_construct_from_stream): 
-	removed forgotten anarchic traces.
-
-1999-08-10  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/ui-tests/store_listing.c: 
-	* tests/ui-tests/store_listing.glade:
-	Quick and (very) dirty hack to test Camel more
-	easily.
-
-	* camel/camel-folder.c (camel_folder_append_message): 
-	new method.
-
-1999-08-09  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/misc/ref_and_id_proposition.txt:
-	new file. Document message UID and vfolder
-	implementation.
-
-1999-08-08  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* camel/gmime-rfc2047.c: more advanced RFC2047 encoder started.
-	
-1999-08-08  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_get_message): 
-	fix. In MH, message number is not related to 
-	message position in folder.
-
-	* camel/providers/MH/camel-mh-folder.c (_is_a_message_file): 
-	util func.
-	(_get_message_count): implemented.
-
-1999-08-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/camel/:
-	updated some autogen doc stuff.
-	Still don't understand warnings :(
-
-	* camel/camel-data-wrapper.c: 
-	* camel/providers/MH/camel-mh-store.c: 
-	* camel/url-util.c: 
-	* camel/gmime-content-field.c: 
-	* camel/camel-store.c: 
-	various inline doc corrections.
-
-	* camel/camel-folder.c (get_message_count): 
-	new method. Returns the number of message 
-	in the folder.
-
-
-
-1999-08-06  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* tests/test6.c: encoder test.
-
-	* camel/gmime-rfc2047.c: Fixed decoder bug : sequence
-	?= is not always the terminator for an encoded-string.
-
-
-1999-08-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): 
-	stat was not testing the good file. Fixed.
-	
-	* tests/test4.c (main): added real test for MH folder 
-	provider. All tested things seem to work OK :)
-
-1998-08-06  Robert Brady  <rwb197@ecs.soton.ac.uk>
-	
-	* tests/test5.c: test for RFC2047 decoder.
-
-	* camel/gmime-rfc2047.c: Improved RFC2047 decoder.
-
-1999-08-06  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_exists): add debug information
-	(_list_subfolders): test if first char in folder name is not '.'
-	before adding it to the folder list.
-
-	* camel/camel-store.c (_init): 
-	disable session check temporarily
-	(_get_separator): 
-	(_get_folder): new static func. 
-	Fixed several oddities in class definition. 
-
-	* camel/providers/MH/camel-mh-store.c (camel_mh_store_get_type): 
-	parent type is CAMEL_STORE_TYPE not CAMEL_FOLDER_TYPE
-
-	* camel/camel-store.c: 
-	prent class is CamelServiceClass not GtkObjectClass
-
-	* camel/url-util.c : 
-	cosmetic changes + use of const when possible.
-	(find_host):
-	fix a bug: when there is no host and no port don't skip the '/'
-	all static find_* func are now named _func_*  
-	(g_url_free): destructor func.
-	cache field has been disabled. Constructing the url string
-	won't be too slow and will occur rarely enough that we
-	do not need to add complexity to this code. 
-
-	* camel/providers/MH/camel-mh-store.c: 
-	parent class is CamelStorClass not GtkObjectClass
-
-1999-08-05  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test4.c: 
-	test mh provider.
-	
-	* camel/providers/MH/camel-mh-folder.c (_get_message): 
-	implemented
-	
-	* camel/camel-folder.c (_get_message): 
-	new method. 
-	(camel_folder_get_message): 
-	corresponding public call
-	
-	* camel/README.HACKING: 
-	Some notes.
-
-	* camel/CODING.STYLE: 
-	short note about coding style. 
-
-	* camel/README.COPYRIGHT: 
-	Note about copyright policy.
-
-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): 
-	minor typo fixes.
-
-
-1999-08-04  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-rfc2047.c: 
-	* camel/gmime-rfc2047.h:
-	indentation and cosmetic changes.
-	
-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): 
-	implemented.
-	* camel/providers/MH/camel-mh-folder.c (_delete): 
-	finshed implementation
-	(_delete_messages): implemented.
-
-
-1999-08-04  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* camel/gmime-rfc2047.[ch]: added an implemention of RFC2047
-	  (support for character sets other than US-ASCII in MIME
-	  headers). Not actually called from anywhere yet.
-
-
-1999-08-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (_create): 
-	implemented.
-	(_delete): started implementation.
-
-	* camel/camel-folder.c (_get_folder): default implementation 
-	calls camel_store_get_folder ().
-
-	* camel/providers/MH/camel-mh-folder.c (_init_with_store): 
-	implemented.
-
-	* camel/camel-folder.h (struct _CamelFolder): 
-	remove useless exist_on_store field.
-
-	* camel/camel-folder.c (_exists): 
-	do not use exist_on_store field.
-
-	* camel/camel-folder.c (camel_folder_set_name): 
-	(camel_folder_get_name): 
-	new public functions 
-	(_set_name): set full_path.
-
-	(_set_full_name): 
-	(camel_folder_set_full_name): 
-	commented out this functions def. 
-	It would make things very difficult to handle, and would not 
-	be very useful. 
-	
-	* camel/providers/MH/camel-mh-store.h: 
-	* camel/providers/MH/camel-mh-store.c (camel_mh_store_set_toplevel_dir): 
-	(camel_mh_store_get_toplevel_dir): 
-	* camel/providers/MH/camel-mh-folder.c (_set_name): 
-	* camel/providers/MH/camel-mh-folder.h: 
-	use (gchar *) instead of (GString *) everywhere.
-	use const when necessary.
-	
-	* camel/camel-folder.h (struct _CamelFolder): 
-	removed unused message_list field.
-	
-	* camel/camel-mime-part.c (_set_content_object): 
-	There is a probleme here. We can not allow mime part
-	content-type field and content_object mime-type to be 
-	different. I thus chosed to set mime part object 
-	content field to be freed (if necessary) and set
-	to be a pointer to content_object mime type
-	field. 
-	(_construct_from_stream): set content_object mime type
-	to be the same as mime_part's one. This is necessary
-	because we use _set_content_type. 
-	
-	This two things are a bit hackish ansd may need
-	to be redesigned.
-	
-	* camel/gmime-utils.c (gmime_write_header_pair_to_stream): 
-	use g_strdup_printf and remove a bug.
-
-	* camel/camel-simple-data-wrapper.c (_construct_from_stream): 
-	more debugging output +  nb_bytes_read is now a signed int 
-	to avoid bug when eos is encountered.
-
-	* camel/camel-mime-part.c (_construct_from_stream): 
-	sync to data_wrapper_repository function name changes. 
-	Use default "text/plain" type when conten-type field
-	is not found. (following RFC 2046 spec).
-
-	* camel/data-wrapper-repository.c (data_wrapper_repository_set_data_wrapper_type): 
-	(data_wrapper_repository_get_data_wrapper_type): 
-	change function name prefix (s/data_wrapper/data_wrapper_repository/)
-
-	* camel/camel-multipart.c (_read_part): 
-	add `\n` at eol but not before boundary.
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	correct implementation of end of stream detection.
-
-1999-08-01  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-multipart.c (_read_part): 
-	use a stream to store the part instead of GString. 
-	
-	* camel/camel-mime-part.c (camel_mime_part_set_text): 
-	set data wrapper content type to "text/plain".
-
-	* camel/camel-stream-mem.c:
-	* camel/camel-stream-mem.h:
-	new memory buffer based stream.
-
-	* camel/camel-stream-fs.c (_seek): 
-	implementation for file system based stream.
-
-	* camel/camel-stream.c (camel_stream_seek): 
-	new method.
-
-	* camel/camel-stream-fs.c (camel_stream_fs_class_init): 
-	pass CamelStreamFsClass instead of CamelStreamClass.
-
-1999-08-01 bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (gmime_write_header_pair_to_stream): 
-	corrected a bug with memory not allocated for '\0' in strtmp
-
-	* camel/gmime-utils.c (gmime_read_line_from_stream): 
-	do not return NULL when line is empty. 
-
-	* camel/camel-multipart.c (_read_part): return true when end
-	of multipart is found, not the opposite
-
-1999-07-31  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (gmime_read_line_from_stream): 
-	Don't return crlf at end of line.
-
-1999-07-30  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (gmime_read_line_from_stream): 
-	new function: reads a line from a stream.
-	should be in streams utils maybe. 
-
-1999-07-29  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_construct_from_stream): 
-	Uses data wrapper repository to find what data wrapper
-	to use to construct the content from a stream. When 
-	no object is registered for the mime type found in
-	content type field a CamelSimpleDataWrapper is 
-	used. 
-	
-	* camel/camel-mime-part.c (_get_content_type): 
-	(camel_mime_part_get_content_type): returns
-	a pointer on the content_type field instead 
-	of the gchar * mime "type/subtype".
-
-1999-07-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-
-	* camel/data-wrapper-repository.c
-	* camel/data-wrapper-repository.h
-	New files. Handles mime type <-> camel object
-	(for example "multipart" <-> CamelMultipart
-	* tests/tesst3.c: test data repository thing.
-
-1999-07-26  bertrand  <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/camel-multipart.c (_write_to_stream): 
-	implemented output of multipart.
-	
-	* tests/test1.c (main): testing content objects operations. 
-
-1999-07-25  bertrand  <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/camel-mime-part.c (camel_mime_part_set_text): 
-	new util function to set a mime part content to be 
-	a text string.
-
-	* camel/camel-simple-data-wrapper.c (camel_simple_data_wrapper_set_buffer_from_text): 
-	new util func. 
-	(camel_simple_data_wrapper_new): new func.
-
-	* camel/camel-multipart.c (_write_to_stream): 
-	implemented output of multiparts.
-
-1999-07-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-content-field.c (gmime_content_field_get_parameter): 
-	New function. Returns the value associated to a 
-	mime parameter. 
-
-
-1999-07-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-multipart.h: 
-	* camel/camel-multipart.c:
-	New class. Models multipart mime objects.
-	
-	* camel/camel-mime-body-part.h: 
-	* camel/camel-mime-body-part.c: 
-	New class. Body part is a mime part contained in 
-	a multipart object.
-	
-
-1999-07-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-log.h: 
-	implemented hard log level stuff.
-	* came/*.c use "CAMEL_LOG_*" instead of "CAMEL_LOG (*"
-	in order to allow hard level switch.
-
-	* tests/test1.c: 
-	* tests/test2.c: 
-	updated to use gchar instead of GString. Tests passed.
-
-
-1999-07-19  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream.c: 
-	* camel/camel-stream.h: 
-	"const"-antified
-	
-
-	* camel/camel-simple-data-wrapper.c: (_construct_from_stream)
-	do not use any limit when constructing the object from a stream
-	
-	* camel/camel-stream-fs.c: 
-	* camel/camel-stream-fs.h: 
-	* camel/camel-mime-message.c: 
-	* camel/camel-mime-message.h: 
-	* camel/camel-session.c: 
-	* camel/camel-session.h: 
-	* camel/camel-service.c: 
-	* camel/camel-service.h:
-	* camel/camel-store.c: 
-	* camel/camel-store.h: 
-	* camel/camel-folder.c: 
-	* camel/camel-folder.h: 
-	* camel/gmime-utils.c: 
-	* camel/gmime-utils.h: 
-	GString -> gchar
-	constantified what had to be.
-	
-	* camel/string-utils.c: 
-	* camel/string-utils.h: 
-	New files. Meant to replace gstring-util for gchar *
-	
-1999-07-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-content-field.c (gmime_content_field_construct_from_string): 
-	GString -> gchar
-	use const to indicate copied parameter.
-
-1999-07-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-simple-data-wrapper.c: 
-	* camel/camel-simple-data-wrapper.h: 
-	Gstring -> gchar
-	
-1999-07-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/url-util.c:  
-	* camel/url-util.h: 
-	Do not use GStrings any more. 
-	Added assertion code. 
-	Cosmetic reformating
-	
-	* AUTHORS:
-	* ChangeLog:
-	Changed my email address.
-
-	
-1999-07-13  Miguel de Icaza  <miguel@gnu.org>
-
-	* camel/gmime-base64.c (gmime_encode_base64): Implemented base64
-	encoder based on CamelStreams.  Should the encoder/decoder be a
-	Stream itself?
-
-	* camel/gmime-utils.c: include config.h here.
-	* camel/url-util.c: ditto.
-	* camel/gstring-util.c: ditto.
-	* camel/gmime-content-field.c: ditto.
-	* camel/camel-stream.c: ditto.
-	* camel/camel-stream-fs.c: ditto.
-	* camel/camel-store.c: ditto.
-	* camel/camel-simple-data-wrapper.c: ditto.
-	* camel/camel-session.c: ditto.
-	* camel/camel-service.c: ditto.
-	* camel/camel-mime-part.c: ditto.
-	* camel/camel-mime-message.c: ditto.
-	* camel/camel-log.c: ditto.
-	* camel/camel-data-wrapper.c: ditto
-	* camel/camel-folder.c: ditto.
-
-	* camel/camel-stream.c (camel_stream_write): Moved api
-	documentation to the places that they document.
-	(camel_stream_class_init): Virtual classes do not need to have a
-	default implementation.  So null them all.
-	(camel_stream_write): Return value from write.
-	(camel_stream_available): implement.
-	(camel_stream_write_strings): documented.
-
-	* devel-docs/query/virtual-folder-in-depth.sgml: Small
-	reformatting
-
-1999-06-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test2.c (main): now use 
-	CamelDataWrapper::contruct_form_stream to test 
-	message parsing
-
-	* camel/camel-data-wrapper.c: 
-	* camel/camel-data-wrapper.h: 
-	construct_from_stream no longer has maximimum size arg.
-
-	* camel/camel-mime-part.c (_construct_from_stream): new.
-	Construct the mime_part from a stream.
-
-	* camel/camel-mime-part.c:
-	new field (content_type) and associated methods.
-	(camel_mime_part_init): initialize content_type field.
-	(_parse_header_pair): now set content_type MimePart field
-	instead of using DataWrapper Mime typing facility.
-
-1999-06-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.h: 
-	s/content_type/mime_type/
-
-1999-06-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-simple-data-wrapper.[ch]:
-	new class. Simple implementation of a data wrapper:
-	simply keeps the stream result in a byte array.
-
-	* camel/camel-mime-part.c (_parse_header_pair): added a warning. 
-	Have to think about the correct way to store content type stuff.
-
-1999-06-24  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (_write_one_recipient_to_stream): 
-	includes gmime-utils header. 
-	patch from Ulrich Drepper <drepper at cygnus.com>
-	set separator string in write_header_with_glist_to_stream()
-	
-	* camel/camel-log.c (camel_log): 
-	patch from Ulrich Drepper <drepper at cygnus.com>
-	Do not use stderr in initialization of logfile descriptor.
-	
-	* camel/camel-stream-fs.c (camel_stream_fs_new_with_name): 
-	patch from Ulrich Drepper <drepper at cygnus.com>
-	initialize mode field in open(). 
-
-1999-06-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.c (_get_content_type): 
-	moved all the content-type stuff here.
-	(camel_data_wrapper_init): initialize the instance
-	content-type field.
-
-	* camel/camel-mime-part.c (_parse_header_pair): 
-	parse Content-Type stuff in header. 
-	(_write_to_stream): write the content type stuff to 
-	the stream.
-
-	* camel/gmime-content-field.c (gmime_content_field_get_mime_type): 
-	new function, returns "type/subtype" mime type string.
-	(gmime_content_field_construct_from_string): 
-	new function, construbt a content_field object
-	form a string. be used to set the mime_type from a
-	string.
-
-	* camel/camel-mime-part.c (_set_content_type): 
-	(camel_mime_part_set_content_type): 
-	(_get_content_type): 
-	(_get_content_type): 
-	new methods.
-
-1999-06-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	replace CR/LF+'\t' with ' ' 
-
-	* camel/camel-mime-message.c (_set_recipient_list_from_string): 
-	trim \t when splitting
-
-	* camel/gmime-utils.c (get_header_table_from_file): 
-	corrected bug in scanning tabulations ('t' -> '\t')
-
-	* tests/test2.c (main): read mail.test instead
-	of mail1.test
-
-	* camel/camel-mime-part.c (_add_header): 
-	added comments 
-
-1999-06-03  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* devel-docs/query/virtual-folder-in-depth.sgml: 
-	sgmlized Giao's doc about virtual folders.
-
-1999-05-31  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test2.c (main): 
-	use new stream code instead of raw file * stuff.
-
-	* camel/gmime-utils.c (get_header_table_from_stream): 
-	new func. Will replace get_header_table_from_file and will
-	be used to parse headers from files as well as from 
-	memory buffers.
-
-	* camel/camel-stream-fs.c:
-	CamelStream Subclass. File system based
-	stream.
-	
-
-1999-05-30  bertrand  <Bertrand.Guiheneuf@aful.org>
-
- 	* camel/camel-stream.h: new class. Represents an 
-	abstract stream object.
-
-       * camel/camel-mime-message.c (_set_recipient_list_from_string): 
-	remove leading and trailing spaces in recipient addresses.
-
-	* camel/gmime-utils.c (_store_header_pair_from_gstring): 
-	remove leading and trailing spaces from header values.
-
-	* camel/gstring-util.c (g_string_trim): new
-	func: remove leading or trailng chars from 
-	a specified char set.
-	(g_string_split): allow trimming of substrings.
-
-	* tests/test1.c (main): remove gtk_main call
-
-1999-05-28  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c 
-	(_parse_header_pair): 
-	(_init_header_name_table): 
-	More header parsing code.
-
-	
-1999-05-27  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test2.c (main): rewrite message obtained via
-	parsing into a file. Actually, it works pretty well :))
-
-	* camel/camel-mime-message.c (_set_recipient_list_from_string): 
-	create recipient list form a comma separated string.
-	(_parse_header_pair): added recipient lists parsing.
-
-	* camel/camel-mime-part.c (_parse_header_pair): 
-	new (protected) method. Parse a head pair and
-	decides what to do with it.
-	
-	(_add_header): Call in _parse_header_pair
-
-	* camel/camel-mime-message.c (_parse_header_pair): 
-	overload  header parsing MimePart mthod.
-
-	* camel/gstring-util.c (g_string_split): 
-	new func: split a gstring into a GList of
-	substring.
-
-1999-05-26  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (get_header_lines_from_file): 
-	new func. Parses message header zone and returns
-	a Glist of all header lines.
-
-	* tests/test2.c: tests message parsing
-
-	* camel/gmime-utils.c (write_header_table_to_file): 
-	new func to write a table of headers.
-
-1999-05-20  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (_write_to_file): 
-	recipient list printing
-	
-	* tests/test1.c (main): more tests.
-
-1999-05-19  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_write_to_file): test if content
-	exists before calling its write_to method.
-
-	* camel/camel-mime-message.c (_write_to_file): bugs fix.
-
-	* camel/camel-mime-message.c (camel_mime_message_new_with_session): 
-	new func. Creates a message with the session field set
-	up correctly.
-
-1999-05-18  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* tests/test1.c (main): tests
-
-	* camel/camel-mime-message.c (_write_to_file): 
-	started write_to framework for mime_messages
-
-	* camel/camel-mime-message.c (*_message_number): 
-	message number funcs.
-	
-1999-05-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (*_flag): 
-	flags handling methods
-
-1999-05-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-message.c (camel_mime_message_class_init): 
-	added recipient handling class funcs.
-
-1999-05-13  bertrand  <Bertrand.Guiheneuf@aful.org>
-        
-	* camel/camel-mime-message.c (camel_mime_message_init): 
-	create recipients hash table
-	(_remove_recipient): 
-	(_add_recipient):
-	(_get_recipients):  new funcs.
-	Internal Recipients data structure is
-	a bit complicated though.
-
-	* camel/camel-mime-part.c (camel_mime_part_init): 
-	create headers hash table
-
-	* camel/camel-mime-message.h: 
-	a bunch of get/set header field
-	method done. Does nothing yet though.
-
-	* camel/camel-mime-message.[ch] :
-	new file. 
-
-1999-05-12  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.h (struct ): 
-	disposition is now a full GMimeContentField
-	object.
-
-	* camel/gmime-content-field.c: new file
-	handle "type/subtype ;parameter=value ; parameter=value ..."
-	BNF grammar elements
-	(gmime_content_field_write_to_file): new func
-	
-	* camel/gmime-utils.c (gmime_write_header_pair_to_file): 
-	namespace change
-
-1999-05-11  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (_write_to_file): 
-	overload wrapper class method.
-	(_write_to_file): start to write some text in 
-	file.
-
-	* camel/camel-store.c: typo fix.
-
-	* camel/camel-store.c: 
-	* camel/camel-service.c: 
-	* camel/camel-folder.c: 
-	* camel/camel-data-wrapper.c: 
-	* camel/camel-mime-part.c: 
-	static functions naming follows gnome 
-	coding style guide.
-
-	* camel/camel-mime-part.h: implemented public interfaces
-	
-
-1999-05-10  Bertrand Guiheneuf  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (__camel_mime_part_get_header_lines): 
-	(__camel_mime_part_set_header_lines): 
-	(__camel_mime_part_get_content_languages): 
-	(__camel_mime_part_set_content_languages): 
-	(__camel_mime_part_get_encoding): 
-	(__camel_mime_part_set_encoding): 
-	(__camel_mime_part_get_content_MD5): 
-	(__camel_mime_part_set_content_MD5): 
-	(__camel_mime_part_get_content_id): 
-	(__camel_mime_part_set_content_id): 
-	A bunch of new set/get func.
-
-	* camel/gstring-util.c (g_string_list_free): 
-	convenience function for string list 
-	complete deallocation.
-
-1999-05-09  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c (__camel_mime_part_add_header): 
-	new method
-
-	* camel/camel-mime-part.h (struct CamelMimePart):
-	added core fields.
-
-1999-05-08  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.[ch]: 
-	new class. models a mime mail part.
-
-	* camel/camel-data-wrapper.c 
-	(camel_data_wrapper_write_to_buffer): method to
-	stream data content in a buffer.
-	(camel_data_wrapper_write_to_file): 
-	(camel_data_wrapper_construct_from_buffer): 
-	(camel_data_wrapper_construct_from_file): 
-	new methods.
-	
-1999-05-07  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.[ch]:new class.
-	This should not be a class but rather an 
-	interface. The day Gtk support interfaces, 
-	it dataWrapper should become an interface.
-
-1999-05-04  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-service.c (camel_service_get_url): 
-	new method.
-
-	* devel-docs/camel/camel-sections.txt: added 
-	function doc references
-
-	* camel/camel-folder.c (__camel_folder_close): 
-	fixed indentation.
-	(camel_folder_expunge): new method.
-	(__camel_folder_close): used expunge flag
-
-1999-05-03  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_get_mode): 
-	typo fix
-
-	* camel/camel-folder.c (__camel_folder_list_subfolders): 
-	new func.
-
-	* some doc stuffs
-	
-
-1999-05-01  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c 
-	(__camel_folder_get_mode): 
-	(camel_folder_get_mode): 
-	(camel_folder_get_parent_store): 
-	(__camel_folder_get_parent_store): 
-	(camel_folder_get_parent_folder): 
-	(__camel_folder_get_parent_folder): 
-	new methods
-
-	* camel/camel-service.c: put __ prefix before
-	private virtual funcs.
-
-	* camel/camel-folder.c (camel_folder_delete): 
-	(camel_folder_delete_messages): 
-	new methods.
-
-	* camel/url-util.c (g_url_new): some
-	more comments 
-
-1999-04-27  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c (camel_folder_create): 
-	new public function.
-
-1999-04-25  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-session.c (camel_session_get_store_from_provider): 
-	initialize folder object.
-
-	* camel/camel-store.c (init): new method.
-	called by session object at instantiation time.
-
-	* camel/camel-store.h (struct _CamelStore): 
-	new fields : session and url_name
-
-1999-04-25  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-session.c (camel_session_set_provider): 
-	new method to set the default provider for a protocol.
-	(camel_session_get_store_from_provider): 
-	new method to instantiate a folder from a provider.
-
-	* camel/camel-provider.h: s/GString/gchar/g
-	+ typo fix.
-
-	* camel/camel-provider.[ch]:
-	basic provider structure. Have to write the
-	code for dynamic loading.
-
-1999-04-24  bertrand <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/url-util.[ch]: s/new_g_url/g_url_new
-
-	* camel/url-util.c (new_g_url): URL 
-	rewritten completely. Error handling not
-	implemented in public functions.
-	But URL scan works pretty well :)))
-
-1999-04-24 bertrand <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/url-util.[ch]: I needed the url 
-	functions to use GString, and I wanted a more
-	general scheme so I finally started rewriting 
-	the whole thing from scratch.
-	No more code from gzilla :(
-	
-1999-04-23  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/url-util.[ch]:
-	Utility functions to parse URLs.
-	Stolen shamelessly from gzilla (www.gzilla.com)
-	written by Raph Levien <raph@acm.org>
-	
-	* camel/Makefile.am: added url-util.[ch]
-	compilation.
-
-	* Makefile.am (SUBDIRS): removed devel-docs
-	until I come up with a correct Makefile.am
-
-	* camel/camel-store.h: 
-	* camel/camel-folder.h:
-	correct declarations of structs
-
-
-1999-04-22  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-store.c:
-	more test implementation.
-
-	* camel/camel-store.c (camel_store_get_type): typo fix
-	
-
-1999-04-21  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/providers/MH/camel-mh-folder.c (camel_mh_folder_get_type): 
-	start test provider.
-
-1999-04-20  bertrand <Bertrand.Guiheneuf@aful.org>
-	
-	* camel/camel-store.h: now CamelStore inherits from
-	CamelService.
-
-	* camel/camel-service.c (camel_service_class_init): 
-	basic abstract service class.
-
-1999-04-19  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/README: added some (few) explanations.
-
-1999-04-18  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-store.[ch]: started implementation
-	* camel/camel-folder.c (camel_folder_get_type): typo
-	uncommented the store related code.
-	(camel_folder_create): enable som store relted code. 
-	Not finished. Have to define public methods first.
-
-	* camel/camel-log.h: some explanation about the 
-	log system
-
-1999-04-18   bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c: 
-	(camel_folder_create): implemented (partially)
-	have to write CamelStore before finishing it.
-
-	* camel/camel-folder.h (CamelFolder): added full_name field
-	(CamelFolderClass): added set/get_full_name methods
-
-1999-04-18  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-folder.c: some work
-	* camel/camel-log.c: log system for camel
-	* camel/gstring-util.c: some utilities for GString objects
-	
-
-1999-04-18  bertrand <Bertrand.Guiheneuf@aful.org>
-
-	* autogen.sh (PKG_NAME): groomf -> gnome-mailer
-
diff --git a/HACKING b/HACKING
deleted file mode 100644
index e69de29bb2..0000000000
--- a/HACKING
+++ /dev/null
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index b42a17ac46..0000000000
--- a/INSTALL
+++ /dev/null
@@ -1,182 +0,0 @@
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
diff --git a/MAINTAINERS b/MAINTAINERS
deleted file mode 100644
index 602e3bf73b..0000000000
--- a/MAINTAINERS
+++ /dev/null
@@ -1,5 +0,0 @@
-Email: ettore@ximian.com
-Email: danw@ximian.com
-Email: chris@ximian.com
-Email: federico@ximian.com
-Email: iain@ximian.com
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index df404ca32f..0000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-changelogs =			\
-	ChangeLog
-
-EXTRA_DIST =			\
-	AUTHORS			\
-	$(changelogs)		\
-	COPYING-DOCS		\
-	README			\
-	HACKING			\
-	MAINTAINERS		\
-	NEWS			\
-	xml-i18n-merge.in	\
-	xml-i18n-update.in	\
-	xml-i18n-extract.in
-
-SUBDIRS =			\
-        intl                    \
-        macros                  \
-        data                    \
-        e-util                  \
-	libical			\
-        widgets                 \
-        shell                   \
-        libibex                 \
-        camel                   \
-        filter                  \
-        libversit               \
-	libwombat		\
-	addressbook             \
-        composer                \
-        mail                    \
-        calendar                \
-        wombat                  \
-	importers		\
-	my-evolution		\
-        art                     \
-	ui			\
-        default_user            \
-	views			\
-        tools                   \
-	doc			\
-	help			\
-        po			\
-	omf-install
-
diff --git a/NEWS b/NEWS
deleted file mode 100644
index ebded585d4..0000000000
--- a/NEWS
+++ /dev/null
@@ -1,2405 +0,0 @@
-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
-
-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 960d0aa66e..0000000000
--- a/README
+++ /dev/null
@@ -1,227 +0,0 @@
-Evolution is the integrated mail, calendar and address book
-distributed suite from Ximian, Inc.
-
-See http://www.ximian.com/apps/evolution.php3 for more information.
-
-Note that Evolution is still beta. This means it may delete all of
-your mail if you give it the chance.
-
-If you are using Evolution, you should subscribe to the Evolution
-mailing list. If you are interested in hacking on it, you should
-subscribe to the Evolution Hackers mailing list. Send mail to
-"evolution-request@ximian.com" or
-"evolution-hackers-request@ximian.com" with the word "subscribe" in
-the body of the message. If you are planning to work on any part of
-Evolution, please send mail to the mailing list first, to avoid
-duplicated effort (and to make sure that you aren't basing your work
-on interfaces that are expected to change).
-
-There are mailing list archives available at
-http://lists.ximian.com/archives/public/evolution/     and
-http://lists.ximian.com/archives/public/evolution-hackers/
-
-There is also an #evolution IRC channel on irc.gnome.org.
-
-
-IF IT DOESN'T WORK
-------------------
-
-Did you read the "How to build" section below?
-
-If the configure script complains that you don't have a library that
-you know you have installed, it usually means either that you've
-installed things into multiple prefixes (see the bits on GNOME_PATH
-below) or (if you're on Linux) that you installed the "foo" package
-but forgot the "foo-devel" or "foo-dev" packages.
-
-
-HOW TO BUILD EVOLUTION
-----------------------
-
-	*** READ THIS BEFORE YOU START BUILDING ANYTHING! ***
-
-Evolution depends on a large number of unreleased and rapidly-changing
-libraries. Some of these libraries in turn depend on other unreleased
-and rapidly-changing libraries.
-
-Building Evolution is HARD, and it's going to stay hard until all of
-the libraries it depends on stabilize, and there's nothing we can do
-to make it any easier until then.
-
-
-GENERAL PRINCIPLES
-------------------
-
-First you have to decide whether you want to install Evolution (and
-its dependencies) into the same prefix as the rest of your GNOME
-install, or into a new prefix. Installing everything into the same
-prefix as the rest of your GNOME install will make it much easier to
-build and run programs, and easier to switch between using packages
-and building it yourself, but it may also make it harder to uninstall
-later.
-
-If you want to install into the same prefix as the rest of GNOME,
-type:
-
-	gnome-config --prefix
-	gnome-config --sysconfdir
-
-and remember the answers, and pass them to "configure" or "autogen.sh"
-when building the other packages you need. For example:
-
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib
-
-    --localstatedir is needed to make the docs integrate with scrollkeeper
-    and needs to point to the directory containing the scrollkeeper indices
-    which are in: gnome-config --localstatedir
-
-If you build in another prefix instead, you will need to set the
-GNOME_PATH environment variable (and ACLOCAL_FLAGS as well if building
-from CVS) to include the prefix you install into. For example:
-
-        export GNOME_PATH=/usr/local
-	export ACLOCAL_FLAGS="-I /usr/local/share/aclocal"
-
-(Assuming your shell is bash, and you installed into /usr/local.) You
-need to set GNOME_PATH both during compiling AND when you run
-evolution. Remember also that if you're installing into an odd prefix
-such as /evolution, that you also need to make sure to put
-${prefix}/bin in your PATH and ${prefix}/lib in your LD_LIBRARY_PATH.
-
-
-DEPENDENCIES
-------------
-
-The following required libraries are available in GNOME CVS, under the
-given names.  Most (but not all) of them are also available as
-tarballs on ftp.gnome.org.  The (*)ed packages are available in Ximian
-GNOME ( http://www.ximian.com/desktop/ ).  Other packages may be
-available from the Ximian GNOME evolution preview mirror.
-
-If installing from packages, remember that you need both the runtime
-and -devel packages for each library.
-
- - xml-i18n-tools - latest from xml-i18n-tools-stable-1-x branch in
-   GNOME CVS (0.8.2 is too old)
-
- - scrollkeeper - 0.1.4 or later (*)
-
- - gnome-xml - 1.8.10 or later in the 1.0 series, but not from the 2.0
-   series (If you get this from GNOME CVS, use the tag "LIB_XML_1_BRANCH".)
-   (*)
-
- - gnome-print - 0.25 or later (*)
-
- - gdk-pixbuf - 0.9.0 or later (*)
-
- - ORBit - 0.5.8 or later (*) (If you get this from GNOME CVS, use the
-   tag "orbit-stable-0-5".)
-
- - oaf - 0.6.2 or later (If you get this from GNOME CVS, use the tag
-   "oaf-stable-0-6")
-
-   *** If you are using oaf from CVS, you should use the flag
-   *** "--disable-more-warnings" when configure, or it may fail to
-   *** build.
-
- - gnome-vfs - 1.0.0 or later (If you get this from GNOME CVS, use
-   the tag "gnome-vfs-1-0")
-
-   *** If you are using gnome-vfs from CVS, you should use the flag
-   *** "--disable-more-warnings" when configuring, or it may fail to
-   *** build.
-
- - libglade - 0.14 or later
-
- - bonobo - 1.0.3 or later
-
-   *** Note that bonobo must be installed with the same --prefix as
-   *** either gnome-libs or evolution for the Makefiles to work
-   *** properly.
-
- - gal (GNOME Application Library) - 0.18.1 or later
-
- - gtkhtml - later than 0.16.1
-
-Other non-GNOME Dependencies:
-
- - Berkeley's libdb - 3.1.17
-
-   db3 is available from http://www.sleepycat.com. Make sure to get
-   3.1.17, it isn't the latest version.
-
-
-COMPILING BERKELEY DB
----------------------
-
-If you don't have 3.1.17 installed on your system or Evolution doesn't
-detect it for some reason, here is a way to get Evolution to link to
-it without messing up your system installation.
-
-� * Get the Sleepycat tarball from:
-
-����� http://www.sleepycat.com/update/3.1.17/db-3.1.17.tar.gz
-
-� * Install the content somewhere _other_ than the evolution source tree.
-���  e.g: NOT evolution/db-3.1.17
-
-� * Compile according to instructions, but installing into some custom
-��� prefix, for example:
-
-����� ../dist/configure --prefix=/home/user/berkeleydb-3.1.17
-
-� * Autogen Evolution specifying that it has to look for the DB
-��� library there, for example:
-
-����� ./autogen.sh --prefix=/opt/gnome
-����� --with-db3-includes=/home/user/berkeleydb-3.1.17/include
-����� --with-db3-libs=/home/user/berkeleydb-3.1.17/lib
-
-
-COMPILING PALM PILOT SUPPORT
-----------------------------
-
-If you want support for PalmPilot syncing (currently experimental so
-please back up your pilot) you will also need to do the following:
-
-1) pilot-link 0.9.5
-http://www.pilot-link.org
-
-2) gnome-pilot 0.1.61
-http://www.eskil.org/gnome-pilot/
-
-3) evolution
-In your evolution source directory do ./autogen.sh --prefix=<evo-prefix> 
---with-pisock=<pilot-link-prefix> --enable-pilot-conduits=yes
-make
-make install
-
-
-SSL SUPPORT
------------
-
-If you want SSL support (and someday S/MIME), you will also need libnspr4 and
-libnss3 which can be found at http://www.mozilla.org.
-
-Once you have libnspr4 and libnss3 (and their respective includes) installed,
-in your evolution source directory do:
-./autogen.sh --prefix=<evo-prefix> --with-nspr-includes=<nspr-includes-prefix>
---with-nspr-libs=<nspr-libs-prefix> --with-nss-includes=<nss-includes-prefix>
---with-nss-libs=<nss-libs-prefix>
-
-You'll need to `cp ~/.mozilla/default/*.db ~/evolution` on you've
-installed Evolution in order to get a functional SSL-enabled
-Evolution.
-
-WARNING: Evolution also comes with OpenSSL support
-(--with-openssl-libs and --with-openssl-includes), but it's not very
-well tested, and quite unstable at this point.  It is recommended that
-you use the NSPR-based SSL support instead.
-
-
-NEWSGROUP (NNTP) SUPPORT
-------------------------
-
-Experimental support for NNTP is enabled if you use the --enable-nntp
-configure option, but it's currently unmaintained and highly unstable
-and experimental.
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index 45fe798c4f..0000000000
--- a/acconfig.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#undef ENABLE_NLS
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-#undef HAVE_LIBSM
-#undef PACKAGE
-#undef VERSION
-#undef ENABLE_THREADS
-#undef SENDMAIL_PATH
-#undef SYSTEM_MAIL_DIR
-#undef HAVE_LDAP
-#undef HAVE_TIMEZONE
-#undef HAVE_TM_GMTOFF
-#undef HAVE_KRB4
-#undef NEED_KRB_SENDAUTH_PROTO
-#undef HAVE_KRB5
-#undef HAVE_NSS
-#undef HAVE_OPENSSL
-#undef HAVE_SSL
-#undef USE_DOT
-#undef USE_FCNTL
-#undef USE_FLOCK
-#undef ENABLE_NNTP
-#undef HAVE_BROKEN_SPOOL
-#undef ENABLE_PEDANTIC_PGPMIME
-#undef HAVE_KDE_APPLNK
-
-/* db3 version */
-#undef EVOLUTION_DB_VERSION_MAJOR
-#undef EVOLUTION_DB_VERSION_MINOR
-#undef EVOLUTION_DB_VERSION_PATCH
-
-/* Sub-version identification string.  */
-#undef SUB_VERSION
-
-/* Preview-release string */
-#undef VERSION_COMMENT
-
-/* Define if ctime_r takes three arguments */
-#undef CTIME_R_THREE_ARGS
-
-/* Define if gethostbyname_r takes five arguments */
-#undef GETHOSTBYNAME_R_FIVE_ARGS
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 3c7d97dbc8..0000000000
--- a/addressbook/ChangeLog
+++ /dev/null
@@ -1,10460 +0,0 @@
-2001-12-13  JP Rosevear  <jpr@ximian.com>
- 
- 	* conduit/address-conduit.c (local_record_from_ecard): Make sure
- 	to copy the custom fields so they are not overwritten
-
-2001-12-13  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book-util.c (simple_query_new): Used
-	g_strdup_printf to dup a string.  Doh!  Changed to g_strdup.
-	(Bug #17126)
-
-2001-12-07  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_entry_new): Remove a reference to code
-	I don't want to commit yet. :-)
-
-	* gui/component/select-names/e-select-names-manager.c: Extensively
-	refactored -- this code had gotten _really_ ugly.  Untangle things
-	to the point where our reference counting problems are fixable.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Remove all of the ugly hacks to work around our
-	memory management problems, and just unref the manager.
-	(Fixes #14412)
-
-2001-12-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(search_for_dn_with_objectclasses): move search_for_dn's contents
-	here, and add an "existing_objectclasses" parameter that we pass
-	on to build_card_from_entry.
-	(search_for_dn): call search_for_dn_with_objectclasses with NULL
-	for existing_objectclasses.
-	(build_card_from_entry): if existing_objectclasses is non-NULL,
-	fill it in with the list of existing objectclass values for this
-	entry.
-	(add_objectclass_mod): if existing_objectclasses is non-NULL,
-	meaning we're modifying an entry, search in the existing
-	objectclasses for the ones we want to be there, and only add
-	what's missing.  If none are missing, don't add objectclass_mod to
-	the list of mods.
-	(create_card_handler): track change to add_objectclass_mod (pass
-	NULL).
-	(modify_card_handler): use search_for_dn_with_objectclasses
-	instead of search_for_dn, and pass the existing objectclasses to
-	add_objectclass_mod.  also, free the list when we're done.
-	(poll_ldap): track change to build_card_from_entry (pass NULL).
-
-2001-12-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	we need to be able to disable non-labels here as well.  since
-	we're using enable_widget and not gtk_widget_set_sensitive, it's
-	okay to handle entries/text's, etc, here.
-	(widget_field_mappings): add label-caluri and label-fburl here.
-
-	* gui/contact-editor/contact-editor.glade: change the label names
-	for the freebusy/calendar urls to have more descriptive names,
-	since we use them in e-contact-editor.c now.
-
-	* backend/pas/pas-backend-ldap.c: add support for
-	caluri/calendarURI, fburl/freeBusyURI.
-
-	* backend/pas/evolutionperson.schema: add calendarURI and
-	freeBusyURI.
-
-2001-12-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Fixed up the
-	accelerators and such here.
-
-	* gui/contact-editor/e-contact-editor.c (file_save_as_cb):
-	Translate this string.
-	(pixmaps): Added a pixmap for the ContactEditorSaveClose command.
-	(setup_tab_order): Fixed up the tab order here.
-
-	* gui/contact-editor/fulladdr.glade: Made the country combo
-	focusable here.
-
-2001-12-03  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_equal): Make address
-	comparisons case-insensitive. (Fixes 11776)
-
-	* backend/ebook/e-card.c (e_card_email_match_single_string): Make address
-	host comparisons case-insensitive. (Fixes 11776)
-
-	* gui/component/select-names/e-select-names-manager.c (focus_out_cb): Clean
-	ESelectNamesModel on focus-out. (Half of a fix for 15656)
-
-	* backend/ebook/e-destination.c (nonempty): Fix this function
-	and make it utf8-safe. (The other half of the fix for 15656)
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Consistency
-	fixes with standard contact editor.  Added Save As, Send As, and
-	Send To.  Replaced Save toolbar with Save and Close and added Save
-	and Close menu item.  Added a trash icon.
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor-address.c (setup_tab_order):
-	Setup the tab order here.  Fixes Ximian bug #13751.
-
-2001-11-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (connect_master_list_changed,
-	make_suboptions): Changed how this list of categories gets
-	computed.  Fixes Ximian bugs #7707 and #7708.
-
-2001-11-15  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* printing/e-contact-print-envelope.c (ecpe_linelist_dimensions),
-	printing/e-contact-print.c (e_contact_divide_text, e_contact_output,
-	e_contact_rectangle, e_contact_print_letter_tab,
-	e_contact_print_letter_heading, e_contact_get_card_size,
-	e_contact_print_card, e_contact_print_phone_list):
-	s/gnome_font_get_width_string/gnome_font_get_width_utf8/
-	s/gnome_font_get_width_string_n/gnome_font_get_width_utf8_sized/
-
-2001-11-14  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (search_for_dn): check against
-	LDAP_SUCCESS as the return value, not -1.
-	(pas_backend_ldap_build_all_cards_list): same.
-	(pas_backend_ldap_process_authenticate_user): same.
-
-2001-11-12  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14843 ]
-	* backend/pas/pas-backend-ldap.c (func_and): don't crash if a
-	subexpression wasn't filled in.
-
-	* backend/pas/pas-backend-ldap.c (func_or): same.
-
-2001-11-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (list_added_cb):
-	Release callback's reference to EContactListEditor.
-	(list_modified_cb): Release callback's reference to
-	EContactListEditor.
-	(save_card): Ref the EContactListEditor on behalf of the
-	e_book_foo callback. (Fixes bug #14743)
-	(save_card): Set changed to false once we've saved.
-	(list_deleted_cb): Release callback's reference.
-	(delete_cb): Hold reference for the callback.
-
-2001-11-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (categories_clicked): If
-	our call to e_categories_new returns NULL, put up an error dialog
-	and return.  (Fixed #14780)
-		
-2001-11-09  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14687 ]
-	* backend/pas/pas-backend-file.c
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): do load_uri before add_client,
-	so we know if the load actually worked (add_client uses this
-	information to respond to the new client.)  before this change,
-	the client would still think the book was in a useful state even
-	if the load_uri failed.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client): if
-	the we're not connected, say so.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):
-	same.
-	(pas_backend_file_load_uri): don't report_writable here,
-	add_client does it.  was only needed before because of the
-	improper ordering in pas-book-factory.c above.
-
-2001-11-09  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14646 ]
-	* gui/component/addressbook.c (addressbook_default_book_open): new
-	function.  if the default_book failed to load, load the local
-	addressbook in its place.
-	addressbook_load_default_book): if we're loading the default_book
-	uri, use addressbook_default_book_open as the open_response.
-
-	* backend/ebook/e-book.c (e_book_load_uri_step): reset the
-	load_state to NotLoaded so we can attempt another load_uri on
-	the book if it fails.
-
-2001-11-08  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Explicitly destroy entries.  Part of the fix for
-	the lingering completion window bug.
-
-2001-11-04  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c: Use ordering of the pilot's phone
-	label list to find fields we sync in order to avoid strcmp'ing the
-	pilot's labels rendering phone syncing usable only for english
-	language pilots
-
-2001-11-03  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes Ximian bug #14410 ]
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	init in_async_call to FALSE.
-	(card_added_cb): turn the UI back on and set in_async_call to
-	FALSE.
-	(card_modified_cb): same.
-	(card_deleted_cb): same.
-	(save_card): turn off the UI by setting the dialog insensitive,
-	and set in_async_call to TRUE.
-	(delete_cb): same.
-	(app_delete_event_cb): if we're in an async call don't let the
-	window get deleted.
-
-	* gui/contact-editor/e-contact-editor.h (struct _EContactEditor):
-	add in_async_call flag for when we make a wombat call and need to
-	disable the UI.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(e_contact_list_editor_init): init in_async_call to FALSE.
-	(list_added_cb): turn the UI back on and set in_async_call to
-	FALSE.
-	(list_modified_cb): same.
-	(list_deleted_cb): same.
-	(save_card): turn off the UI by setting the dialog insensitive,
-	and set in_async_call to TRUE.
-	(delete_cb): same.
-	(app_delete_event_cb): if we're in an async call don't let the
-	window get deleted.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): add in_async_call flag for when we make a
-	wombat call and need to disable the UI.
-
-2001-11-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): Check for
-	NULL dates before converting them to strings.  Fixes Ximian bug
-	#14394.
-
-2001-11-02  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Leak select-names related data structures until
-	the memory management issues get sorted out.  Fixed bug #14086.
-
-2001-10-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/e-cardlist-model.c,
-	gui/component/select-names/e-select-names-table-model.c,
-	gui/widgets/e-addressbook-table-adapter.c: Make the pre_changes
-	and changes match here.
-
-2001-10-31  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_destroy): Check that local_listener and
-	other_contacts_listener are non-NULL before
-	disconnecting/unrefing.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(entry_destroyed): The entry shouldn't unref the manager.
-	(e_select_names_manager_create_entry): The entry shouldn't hold a
-	ref to the manager.  It becomes circular.
-	(e_select_names_manager_create_entry): On the other hand, we
-	should hold a ref to the entry we create.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Remove the explicit dialog destroy hack.
-
-2001-10-30  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_destroy): Force the select names dialog to be destroyed.
-	This is a hack to fix bug #14002 -- I'll clean up the refcounting
-	issues post-freeze.  At least now it won't crash.
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): make sure
-	to translate the character sets of the names
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/component/select-names/e-select-names-bonobo.c
-	(manager_ok_cb): send a null bonobo arg to prevent explosion
-
-2001-10-30  JP Rosevear  <jpr@ximian.com>
-	
-	* gui/widgets/e-addressbook-view.c: correct include typo
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com.
-
-	* gui/widgets/e-minicard.c (add_field): Five characters, not four!
-	
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_value_at): Convert xml-ified destinations into proper
-	addresses.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com.
-
-	* gui/component/select-names/e-select-names-bonobo.c (init):
-	Connect to manager's "ok" signal.
-	(manager_ok_cb): Emit "ok" bonobo-signal.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_class_init): Added "ok" signal.
-	(e_select_names_clicked): Emit 'ok' signal.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-util.c
-	(e_addressbook_prompt_save_dialog): new function, a "Do you want
-	to save changes?" dialog.
-
-	* gui/widgets/e-addressbook-util.h: add prototype for
-	e_addressbook_prompt_save_dialog.
-
-	* gui/contact-editor/e-contact-editor.c (prompt_to_save_changes):
-	call e_addressbook_prompt_save_dialog and save the card if they
-	select save.  return TRUE if the dialog should be closed, FALSE
-	otherwise.
-	(file_close_cb): check prompt_to_save_changes before closing the
-	dialog.
-	(app_delete_event_cb): same.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(prompt_to_save_changes): call e_addressbook_prompt_save_dialog
-	and save the card if they select save.  return TRUE if the dialog
-	should be closed, FALSE otherwise.
-	(file_close_cb): check prompt_to_save_changes before closing the
-	dialog.
-	(app_delete_event_cb): same.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (add_objectclass_mod): overload
-	this function for modifying objectclasses too, so we can make sure
-	evolutionPerson shows up in the objectclasses of an entry if it
-	shows up in the schema for the server.
-	(create_card_handler): add @replace = FALSE in the call to
-	add_objectclass_mod.
-	(modify_card_handler): call add_objectclass_mod with @replace =
-	TRUE.
-	(anniversary_compare): fix typo - return "equal", not "TRUE".
-	(birthday_compare): same.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* conduit/address-conduit.c (pre_sync): Comment out spew.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (fill_in_info):
-	Comment out spew.
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop): Comment out spew.
-	(get_dnd_selection): Comment out spew.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_set_value_at): Comment out spew.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (update_command_state): Check that
-	our BonoboUIComponent has a container so we don't get a lot of
-	annoying debug spew.
-
-	* printing/smallbook.ecps: Fixed fonts.
-
-	* printing/phonelist.ecps: Fixed fonts.
-
-	* printing/medbook.ecps: Fixed fonts.
-
-	* printing/e-contact-print.c (e_contact_get_card_size): Commented
-	out spew.
-
-	* gui/widgets/e-minicard.c (remodel): Check that e_minicard->card
-	!= NULL.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_destroy): We were using
-	book_data->book_view immediately after unrefing it.  Reordered the
-	code a bit to avoid this.
-
-2001-10-29  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.h: add prototype for
-	pas_book_factory_dump_active_backends.
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_dump_active_backends): new function.
-	(dump_active_server_map_entry): new function.
-
-2001-10-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(make_match): Drop a match if either of the text fields is NULL.
-	This could happen if any of the utf-8 involved is invalid, for
-	example. (Bug #13757)
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (is_syncable): fix bug that allowed
-	for phone's not to be in priority order and the item to still be
-	syncable
-
-	* conduit/address-conduit-config.h
-	(addrconduit_load_configuration): get management by id
-
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-	
-	* conduit/address-conduit.c (is_syncable): a card also needs to
-	have its phone nums in priority order to be "syncable"
-	
-2001-10-29  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (is_syncable): move the syncable
-	checking code to a different function
-	(ecard_from_remote_record): set the name parts individually
-	(local_record_from_ecard): use is_syncable
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (file_as_get_style,
-	file_as_set_style): Use the actual ECardName in the ECard instead
-	of parsing the full_name here.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h
-	(e_card_simple_set_name): New function to set the ECardName on
-	this card and fix the file_as if necessary.
-
-2001-10-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h
-	(e_card_simple_get): Handle returning dates here.
-	(e_card_simple_get_allow_newlines): New function.  Returns whether
-	it makes much sense to have newlines in this string.
-
-	* gui/component/addressbook-config.c,
-	gui/component/addressbook-config.h
-	(addressbook_create_new_source): The first argument here should
-	be const.
-
-	* gui/component/addressbook-storage.c: Added #include
-	"addressbook-config.h".
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_event): On an
-	escape here, cancel editing and remove the focus from the text.
-
-	* gui/widgets/e-minicard.c (add_field): Set allow_newlines here.
-	(field_activated): Stop editing on the activate signal and remove
-	the focus from the text.  Fixes Ximian bug #12286.
-
-2001-10-28  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.h: tidy
-
-	* conduit/address-conduit-config.h: ditto
-
-	* conduit/address-conduit.c (add_record): unref ecard when done
-
-2001-10-28  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_date_from_string): Expose this
-	function.
-	(e_card_date_to_string): ...and this one.  Fixes build problem in
-	pas-backend-ldap.c.
-
-2001-10-28  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listeners): Change "this should never
-	happen" dialog to not give my name/e-mail.  Sorry translators.
-	But this really should never happen, thanks to my fix below.
-
-	* gui/component/addressbook-component.c: Initialize
-	global_shell_client to NULL. (Bug #6625)
-
-2001-10-27  Chris Toshok  <toshok@ximian.com>
-
-	[ bug #12979 ]
-	* backend/pas/pas-backend-ldap.c (anniversary_populate): new
-	function.
-	(anniversary_ber): new function.
-	(anniversary_compare): new function.
-	(birthday_populate): new function.
-	(birthday_ber): new function.
-	(birthday_compare): new function.
-
-2001-10-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_destroy): free up all the book_data
-	list stuff.
-	(e_select_names_completion_got_book_view_cb): deal with book_data
-	being passed as the closure, and increment the
-	pending_completion_seq counter.
-	(e_select_names_completion_card_added_cb): deal with book_data
-	being passwd as the closure.
-	(e_select_names_completion_seq_complete_cb): same, and decrement
-	the pending_completion_seq if we haven't gotten one for this book
-	view before.
-	(e_select_names_completion_stop_query): cancel all the
-	book_data's.
-	(e_select_names_completion_start_query): use the books_not_ready
-	counter instead of book_ready.  also, do e_book_get_book_view on
-	each of the book's in our list.
-	(e_select_names_completion_do_query): change to deal with our
-	list.
-	(e_select_names_completion_book_ready): decrement the
-	book_not_ready counter.
-	(e_select_names_completion_new): add the book we're created with
-	to our list.
-	(e_select_names_completion_add_book): implement.
-
-	* gui/component/select-names/e-select-names-completion.h: add
-	prototype for e_select_names_completion_add_book.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): use addressbook_config_data, and
-	don't unref the db.
-	(e_select_names_manager_create_entry): always add NULL for a book
-	(which corresponds to the local book), and if the completion_book
-	is present, add it to the list of books to complete again.
-
-2001-10-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (merge_cb): change to
-	EBookCallback signature, and unref the book.
-	(quick_add_merge_card): use addressbook_load_default_book.
-	(ce_have_book): change to EBookCallback signature, and unref the
-	book.
-	(edit_card): use addressbook_load_default_book.
-
-	* gui/component/e-address-popup.c (email_table_save_card_cb):
-	change to EBookCallback signature, and unref the book.
-	(add_card_idle_cb): use addressbook_load_default_book, and call
-	the cb if it fails.
-	(e_address_popup_cleanup): fix type -- should be "pop->card =
-	NULL", not "pop = NULL".
-	(contact_editor_cb): change to EBookCallback signature.
-	(edit_contact_info_cb): use addressbook_load_default_book.
-	(start_query): change to EBookCallback signature.
-	(e_address_popup_query): use addressbook_load_default_book.
-
-	* gui/widgets/e-minicard-control.c (book_open_cb): change to
-	EBookCallback signature, and unref the book.
-	(save_in_addressbook): use addressbook_load_default_book instead
-	of e_book_use_local_address_book.
-
-	* gui/widgets/Makefile.am (INCLUDES): change includes since we're
-	including addressbook.h which has it's own set of funky include
-	path requirements.
-
-2001-10-27  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): Don't leak
-	stuff. (Bug #13709)
-
-2001-10-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-destination.c (name_and_email_simple_query_cb,
-	nickname_simple_query_cb): Set book_uri when cardification occurs.
-
-2001-10-27  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section): Turned off use_ellipsis (it breaks
-	emulate_label_resize) and on emulate_label_resize.  Fixes Ximian
-	bug #13693.
-
-2001-10-27  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(make_match): Doh!  We should be sorting our contacts so that the
-	most frequently used ones are at the top of the list, not the
-	bottom.
-
-	* backend/pas/pas-book.c (pas_book_check_queue): That should be a
-	bonobo_object_unref, not a gtk_object_unref.
-	(pas_book_queue_request): Likewise, we need to bonobo_object_ref
-	here.
-	(pas_book_destroy): If our pas_book_check_queue timeout is still
-	active, disable it.  This should never happen, but it never hurts
-	to be careful.
-	(pas_book_destroy): Set book->priv to NULL after we free it.
-
-2001-10-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): copy phone
-	labels and show phone as well, clear correct entry text and
-	correctly detect unsyncable cases
-
-2001-10-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): touch the
-	record on lookup
-	(check_for_slow_setting): write touched only if we are doing a
-	slow sync
-	(card_removed): don't touch on lookup
-	(match): touch on lookup
-
-2001-10-27  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_check_queue): Added paranoid
-	reentrancy guards.
-	(pas_book_queue_request): Changed our idle handler into a timeout,
-	so as to work w/ reentrancy guards.
-	(pas_book_init): Explicit initialization.
-
-2001-10-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.h: add prototypes for
-	addressbook_config_database, and addressbook_load_default_book.
-
-	* gui/component/addressbook.c (addressbook_config_database): new
-	function, so we aren't activating the db everywhere we need to use
-	it.
-	(addressbook_load_default_book): load the default book, after
-	getting the uri from bonobo-config.
-
-2001-10-26  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book-util.c (simple_query_card_added_cb): Return
-	on cancellation.
-	(simple_query_sequence_complete_cb): Act if not cancelled.
-	(simple_query_book_view_cb): Free & return on cancellation.
-	(e_book_simple_query_cancel): Set cancellation flag.
-
-	* gui/component/e-address-popup.c (e_address_popup_query): Hold a
-	reference to ourselves for the duration of our addressbook fetch.
-	(start_query): Release when we've fetched our addressbook.
-	(e_address_popup_cleanup): Break out most of what we do in
-	_destroy into a separate function.
-	(e_address_popup_destroy): Class cleanup.
-	(contact_editor_cb): Paranoid clean-up.
-	(add_contacts_cb): Paranoid clean-up.
-	(e_address_popup_ambiguous_email_add): Paranoid clean-up.
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/e-address.conduit.in: remove the merges as valid sync
-	types
-
-	* conduit/address-conduit.c (pre_sync): write out only the touched
-	records if we are doing copies
-
-	* conduit/address-conduit-config.h
-	(addrconduit_load_configuration): get the sync type
-
-2001-10-26  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-popup.c (e_address_popup_destroy):
-	Cancel any pending queries.
-
-	* gui/contact-editor/e-contact-editor.c (close_dialog): Don't
-	assert, but check if ce->app != NULL, since this function can
-	(apparently) get called multiple times.
-
-	* gui/contact-editor/e-contact-save-as.c (file_exists): Remove bad
-	dialog ref-counting crap.
-
-	* gui/contact-editor/e-contact-editor.c (save_card): Ref our
-	EContactEditor, since we are holding a pointer to it in
-	EditorCloseStruct.
-	(card_modified_cb): Unref our EContactEditor when we free our
-	EditorCloseStruct.
-	(card_added_cb): Unref our EContactEditor when we free our
-	EditorCloseStruct.
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-	
-	* conduit/address-conduit.c (check_for_slow_setting): make debug
-	info more accurate
-	
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (e_addr_context_destroy): prevent
-	double unref
-	(cursor_cb): correct typo
-	(card_removed): remove the card from the map if was archived and
-	is now deleted
-
-2001-10-26  JP Rosevear  <jpr@ximian.com>
-	
-	* conduit/address-conduit.h: new member
-
-	* conduit/address-conduit.c (print_remote): free the struct after
-	using it
-	(e_addr_context_new): make consistent with other conduits
-	(e_addr_context_destroy): properly destroy the context
-	(cursor_cb): no need to ref the card, its done for us
-	(clear_entry_text): util function to free a field
-	(free_local): free a local record
-	(local_record_to_pilot_record): use a static buffer so we don't
-	have to free it later
-	(local_record_from_ecard): only fill in the fields we might not
-	sync, clear a field before replacing the contents
-	(for_each): track locals
-	(for_each_modified): ditto
-	(free_match): use free_local
-
-2001-10-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h
-	(set_has_cursor): Added has_cursor argument.  Setting the argument
-	to TRUE if the minicard doesn't have focus will grab the focus.
-	Fixes Ximian bug #3024.
-
-2001-10-24  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): Initialize
-	gnome-vfs.
-
-	* gui/component/addressbook-component.c (xfer_file): Added.
-	(Copied from the calendar.)
-	(xfer_folder): Fixed to allow renaming of contact folders.
-
-2001-10-24  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): Removed key_press handler here
-	since delete and backspace are now handled by keybindings.
-
-2001-10-23  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c: Fix command paths when we specify
-	our pixmaps, so we don't get a lot of totally useless & very ugly
-	bonobo-ui spew.
-
-	* backend/ebook/e-book-util.c (e_book_nickname_query): The empty
-	string as an arg shouldn't generate a warning.
-
-	* gui/component/select-names/e-select-names-completion.c: Removed
-	our cancelled flag and e_select_names_completion_cancel function,
-	since we were just duplicating stuff that had ended up in
-	ECompletion.
-	(match_name): Form our menu_text properly on an additional-name
-	match.
-	(e_select_names_completion_got_book_view_cb): Store handles for
-	our signals, disconnect them properly when we switch book views.
-	(e_select_names_completion_stop_query): Disconnect signals when we
-	stop our query.
-	(check_capabilities): Spew if we are using LDAP for completion.
-	(e_select_names_completion_destroy): Disconnect our signals when
-	we destroy.
-	This all should fix bug #10241.
-
-2001-10-23  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section): Set "draw_button" argument to TRUE
-	on this EEntry.
-
-2001-10-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-save-as.c (save_it): Put up an
-	error dialog if there's an error while saving.  If the person hits
-	cancel on the "file exists" dialog, don't close the file selection
-	dialog.  Fixes Ximian bug #7055.
-
-2001-10-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(model_and_selection_free): right_click_up here when we let go of
-	the popup.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_selection_event):
-	right_click_up here.
-
-2001-10-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section, e_select_names_set_default): Use an
-	EEntry here instead of a GtkLabel.  Fixes Ximian bug #7067.
-
-2001-10-21  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (control_activate_cb): Call
-	e_addressbook_model_force_folder_bar_message when we activate the
-	component. (Fixes bug #11749)
-
-	* gui/widgets/e-addressbook-model.c
-	(e_addressbook_model_force_folder_bar_message): Added.  Forces
-	emission of a folder_bar_message.
-
-2001-10-20  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_set_default): stick with the style font if the
-	efont bold font does not exist.	
-	(e_select_names_set_default): don't forget to unref the oldstyle.
-
-2001-10-20  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(name_style_query): Fix memory leak.
-
-	* gui/widgets/e-addressbook-view.c (jump_to_letter): Free our
-	string vector letter_v when we are done with it.
-
-	* gui/contact-editor/e-contact-quick-add.c (edit_card): Unref our
-	QuickAdd structure.
-
-	* gui/component/e-address-popup.c (e_address_popup_construct):
-	Unref our style after we are done with it.
-
-2001-10-20  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): We
-	shouldn't leak the info returned by oaf_query.
-
-	* gui/contact-editor/e-contact-quick-add.c (card_added_cb): Remove
-	superfluous call to quick_add_unref.
-	(editor_closed_cb): Remove superfluous call to quick_add_unref.
-
-	* gui/component/select-names/e-select-names.c (esn_get_key_fn): We
-	need to unref the card returned by e_addressbook_model_get_card.
-
-2001-10-20  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Make LDAP servers
-	non-user-creatable.
-
-2001-10-20  Jon Trowbridge  <trow@ximian.com>
-
-	* printing/e-contact-print.c (e_contact_print_card): Check that the
-	string we are checking for xml-ness is non-NULL.
-
-	* backend/ebook/e-destination.c (e_destination_importv): Filter
-	out empty destinations. (also Bug #13036)
-
-	* printing/e-contact-print.c (e_contact_build_style): Use
-	gnome_font_new_closest; if gnome_font_new fails and returns NULL,
-	our spacing gets all messed up. (Bug #10785)
-	
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_can_print):
-	Allow printing if there are any cards in our view.  The selection
-	has nothing to do with it.
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Check
-	for strings that contain non-whitespace, rather than just looking
-	for a non-zero first character. (Bug #13036)
-
-2001-10-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_selection_event):
-	Handle focus_change in event by selecting that contact.  Fixes
-	Ximian bug #3024.
-
-	* gui/component/addressbook-component.c (owner_unset_cb):
-	Repeatedly call gtk_main_quit here as long as there is a main loop
-	around.  This is an ugly hack around Ximian bug #11760.
-
-2001-10-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c: Added #include
-	<gal/widgets/e-unicode.h>.
-
-	* gui/widgets/e-minicard-control.c: Made this display the number
-	of extra cards in the attachment as well as made it save them all
-	to the local addressbook if the person selects the button.  Fixes
-	Ximian bug #9507.
-
-2001-10-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): Changed this to not
-	grab on a right click.  Fixes Ximian bug #12660.
-
-2001-10-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_motion): Get @folder_type here too [to
-	match the changes in the EvolutionShellComponentDnd interface].
-	Also, remove a debugging message.
-	(destination_folder_handle_drop): Likewise.
-
-2001-10-18  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (add_menu_item):
-	Translate labels in select-names option menu. (Bug #9604)
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Made the default window size
-	slightly wider. (Bug #7516)
-
-2001-10-18  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h
-	(e_card_list_get_vcard): Made this take a const GList.
-
-2001-10-18  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(check_capabilities): Added.  Check if our book is local or
-	networked.
-	(e_select_names_completion_book_ready): Call check_capabilities.
-	(e_select_names_completion_new): Call check_capabilities.
-	(e_select_names_completion_do_query): If we have a networked book,
-	keep trying if we haven't been able to cache any cards --- our
-	earlier attempts could have failed due to too many matches. (Bug
-	#12932)
-
-	* gui/component/select-names/e-select-names-manager.c
-	(focus_out_cb): Lag our cardification on focus-out.  This seems to
-	help with the unintended cardifications that can result from the
-	weird focus-out/focus-in events that get generated when the popup
-	disappears.
-
-	* backend/ebook/e-card-compare.c: Removed some debug spew.
-
-2001-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	grab focus in the Account entry when preparing the dialog, fixes
-	#10406.
-
-2001-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (new_folder): make
-	sure to also add "ldap-contacts" folders to the option menu.
-
-2001-10-17  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): sync all
-	the fields we can, with out overwriting
-	(local_record_from_ecard): write the fields to the pilot in
-	priority order unless there are fields on the pilot we can't
-	store, then fill in the fields as they are on the pilot
-
-2001-10-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_get_vobject): Did a bit of clean
-	up here.  Might fix some crashes, specifically Ximian bug #10164.
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Updated the model
-	column numbers here.  Fixes Ximian bug #12308.
-
-2001-10-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_upgrade_db):
-	add upgrade from 0.1 to 0.2, where we make sure id dbt's match
-	vcard id's, fixes longstanding bug (#7406) where cards were not
-	modifiable or removable after having been created during a 1-2
-	week long window in early betas.
-	(PAS_BACKEND_FILE_VERSION): change to 0.2
-	(PAS_ID_PREFIX): #define this here.
-	(pas_backend_file_create_unique_id): use PAS_ID_PREFIX instead of
-	the string.
-
-2001-10-16  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-ldif-importer.c (support_format_fn): Return
-	FALSE if no extension.
-
-2001-10-16  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_get_id): If card->id is NULL,
-	return an empty string.
-	(e_card_set_id): Don't allow the card id to be set to NULL; use
-	the empty string instead.
-	(e_card_get_vobject): When building our vcard, pass in the empty
-	string as the id if card->id is NULL. (Bug #10164)
-
-2001-10-16  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): don't set
-	the phone info if it is blank
-	(ecard_from_remote_record): save up to 3 fax numbers
-
-2001-10-15  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):
-	unref the book after we pass it off to evolution-addressbook.
-
-2001-10-15  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_card_dtor): unref
-	op->view.
-	(pas_backend_ldap_process_create_card): ref op->view.
-	(remove_card_dtor): unref op->view.
-	(pas_backend_ldap_process_remove_card): ref op->view.
-	(modify_card_dtor): unref op->view.
-	(pas_backend_ldap_process_modify_card): ref op->view.
-	(ldap_search_dtor): unref op->view.
-	(pas_backend_ldap_search): ref op->view.
-
-2001-10-15  Chris Toshok  <toshok@ximian.com>
-	
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_book_view): make sure to unref the
-	book_view here so we don't leak them.
-
-2001-10-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): call
-	e_passwords_init and e_passwords_shutdown.
-
-2001-10-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (addPropValueQP, addPropValueSets,
-	e_card_get_vobject): Properly decide whether a property needs to
-	be marked as QP by searching for '\n'.  Fixes Ximian bug #3021.
-
-2001-10-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-save-as.c (e_contact_save_as,
-	e_contact_list_save_as): Set the default file name here.  Fixes
-	Ximian bug #7053.
-
-2001-10-14  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listeners): Added linebreaks to our
-	"this shouldn't happen" dialog message. (Bug #12498)
-
-2001-10-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): Add a component name
-	to the e_passwords_init() call.
-
-2001-10-12  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/evolution-ldif-importer.c: commit the importer
-	originally from Michael M. Morrison, with fixups by toshok.
-
-	* backend/ebook/Makefile.am (bin_PROGRAMS): add
-	evolution-ldif-importer.
-	(oaf_in_files): add
-	GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.
-
-	* backend/ebook/e-card-simple.h: add WANTS_HTML and IS_LIST.
-
-	* backend/ebook/e-card-simple.c (field_data): add WANTS_HTML and
-	IS_LIST.
-	(e_card_simple_set): fix typo.
-
-	* backend/ebook/.cvsignore: ignore
-	GNOME_Evolution_Addressbook_LDIF_Importer.oaf and
-	evolution-ldif-importer.
-
-	* backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in:
-	ldif importer oafinfo.
-
-2001-10-12  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added a boolean type here.
-
-2001-10-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): Check to see if the uri we are
-	setting is the same as the current uri.  If so, do nothing.
-	(Bug #11324)
-
-2001-10-11  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c
-	(e_destination_reverting_is_a_good_idea): Added.  Heuristic for
-	whether or not we want to revert to an earlier cardified state.
-	(e_destination_cardify): Don't be quite as aggressive about
-	reverting to previous cardified states. (Bug #11890)
-
-2001-10-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_destroy,
-	fill_in_info, e_card_simple_sync_card, e_card_simple_set_phone,
-	e_card_simple_set_address, e_card_simple_set_delivery_address,
-	file_as_get_style, file_as_set_style, e_card_simple_set,
-	e_card_simple_set_arbitrary),
-	gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_destroy,
-	e_contact_editor_address_set_arg,
-	e_contact_editor_address_get_arg),
-	gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_destroy,
-	e_contact_editor_fullname_set_arg,
-	e_contact_editor_fullname_get_arg),
-	gui/contact-editor/e-contact-editor.c (phone_entry_changed,
-	address_text_changed, name_entry_changed, full_name_clicked,
-	full_addr_clicked, fill_in_info): Changed these to use the new ref
-	and unref functions for ECard auxillary types.
-
-	* backend/ebook/e-card-simple.h: Added a comment.
-
-	* backend/ebook/e-card-types.h: Added ref_count field to all the
-	types.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added ref and
-	unref functions here for all the ECard auxillary types.  Removed
-	the corresponding free functions.  Switched to using these
-	functions where appropriate.
-
-	* gui/component/addressbook-factory.c: #include
-	<e-util/e-passwords.h>
-
-	* gui/component/addressbook.c (load_uri_cb): const correctify.
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names.c: #include
-	<addressbook/gui/component/addressbook.h>
-
-	* gui/widgets/e-addressbook-model.c (modify_card): Removed an
-	unnecessary ref here.
-
-2001-10-11  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_folder):
-	Don't need this any more.
-
-2001-10-11  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (new_contact_cb): Check that
-	view->view != NULL.
-	(save_contact_cb): Check that view->view != NULL.
-	(search_cb): Check that view->view != NULL.
-	(delete_contact_cb): Check that view->view != NULL.
-	(print_cb): Check that view->view != NULL.
-	(print_preview_cb): Check that view->view != NULL.
-	(stop_loading_cb): Check that view->view != NULL.
-	(cut_contacts_cb): Check that view->view != NULL.
-	(copy_contacts_cb): Check that view->view != NULL.
-	(paste_contacts_cb): Check that view->view != NULL.
-	(select_all_contacts_cb): Check that view->view != NULL.
-	(send_contact_cb): Check that view->view != NULL.
-	(send_contact_to_cb): Check that view->view != NULL.
-	(update_command_state): Check that view->view != NULL.  Hold a
-	reference to the AddressbookView for the duration of the function,
-	in case we exit during bonobo-reentrancy.
-	(addressbook_view_ref): Added.
-	(addressbook_view_unref): Added.  Simple ref counting for
-	AddressbookView objects.
-	(addressbook_view_clear): Zero out an AddressbookView.  This is
-	now separated from the deallocation of the AddressbookView object,
-	so that we don't leave a dangling pointer if we exit during
-	bonobo-reentrancy in update_command_state. (Which often seems to
-	happen if we exit while addressbook operations are going on.)
-	(destroy_callback): Replace previous call to addressbook_view_free
-	with addressbook_view_clear/addressbook_view_unref calls.
-	(addressbook_factory_new_control): Initialize the reference count
-	in the AddressbookView object.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_destroy):
-	Carefully zero out our destroyed object.
-	(command_state_change): Hold a reference to ourselves during the
-	signal emission.
-	(get_selected_cards): Ref cards as we add them to the list.
-	(e_addressbook_view_stop): Check for view != NULL.
-	(e_addressbook_view_can_create): Check for view != NULL.
-	(e_addressbook_view_can_print): Check for view != NULL.
-	(e_addressbook_view_can_save_as): Check for view != NULL.
-	(e_addressbook_view_can_send): Check for view != NULL.
-	(e_addressbook_view_can_send_to): Check for view != NULL.
-	(e_addressbook_view_can_delete): Check for view != NULL.
-	(e_addressbook_view_can_cut): Check for view != NULL.
-	(e_addressbook_view_can_copy): Check for view != NULL.
-	(e_addressbook_view_can_paste): Check for view != NULL.
-	(e_addressbook_view_can_select_all): Check for view != NULL.
-	(e_addressbook_view_can_stop): Check for view != NULL.
-
-	* gui/widgets/e-addressbook-model.c (addressbook_destroy): Be
-	careful about zeroing out our destroyed object.
-	
-	* backend/ebook/e-book-view.c (e_book_view_stop): Added.  Stops
-	event processing in the underlying listener.
-
-2001-10-10  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_destroy): If our select names dialog is
-	still around, destroy it.  Otherwise, the dialog will hang around
-	after our composer goes away.
-
-2001-10-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.glade: add an Email Address
-	field/label/help text.
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): fill in the email entry
-	from the source.  also, set the initial state of the email
-	label/entry.
-	(auth_checkbutton_changed): set the email label/entry
-	sensitive/editable if auth is turned on, and
-	insensitive/uneditable if it's off.
-	(addressbook_source_dialog_get_source): get the email address from
-	the email entry.
-	(addressbook_source_dialog): hook up the email entry to the
-	changed signal foo, as well as the focus handler for displaying
-	help text.
-
-2001-10-06  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): db isn't a BonoboObject, so don't
-	bonobo_object_unref it!
-
-2001-10-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(addressbook_model_set_uri): e_book_load_uri ->
-	addressbook_load_uri.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): e_book_load_uri ->
-	addressbook_load_uri.
-
-	* gui/component/addressbook.c (forget_passwords_cb): new function,
-	call e_passwords_forget_passwords.
-	(verbs): Add ContactsForgetPasswords.
-	(load_uri_auth_cb): new function, call the callback and free up
-	our closure stuff.
-	(load_uri_cb): once the uri is loaded, check if we're configured
-	to authenticate for it, and do so, using the e_passwords stuff.
-	(addressbook_load_uri): wrapper around e_book_load_uri.  save off
-	the parameters and start the load-with-auth machinery.
-	(book_open_cb): remove all the auth stuff from here, as it's
-	handled elsewhere now.
-
-	* gui/component/addressbook-factory.c (main): call
-	e_passwords_init.
-
-	* gui/component/addressbook-component.c (user_create_new_item_cb):
-	e_book_load_uri -> addressbook_load_uri.
-	(destination_folder_handle_drop): same.
-
-	* gui/component/addressbook.h: add prototype for
-	addressbook_load_uri (a wrapper around e_book_load_uri that also
-	handles authentication if the user selects it.)
-
-2001-10-05  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Check to make sure our call to
-	e_addressbook_model_get_card doesn't return NULL.
-
-	* gui/widgets/e-addressbook-model.c
-	(e_addressbook_model_get_card): Chek that we aren't requesting a
-	negative row.
-
-	* gui/contact-list-editor/e-contact-list-editor.c (add_email_cb):
-	Move to the bottom of the scrolled window, so we can see the
-	address we just added.
-	(table_drag_data_received_cb): Move to the bottom of the scrolled
-	window, so we can see the contact we just dropped.
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	We don't own the string returned by e_categories_master_list_nth,
-	so terrible things will happen if we free it. (Bug 10916)
-
-2001-10-05  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_set_arg):
-	don't set the editable field on the model - let the book do that.
-	(book_writable_cb): call writable_status to propagate a ui-change
-	event up (and sensitize the write-only toolbar buttons after you
-	authenticate with ldap.)
-
-2001-10-04  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (activate_factories_for_uri): for some
-	reason, matching on protocol is causing problems for me.
-	disabling it for now.
-
-2001-10-04  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c: use ldap.png for ldap
-	contacts.
-
-2001-10-03  Iain Holmes  <iain@ximian.com>
-
-	* addressbook/gui/component/addressbook-storage.c 
-	(addressbook_storage_setup): Only load_storages if you have LDAP.
-	(load_source_data): Only do stuff if you have LDAP.
-
-2001-10-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_height),
-	gui/widgets/e-minicard.c (remodel): Fixed these to determine the
-	fields to use properly.
-
-2001-10-02  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(name_style_query): Strip out commas before forming our query.
-	(match_name): Use e_card_compare_name_to_string_full, rather
-	than our crufty old matching code.  Not only is this cleaner,
-	but that crufty old code was very broken when it came to 
-	handling strings with whitespace. (Bug 8988)
-	(match_nickname): utf8 and bug fixes.
-
-	* backend/ebook/e-card-compare.c
-	(e_card_compare_name_to_string_full): Added.  This is basically
-	e_card_compare_name_to_string with a bunch of extra options, so
-	that it can more readily be reused in other contexts.
-	(e_card_compare_name_to_string): This is now just a call to
-	e_card_compare_name_to_string_full with the extra args filled in
-	to defaults that simulate the old behavior.
-
-2001-10-02  Chris Toshok  <toshok@ximian.com>
-
-        * backend/ebook/e-book.c (e_book_construct): remove most of the
-	oaf stuff from here.  we do it in load_uri, where we'll have more
-	information (namely, the protocol we're using.)
-	(activate_factories_for_uri): do an oaf query to get a list of all
-	objects implementing our BookFactory interface and also supporting
-	the protocol used in the uri.
-        (e_book_load_uri): try activating book factories to handle this
-	uri, and start the iteration over the list.
-        (e_book_load_uri_from_factory): try and load the uri.
-        (e_book_load_uri_open_cb): callback function for the
-	BookFactory_openBook call - if it succeeds, call the user's
-	callback.  otherwise step to the next factory.
-        (e_book_load_uri_step): go to the next factory in our list, and
-	error out if there are no more.
-	
-2001-10-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_get_textification): Made the max length of
-	the textification be 2047 characters.  Fixes Ximian bug #3021.
-
-2001-10-01  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): if there
-	was no first name or last name, file as the company.
-
-2001-10-01  JP Rosevear  <jpr@ximian.com>
-	
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key): if there is a db error,
-	assume deletion
-	(pas_backend_file_changes): write after all is done for efficiency
-
-2001-09-28  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key): g_strdup
-	(pas_backend_file_changes): ditto, make sure to free all data and
-	do a hash write after each add/remove
-
-	* conduit/address-conduit.c (local_record_to_pilot_record): use
-	the local record category
-	(local_record_from_ecard): ndle the fields and category we don't
-	sync by making sure we don't overwrite them
-
-2001-09-27  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_construct): do an oaf query to
-	get a list of all objects implementing our BookFactory interface,
-	instead of just activating the one IID.  this should really be a
-	global list, not a per EBook.
-	(e_book_load_uri): start the iteration over our list of
-	BookFactory's.
-	(e_book_load_uri_from_factory): try and load the uri.
-	(e_book_load_uri_open_cb): callback function for the
-	BookFactory_openBook call - if it succeeds, call the user's
-	callback.  otherwise step to the next factory.
-	(e_book_load_uri_step): go to the next factory in our list, and
-	error out if there are no more.
-
-2001-09-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): use the old
-	record (if there was one) so as not to overwrite fields we don't
-	sync
-	(pre_sync): store the dbi in the context and don't make it object
-	data
-
-2001-09-26  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_destroy): use
-	priv->iid instead of the hardcoded string here.
-	(pas_book_factory_activate): parameterize the factory's iid, as in
-	the calendar server, and provide a default if iid == NULL.
-
-	* backend/pas/pas-book-factory.h: add iid parameter for
-	pas_book_factory_activate.
-
-2001-09-26  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_textrep): Use
-	camel_address_format, not camel_address_encode.
-
-2001-09-26  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Added help text (thanks 
-	to Aaron) and re-worded the labels, and fixed the shortcuts on the 
-	brand-spanking-new Collaboration tab.
-	
-
-2001-09-26  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.h: add
-	completion_book.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_new): get /Addressbook/Completion/uri, and
-	if it's present, use the corresponding EBook for completing
-	addresses.
-	(focus_out_cb): use manager->completion_book here instead of NULL,
-	which corresponds to the local addressbook.
-	(completion_popup_cb): same.
-	(e_select_names_manager_create_entry): same.
-
-2001-09-26  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name_to_string):
-	Properly handle names when the individual elements (given,
-	addition, family) contain whitespace.  (Bug #10502)
-
-	* backend/ebook/e-destination.c (e_destination_set_name): Reset
-	textrep when we change the name.
-	(e_destination_set_email): Reset textrep when we change the email.
-	(e_destination_get_textrep): Make sure that the textrep version of
-	the address is properly quoted if it contains unsafe characters.
-	(All related to bug #10796)
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): Fix nickname matching. (bug #9698)
-	(make_match): Use e_completion_match_new when building our match,
-	rather than ad hoc manipulation of the struct.
-
-2001-09-26  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_changes): set
-	the last_use and use_score fields of the card to known values so
-	the card doesn't register as changed when only they have changed
-
-2001-09-26  Peter Williams  <peterw@ximian.com>
- 
- 	* conduit/address-conduit.c (ecard_from_remote_record): Fix this function
- 	to set email addresses properly, and handle multiple occurrences of
- 	email addresses, home phone numbers, and business phone numbers.
-	
-2001-09-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c (user_create_new_item_cb):
-	Handle creating the new contact in the current folder if it's a
-	contacts folder.  Fixes Ximian bug #7814.
-
-2001-09-24  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/Makefile.am (LDAP_SCHEMA): add
-	evolutionperson.schema
-	(EXTRA_DIST): add LDAP_SCHEMA to the dist (but don't install it).
-
-2001-09-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): sync the
-	note the to pilot and make sure to blank fields when appropriate
-	(local_record_from_ecard): sync the note to the desktop
-
-2001-09-22  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c (do_create): g_free (id) in the
-	error case to plug a memory leak.
-
-2001-09-22  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (remodel): when creating the cards,
-	don't display any of the subname fields (surname, given, middle,
-	suffix, etc.)
-
-2001-09-22  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card-simple.c
-	(e_card_simple_get): add getters for the additional name fields.
-	(field_data): move FAMILY_NAME to the end of the list, and add
-	GIVEN_NAME, ADDITIONAL_NAME (middle name), and NAME_SUFFIX.
-	
-	* backend/ebook/e-card-simple.h: same.
-
-2001-09-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (print_preview_cb): Hooked up print
-	preview button.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h
-	(e_addressbook_view_print_preview): Added this function.
-
-	* printing/e-contact-print.c, printing/e-contact-print.h
-	(e_contact_print_preview): Added this function.
-
-2001-09-19  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (name_and_email_simple_query_cb):
-	Use the default e-mail address if we have nothing else to go on.
-	Previously we just failed, which basically meant that name-only
-	searches would never work properly.
-	(nickname_simple_query_cb): The logic was a bit tangled here; if
-	our query status isn't SUCCESS, always give up but don't leak the
-	destination.  And if our nickname query fails and we try the
-	name-and-email query, use the textrep for a name-only search.  The
-	only reason we are doing a nickname query in the first place is if
-	we have an obviously invalid e-mail.
-	(launch_cardify_query): Use e_destination_is_valid to determine
-	if we should try a nickname query first.
-	These changes basically fix bug 7728, and generally make the
-	auto-cardification of addresses a lot more clever and robust.
-
-	* backend/ebook/e-book-util.c (name_and_email_cb): Use
-	e_card_compare_name_to_string instead of e_card_name_match_string.
-	(e_book_name_and_email_query): The arguments to g_strsplit were
-	in the wrong order.  Doh!
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name_to_string):
-	Added.  Replaces e_card_name_match_string, and actually works.
-
-	* backend/ebook/e-card.c: Removed e_card_name_match_string
-	function, which didn't work particularly well.
-
-2001-09-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (cursor_cb): don't add to the complete
-	list of cards if the card is a list
-	(card_added): don't add to the list of changes if the card is a
-	list
-	(card_changed): ditto
-	(card_removed): ditto
-
-2001-09-19  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listeners): Change the "this should
-	never happen" message into a request for people to e-mail me
-	directly with info if they encounter that error.
-
-	* backend/ebook/e-book-util.c (e_book_name_and_email_query):
-	Freeing name[i] instead of namev[i] is a bad idea. (bug #10270)
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Properly handle our GnomeUIInfo labels so that
-	they won't be leaked if they are dynamic strings, so that they
-	will be i18n-correct, and so that underscores won't be interpreted
-	as key accelerators.  What a PITA.  Also, don't leak our
-	iterators.  (Bug #10200.)
-	(popup_menu_list): The same GnomeUIInfo tweaking as in
-	popup_menu_card.
-	(popup_menu_nocard): Ditto.
-
-2001-09-18  JP Rosevear  <jpr@ximian.com>
- 
- 	* backend/ebook/e-card-simple.c (field_data): add caluri field data
- 
- 	* backend/ebook/e-card.c (e_card_get_vobject): add the caluri
- 	property when appropriate
- 	(parse_caluri): handle read caluri
- 	(e_card_class_init): add caluri arg
- 	(e_card_destroy): free the caluri
- 	(e_card_get_arg): return caluri arg
- 	(e_card_set_arg): set caluri from arg
- 	(e_card_init): init caluri to null
- 
- 	* backend/ebook/e-card-simple.h: new simple field
- 
- 	* backend/ebook/e-card.h: new member
- 
- 	* gui/contact-editor/e-contact-editor.c (field_changed): util
- 	callback to change the command state
- 	(set_entry_changed_signal_field): hook up a change signal to above
- 	(set_entry_changed_signals): use above function
- 
- 	* gui/contact-editor/e-contact-editor.glade: Add collaboration
- 	page and fields
-	
-2001-09-18  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_build_cards_list): create a sexp and check if
-	the cards match before adding them to the list
-	(pas_backend_file_process_get_cursor): send extra param
-
-2001-09-18  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(book_query_process_card_list): unref the destination regardless
-	of whether we get an email addresss.
-
-2001-09-17  Larry Ewing  <lewing@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(name_style_query): use g_strfreev.
-	(match_name): s/g_free/g_strfreev.
-	(match_file_as): s/g_free/g_strfreev.
-
-	* backend/ebook/e-book-util.c (e_book_name_and_email_query): fix
-	the memory handling here.  All there members of the vector need to
-	be freed all the time.
-
-	* backend/ebook/load-pine-addressbook.c (parse_line): free the
-	string outside of the test that makes sure there are three
-	entries.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): don't malloc a match we will never use.
-
-	* gui/widgets/e-addressbook-model.c (get_view): free the dup'd
-	capabilities.
-
-2001-09-17  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_is_valid): We want
-	to assume that a destination that comes from a card is
-	automatically valid, but the right way to check that is by calling
-	e_destination_from_card, not by checking if dest->priv->card !=
-	NULL.  (Fixed bug #10017)
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_name): Fixed a stupid bug was causing completion to fail
-	for contacts who have only one name.  (The classic example we all
-	know and love is 'George <jirka@5z.com>')  (bug #8353)
-
-	* backend/ebook/e-card.c (e_card_list_send): Do the right thing if
-	the card we are trying to send to has no valid e-mail addresses.
-	(bug #10137)
-
-	* gui/widgets/e-minicard.c (e_minicard_event): Code implicitly
-	assumed that event->button.button is 1, 2, or 3, causing disaster
-	when using a wheel-mouse.  Fixed. (bug #9400)
-
-2001-09-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (_phone_arrow_pressed):
-	use enable_widget instead of gtk_widget_set_sensitive.
-	(_email_arrow_pressed): same.
-	(_address_arrow_pressed): same.
-	(disable_widget_foreach): same.
-	(enable_writable_fields): same.
-	(set_editable): same.
-	(enable_widget): new function, using both gtk_widget_set_sensitive
-	and *_set_editable to allow the user to select text in GtkEntry's
-	and GtkText's.
-
-	* gui/contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_set_arg): use set_editable as well as
-	set_sensitive, to allow the user to select text in GtkEntry's.
-
-	* gui/contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_set_arg): same.
-
-2001-09-16  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolutionperson.schema: fix syntax errors (which are
-	broken, imo...)
-
-2001-09-16  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.h: reorder the LDAP scopes so
-	that they match the order of the option menus in the glade file.
-
-	* gui/component/addressbook-config.c (auth_checkbutton_changed):
-	new function, mostly there to house some #ifdef'ed out code.
-	(option_menuitem_activated): new function, to keep track of
-	changes to the ldap scope optionmenu.
-	(addressbook_source_dialog_set_source): set the menu history as
-	well as the dialog's copy of the scope.
-	(addressbook_source_dialog_get_source): fill in the source's scope
-	from the dialog's copy, and add more #if the_ui_gods_smile_on_me
-	code.
-	(add_activate_cb): new function, add an activate callback for the
-	optionmenu's items.
-	(addressbook_source_dialog): more #if the_ui_gods_smile_on_me
-	code, always start the dialog on page 0, and hook up the
-	scope optionmenu's items.
-
-2001-09-15  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name): No
-	loose name matches on family names. (#8802)
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): We can't use NULL as the
-	first arg for e_addressbook_show_contact_editor anymore.  Damn.
-	(#8535)
-
-	* backend/ebook/e-book-listener.c (e_book_listener_stop): Make
-	"stop" do nothing but set the stopped flag, as in
-	e-book-view-listener.c.
-	(e_book_listener_destroy): Clean up our queue here, rather than in
-	e_book_listener_stop.
-	(response_free): Added.  Move the rather lengthy bit of code
-	needed to free a EBookListenerResponse into one place.
-	(e_book_listener_check_queue): Properly deal with the stopped
-	flag.
-	(e_book_listener_queue_response): If the stopped flag is set, just
-	drop the incoming response.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_stop): Make "stop" do nothing but set the
-	stopped flag.
-	(e_book_view_listener_destroy): Move all of the clean-up that used
-	to be in e_book_view_listener_stop here.  This considerably simplifies
-	the logic required to avoid various race conditions.
-	(e_book_view_listener_check_queue): Properly deal with the stopped flag.
-	(e_book_view_listener_queue_response): Drop all incoming responses if
-	we are stopped.
-
-2001-09-14  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_queue_request): Hold a
-	reference to the book on behalf of our idle function.
-	(pas_book_check_queue): When we are finished, drop the reference
-	we've been holding on behalf of the idle function.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_create_card): Hold a reference to the
-	book_view while sending our notifications.
-	(pas_backend_file_process_remove_card): Hold a reference to the
-	book_view while sending our notifications.
-
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_unref): Remove
-	debugging spew.
-
-	* backend/ebook/e-book-util.c: Remove a lot of unused code that
-	worked around bugs that have long since been fixed.
-	(simple_query_disconnect): Added.  Breaks out the part of
-	simple_query_free that disconnect signals.
-	(simple_query_free): Replace code w/ a call to
-	simple_query_disconnect.
-	(simple_query_sequence_complete_cb): Call simple_query_disconnect
-	before executing the callback, so that our callbacks don't get
-	triggered by any book changes that might occur during that
-	callback.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Changed to be consistent with
-	e_book_listener_check_queue.
-	(e_book_view_listener_queue_response): Also changed to use a
-	high-frequency timeout.
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	OK, I've agonized over this stupid little function, and it should
-	now be race-free.
-	(e_book_listener_queue_response): We process our response queue in
-	a high-frequency timeout rather than an idle.  Using an idle
-	function leads to some tricky race conditions and bad interactions
-	with bonobo's semi-broken attempts to take over event processing.
-	(e_book_view_listener_stop): Manually disable our timeout and
-	clean up.
-
-2001-09-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Automake 1.5 fixes pointed out by Richard Boulton
-	<richard@tartarus.org>, as per #9258.]
-
-	* gui/component/select-names/Makefile.am: Set CLEANFILES directly
-	instead of using `+='.
-
-	* backend/pas/Makefile.am: Rename `LDAP_BACKEND_SOURCES' to
-	`LDAP_BACKEND_FILES'.
-
-	* backend/ebook/Makefile.am: Set CLEANFILES directly instead of
-	using `+='.
-
-2001-09-13  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): use
-	ldap_init.  ldap_open is deprecated in openldap 2.x.
-
-2001-09-12  Iain Holmes  <iain@ximian.com>
-
-	* backends/ebook/evolution-vcard-importer.c (check_file_is_vcard):
-	Fix the check.
-
-2001-09-12  Larry Ewing  <lewing@ximian.com>
-
-	* backend/ebook/e-destination.c: free the values that are being
-	leaked here.
-
-2001-09-12  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c (match_email): 
-	printf arguments were reversed by mistake.  Fixed bug #9693.
-
-2001-09-09  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_list): Added.  Treat right-clicks on a contact list as
-	a special case.
-	(e_select_names_popup): Check if we are dealing with a contact
-	list.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): See
-	e_book_listener_check_queue below.
-	(e_book_view_listener_queue_response): See
-	e_book_listener_queue_response below.
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	Explicitly prohibit reentrancy.  Use gtk-unref rather than
-	bobobo-unref.
-	(e_book_listener_queue_response): Hold a gtk-ref to the listener
-	while the idle function runs, not a bonobo-ref.  As far as I can
-	tell, it is impossible to avoid a race condition here when we have
-	to worry about bonobo reentrancy.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Alter a copy of the
-	original EDestination, rather than just using a new one.  We need
-	to do this to preserve prior-card information for possible
-	reversion later.
-	(e_select_names_text_model_delete): Ditto.
-
-	* backend/ebook/e-destination.c (e_destination_clear_card): When
-	clearing a destination where ->card != NULL, store it for possible
-	reversion later.
-	(e_destination_revert): If we have an old card stored, go back to
-	using it for the destination.
-	(e_destination_is_valid): Tries to detect obviously broken
-	addresses.
-	(e_destination_cardify): If our destination is invalid, first try
-	to cardify simply by reverting to an older card.
-	(e_destination_destroy): Unref any cached old card.
-	(e_destination_copy): Copy the old card information.
-
-2001-09-07  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(sync_table_and_models): Show all rows in the table, and then
-	remove the rows that correspond to entries in the
-	ESelectNamesModels in the children.
-	(real_add_address): Freeze/thaw our ESelectNamesModel, so that we
-	don't change our table while we are in the middle of iterating
-	over the selection.
-	(remove_address): Just delete the address from the
-	ESelectNamesModel, the signal handler will do the rest.
-	(selected_rows_foreach_cb): Call remove_address to do our dirty
-	work.
-	(e_select_names_add_section): Connect to the 'changed' signal from
-	the ESelectNamesModel, and call sync_table_and_models explicitly to
-	get our initial state correct.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Deal with EDestinations in our table that don't
-	come from cards.
-
-	* gui/component/select-names/e-select-names-manager.c: Added
-	another ESelectNamesModel* to the ESelectNamesManagerSection
-	struct.  Called 'original_model', this contains a copy of the
-	model as it is when we begin using the SelectNames dialog.
-	(section_copy): Copy the original model.
-	(section_free): Free the original model.
-	(e_select_names_manager_add_section_with_limit): Initialize the
-	original model.
-	(e_select_names_clicked): I've changed the semantics of this
-	dialog quite a bit... no UI freeze can stop me!  If OK is clicked,
-	we do nothing.  If Cancel is clicked, we revert to the
-	'original_model' copy of our address entry state before we started
-	editting.  Finally, we close the dialog before any of thing. Doing
-	it last caused problems, because signals were being triggered
-	which had dangling pointers as their closures.
-	(e_select_names_manager_activate_dialog): Copy our current state
-	to the original model, and share the same ESelectNamesModel
-	between the dialog and the address entry in the composer..
-	(e_select_names_manager_get_cards): Removed.  It had been
-	#if 0/#endif-ed out for a while.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_freeze): Added.
-	(e_select_names_model_thaw): Added.
-	(e_select_names_model_uncardify): Added.  If possible,
-	"uncardifies" a specific model entry.
-	(e_select_names_model_changed): Changed to pay attention
-	to the freeze count.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(clean_query_text): Strip leading/trailing whitespace from
-	queries.
-
-	* backend/ebook/e-destination.c (e_destination_uncardify): Added.
-	Converts a card-associated destination into a text-associated
-	destination w/ the e-mail address.
-	(e_destination_list_to_vector): Added.  A convenience routine.
-	(e_destination_freev): Added.  A convenience routine.
-	(e_destination_touchv): Added.  I'm lazy.
-
-2001-09-08  Chris Toshok  <toshok@ximian.com>
-
-	(make_contact_editor_cb): show the right contact editor (the list
-	editor for list cards).
-	
-2001-09-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): do the EDestination xml magic on email
-	addresses we put in the popup.
-
-2001-08-27  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	For every category:
-	- set .translate to FALSE (e_categories_master_list_nth returns
-	translated category name)
-	- convert category name in UTF-8 to locale's encoding
-
-2001-08-23  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Fixed two bugs:
-	- missing coversion of contact name to GTK+ locale,
-	- passing dynamically created string (contact name) inside uiinfo struct
-	to gnome-app-helper functions.
-	Remember: these functions may change strings, trying to translate them!
-	(popup_menu_nocard): Ditto
-
-2001-09-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c: Removed unused factory
-	variable.
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.c (notify_listener): new
-	function, notify the bonobo listener.
-	(remove_ldap_folder): track change to EvolutionStorage signal.
-	(create_ldap_folder): same, and make sure the type is
-	"ldap-contacts".
-	(load_source_data): folders that we create should have
-	"ldap-contacts" as their type.
-	(addressbook_storage_add_source): same.
-
-	* gui/component/addressbook-component.c: (folder_types): add
-	"ldap-contacts", for display of ldap servers (they get their own
-	icon, and their own name in the Create New Folder dialog.
-	(create_view): use IS_CONTACT_TYPE since we support two folder
-	types now.
-	(create_folder): same.
-	(remove_folder): same.
-	(xfer_folder): same.
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: (pixmaps): change
-	/Toolbar/ContactEditorSave to /Toolbar/ContactEditorSaveClose.
-
-2001-09-06  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/Makefile.am (INCLUDES): add -DEVOLUTION_IMAGESDIR.
-
-	* gui/widgets/e-addressbook-view.c (card_deleted_cb): remove
-	status messages from here.
-	(e_addressbook_view_delete_selection): same.
-
-	* gui/widgets/e-addressbook-model.c (sequence_complete): emit a
-	NULL status message along with the stop_state_changed.  The null
-	status message will clear the status bar for this view.
-
-	* gui/component/addressbook.c (set_status_message): use the
-	EvolutionActivityClient stuff.
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): remove status
-	message for abandoning a search.
-	(ldap_op_process_current): wrap status messages in _().
-	(ldap_op_process): same.
-	(create_card_handler): same, and remove the notify_status for ""
-	and add a notify_complete call after the card is added.
-	(remove_card_handler): same.
-	(modify_card_handler): same.
-	(poll_ldap): wrap status messages with _(), and remove the "Search
-	Complete" message.
-	(ldap_search_handler): wrap status message.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): use
-	_() on status messages, and make sure the last notify_* called is
-	notify_complete.
-
-2001-09-05  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Fix #958, ShellComponents should not be created by factories, for
-	the addressbook.]
-
-	* gui/component/addressbook-component.c
-	(GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_FACTORY_ID): Removed.
-	(GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID): New.
-	(create_component): Renamed from `factory_fn'.  Just register the
-	thing on OAF.
-	(addressbook_component_factory_init): Just call it.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Remove the
-	ShellComponentFactory.
-
-2001-09-04  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-vcard-importer.c (load_file_fn): Return FALSE
-	if the file isn't a valid VCard file.
-
-2001-08-05  Zbigniew Chyla  <cyba@gnome.pl>
-
-	I18n fixes (mainly making buttons on the right side less Anglocentric :-)
-
-	* backend/ebook/e-card-simple.c
-	(field_data): Marked "name" and "short_name" fields for translation.
-	(e_card_simple_get_name, e_card_simple_get_short_name): Return
-	localized version of the name (using U_() macro).
-
-	* gui/contact-editor/e-contact-editor.c (set_entry_changed_signals):
-	Connect "changed" signal from "entry-web" entry to widget_changed.
-	(changing this field wasn't making "Save and Close" button sensitive)
-
-	* gui/widgets/Makefile.am (glade_DATA): Removed alphabet.glade.
-
-	* gui/widgets/e-addressbook-view.c
-	(button_labels, button_letters): New strings containing a list of
-	labels and "values" of all buttons placed on the right side of the
-	addressbook view (intended for localization).
-	(struct LetterClosure): Changed the type of letter field to gunichar.
-	(e_utf8_split): New function, similar to g_strsplit, but operates on
-	UTF-8 strings.
-	(jump_to_letter): Don't hardcode letters, build queries dynamically
-	using UTF-8 and localized letters stored in button_letters.
-	(connect_button): Removed.
-	(create_alphabet): Don't use glade file, build buttons manually using
-	(localized) labels from button_labels. Use (localized) values from
-	button_letters when creating LetterClosure.
-
-	* gui/widgets/e-minicard-view-widget.[ch]
-	(e_minicard_view_widget_jump_to_letter): Changed the type of the
-	second argument from char to gunichar.
-
-	* gui/widgets/e-minicard-view.c
-	(compare_to_utf_str): Renamed from compare_to_letter, now operates on
-	UTF-8 string.
-	(e_minicard_view_jump_to_letter): Changed the type of the second
-	argument from char to gunichar + conversion to UTF-8 string.
-
-	* gui/widgets/e-minicard-view.h
-	(e_minicard_view_jump_to_letter): Changed the type of the second
-	argument from char to gunichar.
-
-2001-09-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_add_card, e_book_commit_card),
-	backend/pas/pas-backend-file.c (do_create),
-	backend/pas/pas-backend-ldap.c
-	(create_card_handler, remove_card_handler, modify_card_handler,
-	pas_backend_ldap_process_get_vcard, poll_ldap): Use
-	e_card_get_vcard_assume_utf8 instead of e_card_get_vcard here
-	since all internal communications and database storage are assumed
-	to be utf8.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h
-	(e_card_simple_duplicate): Simplified this function considerably.
-	(e_card_simple_get_vcard_assume_utf8): Added this function.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h (e_card_new,
-	e_card_load_cards_from_file, e_card_load_cards_from_string): Made
-	these functions pay attention to charset attributes.
-	(e_card_new_with_default_charset,
-	e_card_load_cards_from_file_with_default_charset,
-	e_card_load_cards_from_string_with_default_charset): New functions
-	that let you change the default charset from UTF-8.
-	(e_card_get_vcard): Made this write out charset attributes when
-	necessary.
-	(e_card_get_vcard_assume_utf8): New function that writes out a
-	card without writing out charset attributes.
-
-	* backend/ebook/evolution-vcard-importer.c (book_open_cb),
-	backend/ebook/load-gnomecard-addressbook.c (book_open_cb),
-	backend/ebook/test-card.c (main),
-	gui/component/addressbook-component.c
-	(destination_folder_handle_drop), gui/contact-editor/test-editor.c
-	(main), gui/contact-list-editor/e-contact-list-editor.c
-	(table_drag_data_received_cb), gui/widgets/e-addressbook-view.c
-	(selection_received), gui/widgets/e-minicard-control.c
-	(pstream_load): Changed the default charset to be used here to
-	ISO-8859-1.
-
-	* backend/ebook/load-gnomecard-addressbook.c (add_card_cb),
-	backend/ebook/load-pine-addressbook.c (add_card_cb),
-	backend/ebook/test-client-list.c (get_cursor_cb),
-	backend/ebook/test-client.c (get_cursor_cb, get_card_cb): Use
-	e_card_get_vcard_assume_utf8 to print out testing strings.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h
-	(e_select_names_model_contains): Changed this to be const
-	EDestination *dest to fix a warning.
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Translate window title here.
-
-2001-08-31  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): s/_/U_/
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_compare):
-	Use g_utf8_collate.
-
-	* gui/widgets/e-minicard.c (e_minicard_compare):
-	Ditto.
-
-	* printing/e-contact-print.c (card_compare):
-	Ditto.
-
-2001-08-29  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_clicked): Use e_select_names_model_merge to
-	combine the selected names with any existing ones.  This causes
-	you to not lose addresses typed directly into the entry while the
-	SelectNames dialog is up. (Bug #8058)
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_merge): Merge the contents of one
-	ESelectNamesModel into another, avoiding duplicates.
-
-	* backend/ebook/e-destination.c (e_destination_equal): Added.
-	Determines if two destinations appear to refer to the same
-	recipient.
-
-	* backend/ebook/e-card.c (e_card_list_send): Added cast to
-	g_free args to silence compiler warnings.
-
-	* gui/contact-editor/e-contact-quick-add.c (quick_add_set_name):
-	Paranoia.  Check that name != qa->name.
-	(quick_add_set_email): Check that email != qa->email.
-	(ce_have_book): Store the QuickAdd data structure in object data,
-	so that we can be extra-careful and avoid having a dangling
-	pointer floating around out somewhere as the closure for a signal.
-	Fixes bug #8155, I think.
-	(card_added_cb): Clear object data to ensure single unref.
-	(editor_closed_cb): Clear object data to ensure single unref.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(book_query_score): Make sure that comp->priv->query_text isn't
-	NULL.  (Fixes bug #8195)
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	This function can be re-entrant during the signal emission; Added
-	extra ref/unrefs and checks to avoid problems if this happens.
-	This is similar to my recent changes to
-	e_book_view_listener_check_queue.  (Fixes bug #7400)
-
-2001-08-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Get rid of a warning by
-	initializing the closing NULL element in folder_types correctly.
-
-	* gui/component/select-names/e-select-names.c: Updated to match
-	the studlyCapsification of attributes in shell/Evolution*.idl.
-
-2001-08-27  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(sexp_file_as): Added.  Generated queries against file_as.
-	(match_file_as): Added.  Match results of queries against
-	file_as. (Bug #8152)
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Added ref/unref pair to make
-	sure that our listener doesn't get finalized during the signal
-	emission and leave us with a dangling pointer. (Bug #7661)
-
-	* backend/ebook/e-card.c (e_card_list_send): Removed some debugging
-	spew that I left in by mistake.
-
-	* gui/widgets/e-addressbook-model.c (create_card): Removed debugging
-	spew.
-
-	* backend/ebook/e-card.c (e_card_list_send): Do the right thing if
-	the card we are trying to send to is a contact list. (Bug #6580)
-
-2001-08-27  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	Display localized status string (added missing _()).
-
-2001-08-24  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_set_card): Put a
-	freeze/thaw around our the set of operations that changes the
-	internal state of our card, so 'changed' signal callbacks won't be
-	invoked on a card in an intermediary state.  This fixes the bug
-	that was causing the e-mail addresses in cards to be blank when
-	replying to a message.  (An unexpected side-effect of toshok's
-	change on 8/22 to make sure that priv->email != NULL).
-	(e_destination_get_name): Code slightly rearranged for (IMO)
-	clarity.
-
-2001-08-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): add
-	BUTTON_PRESS_MASK so double clicks still work.
-
-2001-08-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_query_changed): switch
-	"full_name" to "x-evolution-any-field" in all the queries where we
-	want to match all cards, since the backends universally handle
-	this special case more efficiently.
-
-2001-08-22  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (extract_info):
-	In the GUI, the toggle is labelled "hide addresses", not "show
-	addresses" -- so we have to reverse the boolean value we read in.
-	(fill_in_info): Same bug as before: since the GUI reads "hide", we
-	have to initialize the toggle to '!show_addresses', not
-	'show_addresses'.
-
-	* backend/ebook/e-destination.c
-	(e_destination_list_show_addresses): Added.
-	(e_destination_xml_encode): Encode the value of
-	e_destination_list_show_addresses into the XML.
-	(e_destination_xml_decode): Read and store the "show_addresses"
-	flag.
-
-2001-08-22  jacob berkman  <jacob@ximian.com>
-
-	* gui/component/e-address-popup.c (emit_event): emit an event from
-	our event source
-	(contact_editor_cb): emit a destroy event so our control frame can
-	be destroyed.
-	(edit_contact_info_cb): emit a hide event so our control frame can
-	be hidden
-	(e_address_popup_cardify):
-	(add_contacts_cb): emit the destroy event
-	(e_address_popup_factory_new_control): don't unref our object at
-	widget destroy time as that was really really broken
-	(e_address_popup_factory_new_control): create an event source and
-	aggregate ourself with it
-
-	* gui/contact-editor/e-contact-editor.c (enable_writable_fields):
-	display a nicer warning when we can't find a widget for a given
-	field
-	(e_contact_editor_raise): only raise if there is a window
-
-	* gui/contact-editor/contact-editor.glade: name some widgets that
-	got unnamed, and set the first entry as defaultable
-
-	* gui/contact-editor/e-contact-editor.c: envelope printing is
-	disabled in 1.0
-
-2001-08-22  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_email): make
-	sure we don't get into a situation where priv->email == NULL.
-
-2001-08-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): if we're dragging,
-	drag_button_down won't be true in the BUTTON_RELEASE case, since
-	we set it to false in MOTION_NOTIFY once the threshold is reached.
-	(e_minicard_drag_end): remove this function, since it was needed
-	to work around a bug in gnome-canvas.
-	
-2001-08-20  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_addressbook_create_ebook_table): Wrap our addressbook table
-	adapter in an ETableWithout, so that we can make addresses appear
-	and disappear when we remove/add them to the section lists
-	(To/Cc/Bcc) on the right of the dialog.
-	(real_add_address_cb): When we add an address, hide it in the main
-	list.
-	(e_select_names_init): Get pointer to our without table from the
-	table's object data, and store it.
-	(remove_address): When we remove an address, show it in the main
-	list.
-	(card_key): Added.  Allocate a unique key from an ECard.
-	(esn_get_key_fn): Added.  Callback for ETableWithout.
-	(esn_dup_key_fn): Added.  Callback for ETableWithout.
-	(esn_free_gotten_key_fn): Added.  Callback for ETableWithout.
-	(esn_free_duped_key_fn): Added.  Callback for ETableWithout.
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): Changed
-	E_CARD_SIMPLE_FIELD_NAME_OR_ORG to first try the FILE_AS
-	type.  This allows the cards in the ESelectName dialog to
-	appear in proper sort order (i.e. as 'Doe, John' rather than
-	'John Doe').  Fixes ximian #6002.
-
-2001-08-20  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_class_init): fix arg info - we're
-	only passing 1 GTK_TYPE_POINTER arg, not 2.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): lots of fixes for
-	DnD.  For GDK_BUTTON_PRESS, we grab immediately.  For
-	GDK_BUTTON_MOTION, we start the drag after a certain threshold,
-	and connect to the "drag_end" signal on our canvas so we'll know
-	when the drag is complete.  For GDK_BUTTON_RELEASE, we release the
-	grab if we were dragging and get the event.
-	(e_minicard_drag_end): new function, just remove the pointer/gtk
-	grabs and disconnect.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add "gint
-	drag_button"
-
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key): use DB_NOTFOUND const
-	
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_changes): null out card_sexp so that
-	we don't crash when copying
-
-2001-08-20  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c: fix warnings, get compiling again
-
-	* conduit/address-conduit-config.h: remove c/p typos
-
-	* conduit/address-conduit.h: ditto
-
-	* conduit/Makefile.am: link against the static camel
-
-2001-08-20  Damon Chaplin  <damon@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c: use bigger Save icon for
-	toolbar. Used Delete icon in menu.
-
-	* gui/component/addressbook.c: use 'Save As' icon rather than 'Save'
-	as it seems more appropriate. Also added delete icon for menu.
-
-2001-08-19  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Update the folder list to
-	include a display name and a description.
-
-2001-08-19  Damon Chaplin  <damon@ximian.com>
-
-	* gui/component/addressbook.c: use new Cut/Copy/Paste/Save/Search
-	icons.
-
-2001-08-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (set_folder_bar_label),
-	gui/widgets/e-addressbook-model.c,
-	gui/widgets/e-addressbook-model.h (update_folder_bar_message),
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-addressbook-view.h
-	(folder_bar_message): Set the folder bar message here.  Fixes
-	Ximian bug #4670.
-
-	* gui/component/select-names/e-select-names-model.c (SEPLEN): Use
-	strlen(SEPARATOR) here so that if the separator changes the length
-	will work properly.
-
-2001-08-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/fulladdr.glade: Added full country list.
-	Fixes Ximian bug #5123.
-
-2001-08-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c: Hook up `delete-message.png' as the
-	icon for "ContactDelete".
-	* gui/contact-editor/e-contact-editor.c: Likewise.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.h: add prototype for
-	addressbook_get_other_contact_storage.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_get_other_contact_storage): rename register_storage
-	to this, and return the EvolutionStorage.
-	(load_source_data): register_storage =>
-	addressbook_get_other_contact_storage.
-	(addressbook_storage_add_source): register_storage =>
-	addressbook_get_other_contact_storage.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c
-	(set_entry_changed_signals): connect to the "changed" signal on
-	"entry-web" to update command state.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (list_added_cb):
-	call e_card_set_id on the list's card so we can continue to use
-	this dialog.  also, call command_state_changed if we aren't
-	closing the dialog so the toolbar is properly sensitized.
-	(list_deleted_cb): always close the dialog after we successfully
-	delete a list.
-
-	* gui/contact-editor/e-contact-editor.c (card_added_cb): call
-	e_card_set_id on the card so we can continue to use this dialog
-	(to modify or delete the card.)
-	(card_deleted_cb): always close the dialog after we successfully
-	delete a card.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_query_changed): call
-	e_sexp_encode_string on the search string the user types in so it
-	doesn't break sexp parsing in the wombat.
-
-2001-08-17  Damon Chaplin  <damon@ximian.com>
-
-	* gui/component/addressbook.c: changed to new print icon.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.c: (struct
-	ESelectNamesFolder): rename physical_uri to uri, since it includes
-	the addressbook.db for file: uris.
-	(e_select_names_folder_free): physical_uri => uri.
-	(e_select_names_option_activated): physical_uri => uri, and we
-	don't need to strdup_printf "addressbook.db" onto the end anymore.
-	(new_folder): if the physical_uri is a file: uri, append
-	/addressbook.db onto it.
-	(hookup_listener): new function, split out lots of code from
-	e_select_names_hookup_shell_listener.
-	(e_select_names_hookup_shell_listeners): rename
-	e_select_names_hookup_shell_listener to this, and hookup both the
-	local and "Other Contacts" listener, using hookup_listener.
-	(e_select_names_destroy): disconnect from the
-	other_contacts_listener and unref it.
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): add a listener for Other Contacts, and rename
-	"listener" to "local_listener."
-
-2001-08-17  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_seq_complete_cb): If we get the
-	"sequence_complete" signal when we aren't searching, it means the
-	addressbook changed out from under us.  Clear the search cache, so
-	that future completion requests won't use the out-of-date cached
-	data.  Also, don't unref book_view... we leave the EBookView open
-	so that we can catch these addressbook changes.
-	(e_select_names_completion_do_query): Don't use the book_view
-	being non-NULL as a sign that another query is still running.
-	(e_select_names_completion_got_book_view_cb): Properly unref any
-	previous value in book_view.
-
-2001-08-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click),
-	gui/widgets/e-addressbook-view.c (table_right_click): Changed the
-	messages here in the right click menus.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): unref our
-	card_sexp.
-	(create_card_handler): make sure to set the id of the vcard so it
-	gets properly transmitted back to the BookView, and notify all
-	matching BookViews to add the created card.
-	(remove_card_handler): notify all matching BookViews to remove the
-	card.
-	(modify_card_handler): notify all matching BookViews to modify the
-	card.
-	(pas_backend_ldap_process_get_book_view): init card_sexp based on
-	the view's search.
-
-2001-08-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_book_view_copy): use card_sexp.
-	(pas_backend_file_book_view_free): same.
-	(vcard_matches_search): use the new pas_backend_card_sexp_match_vcard call.
-	(pas_backend_file_search): use card_sexp.
-	(pas_backend_file_process_get_book_view): same.
-
-	* backend/pas/Makefile.am (libpas_a_SOURCES): add
-	pas-backend-card-sexp.[ch].
-
-2001-08-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Added code
-	so the user can create a new contact or contact list from anywhere
-	in evolution.
-
-2001-08-16  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/pas/evolutionperson.schema: Added a closing paren.
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_handle_request): Renamed from _begin to
-	match changes in gal 0.10.99.3.
-
-	* gui/contact-editor/e-contact-quick-add.c (e_contact_quick_add): 
-	Check that name != NULL before we start messing with it.
-	(Fixes bug #7329)
-
-2001-08-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): Boost scoring on an exact nickname match.
-	Manually addressify match.
-	(match_name): Manually addressify matches.
-	(book_query_score): Remove automatic addressification.
-
-	* gui/component/addressbook.c (addressbook_query_changed): Minor
-	tweak to avoid a crash if we have a negative subid with id
-	ESB_CATEGORY.  This should never happen.
-	(addressbook_menu_activated): Reset the entry/option when we
-	select "Clear".
-	Some changes to reflect renaming in ESearchBar.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): Cardify after importing destinations.
-	This might fix a problem that Damon is having.
- 
-2001-08-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.glade: set title of initial
-	dialog to Addressbook Sources (bug #6704).
-
-2001-08-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.c (create_ldap_folder): don't
-	let people add subdirs in the ldap server storage - everything is
-	toplevel there.
-
-2001-08-14  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_vcard): implement using
-	search_for_dn.
-
-2001-08-14  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Tell the search bar to translate the subitem texts.
-
-2001-08-14  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Add "Any Category" option for category searches.
-	(addressbook_query_changed): Do the right thing on an
-	"Any Category" search.
-
-2001-08-14  Dan Winship  <danw@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: Fix up to match the
-	pas_book_new/get_vcard changes.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
-	Got rid of an extraneous _ here.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	Changed Canceled to Cancelled here.  Fixes Ximian bug #2465.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_respond_get_vcard): Oops,
-	forgot to write this function.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Added focus targets
-	here.  Fixes part of Ximian bug #5843.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (e_contact_editor_init):
-	Grab focus here.  Fixes Ximian bug #2265.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control): 
-	(addressbook_query_changed): Fixed two const warnings here.
-
-	* printing/e-contact-print-envelope.c,
-	printing/e-contact-print-envelope.h: Fixed some missing includes
-	here.
-
-2001-08-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-view.c (add_book_iterator): Call
-	e_card_set_book here.
-
-	* backend/ebook/e-book.c (e_book_do_response_get_vcard): Call
-	e_card_set_book here.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Pulled out the
-	part where the uri is made part of the uid.  Made uri a separate
-	field.  Fixes Ximian bug #6490.
-
-	* backend/ebook/e-destination.c, backend/ebook/e-destination.h:
-	Change this to use ECard's split uids and uris.
-
-2001-08-13  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (add_to_supported_fields): don't
-	g_strdup the stuff we're passing into e_list_append, since it does
-	the copy for us.
-	(check_schema_support): don't initialize supported_fields list
-	here, since there's a gross case where the programmer/user can
-	bring up the contact editor before the connection stuff is
-	finished, and we don't want to crash.
-	(pas_backend_ldap_init): move it here to we can guarantee it's
-	there. (bug #6546).
-
-2001-08-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): don't access source->auth
-	if source == NULL (bug #7086).
-
-2001-08-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c,
-	backend/ebook/e-book-listener.h, backend/ebook/e-book.c,
-	backend/ebook/e-book.h, backend/idl/addressbook.idl,
-	backend/pas/pas-backend-file.c, backend/pas/pas-book.c,
-	backend/pas/pas-book.h: Changed get_card to be asyncronous.
-
-	* backend/ebook/e-card.c, backend/ebook/test-client.c: Changed
-	these to deal with the new get_card functionality.
-
-2001-08-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/component/select-names/e-select-names.c: Mark a string for translation.
-	* This fixes bug #7052
-	* printing/e-contact-print.h: Add headers to make it stand on itw own.
-	* printing/e-contact-print.c: Marked some strings for translation.
-	* printing/e-contact-print-envelope.c: Same here.
-	
-2001-08-10  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (e_contact_quick_add):
-	Remove single- or double-quotes from names before sticking them
-	into the addressbook. (Bug #6499)
-
-	* gui/component/addressbook.c (addressbook_query_changed):
-	Properly handle "Category is" queries by checking the search bar
-	suboption.
-	(addressbook_factory_new_control): Attach subitems corresponding
-	to all wombat categories to the "Category is" ESearchBarItem.
-
-	* gui/component/addressbook.c: Set the ESearchBarItem
-	subitems explicitly to NULL.
-
-2001-08-10  Anna Marie Dirks <anna@ximian.com>
-	 * gui/component/select-names/select-names.glade: did a little
-	packing-magic to get the two tables at bottom of this dialog
-	to seem to line up. 
-
-	*gui/component/select-names/e-select-names.c: changed the title
-	of this dialog to "Select Contacts from Addressbook". 
-
-2001-08-09  Anna Marie Dirks <anna@ximian.com>
-        * gui/component/select-names/select-names.glade: redesigned
-        this dialog to fix bug #6815. 
-
-	*gui/component/select-names/e-select-names.c: connected the
-	widgets (or one of them anyway. clahey did the rest) for my
-	new and lovely glade file.
-	
-2001-08-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: remove passwd_cb.
-
-2001-08-09  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	This change is dedicated to Jacob Berkman.
-	(e_select_names_text_model_insert_length): If the last character
-	we inserted was a "magic comma", remember its position.
-	(e_select_names_text_model_delete): If the last character we
-	inserted was a "magic comma", and if the next thing we do is to
-	hit backspace, delete both the comma and the extra whitespace we
-	added.
-	(e_select_names_text_model_init): Initialize our last magic comma
-	position.
-
-2001-08-09  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): Hook up some magic to
-	(basically) cardify an entry on focus-out.  (What we do is actually
-	more complicated than that.)
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): After we set an entry's text, try to
-	cardify it.  We need to do this so that (for example) reply
-	e-mails get properly cardified.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_duplicate): Use e_select_names_model_append,
-	rather than manipulating lists directly.
-	(e_select_names_model_insert): Connect "changed" signal proxy for
-	added EDestination.
-	(e_select_names_model_append): Ditto.
-	(e_select_names_model_replace): Ditto, and disconnect signals for
-	replaced EDestination.
-	(e_select_names_model_delete): Ditto on the disconnection.
-	(e_select_names_model_delete_all): Ditto.
-	(e_select_names_model_cardify): Added.  Try to cardify a specified
-	EDestination.
-	(e_select_names_model_cancel_cardify): Added.  Cancel the pending
-	cardification of a single EDestination.
-	(e_select_names_model_cardify_all): Added.  Cardify all of the
-	EDestinations in the model.
-	(e_select_names_model_cancel_cardify_all): Added.  Cancel's any
-	and all pending cardifications.
-
-	* backend/ebook/e-destination.c (e_destination_class_init): Added
-	"changed" and "cardified" signals.
-	(e_destination_freeze): Added (static).
-	(e_destination_thaw): Added (static).
-	(e_destination_clear_card): Reset allow_cardify and
-	cannot_cardify, cancel any pending cardifications, and emit the
-	"changed" signal.
-	(e_destination_clear_strings): Emit the "changed" signal.
-	(e_destination_clear): Do freeze/thaw to prevent multiple signal
-	emissions.
-	(e_destination_set_card): Check that the card we are setting is
-	not equal to the current card, and emit the "changed" signal if we
-	are actually changing.
-	(e_destination_set_card_uri): Emit "changed" signal, if necessary.
-	(e_destination_set_name): Emit "changed" signal, if necessary.
-	(e_destination_set_email): Emit "changed" signal, if necessary.
-	(e_destination_set_html_mail_pref): Emit "changed" signal, if
-	necessary.
-	(use_card_cb): If we've just loaded/set the ECard, emit the
-	"changed" signal.
-	(e_destination_set_raw): Emit "changed" signal, if necessary.
-	(e_destination_allow_cardification): Added.
-	(e_destination_set_allow_cardification): Added.
-	(e_destination_cardify): Added.  Tries to automatically convert
-	a string-based EDestination to one based on an ECard.
-	(e_destination_cardify_delayed): Added.  Cardifies in a timeout.
-	(e_destination_cancel_cardify): Added.  Cancels any pending
-	cardifications.
-	(e_destination_xml_decode): Added freeze/thaw.
-
-	* backend/ebook/e-book-util.c (e_book_nickname_query): Added.  A
-	canned simple query for nicknames.
-
-	* backend/ebook/e-card.c (e_card_email_find_number): Added.  Given
-	a card and an string containing an email address, return the index
-	number of the address inside of the card, or -1 if the address is
-	not found.
-
-2001-08-09  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes ximian bugs #5080, #6021, #6704, #6705 ] 
-	
-	* gui/component/addressbook.c (book_open_cb): create our own
-	dialog that prompts for both the email address and the password.
-	the email address is stored in the source and filled in for the
-	user after the first time they enter one and press OK.
-
-	* gui/component/addressbook-storage.c (create_ldap_folder): has a
-	return value, not a int* parameter.
-	(create_ldap_folder): new function, we can create ldap servers
-	from the File->New->Folder menu item now.
-	(register_storage): hook up the "create_folder" signal.
-	(addressbook_storage_init_source_uri): remove the file case, we
-	only build ldap uris here.
-	(load_source_data): remove the file source stuff, and handle
-	"emailaddr".
-	(save_source_data): call ldap_source_foreach directly.
-	(addressbook_source_free): remove file source stuff.
-	(addressbook_source_copy): same.
-
-	* gui/component/addressbook-storage.h: get rid of all the file
-	source stuff from AddressbookSource, since this is only being used
-	for ldap servers.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_authenticate_user): look up the ldap
-	entry based on the provided email address and use the resulting
-	DN/passwd to authenticate.
-
-	* gui/component/addressbook-config.c: pretty much gutted to make
-	it work with the new UI.
-
-	* gui/component/addressbook-config.glade: new version from anna.
-	
-2001-08-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Upped the minimum width
-	on all addressbook columns to 75.  Fixes Ximian bug #2773.
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (ce_have_book): mark
-	the dialog as changed so the save button is immediately available.
-
-	* gui/contact-editor/e-contact-editor.c (card_modified_cb): once
-	we save reset the change flag to false if we aren't closing the
-	dialog.
-	(card_added_cb): same.
-	(e_contact_editor_class_init): add a "changed" arg.
-	(e_contact_editor_set_arg): add setter for "changed".
-	(e_contact_editor_get_arg): add getter for "changed".
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-quick-add.c (ce_have_book): better
-	to assume that we can write to the local addressbook than that we
-	can't write to it :)
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (create_ui):
-	call e_pixmap_update so we can use the same save/save-as pixmaps
-	as the contact editor.
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (open_card): new
-	function, used by the context menu.
-	(e_addressbook_reflow_adapter_right_click): put "Open" at the top
-	of the menu.  also, disable "Delete" if the addressbook isn't
-	writable.
-
-2001-08-08  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (rfc2254_escape): escape *, \, (,
-	and ), as per rfc2254.
-	(func_contains): escape the string.
-	(func_is): same.
-	(func_beginswith): same.
-	(func_endswith): same.
-
-2001-08-08  Nat Friedman  <nat@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (print_envelope): If 0'd out
-	since Envelope printing is disabled for 1.0.	
-	* gui/widgets/e-addressbook-view.c (print_envelope): Likewise.
-	* gui/contact-editor/e-contact-editor.c (print_envelope_cb): Likewise.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(e_addressbook_reflow_adapter_right_click): Removed "Print
-	Envelope" menu item.
-	* gui/widgets/e-addressbook-view.c (table_right_click): Likewise.
-	* gui/contact-editor/e-contact-editor.c	(verbs): Likewise.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-storage.c (remove_ldap_folder): ifdef
-	this HAVE_LDAP.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): set the title of the window to
-	"Advanced Search".
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (search_cb): pass view->view instead
-	of the EBook.
-	(addressbook_search_menu_items): remove E_FILTERBAR_ADVANCED.
-	(addressbook_menu_activated): remove E_FILTERBAR_ADVANCED.
-	(addressbook_search_option_items): add "Advanced..." here.
-	(addressbook_query_changed): add special handling for Advanced...
-
-	* gui/search/e-addressbook-search-dialog.h (struct
-	_EAddressbookSearchDialog): add EAddressbookView and remove the
-	model/adapter fields.  Also fix prototype of
-	e_addressbook_search_dialog_new.
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_class_init): get rid of
-	set_arg/get_arg.
-	(button_press): set the query on the EAddressbookView, and always
-	close the dialog.
-	(e_addressbook_search_dialog_init): get rid of the minicard view,
-	and pack the other widgets accordingly.
-	(e_addressbook_search_dialog_new): pass EAddressbookView instead
-	of EBook.
-	(e_addressbook_search_dialog_destroy): remove model/adapter stuff.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bug #5066 ]
-	* gui/component/addressbook-storage.c (remove_ldap_folder): new
-	function, remove the source.
-	(register_storage): connect to the "remove_folder" signal so we
-	know when to remove the folder.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (build_card_from_entry): use
-	g_strcasecmp since ldap attribute names are not case sensitive.
-
-2001-08-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(table_drag_data_received_cb): make sure we update the changed
-	state if a successful drop happens.
-
-2001-08-07  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Make the OK button the keyboard default
-	instead of Cancel.  Bug #4942.
-
-2001-08-06  Radek Doulik  <rodo@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_op_free): new EBookOp destructor
-	(e_book_unqueue_op): use e_book_op_free
-	(e_book_do_response_create_card): ditto
-	(e_book_do_response_generic): ditto
-	(e_book_do_response_get_cursor): ditto
-	(e_book_do_response_get_view): ditto
-	(e_book_do_response_get_changes): ditto
-	(e_book_do_response_open): ditto
-	(e_book_do_response_get_supported_fields): ditto
-
-2001-08-05  Radek Doulik  <rodo@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_do_response_get_view): set
-	op->listener to NULL to catch possible use of freed op
-	(e_book_do_response_get_changes): ditto
-
-	* backend/ebook/e-book-view-listener.c
-	   (e_book_view_listener_check_queue): this callback could be (and
-	   indeed is) called from signal emited above, 
-	   signal handler could call e_book_view_listener_stop, so we need to check
-	   if idle is still set and if not we don't want to unref again
-
-2001-08-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name): Made it so
-	that if there's one less match than possible compares are
-	considered more VAGUE.  Fixes Ximian bug #3400.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listener): Check for storage != NULL
-	here.  This shouldn't come up unless addressbook has crashed
-	previously within this session of evolution, but this is just a
-	bit of insurance.  Fixes Ximian bug #3699.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_name_match_string): Changed the
-	criteria of whether the first part of each iteration matched or
-	the second one did.  Before it got it wrong sometimes and caused
-	the pointer to jump off the end of the array.  Fixes Ximian bug
-	#4674.
-
-2001-08-03  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Update
-	for EvolutionStorage API changes.
-	(addressbook_storage_add_source): Ditto.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (jump_to_letter): Made this
-	change the query based on which letter is clicked.  Fixes Ximian
-	bug #2202.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Fixed warnings here.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(hash_cleanup_fn): Removed this unused function.
-
-2001-08-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c (e_card_simple_sync_card,
-	fill_in_info): Made the list of E_CARD_PHONE types in
-	phone_correspondences more complete by adding the new 5
-	E_CARD_PHONE types.  Also, made it a bit less restrictive for some
-	types (E_CARD_PHONE_HOME will actually match
-	E_CARD_SIMPLE_PHONE_ID_HOME now.)  Made e_card_simple_sync_card
-	and fill_in_info search for an exact match in the list of
-	phone_correspondences and then look for a partial match.  Got rid
-	of not going forward when doing a remove from an EList since EList
-	handles this case automatically.
-
-	* backend/ebook/e-card-types.h: Added E_CARD_PHONE types for
-	assistant, callback, radio, telex, and ttytdd.
-
-	* backend/ebook/e-card.c (get_phone_flags, set_phone_flags):
-	Handle the new E_CARD_PHONE types.
-
-2001-08-02  Jon Trowbridge  <trow@ximian.com>
-
-	* printing/Makefile.am (ecpsdir): Add camel dependency.
-
-	* gui/component/Makefile.am: Add camel dependency.
-
-	* backend/ebook/Makefile.am: Add camel dependency.
-
-	* gui/component/addressbook-factory.c (main): Properly init camel.
-
-	* backend/ebook/e-destination.c (e_destination_clear_strings):
-	Clear ->raw.
-	(e_destination_is_empty): We aren't empty if ->raw is set..
-	(e_destination_set_raw): Replaces e_destination_set_string.
-	(e_destination_get_name): Use camel's parser to extract the name
-	from ->raw.
-	(e_destination_get_email): Use camel's parser to extract the email
-	address from ->raw.
-	(e_destination_get_address): Use camel to produce properly quoted,
-	RFC-compliant addresses.  Thanks camel! (Bug #5860)
-
-	* gui/component/select-names/e-select-names-completion.c
-	(emailify_match): Always append an e-mail address, as long as it
-	doesn't have one already at it's beginning or end.  Don't limit
-	self to just emailifying entries tied to cards with multiple
-	addresses.  (I didn't really want to do this, but people seem to
-	like keeping multiple cards for the same person, and other
-	solutions (like scanning all matches for duplicate names, and only
-	emailifying those) just seemed like way too much work for such a
-	limited payoff.)
-
-	* gui/component/select-names/e-select-names-text-model.c:
-	s/e_destination_set_string/e_destination_set_raw/.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Quote _'s in our popup menus, so that "foo_bar"
-	doesn't get displayed as "foobar" w/ the 'b' underlined. (Bug
-	#5558)
-	(popup_menu_nocard): Ditto.
-
-2001-08-02  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	Removed some extra padding and pack the addressbook view into a
-	frame with inward shadowing, just because it looks prettier.
-
-	* gui/contact-editor/e-contact-editor.c: Use the updated Save,
-	Save As, and Print icons for the menus and toolbar.
-
-2001-08-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c: Added ContactsSaveAsVCard,
-	ContactsSendContactToOther, and ContactsSendMessageToContact verbs
-	here.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h (e_addressbook_view_save_as,
-	e_addressbook_view_send, e_addressbook_view_send_to): New
-	functions to allow outside users to cause the addressbook to save,
-	send, or send a message to its selection.
-
-2001-08-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* contact-editor/.cvsignore: Removed this file from this unused
-	directory.
-
-2001-08-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/Makefile.am: Added file-exists.glade.
-
-	* gui/contact-editor/e-contact-save-as.c (file_exists),
-	gui/contact-editor/file-exists.glade: Added a dialog to ask the
-	user whether to replace an already existing file.  Mostly from a
-	patch by Jos Dehaes.  Fixes Ximian bug #2231.
-
-2001-08-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Removed thrash checking code
-	here since thrashing shouldn't happen now that we've cleaned this
-	up some.
-
-	* backend/ebook/e-book.c (e_book_do_response_get_view): Properly
-	handle cases where construction fails.
-
-2001-07-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/evolution-vcard-importer.c: Added #include
-	<e-util/e-path.h>.
-
-2001-07-23  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	Convert translated string to UTF8 before calling put_html.
-
-2001-07-30  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_do_query): Properly handle the case
-	where our "cleaned" completion is the empty string.  This happens,
-	for example, if the query text is the string "\"".  (Bug #5610).
-
-	* backend/ebook/e-destination.c (e_destination_get_address_textv):
-	Reassure fejj that I'm not doing something stupid here.
-	(e_destination_get_address): Fix address quoting.  This is a
-	stop-gap measure until I can change this code to use Camel's
-	superior address-handling routines.  (Also Bug #5610)
-
-2001-07-30  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/addressbook-storage.c (load_source_data): Fix a
-	return value bug, to make it so if it fails to load an
-	addressbook-sources.xml file (either a parse error or it doesn't
-	exist for example), it deregisters the storage.
-	(register_storage): Don't make a storage for users who don't have
-	LDAP support built in.  Bug #1950.
-
-2001-07-30  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* addressbook/gui/component/addressbook-factory.c: Fix crashes
-	when gtkhtml is compiled with gconf support
-
-2001-07-27  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: Tidy ldadds
-
-2001-07-26  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c: Fixing a
-	small, stupid mistake; use e_select_names_model_get_textification
-	for the getter for "text".
-
-	* backend/ebook/e-card.c: Removed some debugging chatter.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): Store the completion
-	handler in the entry's object data.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Added support for getting "destinations"
-	and "allow_contact_lists" properties.
-	(entry_set_property_fn): Added support for setting "destinations"
-	and "allow_contact_lists" properties.
-	(impl_SelectNames_get_entry_for_section): Added definitions for
-	"destinations" and "allow_contact_lists" properties.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_get_match_contact_lists): Added.
-	(e_select_names_completion_set_match_contact_lists): Added.
-	Controls whether contact lists are offered as options during
-	completion.
-	(book_query_process_card_list): Check if match_contact_lists
-	is set before (duh!) matching on a contact list.
-	(e_select_names_completion_init): Set match_contact_lists
-	to TRUE by default.
-
-2001-07-25  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (func_contains): change the way
-	x-evolution-any-field is converted to an ldap query.  it used to
-	be we'd nest queries like: (|(|(|(foo=*x*))(bar=*x*))(baz=*x*)).
-	now we build it like: (|(foo=*x*)(bar=*x*)(baz=*x*)).  much more
-	efficient (both in the building, and on the server side no doubt).
-
-2001-07-25  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_name): Properly dup
-	the results of e_destination_get_email.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(e_select_names_popup): Check that our destination isn't empty
-	before building our popup. (Bug #5250)
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Made
-	argument const.
-
-2001-07-24  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-model.c: Added checks
-	for all of the args of the exposed functions, so that
-	we won't crash on bad inputs.  (Related to bug #4856.)
-
-2001-07-24  Jason Leach  <jleach@ximian.com>
-
-	* gui/merging/e-card-duplicate-detected.glade: "_Add Anyway" to
-	"Add Anyway".
-
-2001-07-24  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_name): Added
-	fallbacks for the name in the case of an e-card, to avoid the
-	"nameless contact" bug.
-
-2001-07-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (remodel): need the EDestination magic
-	here too for when we modify an already shown card.
-
-	* gui/contact-list-editor/e-contact-list-model.c: make
-	parent_class static, just to be anal.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(remove_entry_cb): removing entries changes the list, so flag it.
-	(table_drag_data_received_cb): restrict cards we add to lists to
-	be non-list cards.
-	(extract_info): clear out the email list in the card before we
-	repopulate it from the contact list model.
-	(fill_in_info): set the checkbox to active/inactive based on
-	thecard.
-
-2001-07-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (wants_html_changed): call
-	widget_changed.
-	(phone_entry_changed): same.
-	(email_entry_changed): same.
-	(address_text_changed): same.
-	(name_entry_changed): same.
-	(company_entry_changed): same.
-	(widget_changed): new function that we can either call or set as a
-	signal to change the "changed" flag on the dialog.
-	(set_entry_changed_signals): connect lots of "changed" signals on
-	widgets to widget_changed.
-	(add_lists): connect "changed" to widget_changed.
-
-2001-07-24  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_hookup_shell_listener): Check if
-	evolution_shell_client_get_local_storage returns CORBA_OBJECT_NIL,
-	which it should never do.  If it does, print a warning in a dialog
-	and try to recover w/o crashing.  (Bug #5193)
-
-2001-07-24  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book-listener.c (e_book_listener_stop): Don't
-	stop the idle_queue and unref from here, since this might be
-	called from inside e_book_listener_check_queue, and we don't want
-	to return to that function with the listener having been
-	destroyed.
-	(e_book_listener_check_queue): Don't exit early if the queue is
-	stopped. Proceed through the check if the queue is NULL (which is
-	must be if the queue is stopped), and then reach the existing code
-	to remove the idle handler. Combined with the above, this fixes
-	ximian #4485 (again). This is not a plot to boost my
-	showstopper-bugfixing count by fixing the same bug over and over
-	again.
-
-2001-07-23  Dan Winship  <danw@ximian.com>
-
-	Re-fix for my 07-18 not-quite-fix.
-
-	* backend/ebook/e-book-listener.c: Add a "stopped" flag like
-	EBookViewListener.
-	(e_book_listener_check_queue): Don't emit signals if the listener
-	is stopped.
-	(e_book_listener_queue_generic_response, etc): Don't queue
-	responses if the listener is stopped.
-	(e_book_listener_stop): Flush the queue and stop queue/emitting
-	further responses.
-
-	* backend/ebook/e-book.c (e_book_unload_uri): Revert the previous
-	change and call e_book_listener_stop() instead.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_stop): When removing an idle handler, unref
-	the listener as well, since e_book_view_listener_queue_response
-	will have ref'ed it.
-
-2001-07-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): Add a
-	@type arg.  If the type is not "contacts", report an
-	`UNSUPPORTED_TYPE' error through the listener.  Also, remove
-	`g_print()' debugging messages.
-	(xfer_folder): Likewise.
-
-2001-07-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c: Make the "contacts"
-	folders user-creatable by setting `user_creatable' to %TRUE in the
-	`EvolutionShellComponentFolderType's.
-
-2001-07-18  Chris Toshok  <toshok@ximian.com>
-
-	[ patch contributed by Jos Dehaes <jos.dehaes@bigfoot.com> ]
-	
-	* gui/component/addressbook-storage.c (register_storage): new
-	function, register our evolution_storage.
-	(addressbook_storage_setup): remove storage registration from
-	here.
-	(load_source_data): register the storage here before we load
-	addressbook-sources.xml, and deregister it if there are no sources
-	listed.
-	(addressbook_storage_remove_source): unregister the storage if the
-	list of sources hits 0 length.
-
-2001-07-18  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_unload_uri): Flush the listener's
-	queue before unreffing it to ensure that it doesn't emit any more
-	"responses_queued" signals after the EBook is destroyed.
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue,
-	e_book_listener_queue_response, e_book_listener_new): Use
-	bonobo_object_ref/unref rather than gtk_object_ref/unref.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response, e_book_view_listener_new):
-	Likewise.
-
-2001-07-18  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card-compare.c (simple_query_cb): prune the list
-	of cards that match our query using the avoid list here, instead
-	of using the avoid list in the query itself, since ldap can't
-	handle that.
-	(use_common_book_cb): remove the block of code including the avoid
-	list in the query sent to wombat.
-
-2001-07-17  Chris Toshok  <toshok@ximian.com>
-
-	[ Fixes bugs #4611 - crash searching in the name field at Bigfoot for "\"
-	        and  #4554 - general ldap search crash ]
-	
-	* backend/pas/pas-backend-ldap.c (func_contains): the length of
-	the big query string needs to take into account the length of the
-	footer as well as the header - fix random memory corruption here.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_build_query):
-	list can be NULL, specifically if there's a parsing error in the
-	sexp, so deal with it.
-
-2001-07-17  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_queue_response): Hold a reference to our
-	listener while the idle function is active.
-	(e_book_view_listener_check_queue): Only unref the listener when
-	the idle function is finished.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_clicked): Instead of replacing section->model with
-	source, copy source onto section->model with
-	e_select_names_model_overwrite_copy.  #if 0/#endif out all of the
-	stuff related to ETextModels, because it doesn't make any sense to
-	me, and everything appears to work without it.
-	(Die bug #2059.  Die! Die! Die!)
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_overwrite_copy): Added.  Copies the contents
-	of one ESelectNamesModel onto another.
-
-	* backend/ebook/e-destination.c (e_destination_copy): Made the argument
-	const.
-
-	* backend/ebook/e-destination.c (e_destination_set_string): Removed
-	old, broken code and annoying g_messages.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_response): Hold a reference to the listener
-	while the idle function is active.
-	(e_book_listener_check_queue): Only release our reference to the
-	listener when the queue is empty.  These two changes fix a race
-	condition, since the listener could be unrefed while the listener
-	was still active. (Seems to fix bug #4485)
-
-2001-07-17  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade,
-	gui/merging/e-card-duplicate-detected.glade,
-	gui/merging/e-card-merging-book-commit-duplicate-detected.glade,
-	printing/e-contact-print.glade: Patch from Taylor Hayward
-	<thayward@gjpc.com>.  Added accelerators to a few dialogs.
-
-2001-07-16  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
-	Added addSectionWithLimit to the SelectNames interface.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_SelectNames_add_section_with_limit): Added.  Implements
-	addSectionWithLimit.
-	(e_select_names_bonobo_construct): Set up as a BonoboEventSource.
-	(init): Listen for "changed" signals from our manager.
-	(manager_changed_cb): Notify our listeners if we get a changed
-	signal from our manager.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_class_init): Added a "changed" signal".
-	(section_copy): Propogate the signal connection.
-	(section_free): Disconnect the changed handler.
-	(e_select_names_manager_add_section_with_limit): Connect to the
-	new section's model, listening for changes.
-	(e_select_names_manager_activate_dialog): Connect to the "working
-	copy" model, listening for changes.
-	(e_select_names_manager_add_section_with_limit): Added.
-	(e_select_names_manager_add_section): Changed to just be a special
-	case of e_select_names_manager_add_section_with_limit.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_set_limit): Added.  Allows a max number of
-	names allowed in the model.
-	(e_select_names_model_get_limit): Added.  Returns the limit.
-	(e_select_names_model_at_limit): Added.  Returns TRUE if the
-	model is "full".
-	(e_select_names_model_insert): Check that we aren't at the
-	limit before inserting.  Silently return if we are.
-	(e_select_names_model_append): Check that we aren't at the
-	limit before appending.  Silently return if we are.
-
-2001-07-16  Chris Toshok  <toshok@ximian.com>
-
-	[ Fix bug #4705 - LDAP storage gets saved with corrupted binddn]
-	
-	* gui/component/addressbook-config.c (addressbook_dialog_apply):
-	call addressbook_storage_write_sources here after we're done
-	rebuilding them.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_clear_sources): don't write the source file
-	here.
-	(addressbook_storage_add_source): same.
-	(addressbook_storage_remove_source): same.
-	(addressbook_storage_write_sources): new function, write the
-	source file out.
-	(addressbook_source_copy): g_strdup the binddn so we don't end up
-	free'ing it multiple times thanks to copies freeing theirs.
-
-	* gui/component/addressbook-storage.h: add prototype for
-	address_storage_write_sources.
-
-2001-07-16  Iain Holmes  <iain@ximian.com>
-
-	* backend/pas/evolution-vcard-importer.c (ebook_create): Don't just 
-	use the default directory. Use the directory that is passed into the
-	load file function.
-
-2001-07-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_set_string):
-	Commented out some unused variables and labels.
-	(e_destination_importv): Check for the xml not parsing correctly
-	and just return NULL here.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_import_destinationv): Handle a NULL destv
-	here.
-
-2001-07-15  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_drag_data_get): Added a
-	call to e_table_view_to_model_row here.
-	(e_addressbook_view_can_print, e_addressbook_view_can_delete,
-	e_addressbook_view_can_copy): If the selection model is NULL here,
-	return NULL (this was done before in a g_return_val_if_fail which
-	is only conditionally included.)
-
-2001-07-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/contact-editor.glade: Changed Company to
-	Organization here.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/Makefile.am: add ldap cflags
-
-2001-07-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_xml_decode):
-	Oops. I introduced my own bug, accidently set `email' to a
-	g_free'd pointer - eek!
-
-2001-07-12  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_importv): Optimized
-	the same way I optimized g_strsplit. If you use a GPtrArray
-	instead of a linked list, you save yourself from having to iterate
-	through the list an extra 3 times.
-	(e_destination_xml_decode): Do NOT, I repeat: do NOT!
-	e_utf8_xml1_decode something which is already in UTF-8 or you'll
-	corrupt it!! I smack thee who hath done this evil deed!
-
-2001-07-12  Iain Holmes  <iain@ximian.com>
-
-	* backend/e-book/evolution-vcard-importer.c (support_format_fn):
-	Check for no extension. Actually same as Jason's fix below :) but
-	also check the file contents.
-
-2001-07-12  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/addressbook-config.glade: add accelerators,
-	taylor's patch
-
-2001-07-12  Jason Leach  <jleach@ximian.com>
-
-	* backend/ebook/evolution-vcard-importer.c (support_format_fn):
-	Crash fix because strcmp() hates NULL arguments.  Bug #3777.
-
-2001-07-11  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (remove_cb): Added
-	some comments for clarity and fixed a pretty noticable bug with
-	how right click "Remove" was deleting more than it should with
-	consecutive runs.
-
-2001-07-10  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolutionperson.schema: assign OID's to the schema
-	entries, and add schema support for contact lists.
-
-2001-07-10  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): Set
-	bf->priv->file_db before calling do_create.
-
-2001-07-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Fixed order
-	of arguments to evolution_shell_component_new.
-
-2001-07-08  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Check that str isn't
-	the empty string before doing an insert.
-
-	* backend/ebook/e-destination.c (e_destination_set_string): We were
-	being too smart for our own good here, and causing problems for
-	the completion code... (bug #4253, bug #4255, bug #4280)
-	(e_destination_set_name): Clear any cached address.
-	(e_destination_set_email): Clear any cached address.
-	(e_destination_get_address): Handle the cases where the name
-	contains some e-mail information.
-
-2001-07-09  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Marked a
-	string for translation. Also add the neccesary includes to make
-	_() macros work.
-	
-2001-07-07  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/widgets/e-minicard.c (add_field): Detect the embedded
-	EDestination XML, and convert it to a nice-looking e-mail address.
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Adjusted to
-	reflect changes to EContactListModel.  (Yeah, this is vague,
-	but the changes are _really_ obvious and boring.)
-
-	* gui/contact-list-editor/e-contact-list-model.c: Revamped
-	to make everything an EDestination, rather than storing either
-	cards or strings.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Use
-	e_destination_get_textrep.
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Use e_destination_get_name and
-	e_destination_get_email.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(popup_menu_card): Use e_destination_get_name instead of
-	e_card_name_to_string.
-	(quick_add_cb): Use e_destination_get_address.
-	(popup_menu_nocard): Use e_destination_get_name.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_changed): Removed obsolete debugging code.
-	(e_select_names_model_get_textification): Use e_destination_get_textrep.
-	(e_select_names_model_get_address_text): Use e_destination_get_address.
-	(e_select_names_model_get_string): Use e_destination_get_textrep.
-	(e_select_names_model_replace): Use e_destination_get_textrep.
-	(e_select_names_model_name_pos): Use e_destination_get_textrep.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(emailify_match): Match only if this isn't a contact list.
-	(match_email): Match only if this isn't a contact list.
-	(match_name): Do the right thing in the case of a contact list.
-	(book_query_process_card_list): Don't construct a match for
-	each possible e-mail address if this is a contact list.
-
-	* backend/ebook/e-destination.c: Major-league de-crufting and
-	rationalization, combined with lots of hacks to make things work
-	properly with contact lists.
-	(e_destination_copy): Copy contact list info.
-	(e_destination_clear_card): Clear contact list info.
-	(e_destination_is_empty): If we contain a contact list, we aren't
-	empty.
-	(e_destination_set_card_uri): Added.  Allows us to set a
-	destination by card URI.
-	(e_destination_set_name): Allows the contact's name only ("Jane
-	Smith") to be set.
-	(e_destination_set_email): Allows the contact's e-mail only
-	("jane@assbarn.com") to be set.
-	(e_destination_set_string): Takes a free-form string containing a
-	contact's name and/or e-mail, and tries to do the right thing with
-	it.
-	(e_destination_contains_card): Renamed.  Used to be
-	e_destination_has_card.
-	(e_destination_from_card): Added.  Returns TRUE if the
-	EDestination comes from either a ECard (which we presently hold)
-	or is specified by an ECard URI.
-	(e_destination_use_card): Allows an EDestination's ECard to be
-	accessed, via a callback.  If we only are holding the URI, the
-	card will be loaded and stored in the EDestination.
-	(e_destination_get_name): Returns the name only ("Jane Smith"), or
-	NULL.
-	(e_destination_get_email): Returns the email only
-	("jane@assbarn.com"), or NULL.
-	(e_destination_get_address): Added.  Returns a "full address" if
-	both the name & e-mail are available ("Jane Smith
-	<jane@assbarn.com>"), or just the e-mail if the name is unknown
-	("jane@assbarn.com>").  If the destination is a contact list,
-	returns a comma-separated list of addresses.
-	(e_destination_get_textrep): Added.  Returns a "text
-	representation" of the EDestination.  This is what is now
-	displayed for completed, "cardified" destinations in addressbook
-	entries.
-	(e_destination_is_evolution_list): Check to see if this
-	destination is for a contact list.
-	(e_destination_xml_encode): Added.  Build an XML data structure
-	representing an EDestination.
-	(e_destination_xml_decode): Added.  Parse an XML data structure,
-	constructing an EDestination.
-	(e_destination_export): Added.  Returns a null-terminated string
-	containing an XML representation of the EDestination, with
-	newlines and excess whitespace removed.
-	(e_destination_import): Added.  Parses a string containing an XML
-	representation of an EDestination.
-	(e_destination_exportv): Added.  Returns a null-terminated string
-	containing an XML representation of a collection of EDestinations,
-	with newlines and excess whitespace removed.
-	(e_destination_importv): Added.  Takes an XML representation of a
-	collection of destinations, parses it, and returns a vector of
-	EDestinations.
-
-	* backend/ebook/e-card.c (e_card_duplicate): Copy the ->book
-	pointer.
-	(e_card_get_id): Check that the argument is valid.
-	(e_card_set_id): Check that the argument is valid.
-	(e_card_get_book): Added.  Return the EBook the ECard came from.
-	(e_card_get_uri): Added.  Tries to returns a URI for the ECard,
-	which is of the form (EBook URI)/(ECard unique ID).  Returns NULL
-	if the EBook URI or the ID are unknown/not set.
-	(e_card_get_vobject): If we have the URI, use it as the
-	VCUniqueStringProp, rather than just the ID.  This is a hack to
-	make DnD work properly.
-	(parse_id): Detect if the unique ID we've been passed is a URI or
-	just a plain card ID, and do the right thing in either case.
-	(e_card_uri_extract_book_uri): Added.  Convenience function for
-	parsing card URIs.
-	(e_card_uri_extract_card_id): Added.  Convenience function for
-	parsing card URIs.
-	(e_card_load_uri): Added.  Allows an ECard to be loaded by its
-	URI.
-
-	* backend/ebook/e-book-view.c: Added a EBook * to the
-	_EBookViewPrivate struct.  This is meant to contain the EBook the
-	EBookView is associated with.
-	(add_book_iterator): Added.  A convenience function for attaching
-	the EBook to a GList of cards (if no EBook is already stored).
-	(e_book_view_do_added_event): Record the EBook in the added
-	ECards.
-	(e_book_view_do_modified_event): Record the EBook in the modified
-	ECards.
-	(e_book_view_set_book): Added.  Stores a pointer to the
-	EBookView's "parent" EBook.
-	(e_book_view_init): Init book_view->priv->book to NULL.
-	(e_book_view_destroy): Unref book_view->priv->book.
-
-	* backend/ebook/e-book.c: Added a uri field to _EBookPrivate.
-	(e_book_unqueue_op): Removed debugging spew.
-	(e_book_do_response_get_view): Attach the current EBook to the
-	created EBookView.
-	(e_book_do_response_get_changes): Attach the current EBook to the
-	created EBookView.
-	(e_book_load_uri): Save a copy of the uri in the EBook.
-	(e_book_get_uri): Added.  Just returns book->priv->uri.
-	(e_book_get_card): Attach a pointer to the Ebook to the
-	newly-loaded ECard.
-	(e_book_add_card): Attach a pointer to the EBook to the
-	newly-added ECard.
-	(e_book_commit_card): Attach a pointer to the EBook to the
-	committed ECard.
-	(e_book_init): Initialize the uri to NULL.
-	(e_book_destroy): Free the uri string on destruction.
-
-2001-07-06  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (populate_context_menu):
-	Removed.  [It was just bogus testing code for the right-click menu
-	populating interface in the shell].
-	(factory_fn): Pass NULL as the PopulateContextMenuFn.
-
-2001-07-05  Anna Marie Dirks  <anna@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade: 
-	Added some accelerators, padding, and a "memebers" frame;
-	also fixed spacing and growth behaviour of this dialog. 
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (compare_category): Fix a memory
-	leak here.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (match_search_info_free): Set
-	info->avoid = NULL.  This shouldn't make a difference, but it
-	can't hurt.
-
-2001-07-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_is_cell_editable): Check if the row is within our
-	table and return from this function as if the card is a standard
-	card, not a list.
-
-2001-07-03  Damon Chaplin  <damon@ximian.com>
-
-	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): 
-	added $(BONOBO_CONF_LIBS) to get it to compile.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added
-	$(BONOBO_CONF_LIBS).
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_create_categories),
-	gui/contact-editor/e-contact-editor.c (categories_clicked):
-	Switched to an ECategoriesMasterListWombat instead of an
-	ECategoriesMasterListArray here.
-
-2001-07-02  Peter Williams  <peterw@ximian.com>
-
-	* gui/contact-editor/Makefile.am (INCLUDES): srcdir !=
-	builddir compile fix.
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): Same.
-
-	* gui/widgets/Makefile.am (INCLUDES): Same.
-
-	* gui/search/Makefile.am (INCLUDES): Same.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/contact-editor/e-contact-editor.c (categories_clicked):
-	Turned off wombatification of the categories master list here.
-
-2001-07-01  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-editor.c (fill_in_info):
-	use ECARD_UID_LINK_PREFIX.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(e_contact_list_model_get_email): use ECARD_UID_LINK_PREFIX.
-
-	* backend/ebook/e-destination.h: add prototype for
-	e_destination_importv_list.
-
-	* backend/ebook/e-destination.c (e_destination_importv_list): new
-	function, take an ECard corresponding to an address list and
-	resolve any linked cards, returning an EDestination vector.
-
-	* backend/ebook/e-card.h (ECARD_UID_LINK_PREFIX): #define this here,
-	since we need to use it in a few places.
-
-2001-07-02  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	related_contacts field.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h
-	(e_select_names_model_import_destinationv): Added this function.
-
-	* gui/contact-editor/contact-editor.glade: Replaced the entry here
-	for related contacts with a table which is filled in in the C code.
-
-	* gui/contact-editor/e-contact-editor.c,
-	gui/contact-editor/e-contact-editor.h (add_lists): Added a select
-	names entry here for the related contacts field.
-
-	* gui/widgets/Makefile.am: Removed all the test programs here
-	since there are circular dependencies now.
-
-2001-07-01  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_string): Fall
-	back to use the name field if all else fails (which can happen
-	with imported EDestinations).
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Fix for the
-	"recipient not specified" bug --- we were not correctly checking
-	for whether or not an EDestination was actually empty.
-
-2001-06-30  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_evolution_list): Check args.
-	Somewhere in the code (somewhere in the minicard stuff) this can
-	be called with a NULL arg, which was causing crashes.
-	(e_card_evolution_list_show_addresses): Check args.
-
-	* backend/ebook/e-destination.c (build_field): I was accidentally
-	comparing characters and strings here, and didn't see the compiler
-	warning.  Fixed.
-	(e_destination_exportv): Don't export any empty destinations.
-	(bug#3825).
-
-2001-06-30  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* gui/component/e-address-popup.c (e_address_popup_construct): Marked
-	strings for translation.
-
-2001-06-30  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/merging/e-card-merging.c (match_query_callback): Make the
-	standard for considering two cards to be match stricter.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(make_match): Use the card's use-score to set the match's
-	sort_major value.
-	(match_name): Removed obsolete code.
-	(e_select_names_completion_begin): Added (double) cast to make
-	match->score calculation come out properly.
-
-	* backend/ebook/e-card.c: Added X-EVOLUTION-LAST-USE and
-	X-EVOLUTION-USE-SCORE to attribute_jump_array.
-	(e_card_get_today): Added.  A convenience routine for getting
-	today's date and putting it in a GDate.
-	(e_card_get_use_score): Added.  Compute the current, time-decayed,
-	use-score for the card.
-	(e_card_touch): Increment the use-score by one; update the last
-	used date.
-	(e_card_date_to_string): Added as a convenience routine, getting
-	rid of some code duplication.
-	(e_card_get_vobject): Add handlers for X-EVOLUTION-USE-SCORE and
-	X-EVOLUTION-LAST-USE.
-	(parse_last_use): Added.
-	(parse_use_score): Added.
-	(e_card_class_init): Added args for last-use and use-score.
-	(e_card_get_arg): Added handlers for last-use and use-score.
-	o
-	(e_card_set_arg): Added handlers for last-use and use-score.
-
-	* backend/ebook/e-destination.c: Added pending_card_id to
-	EDestinationPrivate struct.
-	(e_destination_copy): Copy the pending_card_id.
-	(e_destination_is_empty): Check for a pending_card_id.  We are
-	non-empty if we have one.
-	(e_destination_clear_card): Clear pending_card_id.
-	(e_destination_set_card): Clear pending_card_id.
-	(e_destination_has_pending_card): Added.
-	(e_destination_use_card): Added.  An asynchronous way to load a
-	pending card and then apply a callback to it.
-	(build_field): Be paranoid, map our special characters to '_'.
-	(e_destination_export): Use EXPORT_MAX_FIELDS symbol rather than a
-	hard-wired array size.  Added the "card" entry.
-	(e_destination_import): Fix bug in handling of the "name" field.
-	Process the "card" field.
-	(e_destination_touch): "Touch" and commit the ECard corresponding
-	to the e-mail address in the destination.  (A query against the
-	local addressbook is actually performed, in case the destination
-	isn't cardified.
-
-	* backend/ebook/e-card-compare.c (e_card_compare_name): Revamp the
-	way E_CARD_MATCH_FOO results are mapped to comparison results.
-	Report better matches when the family name is matched.
-
-2001-06-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_query):
-	Added a search field to the query here.
-	(e_select_names_init): Update the query on a number of signals here.
-
-	* gui/component/select-names/e-select-names.h: Added search_entry
-	here.
-
-	* gui/component/select-names/select-names.glade: Added the search
-	entry here.  Added some labels.  Removed the update button.
-
-2001-06-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_option_activated): Change the uri here to have
-	addressbook.db at the end.
-
-	* gui/component/select-names/select-names.glade: Changed the name
-	of the folder option menu here to match the name used in the code.
-
-2001-06-29  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (update_query):
-	Change the query when the "Update List" button is pushed.
-
-	* gui/component/select-names/e-select-names.h: Removed
-	currently_selected field.  Added categories_entry field.
-
-	* gui/component/select-names/select-names.glade: Added "Update
-	List" button.
-
-2001-06-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/Makefile.am (INCLUDES): add EVOLUTION_IMAGESDIR
-	define.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add our pixbuf and
-	pixbuf size.
-
-	* gui/widgets/e-minicard.c (e_minicard_init): init the icon pixbuf
-	and its size.
-	(e_minicard_destroy): unref the list_icon_pixbuf.
-	(e_minicard_realize): create the list_icon GnomeCanvasPixbuf.
-	(e_minicard_resize_children): clip the header_text by the
-	list_icon, and place the list_icon in the right spot.
-	(remodel): show the list_icon if we're a list, and hide it
-	otherwise.
-
-2001-06-28  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): pop up
-	list editor for lists, contact editor otherwise.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): same.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): change "editor" to
-	GtkOjbect, since it can be either a contact editor or contact list
-	editor.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_is_cell_editable): don't allow editting of any fields
-	except the name and file_as for lists.
-
-2001-06-28  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/Makefile.am (INCLUDES): remove ancient
-	e-table include, and add include for contact-editor so we can
-	reuse the confirm_delete dialog.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): remove prototype for
-	e_contact_list_editor_close, since the function no longer exists.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(list_deleted_cb): new function, emit our "list_deleted" signal.
-	(delete_cb): new function, called from the Delete toolbar item.
-	(e_contact_list_editor_raise): flesh out function.
-	(extract_info): "evolution_list" => "list".
-	(fill_in_info): same.
-
-2001-06-28  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_get_vobject): add support for
-	X-EVOLUTION-LIST and X-EVOLUTION-LIST-SHOW-ADDRESSES.
-	(parse_list): new function, parse the boolean X-EVOLUTION-LIST.
-	(parse_list_show_addresses): new function, parse the boolean
-	X-EVOLUTION-LIST-SHOW-ADDRESSES.
-	(e_card_class_init): add args for "list" and
-	"list_show_addresses".
-	(e_card_set_arg): add support for list and list_show_addresses.
-	(e_card_get_arg): same.
-	(e_card_init): init list and list_show_addresses.
-
-2001-06-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Pass NULL as
-	the @external_uri_schemas argument to
-	`evolution_shell_component_new()'.
-
-2001-06-27  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_row_count): track storage change - we're only using
-	1 array now.
-	(contact_list_value_at): same.
-	(contact_list_model_destroy): same.
-	(e_contact_list_model_init): same.
-	(e_contact_list_model_add_email): same.
-	(e_contact_list_model_add_card): same.
-	(e_contact_list_model_remove_row): same.
-	(e_contact_list_model_remove_all): new function - just free/unref
-	all existing rows.
-	(e_contact_list_model_get_email): new function, returns the
-	alloc'ed string containing either an email address or an encoded
-	ECardId.
-
-	* gui/contact-list-editor/e-contact-list-model.h: remove the 2
-	separate arrays for email and cards, and store them in the same
-	array.
-
-	* gui/contact-list-editor/e-contact-list-editor.h (struct
-	_EContactListEditor): add the visible_addr_checkbutton widget.
-
-	* gui/contact-list-editor/e-contact-list-editor.c
-	(visible_addrs_toggled_cb): new function.
-	(e_contact_list_editor_init): connect to "toggled" on
-	visible_addrs_checkbutton.
-	(file_save_cb): new function.
-	(tb_save_and_close_cb): new function.
-	(verbs): add Save and Save & Close.
-	(list_added_cb): new function.
-	(list_modified_cb): new function.
-	(save_card): new function - we do *not* use e_card_merging_* calls
-	here.
-	(e_contact_list_editor_get_arg): un-#if 0 code in the "card"
-	getter.
-	(e_contact_list_editor_set_arg): same for the "card" setter.
-	(extract_info): new function.
-	(fill_in_info): new function.
-
-	* gui/contact-list-editor/contact-list-editor.glade: add a
-	checkbutton at the bottom to determine whether to visibly include
-	mail addresses in mail sent to this list.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_create_categories): Oops.  Can't use the wombat
-	version of the master categories list yet.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-table-adapter.c (create_card): memmove
-	counts were off in this function.
-	(remove_card, modify_card): Moved the table notifications around a
-	bit here.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/component/select-names/select-names.glade
-	(e_select_names_create_categories): Added a categories combo here.
-	It's not used yet.
-
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/search/addresstypes.xml: Added category searching to the
-	advanced search dialog here.
-	
-2001-06-26  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (compare_category): Added
-	category searching to the file backend.
-
-	* gui/component/addressbook.c (addressbook_query_changed): Added
-	category searching to the search bar.
-
-2001-06-25  Peter Williams  <peterw@ximian.com>
-
-	* conduit/Makefile.am (INCLUDES): Fix for srcdir != builddir.
-
-2001-06-25  Chris Toshok  <toshok@ximian.com>
-
-	* gui/contact-list-editor/contact-list-editor.glade: change layout
-	slightly, the icon no longer pushes everything to the left, and
-	make the buttons on the right smaller and more in line with the
-	other widgets.
-
-	* gui/contact-list-editor/e-contact-list-model.c
-	(contact_list_value_at): return the SimpleAndString->string
-	instead of querying the ecardsimple.
-	(e_contact_list_model_init): initially allocate 10 of each type
-	(email and simple).
-	(e_contact_list_model_add_email): realloc if need be.
-	(e_contact_list_model_add_card): same, and initialize the string
-	displayed to be "[Name] [<email>]".
-	(e_contact_list_model_remove_row): change for SimpleAndString.
-	(contact_list_model_destroy): free our 2 arrays.
-
-	* gui/contact-list-editor/e-contact-list-model.h: add alloc counts
-	and the SimpleAndString struct.
-
-	* gui/contact-list-editor/e-contact-list-editor.c: Helix Code =>
-	Ximian.
-	(e_contact_list_editor_init): hook up d&d destination signals, and
-	un-#if 0 the delete_event signal.
-	(table_drag_motion_cb): new function.
-	(table_drag_drop_cb): new function.
-	(table_drag_data_received_cb): new function.
-	(file_close_cb): new function.
-	(verbs) uncomment the close verb.
-	(close_dialog): new function.
-	(app_delete_event_cb): new function.
-
-	* gui/contact-list-editor/e-contact-list-editor.h: Helix Code =>
-	Ximian.
-
-2001-06-25  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-popup.c: Add a huge steaming pile of
-	code to handle the case of single-address merging.  In other
-	words, if you go to "harvest" an address by right-clicking on it
-	in the mail viewer, and you already have a closely-matching
-	contact (w/ a different e-mail address), this gives you the
-	option of editting that contact's e-mail addresses to add the
-	one you just clicked on.
-
-	* backend/ebook/e-card-compare.c (match_search_info_free): It is
-	amazing how much better things work when you don't try to
-	dereference the pointer you just freed.
-
-2001-06-24  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/Makefile.am (minicard_test_LDADD): correct path to
-	libecontacteditor.a.
-	(minicard_widget_test_LDADD): same.
-	(INCLUDES): same, for the includes.
-
-	* gui/widgets/e-minicard.h: correct e-contact-editor.h path.
-
-	* gui/widgets/e-addressbook-util.h: correct path to
-	e-contact-editor.h, and add e-contact-list-editor.h.  Add
-	prototype for e_addressbook_show_contact_list_editor.
-
-	* gui/widgets/e-addressbook-util.c: remove #include
-	"e-contact-editor.h" (our header includes it.)
-	(added_cb): rename card_added_cb to this, and make it so it can be
-	reused in both the list and card cases.  remove the g_print too.
-	(modified_cb): same for modified case.
-	(deleted_cb): same for deleted case.
-	(editor_closed_cb): change first arg to GtkObject* so we can reuse
-	this for both list and card.
-	(e_addressbook_show_contact_editor): use added_cb, modified_cb,
-	deleted_cb, and pass FALSE as user_data.
-	(e_addressbook_show_contact_list_editor): new function, same as
-	above but creating a contact-list-editor, and pass TRUE as
-	user_data.
-
-	* gui/component/e-address-popup.c: correct path to contact-editor.
-
-	* gui/component/e-address-widget.c: same.
-	
-	* gui/component/select-names/e-select-names-popup.c: same.
-
-	* gui/component/select-names/e-select-names-text-model.c: same.
-
-	* gui/component/addressbook.c (new_contact_list_cb): new function.
-	(update_command_state): update ContactNewList command.
-	(verbs): remove ViewAll from the toolbar from the verb list.  Add
-	ContactNewList.
-	(pixmaps): same for pixmaps.
-	
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): new
-	path for contact-editor.
-	(INCLUDES): same.
-
-	* gui/contact-list-editor/e-contact-list-model.h:
-	* gui/contact-list-editor/e-contact-list-model.c:
-	* gui/contact-list-editor/e-contact-list-editor.h:
-	* gui/contact-list-editor/e-contact-list-editor.c:
-	* gui/contact-list-editor/Makefile.am: Initial contact-list editor
-	  commit.
-
-	* gui/Makefile.am (SUBDIRS): add contact-editor.
-
-	* Makefile.am: (SUBDIRS): remove contact-editor.
-
-2001-06-21  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(make_contact_editor_cb): Renamed.  (The old name,
-	edit_contact_info_have_book_cb was a hold-over from before, when
-	we weren't using e_book_use_local_address_book.)
-
-	* gui/component/e-address-popup.c
-	(e_address_popup_schedule_refresh): A Added.  We now do the name
-	refreshes in an idle function, rather than in the setters.
-	(e_address_popup_set_free_form): Added.  Properly handle inputs of
-	the form "Foo <bar@zar.com>", extracting the name and e-mail
-	address.
-	(e_address_popup_set_name): Check to make sure that the free-form
-	handler shouldn't be used to handle the input.  Schedule a refresh
-	after making any changes.
-	(e_address_popup_set_email): Check to make sure that the free-form
-	handler shouldn't be used to handle the input.  Schedule a refresh
-	after making any changes.
-	(e_address_popup_name_only_matches): Temporary place-holder for
-	handling name-only matches.
-	(query_cb): If our initial query fails (and included e-mail
-	information), do a name-only query.  This is to handle the case of
-	adding new e-mail addresses to existing contacts.
-	(e_address_popup_query): Eliminated the "common_book" crap; using
-	e_book_use_local_address_book instead.
-
-	* backend/ebook/e-card-compare.c (match_search_info_free): Make
-	sure that the ->avoid list gets properly freed.
-
-2001-06-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_supported_fields): fix a refcounting
-	memleak.
-
-2001-06-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_get_supported_fields_response): fix memory
-	leak.
-
-2001-06-20  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c: add prototype for
-	close_dialog to remove warnings.
-
-2001-06-20  Dave Camp  <dave@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_list_send): Changed attach_data
-	to be a GNOME_Evolution_Composer_AttachmentData rather than a
-	CORBA_char*.
-
-2001-06-19  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): track
-	change to e_addressbook_show_contact_editor signature.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_event): same.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): same.
-
-	* gui/widgets/e-addressbook-util.c (e_addressbook_error_dialog):
-	add an entry for "Card ID already exists".
-	(e_addressbook_show_contact_editor): track the change to signal
-	names and e_contact_editor_new signature here.
-
-	* gui/widgets/e-addressbook-util.h: change
-	e_addressbook_show_contact_editor's signature to match
-	e_contact_editor_new more closely.
-
-	* gui/widgets/e-addressbook-table-adapter.c (unlink_model): free
-	up the simple mapping to plug a potentially sizeable memory leak.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): call
-	e_addressbook_show_contact_editor here.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(edit_contact_info_have_book_cb): remove the get_supported_fields
-	stuff, since the contact editor handles it for us now, and call
-	e_addressbook_show_contact_editor.
-
-	* gui/component/e-address-popup.c (edit_contact_info_cb): same.
-
-	* gui/component/addressbook.c (new_contact_cb): track change to
-	e_addressbook_show_contact_editor.
-
-2001-06-19  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-quick-add.c (ce_have_book): rename
-	ce_book_found_fields to this, remove the fetching of fields (the
-	contact editor code handles that now.), and change the add_card
-	signal to card_added.
-	(card_added_cb): copied somewhat from merge_cb above.  we don't
-	need to do the merge here, just call the callback.
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_class_init):
-	track signal change.  add book arg, and is_read_only -> editable.
-	(wants_html_changed): if the card isn't already changed, flag it
-	as such (and update the commands.)
-	(phone_entry_changed): same.
-	(email_entry_changed): same.
-	(address_text_changed): same.
-	(name_entry_changed): same.
-	(company_entry_changed): same.
-	(full_name_clicked): is_read_only -> editable.
-	(full_addr_clicked): same.
-	(card_added_cb): new function, emit our card_added signal, and
-	close the dialog if we're supposed to.  properly deal with error
-	status here.
-	(card_modified_cb): same, modulo card_added -> card_modified.
-	(save_card): actually call e_card_merging_book_{add/commit}_card
-	instead of using a signal.  Also, add a gboolean arg to tell
-	whether or not to close the dialog after saving the card.
-	(card_deleted_cb): new function, just emit our "card_deleted"
-	signal.
-	(delete_cb): actually call e_book_remove_card here, instead of
-	using a signal.
-	(tb_save_and_close_cb): call save_card with TRUE for should_close.
-	(e_contact_editor_init): init changed = FALSE;
-	(e_contact_editor_destroy): unref our book if we have one.
-	(e_contact_editor_new): new signature, set the "book" arg, and
-	call e_book_get_supported_fields here.
-	(supported_fields_cb): new function, show the contact editor.
-	(e_contact_editor_set_arg): initialize changed to FALSE when
-	setting the card (but *after*, since the changed callbacks will
-	set it to TRUE.)  also, call command_state_changed if editable
-	changes.  also handle setting "book".  oh, and is_read_only ->
-	editable.
-	(command_state_changed): new function - set the state of the
-	commands we care about.
-	(e_contact_editor_get_arg): add "book" handling, and is_read_only
-	-> editable.
-	(_phone_arrow_pressed): is_read_only -> editable.
-	(_email_arrow_pressed): same.
-	(_address_arrow_pressed): same.
-	(enable_writable_fields): same.
-	(set_editable): rename set_read_only to this, and is_read_only ->
-	editable.
-
-	* contact-editor/e-contact-editor.h (struct _EContactEditor):
-	is_read_only -> editable, add a "changed" flag so we can sensitize
-	commands correctly, and add an EBook* arg to e_contact_editor_new
-	and to the EContactEditor struct.  Also, change all the signals to
-	past tense, and send the EBookStatus in them.
-
-	* contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_class_init): is_read_only -> editable.
-	(e_contact_editor_address_set_arg): same.
-	(e_contact_editor_address_get_arg): same.
-
-	* contact-editor/e-contact-editor-address.h (struct
-	_EContactEditorAddress): same.
-
-	* contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_class_init): same.
-	(e_contact_editor_fullname_set_arg): same.
-	(e_contact_editor_fullname_get_arg): same.
-
-	* contact-editor/e-contact-editor-fullname.h (struct
-	_EContactEditorFullname): same.
-
-	* contact-editor/Makefile.am: don't build contact-editor-test now,
-	until contact-editor gets moved to gui/ and we can more easily
-	depend on the e_card_merging_* calls.
-
-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response): return
-	CardIdAlreadyExists for LDAP_ALREADY_EXISTS.
-
-	* backend/idl/addressbook.idl: Add CardIdAlreadyExists to the
-	BookListener status enum.
-
-	* backend/ebook/e-book-types.h: add
-	E_BOOK_STATUS_CARD_ID_ALREADY_EXISTS.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_convert_status): add support for
-	CardIdAlreadyExists.
-
-2001-06-19  Jon Trowbridge  <trow@ximian.com>
-
-	* contact-editor/e-contact-quick-add.c: Serious de-crufting,
-	removal of gtk_object_set_data() hacks, simplified by using
-	some of the newer ebook convenience routines, etc.
-	(ce_book_found_fields):
-	s/e_contact_editor_raise/e_contact_editor_show/, to accomodate the
-	small changes in the contact editor API.
-
-2001-06-18  Eskil Heyn Olsen  <eskil@eskil.dk>
-
-	* conduit/address-conduit.c: (check_for_slow_setting),
-	(conduit_get_gpilot_conduit):
-	Tweaked for some gnome-pilot api changes
-
-2001-06-15  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (search_for_dn): implement this
-	properly, using base and (objectclass=*).
-
-2001-06-14  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c (delete_cb): save ourselves a
-	function call - call close_dialog instead of file_close_cb.
-
-2001-06-14  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* gui/component/addressbook-component.c: Set the
-	"expoted_dnd_types" to NULL in the folder_types.
-
-2001-06-11  Dan Winship  <danw@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(search_override_check): Add a workaround for an EText bug.
-	(e_select_names_completion_begin): Fix up the match scoring in the
-	search_override case so the lines are offered in the correct
-	order.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/merging/Makefile.am (glade_DATA): Added
-	e-card-merging-book-commit-duplicate-detected.glade here.
-
-	* gui/merging/e-card-merging-book-commit-duplicate-detected.glade:
-	Added this file.  The GUI for asking whether to commit a modified
-	card.
-
-	* gui/merging/e-card-merging.c, gui/merging/e-card-merging.h
-	(e_card_merging_book_commit_card): Added this function.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_set_value_at), gui/widgets/e-addressbook-util.c
-	(commit_card_cb), gui/widgets/e-minicard.c (e_minicard_event): Use
-	e_card_merging_book_commit_card instead of e_book_commit_card here.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Made e_card_simple_get_id return const char *.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Made
-	e_card_get_id return const char *.
-
-	* gui/component/e-cardlist-model.c (e_cardlist_model_add): Made id
-	variable const here.  Added a break to make it slightly more
-	efficient.
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Made
-	e_minicard_get_card_id return const char *.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (entry_compare): Made this handle
-	the "id" property in searches.
-	(pas_backend_file_process_modify_card): Made id variable const
-	here.
-
-	* backend/pas/pas-backend-ldap.c (modify_card_handler): Made id
-	variable const here.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c,
-	backend/ebook/e-book-listener.h, backend/ebook/e-book.c: Rolled
-	back the change 2 ago, dated 06/11/2001 01:51 in CVS, involving
-	e-book-listener.[ch] and e-book.c.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_load_uri,
-	e_book_get_supported_fields, e_book_authenticate_user,
-	e_book_remove_card_by_id, e_book_add_vcard, e_book_commit_vcard,
-	e_book_get_cursor, e_book_get_book_view, e_book_get_changes): Made
-	it so that all of these functions queue their ops before calling
-	their CORBA functions.  This way, if the response is sent back
-	before the CORBA function returns there's no problem.  Added
-	e_book_unqueue_op so that the op could be unqueued if the CORBA
-	call fails.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c, backend/ebook/e-book-listener.h
-	(e_book_listener_unpop_response): Added this function to put a
-	response back into the queue.
-
-	* backend/ebook/e-book.c (e_book_check_listener_queue,
-	e_book_queue_op): Handle the case where the op hasn't been queued
-	yet when we get the response.  In this case we unpop the response.
-	Also, when queueing an op, we check to see if there are any
-	responses waiting.
-
-	* This change has been reverted.
-
-2001-06-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c, backend/ebook/e-card-compare.h
-	(e_card_locate_match_full): Added this function to let you do
-	slightly more complicated searches.
-
-	* gui/merging/e-card-merging.c (e_card_merging_book_add_card): Use
-	e_card_locate_match_full to check if the card exists in the book
-	it's being added to instead of in the default book.
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_name): Removed unused email variable.
-
-2001-06-09  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-compare.c (use_common_book_cb): Null
-	terminate the strv here.
-	(e_card_locate_match): ref here instead of unref.
-
-	* backend/ebook/e-card-simple.c (e_card_simple_get): Handle a NULL
-	card here.
-
-	* contact-editor/Makefile.am (INCLUDES), gui/widgets/Makefile.am
-	(INCLUDES): Added addressbook/gui/merging here.
-
-	* contact-editor/e-contact-quick-add.c (book_ready_cb),
-	gui/component/addressbook-component.c (dnd_drop_book_open_cb),
-	gui/widgets/e-addressbook-table-adapter.c
-	(addressbook_append_row), gui/widgets/e-addressbook-util.c
-	(add_card_cb), gui/widgets/e-addressbook-view.c
-	(selection_received), gui/widgets/e-minicard-control.c
-	(book_open_cb): Use e_card_merging_book_add_card instead of
-	e_book_add_card here.
-
-	* gui/Makefile.am (SUBDIRS): Added merging.
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD),
-	gui/widgets/Makefile.am (minicard_test_LDADD,
-	minicard_widget_test_LDADD): Added libecardmerging.a here.
-
-	* gui/merging/, gui/merging/.cvsignore, gui/merging/Makefile.am:
-	New addressbook library.
-
-	* gui/merging/e-card-duplicate-detected.glade: Glade file for
-	duplicate detected dialog.
-
-	* gui/merging/e-card-merging.c, gui/merging/e-card-merging.h: New
-	files for detecting duplicates before adding and putting up a
-	dialog if duplicates are found.
-
-	* gui/widgets/e-minicard-view.c: Include e-addressbook-util.h
-	here.
-
-2001-06-08  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_new): remove
-	the gtk_widget_show call...
-	(e_contact_editor_show): and put it here.
-
-	* contact-editor/e-contact-editor.h: add prototype for
-	e_contact_editor_show.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): call
-	e_addressbook_show_contact_editor.
-	(card_modified_cb): call e_addressbook_error_dialog if status !=
-	SUCCESS.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_event): call
-	e_addressbook_show_contact_editor.  also, use card_modified_cb as
-	the commit_card callback.
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): clean
-	this area up alot, call e_addressbook_show_contact_editor.
-	(card_deleted_cb): call e_addressbook_error_dialog.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(card_modified_cb): new function, call e_addressbook_error_dialog
-	if the status != SUCCESS.
-	(addressbook_set_value_at): use card_modified_cb as the callback
-	for e_book_commit_card.
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): add
-	e-addressbook-util.[ch].
-
-	* gui/component/addressbook.c (new_contact_cb): use
-	e_addressbook_show_contact_editor here.
-
-2001-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* contact-editor/e-contact-editor.c (categories_clicked): Remove
-	references to ECategoryMasterListWombat.
-
-2001-06-05  Jason Leach  <jleach@ximian.com>
-
-	* gui/component/select-names/e-select-names.c (remove_cb): Make
-	this work when multiple names are selected then right
-	click->Remove.
-
-2001-06-05  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): Copy dates as they come
-	in.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_changes_foreach_key, pas_backend_file_changes,
-	pas_backend_file_process_remove_card,
-	pas_backend_file_process_modify_card,
-	pas_backend_file_build_all_cards_list, pas_backend_file_get_vcard,
-	pas_backend_file_maybe_upgrade_db): memset DBTs to 0 before using
-	them.
-	(pas_backend_file_build_all_cards_list): Reindented.
-
-	* contact-editor/contact-editor.glade: Replaced GnomeDateEdits
-	with a custom widget that creates an EDateEdit.
-
-	* contact-editor/e-contact-editor.c: Use an EDateEdit here instead
-	of a GnomeDateEdit.
-
-2001-06-05  Jason Leach  <jleach@ximian.com>
-
-	(Fix bug #655: SelectNames doesn't let you remove addresses after
-	 you add them)
-	
-	* gui/component/select-names/e-select-names.c
-	(section_right_click_cb): New function, provides a popup menu with
-	just "Remove" in it.
-	(remove_cb): New callback to do the remove.
-	(e_select_names_add_section): Attach the "right_click" signal to
-	the section_right_click_cb above.
-
-2001-06-05  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(completion_handler): Change the completion handler to use the
-	ECompletionMatch.
-
-	* gui/component/select-names/e-select-names-completion.c
-	General changes to convert for ECompletionMatch use.
-	(emailify_match): Use extra sort keys in ECompletionMatch to let
-	us ensure that the primary email address is always the first
-	option, the secondary comes second, etc.  There was no nice way to
-	do this previously.
-	(match_name): Removed code that adjusted score based on
-	similarities between the "real name" and the e-mail address.  It
-	seemed like a good idea at the time, but produced unexpected and
-	confusing results.
-
-2001-06-04  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-card-compare.c: Added.  Code for testing
-	if two ECards appear to pertain to the same contact (using loose
-	matching rules, as opposed to requiring exact equality) and to
-	query the addressbook for the "best match" to ECard.
-
-2001-06-03  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (set_status_message): remove spew,
-	and don't call the ShellView CORBA method if the interface doesn't
-	exist (for whatever reason.)
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_destroy):
-	unref the EAddressbookModel.
-	(create_minicard_view): unref the adapter.
-	(card_added_cb): call e_book_error_dialog if status != SUCCESS.
-	(card_modified_cb): same.
-	(card_removed_cb): new function, and same.
-	(delete_card_cb): pass card_removed_cb as the callback.
-	(emit_status_message): new function, just emit status_message.
-	(status_message): change to call emit_status_message.
-	(card_deleted_cb): emit_status_message ("Done."), and call
-	e_book_error_dialog if status != SUCCESS.
-	(do_remove): pass view in the closure arg.
-	(e_addressbook_view_delete_selection): emit status "Removing
-	cards..." before starting the removal.
-	(e_book_error_dialog): new function - pop up a (possibly) helpful
-	message about why an operation failed.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_new): ref the EAddressbookReflowAdapter.
-	(e_minicard_view_widget_destroy): unref the adapter.
-	(e_minicard_view_widget_get_selection_model): if there isn't a
-	minicard view return NULL.
-
-	* gui/widgets/e-addressbook-table-adapter.c
-	(e_addressbook_table_adapter_construct): ref the
-	EAddressbookModel.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c
-	(addressbook_finalize): rename this from addressbook_destroy, to
-	reflect the method change.
-	(e_addressbook_reflow_adapter_class_init): same.
-	(e_addressbook_reflow_adapter_construct): ref the
-	EAddressbookModel.
-
-	* gui/widgets/e-addressbook-model.h: add editable_set flag.
-
-	* gui/widgets/e-addressbook-model.c (writable_status): only record
-	the writable state of the addressbook if the user hasn't set it.
-	(e_addressbook_model_init): init editable_set to FALSE.
-	(e_addressbook_model_set_arg): set editable_set to TRUE.
-
-2001-06-03  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): Move
-	`$(DB3_LDADD)' before libeutil.
-
-2001-06-01  Ettore Perazzoli  <ettore@ximian.com>
-
-	* backend/ebook/Makefile.am (evolution_vcard_importer_LDADD): Add
-	$(DB3_LDADD)'.
-
-2001-05-31  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/Makefile.am (INCLUDES): Added db3 cflags.
-
-	* backend/pas/pas-backend-file.c: Updated this to use db3.
-
-2001-05-31  Federico Mena Quintero  <federico@ximian.com>
-
-	* gui/widgets/e-addressbook-view.h (EAddressbookView): Added
-	fields for the GalViewMenus and GalViewCollection; we need to keep
-	them around while the component is active.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Plug leak; unref the spec.
-	Unref the factories.  Do not unref the collection, since we need
-	it for the signal emission (okay, so the views object adds a
-	reference to it, but if we are interested in it we should keep a
-	reference anyways).
-	(e_addressbook_view_setup_menus): Create the collection and views
-	on the EAddressbookView's fields so that we can keep them around.
-	(e_addressbook_view_discard_menus): New function; gets rid of the
-	collection and views objects.
-
-	* gui/component/addressbook.c (control_activate_cb): Call
-	e_addressbook_view_discard_menus().
-
-2001-05-31  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names.h (struct
-	_ESelectNames): add the EAddressbookModel* and change the
-	ETableModel's name to "adapter".
-
-	* gui/component/select-names/e-select-names.c (set_book),
-	(addressbook_model_set_uri): these two things take an
-	EAddressbookModel* instead of an ETableModel now.
-	(e_addressbook_create_ebook_table): don't case the
-	EAddressbookModel* to ETableModel*, create an EAddressbookTableAdapter
-	on the EAddressbookModel instead.
-	(e_select_names_init): set e_select_names->adapter.
-
-2001-05-31  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (remove_card): decrement
-	data_count before emitting the card_removed signal, and break
-	after we've removed the matching card.
-	(e_addressbook_model_class_init): change signature of
-	"card_removed" signal to match what we emit (and what is
-	expected.)
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init): the
-	signal name is "destroy", not "destroyed".
-	(do_remove): new function, actually remove the card.
-	(e_addressbook_view_delete_selection): get this working for both
-	view types.
-
-2001-05-31  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: Print Preview =>
-	ContactsPrintPreview.  Changed peter's change so that the node
-	name is more in line with "Print.."'s
-
-2001-05-30  Peter Williams  <peterw@ximian.com>
-
-	* gui/component/addressbook.c: Use the correct path to the print
-	preview menu item.
-
-2001-05-30  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (cut_contacts_cb): new function, for
-	the Cut verb.
-	(copy_contacts_cb): new function, for the Copy verb.
-	(paste_contacts_cb): new function, for the Paste verb.
-	(select_all_contacts_cb): new function, for the Select All verb.
-	(update_command_state): add handling for sensitivity of
-	Cut/Copy/Paste/Select All.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init): init
-	the invisible and set up selection/destroy signals.
-	(get_selection_model): new function, so we can get the
-	ETableSelectionModel from either view type.  makes lots of the
-	other functions easier, since we can get the list of selected
-	cards using the same code regardless of view type.
-	(invisible_destroyed): new function.
-	(selection_get): new function.  convert the clipboard list to
-	string.
-	(selection_clear_event): new function - free up the list of
-	ECards.
-	(selection_received): if the selection data is valid and
-	well-formed, add the corresponding cards to the ebook.
-	(add_to_list): new function.
-	(get_selected_cards): new function.
-	(e_addressbook_view_cut): new function, implement in terms of
-	_copy and _delete_selection.
-	(e_addressbook_view_copy): claim ownership of the CLIPBOARD
-	selection after saving the list of selected ECards.
-	(e_addressbook_view_paste): call gtk_selection_convert.
-	(e_addressbook_view_select_all): new function, using
-	e_selection_model_select_all.
-	(e_addressbook_view_can_print): re-implement in terms of
-	get_selection_model.
-	(e_addressbook_view_can_delete): same.
-	(e_addressbook_view_can_cut): new function.
-	(e_addressbook_view_can_copy): new function.
-	(e_addressbook_view_can_paste): new function.  hmm, always return
-	TRUE here.
-	(e_addressbook_view_can_select_all): new function.
-
-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add
-	selection stuff - the list of selected cards, and the GtkInvisible
-	selection owner, and add prototypes for
-	e_addressbook_view_[can]_{cut,copy,paste,select_all}.
-	
-	* gui/widgets/e-minicard-view-widget.h: add a prototype for
-	e_minicard_view_widget_get_selection_model.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_get_selection_model): new function.
-
-2001-05-27  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook.c: #include
-	"evolution-shell-component-utils.h" rather than "e-gui-utils.h"
-	for e_pixmaps_update.
-
-2001-05-25  Peter Williams  <peterw@ximian.com>
-
-	* gui/component/Makefile.am: Reference libeshell.la instead of
-	libeshell.a.
-
-2001-05-25  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-reflow-adapter.c (addressbook_height):
-	Correct the height calculation here to not include the
-	E_CARD_SIMPLE_FIELD_FAMILY_NAME since it won't be displayed.
-
-	* gui/widgets/e-minicard.c (remodel): Changed this to continue to
-	be more consistent and simpler.
-
-2001-05-23  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): fix strings such
-	that ones that happening at the beginning or during an operation
-	are followed by "..." and those that stop the operation are
-	followed by "."
-	(create_card_handler): same.
-	(ldap_op_process_current): same, and also call _notify_complete if
-	we can't connect to ldap server.
-	(poll_ldap): same, and change "Polling for LDAP search result" to
-	"Receiving LDAP search results"
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): call
-	notify_status_message at the beginning of this function, and
-	whenever we call _notify_complete.
-
-2001-05-23  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-addressbook-model.h: add sequence_complete_id to
-	EAddressbookModel and stop_state_changed to
-	EAddressbookModelClass.  also, add prototype for
-	e_addressbook_model_can_stop.
-
-	* gui/widgets/e-addressbook-model.c (remove_book_view): disconnect
-	from "sequence_complete", and set search_in_progress to FALSE.
-	(sequence_complete): set search_in_progress to FALSE and emit
-	"stop_state_changed."
-	(e_addressbook_model_class_init): create the "stop_state_changed"
-	signal.
-	(e_addressbook_model_init): init stuff.
-	(book_view_loaded): connect to "sequence_complete" signal.
-	(book_view_loaded): set search_in_progress to TRUE and emit
-	"stop_state_changed"
-	(e_addressbook_model_stop): set search_in_progress to false, emit
-	"stop_state_changed", and set our status to "Search Interrupted."
-	(e_addressbook_model_can_stop): return search_in_progress.
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init):
-	connect to the stop_state_changed signal on EAddressbookModel.
-	(stop_state_changed): new function.
-	(e_addressbook_view_can_stop): call e_addressbook_model_can_stop.
-
-	* gui/component/addressbook.c (update_command_state): use
-	e_addressbook_view_can_stop to set the sensitivity of the stop
-	button.
-
-2001-05-22  Dan Winship  <danw@ximian.com>
-
-	* backend/ebook/e-book-listener.c (e_book_listener_check_queue):
-	ref the listener for the duration of this function, since emitting
-	"responses_queued" may cause it to be unreffed by its EBook in
-	some cases, which could cause the second response_queue check to
-	look at garbage data if it got destroyed.
-	(e_book_listener_destroy): Call g_source_remove if idle_id is set.
-
-2001-05-22  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c: track the change in
-	evolution-addressbook.xml's bonobo ui path's.
-
-2001-05-21  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (change_view_type): update_view_type
-	is gone, since the menu item is gone.
-
-	* gui/widgets/e-addressbook-table-adapter.c (create_card): use
-	e_table_model_rows_inserted here.
-
-2001-05-20  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_item_new): Removed an unused variable.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Made text here non-const.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(edit_contact_info_cb): Cast to a gpointer here.
-
-	* gui/component/select-names/e-select-names.c
-	(e_addressbook_create_ebook_table): Cast to E_TABLE_MODEL here.
-
-2001-05-18  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_name): Do a better job constructing match strings, so we
-	never try to use a segment of the name that isn't there (resulting
-	in ugly (null)'s in the string).  Boost our score if some part of
-	the name also matches the front part of the e-mail address, so the
-	name match will always trump the e-mail match.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Return the serialized EDestinations
-	(rather than just a string w/ e-mail addresses) through the bonobo
-	component's property bag.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_export_destinationv): Added.  A convenience routine
-	for serializing the model's EDestinations into a string.
-
-	* gui/component/select-names/e-select-names-popup.c
-	(add_html_mail): Added.  Puts in a check menu item for whether or
-	not the recipient wants HTML mail.
-	(popup_menu_card): Add menu item for HTML mail.  Enable edit
-	contact info item.
-	(popup_menu_nocard): Add menu item for HTML mail.  Enable edit
-	contact info item.
-
-	* backend/ebook/e-book-util.c (e_book_use_local_address_book):
-	Added.  Fetches the local addressbook and caches it on the first
-	call.  This is meant to be an easy and efficient way to get at the
-	local addressbook with the minimum of code.
-	(e_book_query_address_locally): Added.  Convenience code that
-	does an e-mail only e_book_name_and_email_query against the
-	local address book.
-
-	* backend/ebook/e-destination.c
-	(e_destination_set_html_mail_pref): Added.  Allows the intended
-	recipient's HTML mail preference to be manipulated.
-	(e_destination_get_email_verbose): Added.  Cleaned up to use
-	e_destination_get_name.
-	(e_destination_get_html_mail_pref): Added.  Read the recipient's HTML mail
-	preference.  If the destination is linked to a card, the
-	preference is taken from the card (unless it has been explicitly
-	overridden by a called to e_destination_set_html_mail_pref).
-	(e_destination_get_address_textv): Added.  Form a unified address string
-	from a NULL-terminated vector of EDestinations.
-	(e_destination_export): Added.  Serialize an EDestination to a string.
-	(e_destination_import): Added.  Unserialize a string to build an
-	EDestination.
-	(e_destination_exportv): Added.  Serialize a NULL-terminated vector of
-	EDestinations to a string.
-	(e_destination_importv): Added.  Unserialize a string to build a
-	NULL-terminated vector of EDestinations.
-
-	* gui/component/select-names/e-select-names-completion.c:
-	Implemented local versions of g_strcasecmp and g_strncasecmp
-	(which should really be in glib, I think...) for utf8, and used
-	them to make this code utf8-safe.
-
-2001-05-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (update_command_state): no more
-	ContactFind command.
-
-2001-05-17  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): add our selection_change
-	signal.
-	(e_minicard_view_widget_realize): connect to the ESelectionModel's
-	selection_changed signal.
-	(e_minicard_view_widget_selected_count): new function.
-	(selection_change): new function - emit our "selection_change"
-	signal.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidgetClass): add selection_change signal.  also,
-	add prototype for e_minicard_view_widget_selected_count.  
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): add our command_state_change
-	signal.
-	(e_addressbook_view_init): connect to the writable_status signal
-	on the EAddressbookModel.
-	(minicard_selection_change): new function - calls
-	command_state_change.
-	(create_minicard_view): connect to selection_change on the
-	minicard_view so we know when to update command state.
-	(table_selection_change): new function - calls
-	command_state_change.
-	(writable_status): new function - calls command_state_change.
-	(command_state_change): new function - emits our
-	"command_state_change" signal.
-	(create_table_view): connect to the selection_change signal so we
-	know to update the command state.
-	(change_view_type): update the command state every time we change
-	view types.
-	(e_addressbook_view_can_create): new function.
-	(e_addressbook_view_can_print): new function.
-	(e_addressbook_view_can_delete): new function.
-	(e_addressbook_view_can_stop): new function.
-
-	* gui/widgets/e-addressbook-view.h (struct
-	_EAddressbookViewClass): add command_state_change signal, and
-	prototypes of functions the component can use to test the state of
-	commands.
-
-	* gui/widgets/e-addressbook-model.c (addressbook_destroy): unlink
-	the writable_status signal on the EBook.
-	(writable_status): new function.
-	(e_addressbook_model_class_init): add our writable_status signal.
-	(e_addressbook_model_init): init writable_status_id.
-	(e_addressbook_model_set_arg): unlink the writable_status signal
-	on the old EBook, and connect it on the new one.
-
-	* gui/widgets/e-addressbook-model.h: add writable_status signal.
-
-	* gui/component/addressbook.c (update_command_state): new
-	function, set the sensitivity of the bonobo commands.
-	(control_activate): update our command state immediately upon
-	activating the control.
-	(addressbook_factory_new_control): register command_state_change
-	to update the commands.
-
-2001-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): initialize the model and
-	adapter.
-	(button_press): set on the model.
-	(e_addressbook_search_dialog_new): same.
-	(e_addressbook_search_dialog_set_arg): same.
-	(e_addressbook_search_dialog_destroy): unref the model and
-	adapter.
-
-	* gui/search/e-addressbook-search-dialog.h (struct
-	_EAddressbookSearchDialog): add our model and reflow adapter.
-
-2001-05-16  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c: (e_minicard_view_destroy): Fixed
-	up the lifetime of the drag_data_get signal a bit.
-
-2001-05-15  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (add_to_list): MinicardViewModel
-	-> ReflowAdapter name change.
-	(get_card_list): same.
-	(e_minicard_view_drag_begin): same.
-	(supported_fields_cb): model -> adapter.
-	(adapter_changed): hook up signals and set the empty message on
-	our adapter.
-	(e_minicard_view_set_arg): add support for "adapter", and set
-	model -> adapter.
-	(e_minicard_view_get_arg): same.
-	(disconnect_signals): no more status_message.
-	(do_remove): track to use adapter.
-	(e_minicard_view_class_init): add adapter arg, and remove
-	status_message.
-	(e_minicard_view_init): all the code here is in adapter_changed
-	now.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView):
-	EMinicardViewModel -> EAddressbookReflowAdapter.
-	(struct _EMinicardViewClass): get rid of status_message.
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): remove the status_message
-	signal.
-	(e_minicard_view_widget_new): take the adapter as our argument,
-	and store it away for when we create the view.
-	(e_minicard_view_widget_realize): when we create the view just set
-	the adapter field on it.  also, don't connect to status_message.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidget): add our adapter here, so we can pass it
-	into the view when we create it.
-	(struct _EMinicardViewWidgetClass): remove status_message.
-
-	* gui/widgets/e-addressbook-view.c (status_message): new function,
-	no more propagating status messages!
-	(e_addressbook_view_init): create our model and conenct to its
-	status_message signal.
-	(book_writable_cb): set "editable" on the model, not our object.
-	(e_addressbook_view_set_arg): same, but with "book" and "query" as
-	well.
-	(create_minicard_view): create our reflow adapter and pass it to
-	the minicard view widget.  also, call e_reflow_model_changed so
-	it'll pick up any already present cards.
-	(table_double_click): ADDRESSBOOK_MODEL -> TABLE_ADAPTER.
-	(get_card_list_1): remove the cast, since we don't need it any
-	longer.
-	(table_right_click): ADDRESSBOOK_MODEL -> TABLE_ADAPTER.
-	(table_drag_data_get): same.
-	(create_table_view): create the table adapter, and use it as our
-	ETableModel.
-	(change_view_type): remove the status_message hook up and setting
-	of query/book/editable.
-	(e_addressbook_view_stop): just call e_addressbook_model_stop here
-	instead of switching on the view type.
-
-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add
-	our EAddressbookModel.
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): add the
-	adapter files, and remove e-minicard-view-model.[ch].
-
-	* gui/widgets/e-minicard-view-model.[ch]: removed.
-	
-	* gui/widgets/e-addressbook-table-adapter.c: new file.
-
-	* gui/widgets/e-addressbook-table-adapter.h: new file.
-
-	* gui/widgets/e-addressbook-reflow-adapter.c: new file.
-
-	* gui/widgets/e-addressbook-reflow-adapter.h: new file.
-
-	* gui/widgets/e-addressbook-model.c: rework this class to now
-	subclass from ETableModel anymore.  It not subclasses from
-	GtkObject, and we use table and reflow adapters to get at the
-	data.
-
-	* gui/widgets/e-addressbook-model.h: same.
-
-2001-05-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view-model.c (remove_card): Fix a small
-	error not decreasing the data_count here.
-
-2001-05-13  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.h: add prototype for
-	addressbook_expand_uri.
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop): create an EBook for
-	@physical_uri.
-	(dnd_drop_book_open_cb): actually add the dropped cards.
-
-	* gui/component/addressbook.c (addressbook_expand_uri): abstract
-	this code out from the set_prop method so we can use it in the
-	component.
-	(set_prop): call addressbook_expand_uri.
-
-	* backend/ebook/e-card.c (e_card_load_cards_from_string): new
-	function.
-
-	* backend/ebook/e-card.h: add prototype for
-	e_card_load_cards_from_string.
-
-2001-05-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c
-	(destination_folder_handle_drop): spew the data passed to us.
-	(destination_folder_handle_motion): the suggested_action is not an
-	ActionSet, but an Action, so don't or together multiple actions.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	correct bug causing the Ok button to never be enabled.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (populate_context_menu):
-	example.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_drag_data_get):
-	use e_card_list_get_vcard to build up the data to send.
-	(e_minicard_view_init): connect to the model's drag_begin signal.
-	(e_minicard_view_drag_begin): gather the list of cards being
-	dragged and call gtk_drag_begin.
-	(add_to_list): new function.
-	(get_card_list): same.
-	(disconnect_signals): disconnect the drag_data_get signal.
-	(e_minicard_view_init): connect to the drag_begin signal on our
-	model.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView): change
-	drag_card to drag_list.
-	
-	* gui/widgets/e-minicard-view-model.c (minicard_drag_begin): new
-	function, emit our drag_begin signal.
-	(addressbook_incarnate): connect to the item's drag_begin signal.
-	(e_minicard_view_model_class_init): init our drag_begin signal.
-
-	* gui/widgets/e-minicard-view-model.h: add drag_begin signal.
-
-	* gui/component/addressbook-config.c (addressbook_source_dialog):
-	always loop through all source types here, making LDAP first so
-	it's forces as the first notebook item.
-	(addressbook_config_auth_label): remove SASL case.
-	(addressbook_source_edit_changed): same.
-	(addressbook_source_item_new): flag the area of code that needs to
-	go into the advanced dialog (if we add one before someone
-	graciously redesigns the entire addressbook gui :)
-
-
-	* gui/component/addressbook-storage.c (ldap_unparse_auth): remove
-	SASL case.
-	(ldap_parse_auth): same.
-
-	* gui/component/addressbook-storage.h: make LDAP come first in our
-	source type enumeration, and remove the SASL auth type.
-
-2001-05-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): If the name is set and
-	the full_name or file_as haven't been yet, set them.
-
-2001-05-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c: Reordered the includes here.
-	(string_to_dbt): The sleepycat libdb documentation suggests
-	memseting the DBT to 0 so we do that here.
-
-	* gui/widgets/e-minicard-view-model.c (addressbook_height): Skip
-	the E_CARD_SIMPLE_FIELD_FAMILY_NAME field.
-
-	* gui/widgets/e-minicard.c (remodel): Skip the
-	E_CARD_SIMPLE_FIELD_FAMILY_NAME field.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): only
-	check schema support if we've connected.
-
-2001-05-11  Chris Toshok  <toshok@ximian.com>
-
-	* contact-editor/e-contact-editor.c (enable_writable_fields):
-	don't leak the ECard or ECardSimple.
-
-2001-05-08  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in:
-	Renamed the GnomeCard_Importer.oaf.in to this, and change the IID.
-
-	* Makefile.am: Rename all the GnomeCard to VCard.
-
-	* evolution-vcard-importer.c: Make the GnomeCard a generic 
-	vcard importer.
-
-2001-05-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/Makefile.am (libebookinclude_HEADERS): Removed
-	e-card-pairs.h since we're not using it.
-
-	* backend/ebook/e-book-view.c (e_book_view_check_listener_queue):
-	Added break; to default: case here.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added changed variable so as to avoid sync_card when possible.
-	(e_card_simple_destroy): Free all the data here properly.
-	(e_card_simple_get_arg): Slight simplification here.
-	(fill_in_info, e_card_simple_arbitrary_foreach,
-	e_card_simple_get_arbitrary): Call e_card_free_empty_lists here to
-	save a bit of memory.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Fixed up
-	includes a bit.
-	(e_card_list_get_vcard, e_card_list_send): Added these functions
-	for acting on a group of cards.
-	(parse_org): Cleaned up this function a bit.
-	(e_card_free_empty_lists): Added this function to delete
-	unnecessary ELists and save a bit of memory.
-	(e_v_object_get_child_value): Made this return NULL if not found
-	instead of g_strdup("").
-
-	* contact-editor/e-contact-save-as.c,
-	contact-editor/e-contact-save-as.h (e_contact_list_save_as): Added
-	this function to save multiple contacts.
-
-	* gui/widgets/Makefile.am: Commented out reflow test.
-	(libeminicard_a_SOURCES): Added e-minicard-view-model.c and
-	e-minicard-view-model.h.
-
-	* gui/widgets/e-minicard-view-model.c,
-	gui/widgets/e-minicard-view-model.h: Model for use in
-	EMinicardView.
-
-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h:
-	Reworked this to use the new EReflow stuff.
-
-	* gui/widgets/e-minicard.c (e_minicard_event): Doesn't handle
-	right click menus now.  Emits a signal on the parent canvas item
-	instead.
-
-	* printing/e-contact-print-envelope.c,
-	printing/e-contact-print-envelope.h
-	(e_contact_print_envelope_list_dialog_new): Added this function to
-	print multiple envelopes (only prints first for now.)
-
-	* printing/e-contact-print.c, printing/e-contact-print.h
-	(e_contact_print_card_list_dialog_new): Added this function to
-	print multiple cards.  Only prints the first for now.
-
-2001-05-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): flesh out
-	the function more.  It should work now, but there's no way to
-	invoke this method from the ui at the moment, heh.
-
-2001-05-07  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook.c (book_open_cb): Use a different
-	error message in the ldap support/no ldap support/file cases.
-
-2001-05-07  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* gui/component/addressbook.c: use define from
-	widgets/misc/e-filter-bar.h instead of own enumeration and search menu
-	names.
-
-	* gui/component/Makefile.am, gui/component/select-names/Makefile.am:
-	removed EVOLUTION_VERSION.
-
-2001-05-04  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): un-#if 0
-	this.
-	(xfer_folder): add skeleton code to validate xfer request.  always
-	notifies with PERMISSION_DENIED at present.
-	(populate_context_menu): un-#if 0 this.
-	(get_dnd_selection): same.
-	(destination_folder_handle_motion): new function.
-	(destination_folder_handle_drop): new function.
-	(factory_fn): create a EvolutionShellComponentDndDestinationFolder
-	interface, and add it to our shell component.
-
-2001-05-04  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): init change_id to NULL
-
-2001-05-02  JP Rosevear  <jpr@ximian.com>
-
-	* gui/component/addressbook.c (addressbook_view_free): unref the
-	book if the view is being destroyed
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): unref the book_view when
-	we are finished, it is only interesting if someone else has reffed
-	it now (weak reference)
-	(pas_backend_file_add_client): unref the book for the same reason
-	as above
-
-	* Fixes bug #2255
-
-2001-04-30  JP Rosevear  <jpr@ximian.com>
-
-	* backend/pas/pas-backend-file.c (vcard_matches_search): if the
-	view does not contain a search context, the result is by default
-	false fixes #2470
-
-2001-04-25  Dan Winship  <danw@ximian.com>
-
-	* gui/component/addressbook-factory.c (main): Remove call to
-	unicode_init.
-
-2001-04-23  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-popup.c: Lots of code has been
-	simplified here.
-	(e_address_popup_factory_new_control): Rather than directly pop
-	our control up in a window (via the e_address_popup_popup
-	function, which is now gone), just return the widget and let the
-	caller do the popping.  This works better, since it means we don't
-	have to work around the vagaries of bonobo focus & event handling.
-	(e_address_popup_set_name): Refresh when both name & email have
-	been set, rather than checking a stupid counter.
-	(e_address_popup_set_email): Ditto.
-
-2001-04-22  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_clear_sources): Added save_source_data here.
-
-2001-04-21  Jon Trowbridge  <trow@ximian.com>
-
-	* contact-editor/e-contact-quick-add.c (clicked_cb): Properly
-	convert to utf8. (Bug #2256)
-	(build_quick_add_dialog): Properly convert from utf8. (Bug #2256)
-
-2001-04-16  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-destination.c (e_destination_get_name): Added.
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Use e_select_names_model_append.  It's
-	nicer.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_append): Added.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(book_query_process_card_list): Filter out completion matches that
-	don't have an associated e-mail address.
-	(book_query_score): Give a bonus to the primary address, so that
-	it always comes up first in the completion results.
-
-	* gui/component/e-address-popup.c (e_address_popup_refresh_names):
-	Convert utf8 strings into gtk strings before displaying.
-
-2001-04-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-view-listener.c,
-	backend/ebook/e-book-view-listener.h: Added the function
-	e_book_view_listener_stop to tell the book view listener to stop
-	sending signals.
-
-	* backend/ebook/e-book-view.c (e_book_view_destroy): Tell the
-	EBookViewListener to stop when we're destroyed.
-
-	* backend/pas/pas-backend-file.c (view_destroy,
-	pas_backend_file_process_get_book_view,
-	pas_backend_file_process_get_changes): Cleaned these up a bit
-	using bonobo_object_ref and bonobo_object_unref.
-	(pas_backend_file_process_get_book_view,
-	pas_backend_file_process_get_changes): bonobo_object_release_unref
-	the EBookListener here.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_book_view): Cleaned this up a bit
-	using bonobo_object_ref.  Make sure to unref the listener when
-	we're done with it.  Put the new book_view in the list before
-	telling the book_listener that it's ready.
-
-	* backend/pas/pas-book-view.c (pas_book_view_construct): Cleaned
-	this up a bit using bonobo_object_dup_ref.
-	(pas_book_view_destroy): Cleaned this up a bit using
-	bonobo_object_release_unref.
-
-	* backend/pas/pas-book.c (pas_book_queue_get_book_view,
-	pas_book_queue_get_changes): bonobo_object_dup_ref here instead of
-	just duplicating.
-
-2001-04-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-book-listener.c
-	(impl_BookListener_respond_get_cursor): Ref the cursor here when
-	we receive it.
-	(impl_BookListener_respond_get_view,
-	impl_BookListener_respond_get_changes): Ref the book_view here
-	when we receive it.
-	(impl_BookListener_respond_open_book): Ref the book here when we
-	receive it.
-	(e_book_listener_destroy): Unref the objects in our queue here.
-
-	* backend/ebook/e-book-view.c (e_book_view_construct): Cleaned
-	this up using bonobo_object_dup_ref.
-	(e_book_view_destroy): Cleaned this up using
-	bonobo_object_release_unref.
-
-	* backend/ebook/e-book.c (e_book_do_response_get_cursor,
-	e_book_do_response_get_view, e_book_do_response_get_changes,
-	e_book_unload_uri): Cleaned this up using
-	bonobo_object_release_unref.
-
-2001-04-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Get the ESelectNamesModel from the
-	widget's text model instead of storing it as a gtk_object_set_data
-	since it may change.
-
-2001-04-12  Jason Leach  <jasonleach@usa.net>
-
-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): Update the Voice
-	and Fax phone numbers too, finishing off bug #1667.
-
-2001-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): Update the built
-	in VCard.
-
-2001-04-12  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): put the
-	business address into the pilot record as that is what we put into
-	the desktop record
-	(ecard_from_remote_record): set both the address label and
-	delivery address to avoid bad parser guessing, fixes #2143
-
-	* backend/ebook/e-card-types.h: remove deprecated pilot code
-
-	* backend/ebook/e-card.c: ditto
-
-	* backend/ebook/e-card.h: ditto
-	
-2001-04-11  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): Don't add
-	more than five phone numbers and set the remaining blank entries
-	to some reasonable defaults
-
-2001-04-11  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.h: Added
-	E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING.
-
-	* gui/component/addressbook-component.c (accepted_dnd_types):
-	Fixed a warning here.
-
-	* gui/widgets/e-addressbook-model.c: Modified this to have more
-	columns, but not let them be edited if they're not a simple
-	string.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_init): Fixed a
-	warning and a memory leak here.
-
-2001-04-10  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* backend/ebook/evolution-gnomecard-importer.c: added missing #include.
-	* contact-editor/e-contact-editor.c (_arrow_pressed): popup menu items were
-	not translated after selecting one of them.
-	* gui/widgets/e-addressbook-view.c: mark popup menu items with N_().
-	Updated list[] for translators.
-	* gui/widgets/e-minicard.c: same.
-	* gui/widgets/e-minicard-view-widget.c (e_minicard_view_widget_set_arg): fix warning
-	for "editable" arg.
-	* gui/widgets/e-minicard-view.c: convert "empty_message" to utf8.
-
-2001-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-component.c (remove_folder): stubbed,
-	#if 0'ed
-	(xfer_folder): same.
-	(populate_context_menu): same.
-	(get_dnd_selection): same.
-	(factory_fn): add the accepted drag types ("text/x-vard") to
-	folder_types.
-
-2001-04-09  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_event): on BUTTON_PRESS: if
-	it's button 1, store the button x, y, and set drag_button_down to
-	TRUE.  on BUTTON_RELEASE: always set drag_button_down to FALSE.
-	for MOTION_NOTIFY: initiate drag if the pointer has moved 3
-	pixels.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add fields for
-	button x, y, and a bit for if the button has been pressed so we
-	can tell whether a motion should be a drag.
-	(struct _EMinicardClass): add drag_begin signal.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_drag_begin): new
-	function, starts the drag.
-	(book_view_loaded): connect the "drag_data_get" signal.
-	(e_minicard_view_drag_data_get): new function.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView): add
-	drag_card and id for canvas_drag_data_get_id.
-
-	* gui/widgets/e-addressbook-view.c (table_drag_data_get): new
-	function.
-	(create_table_view): add d&d stuff.
-
-2001-04-08  Chris Toshok  <toshok@ximian.com>
-
-	* printing/e-contact-print.c: add #include <sys/types.h> since
-	gnome-print.h uses time_t without including it.  this really
-	should be fixed in gnome-print.
-
-2001-04-08  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):
-	make sure to notify new clients to the writable status of an
-	already open (and authenticated) book.
-
-2001-04-04  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* contact-editor/e-contact-editor.[ch]: Fix headers.
-	* component/addressbook-storage.c: Same here.
-	* gui/search/e-addressbook-search-dialog.c: Same here.
-	* gui/widgets/e-addressbook-view.c: Same here.
-	* gui/widgets/e-minicard-label.c: Same here.
-	* gui/widgets/e-minicard-view-widget.c: Same here.
-	* gui/widgets/e-minicard-view.c: Same here.
-	* gui/widgets/e-minicard-widget-test.c: Same here.
-	* gui/widgets/e-minicard-widget.c: Same here.
-	* gui/widgets/e-minicard.c: Same here.
-	* gui/widgets/test-minicard-label.c: Same here.
-
-2001-04-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): Fixed a
-	crash here.
-
-2001-04-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-model.c (COLS): Made this table model
-	more consistent in the number of columns it has.
-	(addressbook_append_row): Fixed this function.  We removed the col
-	offset.
-
-2001-04-02  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-gnomecard-importer.c (importer_init): Shut
-	down and unregister the factory on exit. 
-
-2001-04-01  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* contact-editor/contact-editor.glade: changed icon to
-	evolution-contacts-plain.png.
-	* gui/component/addressbook.c: use new pixmap cache. Added icon for new
-	contact, print, print preview, changed filenames of renamed icons.
-
-2001-03-31  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Call e_select_names_model_clean after
-	adding address.  This should deal with the bug reports related
-	to stray commas.
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_clean): Added.  Remove all empty destinations.
-
-	* backend/ebook/e-destination.c (e_destination_is_empty): Added.  Check
-	if an EDestination is in essentially a null state.
-
-2001-03-30  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):
-	Tell new clients that are added whether they're writable.
-
-2001-03-29  Jon Trowbridge  <trow@ximian.com>
-
-	* printing/e-contact-print.c: Added #include <libgnome/gnome-paper.h>
-	
-	* printing/e-contact-print-envelope.c: Added #include <time.h>
-	and #include <libgnome/gnome-paper.h>
-
-2001-04-03  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_email): Better handle matching of "nameless" contacts.
-
-	* backend/ebook/e-destination.c (e_destination_get_string): Better
-	handle the case of a "nameless" contact.
-
-2001-03-29  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* *.*: Clean up #includes. Replace <gnome.h>, <bonobo.h> and
-	<gtk/gtk.h> with more finegrained headers where needed.
-
-2001-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): Fixed some crashes.
-
-2001-03-28  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Use E_CARD_SIMPLE_FIELD_NAME_OR_ORG instead of
-	getting the NAME and then the ORG.  That way if we expand
-	NAME_OR_ORG, this will use it.
-
-	* gui/component/select-names/e-select-names.c
-	(e_addressbook_create_ebook_table, SPEC): Use the correct column
-	in the SPEC.
-
-2001-03-25  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_seq_complete_cb): Rather than starting
-	the pending query by directly calling
-	e_select_names_completion_do_query, call
-	e_completion_begin_search.  Circumventing the ECompletion API was
-	causing it to get confused in some cases.
-
-2001-03-23  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/widgets/e-minicard-widget.c (e_minicard_widget_set_card):
-	Added.  Call me old-fashioned, but I just prefer to have a real
-	API rather than doing everything via gtk_object_get/set-type
-	calls.
-	(e_minicard_widget_set_arg): Changed to call
-	e_minicard_widget_set_card.
-
-	* backend/ebook/e-book-util.c: Small changes to get rid of
-	compiler warnings.  (Casting out const, removed unused variables,
-	etc.)  Removed some debugging messages.
-
-	* gui/component/addressbook-factory.c (main): Added call
-	to e_address_popup_factory_init.
-
-	* gui/component/e-address-popup.c: Added.  A popup gadget that is
-	invoked (as a bonobo control) when an address is left-clicked in
-	the mailer.  The addressbook is queries, and the address is either
-	displayed as a minicard (if it already exists) or in a "generic
-	format".  A button is provided for editting/adding the contact.
-	Some of the semantics of this widget are a bit... non-standard,
-	because of bonobo issues.  I can't really seem to replicate
-	popup-menu behavior because of how bonobo propogates events, etc.
-	so I've tried to produce something that I think is non-annoying.
-	YMMV.
-
-2001-03-22  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/evolution-gnomecard-importer.c: Update to the new
-	IDL.
-
-2001-03-20  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/component/addressbook.c (update_pixmaps): Added artwork from
-	Jakub. 
-
-2001-03-19  Christopher James Lahey  <clahey@ximian.com>
-
-	* Merged branch:
-
-2001-03-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c: Call
-	e_selection_model_simple_insert_rows and
-	e_selection_model_simple_delete_rows instead of
-	e_selection_model_simple_insert_row and
-	e_selection_model_simple_delete_row.
-
-End of branch
-
-2001-03-17  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-completion.c: Brutally
-	refactored to boost performance in large-addressbook situations.
-	These fixes give accepable performance (even with the suboptimal
-	pas-backend-file searching) using tigert's addressbook-of-death.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): 
-	Start feeding query matches back to the caller before the
-	entire search is complete; this gives us some "instant feedback"
-	rather than causing evolution to totally lock up...
-
-	* backend/ebook/e-book.c (e_book_queue_op): Tag all queued ops.
-	(e_book_cancel_op): Added.  Search for a pending op with a given
-	tag, and mark it as inactive.
-	(e_book_do_response_get_cursor): Don't execute callback if this
-	operations has been cancelled.
-	(e_book_do_response_get_view): Ditto.
-	(e_book_do_response_get_changes): Ditto.
-	(e_book_do_response_get_supported_fields): Ditto.
-	(e_book_get_supported_fields): Return an operation tag (that can
-	be used to cancel the operation) rather than just TRUE/FALSE.
-	Zero is always an invalid tag and is returned in the case of an
-	error, so this shouldn't break any code that looked at the return
-	value (unless it did so in a particularly stupid way, of course).
-	(e_book_get_cursor): Ditto.
-	(e_book_get_book_view): Ditto.
-	(e_book_get_changes): Ditto.
-	(e_book_cancel): Added.  Cancel a pending operation.  (Basically
-	a call to e_book_cancel_op with error checking, etc.)
-
-	* backend/ebook/e-book-types.h: Added E_BOOK_STATUS_CANCELLED.
-
-2001-03-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_writable_status): new function.
-	(impl_BookListener_report_writable): new function.
-	(e_book_listener_get_epv): fill in epv->notifyWritable.
-
-	* backend/ebook/e-book-listener.h: add writable status entries.
-
-	* backend/ebook/e-book.c (e_book_do_writable_event): new function.
-	(e_book_check_listener_queue): add WritableStatusEvent to the
-	switch.
-	(e_book_class_init): register writable_status signal.
-
-	* backend/ebook/e-book.h: add writable_status signal.
-
-	* backend/idl/addressbook.idl: add notifyWritable method to
-	BookListener.
-
-	* gui/widgets/e-minicard.c (e_minicard_class_init): add "editable"
-	arg.
-	(e_minicard_init): init editable.
-	(e_minicard_set_arg): loop over the minicard fields setting their
-	"editable".
-	(e_minicard_get_arg): add editable.
-	(supported_fields_cb): use editable when creating the
-	contact_editor.
-	(add_field): set "editable" when creatin the e_minicard.
-
-	* gui/widgets/e-minicard.h (struct _EMinicard): add "editable".
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_class_init): add
-	editable arg.
-	(e_minicard_view_init): init editable.
-	(create_card): pass editable to e_minicard canvas item.
-	(e_minicard_view_set_arg): bit of a hack - loop over all the
-	canvas items setting their "editable."
-	(e_minicard_view_get_arg): add editable.
-	(supported_fields_cb): use editable when creating the contact
-	editor.
-
-	* gui/widgets/e-minicard-view.h (struct _EMinicardView): add
-	"editable."
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): add "editable" field.
-	(e_minicard_view_widget_init): init editable to FALSE.
-	(e_minicard_view_widget_set_arg): save editable, and pass it along
-	the e-minicard-view.
-	(e_minicard_view_widget_realize): same.
-	(e_minicard_view_widget_get_arg): add editable.
-
-	* gui/widgets/e-minicard-view-widget.h (struct
-	_EMinicardViewWidget): add "editable" field.
-
-	* gui/widgets/e-minicard-label.h (struct _EMinicardLabel): add
-	"editable" field.
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_class_init):
-	add "editable" arg.
-	(e_minicard_label_set_arg): editable, set it on the e_text too.
-	(e_minicard_label_get_arg): editable.
-	(e_minicard_label_construct): set the "editable" field when we
-	create the e_text cavas item
-
-	* gui/widgets/e-addressbook-view.c (e_addressbook_view_init):
-	default editable to FALSE.
-	(book_writable_cb): new function, set our editable field and
-	gtk_object_set it on the active view.
-	(e_addressbook_view_set_arg): set the active view's editable when
-	we set the view's book, and connect the "writable_status" signal
-	to book_writable_cb.
-	(change_view_type): same.
-	(supported_fields_cb): use our "editable" when creating the
-	contact editor.
-
-	* gui/widgets/e-addressbook-view.h (struct _EAddressbookView): add
-	editable field.
-
-	* gui/widgets/e-addressbook-model.c (e_addressbook_model_init):
-	change the default of editable to FALSE.
-
-	* backend/pas/pas-book.c (pas_book_report_writable): new function.
-
-	* backend/pas/pas-book.h: prototype for pas_book_report_writable.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): if
-	we open the file O_RDWR (or create it) report it as writable.  if
-	we can't open it as O_RDWR, try opening it read-only before we
-	attempt to create it.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_authenticate_user): if we authenticate
-	successfully, grant write permissions (this is lacking but there's
-	really nothing we can do to determine the extent of the access
-	afforded a user.)
-
-
-2001-03-15  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/e-address-widget.c: Added addressbook querying and
-	"cardification" functions, which are turned off by default for now
-	because of addressbook bugs.  Added a popup menu option to turn
-	queries on, so that others can enjoy the thrill of massive flaming
-	death.
-
-	* gui/component/addressbook-factory.c (main): Made warnings always
-	be fatal.
-
-	* backend/pas/pas-book-view.c: Added some debugging spew.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): Added
-	a little experimental code to try to make file searches scale
-	better.  #if 0/#endif-ed out for now.
-
-	* contact-editor/e-contact-quick-add.c: #included e-book-util.h.
-
-	* backend/ebook/e-card.c (e_card_name_match_string): Added.
-	Looser name-matching function.
-	(e_card_email_match_string): Added.  Loose e-mail matching.
-
-	* backend/ebook/e-book-view-listener.c
-	(e_book_view_listener_check_queue): Added code to cause us to
-	abort rather than get trapped in a 100%-CPU-consuming loop in
-	certain situations.  Now we just need to figure out how to avoid
-	these situations altogether.
-
-	* backend/ebook/e-book-util.c: Added.  Now contains the simple
-	query stuff and the open local addressbook functions.
-
-	* backend/ebook/e-book.c: Moved simple query stuff and open local
-	addressbook functions into e-book-util.c.
-
-2001-03-15  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-minicard-label.c (e_minicard_label_set_arg): 
-	* gui/widgets/e-minicard.c (e_minicard_set_arg, e_minicard_event):
-	Update arguments to e_canvas_item_grab_focus.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/addressbook.c (update_pixmaps): Fix a warning
-	here.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/Makefile.am (minicard_label_test_LDADD): Change to
-	ld order from Greg Williams.
-
-2001-03-13  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_book_view): Moved where we call
-	pas_book_respond_get_book_view.
-
-2001-03-12  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: add E_STRING_PROP for
-	categories.
-
-	* backend/pas/evolutionperson.schema: add categories attribute.
-
-	* backend/ebook/e-card-simple.c (field_data): add
-	E_CARD_SIMPLE_FIELD_CATEGORIES.
-
-	* backend/ebook/e-card-simple.h: add
-	E_CARD_SIMPLE_FIELD_CATEGORIES.
-
-2001-03-12  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard.c (supported_fields_cb): add is_read_only
-	param.
-
-	* gui/widgets/e-minicard-view.c (supported_fields_cb): add
-	is_read_only param.
-
-	* gui/widgets/e-addressbook-view.c (supported_fields_cb): add
-	is_read_only param.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): add is_read_only param.
-	also, include a little policy here and make it TRUE, as the user
-	shouldn't be editting in this context anyway (imo).
-
-	* gui/component/addressbook.c (supported_fields_cb): add
-	is_read_only param.
-
-	* contact-editor/test-editor.c (main): add is_read_only param.
-
-	* contact-editor/e-contact-editor.c (set_read_only): new function,
-	that either enables or disables all the text fields, combo boxes,
-	and some buttons, depending on the state of is_read_only.
-	(e_contact_editor_class_init): add read/write arg "is_read_only".
-	(full_name_clicked): set the is_read_only of the fullname dialog
-	to the editor's.
-	(full_addr_clicked): same.
-	(e_contact_editor_new): add is_read_only param, that gets set
-	along with the other params.
-	(e_contact_editor_set_arg): add setter for is_read_only.
-	(e_contact_editor_get_arg): add getter for is_read_only.
-	(_phone_arrow_pressed): change TRUE to !editor->is_read_only for
-	entry.
-	(_email_arrow_pressed): same.
-	(_address_arrow_pressed): same.
-	(enable_writable_fields): same.
-
-	* contact-editor/e-contact-editor-fullname.c
-	(e_contact_editor_fullname_class_init): add read/write arg
-	"is_read_only".
-	(e_contact_editor_fullname_set_arg): add setter for is_read_only
-	that enables/disables all the entries/combos.
-	(e_contact_editor_fullname_get_arg): add getter for is_read_only.
-
-	* contact-editor/e-contact-editor-fullname.h (struct
-	_EContactEditorFullname): add is_read_only flag.
-
-	* contact-editor/e-contact-editor-address.c
-	(e_contact_editor_address_class_init): add read/write arg
-	"is_read_only".
-	(e_contact_editor_address_set_arg): add setter for is_read_only
-	that disables/enables all the entries/combos.
-	(e_contact_editor_address_get_arg): add getter for is_read_only.
-
-	* contact-editor/e-contact-editor-address.h (struct
-	_EContactEditorAddress): add is_read_only flag.
-
-2001-03-13  Iain Holmes  <iain@ximian.com>
-
-	* backend/ebook/Makefile.am: Change the importer includes around a bit.
-
-	* backend/ebook/evolution-gnomecard-importer.c: Correctly add the includes.
-
-2001-03-09  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: PISOCK_INCLUDEDIR has become
-	PISOCK_CFLAGS in gnome-pilot.m4 and remove capplet foo
-
-2001-03-11  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_simple_query): Added. A
-	simplified, cancellable query mechanism that lets you avoid
-	dealing with EBookView.
-	(e_book_simple_query_cancel): Added. Cancels a running query.
-
-	* backend/ebook/e-book-types.h: Add enum EBookSimpleQueryStatus.
-
-2001-03-08  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-popup.c
-	(quick_add_cb): Switched to use e_contact_quick_add_free_form.
-	Removed debugging code, hopefully without introducing any bugs
-	in the process.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Fix bug with commas
-	inside of name/address combos.  As long as the comma is inside of
-	quotes, it will be treated as part of the name rather than as a
-	break between addresses.
-
-	* gui/component/select-names/e-select-names-completion.c
-	(match_nickname): Use e_card_name_to_string for nickname match
-	strings.
-	(match_email): Use e_card_name_to_string for email match strings.
-	(e_select_names_completion_begin): Strip quotes out of query text,
-	so we don't produce malformed sexps.
-	Added William Blake quote easter egg.
-
-	* contact-editor/e-contact-quick-add.c: Further attempts to fix...
-	mostly unsuccessful.
-	(e_contact_quick_add_free_form): Added.  Takes a single string
-	and tries to parse out (using some simple, loose rules) the
-	name and e-mail -- then calls e_contact_quick_add.  An attempt to 
-	get the computer to automatically Do The Right Thing.
-
-	* backend/ebook/e-book.c: Fixed some broken indentation.  Yes, I'm
-	anal.
-
-	* gui/component/GNOME_Evolution_Addressbook.oafinfo: Added oaf_server
-	info for EAddressWidget.
-
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Added oaf_server
-	info for EAddressWidget.
-
-	* gui/component/addressbook-factory.c (main): Add call to
-	e_address_widget_factory_init.
-
-	* gui/component/e-address-widget.h: 
-	* gui/component/e-address-widget.c: Added.  A little widget (and a
-	Bonobo control, BTW) for displaying addresses, with a left-click
-	menu.  Used to display addresses in the mail viewer (as embedded
-	GtkHTML objects, replacing the text previously used).  Still quite
-	incomplete.
-
-2001-03-08  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Specify a
-	NULL `EvolutionShellComponentGetDndSelectionFn'.
-
-2001-03-06  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Fix glitch with
-	inserting comma-delimited stuff when length > 1.
-
-2001-03-06  Jon Trowbridge  <trow@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_load_local_address_book): Added.
-	Just encapsulates opening
-	file://~username/evolution/local/Contactes/addressbook.db, so that
-	path doesn't need to be hardwired in throughout the code.
-
-2001-03-06  Benjamin Kahn  <xkahn@cybersites.com>
-
-	* contact-editor/e-contact-quick-add.c (clicked_cb): 
-	Added the third argument to e_contact_editor_new.  (Cheated
-	and send NULL for the field argument, which is probably
-	troublesome.  It will be fixed soon by either clahey or 
-	toshok.)
-
-2001-03-06  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-model.c
-	(e_select_names_model_replace): Fix a reference counting bug.
-
-	* gui/component/select-names/e-select-names-manager.c (popup_cb):
-	A callback for creating the appropriate popup by calling
-	e_select_names_popup.
-	(e_select_names_manager_create_entry): Connect popup_cb to the
-	entry's popup signal
-
-	* gui/component/select-names/e-select-names-popup.c: Added.  Code
-	for popup right-click menus for recipient entries.  Still a bit
-	incomplete.
-
-	* backend/ebook/e-destination.c (e_destination_get_email_num):
-	Added.
-
-	* contact-editor/e-contact-quick-add.c: Added.  Some code and a
-	dialog for very quickly adding entries to the address book.
-	Still not fully working.
-
-2001-03-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/ebook/e-card-simple.c: Cleaned up the formatting in this
-	file a bit.
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_set_arg):
-	Made it so that passing in NULL to the writable_fields arg sets
-	the set of writable fields to the empty set.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): Pass NULL as the
-	writable_fields argument here.
-
-	* gui/widgets/e-addressbook-model.c: Don't offset by one here.
-	This way we will get the file_as field as one of our
-	ETableColumns.
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Updated this for the
-	changes in ECardSimple.
-
-	* gui/widgets/e-minicard.c (remodel): Don't remodel if the item
-	isn't realized.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: doh, track renaming of
-	objectclass from evolvePerson to evolutionPerson.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolutionperson.schema: rename evolveperson.schema
-	to this, and add remaining attributes.
-
-	* backend/pas/pas-backend-ldap.c: add remaining fields, and fix up
-	ones that were incorrent (either the ldap_attr or the query prop).
-
-2001-03-02  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: update sed script
-
-	* conduit/e-address.conduit.in: update for new pilot foo
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): track change to
-	e_contact_editor_new.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (add_objectclass_mod): add
-	objectclasses for "person", "organizationalPerson", and "top" as
-	well, just to be complete.
-	(check_schema_support): rename check_for_evolve_person to this, to
-	reflect that we're doing more than just checking for that
-	objectClass.
-	(add_oc_attributes_to_supported_fields): new function.
-	(add_to_supported_fields): new function.
-	(pas_backend_ldap_destroy): unref supported_fields.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* gui/widgets/e-minicard-view.c (supported_fields_cb): new
-	function.
-	(e_minicard_view_event): split out the creation of the contact
-	editor to the supported_fields callback.
-
-	* gui/widgets/e-minicard.c (supported_fields_cb): new function.
-	(e_minicard_event): split out the creation of the contact editor
-	to the supported_fields callback.
-
-	* gui/widgets/e-addressbook-view.c (table_double_click): split
-	function into two functions, since e_book_get_supported_fields
-	requires a callback now.
-	(supported_fields_cb): new function.
-
-	* gui/component/addressbook.c (new_contact_cb): split this into
-	two functions, since e_book_get_supported_fields requires a
-	callback now.
-	(supported_fields_cb): new function.
-
-	* contact-editor/test-editor.c (main): track change to
-	e_contact_editor_new (pass NULL for the writable_fields arg.)
-
-	* contact-editor/contact-editor.glade: fix several labels so they
-	make better sense (since we look them up in e-contact-editor.c.)
-
-	* contact-editor/e-contact-editor.h (struct _EContactEditor): add
-	writable_fields.  also, add it to e_contact_editor_new.
-	
-	* contact-editor/e-contact-editor.c (e_contact_editor_class_init):
-	add writable_fields arg.
-	(e_contact_editor_destroy): unref the writable_fields list.
-	(e_contact_editor_new): pass @fields as the writable_fields arg.
-	(e_contact_editor_set_arg): add writable_fields support.
-	(enable_writable_fields): new (very hairy) function, to disable
-	everything and reenable just the fields listed in the
-	writable_fields list.
-	(_email_arrow_pressed): set label-email1, entry-email1, and
-	checkbutton-htmlmail to be sensitive since the only way to get
-	here is to activate a writable field in the menu.
-	(_address_arrow_pressed): set label-address, button-fulladdr, and
-	text-address to be sensitive for the same reason.
-	(_phone_arrow_pressed): sensitize the label and entry for the same
-	reason.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-card-simple.c (field_data): add new entries for
-	phone enums, and fill in the ecard_field with (bogus in all but a
-	few cases) strings.  these are the strings sent from wombat to
-	evolution-addressbook for supported_fields.
-	(e_card_simple_get_ecard_field): new function.
-	(e_card_simple_map_phone_to_field): new function.
-	(e_card_simple_map_email_to_field): new function.
-	(e_card_simple_map_address_to_field): new function.
-
-	* backend/ebook/e-card-simple.h: add a few phone entries to the
-	ECardSimpleField enum, and add prototypes for mapping the list
-	types (phone, email, address) to ECardSimpleField.  Also, add
-	prototype for e_card_simple_get_ecard_field.
-
-	* backend/ebook/e-book.c
-	(e_book_do_response_get_supported_fields): don't build the EList
-	here, it's already built.
-
-	* backend/ebook/e-book-listener.h: change fields from the CORBA
-	sequence to the EList in our reponse struct.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_get_supported_fields_response): we make the
-	EList here, since after we return the CORBA list is freed up.
-
-2001-03-02  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_supported_fields): implement
-	properly, we support everything.
-
-2001-03-01  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): Oops, we do need to be able to write to
-	"text" after all (for things like Reply-to: to work properly).
-	Fixed.
-	(impl_SelectNames_get_entry_for_section): Made "text" a writeable
-	property again.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_insert_length): Increment pos so that
-	we don't reverse strings when length > 1 (a particularly amusing
-	bug).
-
-	* gui/component/select-names/e-select-names-completion.c
-	(e_select_names_completion_destroy): Check for NULL before calling
-	gtk_object_unref (GTK_OBJECT (---)), to get rid of annoying error
-	messages.
-
-2001-03-01  Jon Trowbridge  <trow@ximian.com>
-	
-	* gui/component/select-names/e-select-names-completion.c: I am an
-	idiot.
-
-2001-03-01  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-table-model.c
-	(fill_in_info): Change for new EDestination/ESelectNamesModel API.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_get_source): Added.  A function for
-	looking up the ESelectNamesModel by id.  (I didn't end up using
-	this function, but it might come in handy later.)
-	(e_select_names_manager_get_cards): #if 0/#endif out this
-	function.
-	(e_select_names_manager_create_entry): Modified to attach an
-	ESelectNamesCompletion to the entry we create.
-	(completion_handler): A post-completion handler for our EEntry, to
-	take the completion's extra data (an EDestination) and properly
-	stick it into our ESelectNamesModel.
-
-	* gui/component/select-names/e-select-names.c
-	(real_add_address_cb): Changed to operate on EDestinations rather
-	than ECards and to use the new ESelectNamesModel API.  This leads
-	to a rather nice code simplication.
-	(remove_address): Changed for new ESelectNamesModel API.
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): Rather than just passing the entry's text
-	through the property bag, get the "address text" from the model.
-	This returns a nice, verbose string of addresses with names
-	expanded when the address is tied to an ECard (i.e. "Jon
-	Trowbridge <trow@ximian.com>").
-	(impl_SelectNames_get_entry_for_section): Make the text property
-	read-only.
-	(entry_set_property_fn): ...and since it is read-only now, chop
-	out the setter code.
-	
-	* gui/component/select-names/e-select-names-text-model.h: 
-	* gui/component/select-names/e-select-names-text-model.c: Again,
-	this code has been (pretty much) totally rewritten to convert all
-	text operations into changes on the ESelectNamesModel.  This lets
-	us give the associated EEntry some (IMHO) nice semantics regarding
-	whitespace, etc.  Includes object activation, so destinations tied
-	to ECards are underlined and can be double-clicked to bring up a
-	contact editor.
-
-	* gui/component/select-names/e-select-names-model.h: 
-	* gui/component/select-names/e-select-names-model.c: I've heavily
-	modified this object to both hide all implementation details
-	(which the old version exposed a bit too much for my peculiar
-	tastes) and to act as an EDestination container.  The old code put
-	the text model operations here.  I've moved them all to
-	ESelectNamesTextModel --- so the text model actions (insert,
-	delete, etc.) are all done through the API rather than operating on
-	ESelectNamesModel internals.
-
-	* gui/component/select-names/e-select-names-completion.c: Added.  A
-	fairly complicated object derived from ECompletion that searches
-	our local addressbook in various and sundry ways.
-
-	* gui/component/select-names/e-select-names-completion.h: 
-
-	* backend/ebook/e-destination.h: 
-	* backend/ebook/e-destination.c: Added.  This object encapsulates
-	a place to sent an email to, which can either be just a address as
-	a string ("trow@ximian.com"), a fancier string ("Jon Trowbridge
-	<trow@ximian.com>"), or an ECard and a specific address within
-	that ECard.
-
-2001-03-01  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h,
-	gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Used
-	ESelectionModelSimple and the changes to EReflow and EReflowSorted
-	to get multiple selection in the minicard view.
-
-	* gui/widgets/test-reflow.c: Changed this to get it to compile
-	with the changes to EReflow.
-
-2001-02-21  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search): Made
-	this pay attention to the return value of e_sexp_parse.
-
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_activate_obj): Fixed a const
-	inconsistency here.
-
-2001-02-21  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-book.c (pas_book_queue_get_supported_fields):
-	new function.
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedFields): track
-	change to idl.
-	(pas_book_respond_get_supported_fields): new function.
-
-	* backend/pas/pas-book.h: add GetSupportedFields to the
-	PASOperation enum.  Also, add a stringlist field to the PASRequest
-	struct.  lastly, add a prototype for
-	pas_book_respond_get_supported_fields.
-	
-	* backend/pas/pas-backend.h: remove prototype for
-	pas_backend_get_supported_fields, and remove it from the vtable.
-
-	* backend/pas/pas-backend.c (pas_backend_get_supported_fields):
-	remove.
-	(pas_backend_class_init): no vtable entry for get_supported_fields
-	anymore.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_get_supported_fields): new function.
-	(pas_backend_ldap_process_client_requests): add case for
-	GetSupportedFields.
-	(pas_backend_ldap_class_init): get_supported_fields isn't in
-	vtable anymore.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_get_supported_fields): new function.
-	(pas_backend_file_process_client_requests): add case for
-	GetSupportedFields.
-	(pas_backend_file_class_init): get_supported_fields isn't in
-	vtable anymore.
-
-	* backend/idl/addressbook.idl: Book::getSupportedFields now
-	returns void and add BookListener::notifySupportedFields.
-
-	* backend/ebook/test-client.c (get_fields_cb): new function.
-	(auth_user_cb): track change to e_book_get_supported_fields.
-
-	* backend/ebook/e-book.c
-	(e_book_do_response_get_supported_fields): new function.
-	(e_book_check_listener_queue): add case
-	GetSupportedFieldsResponse.
-	(e_book_get_supported_fields): switch to async model.
-
-	* backend/ebook/e-book.h: switch e_book_get_supported_fields to an
-	async model.
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_get_supported_fields_response): new
-	function.
-	(impl_BookListener_response_get_supported_fields): new function.
-	(e_book_listener_get_epv): fill in epv's "notifySupportedFields"
-
-	* backend/ebook/e-book-listener.h: add an async response for
-	GetSupportedFields and add a stringlist member to the
-	EBookListenerResponse struct.
-
-2001-02-20  Federico Mena Quintero  <federico@ximian.com>
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_activate):
-	Moved the register_factory() code to here, since it was the only
-	thing being called anyways.
-	(PasBookFactoryPrivate): Added a "registered" flag.
-	(pas_book_factory_activate): Set the registered flag.
-	(pas_book_factory_destroy): Deactivate the factory when we go away.
-
-2001-02-20  Chris Toshok  <toshok@ximian.com>
-
-	* backend/ebook/e-book.c (e_book_get_supported_fields): new function.
-
-	* backend/ebook/e-book.h: add e-book interface to getting
-	supported fields.
-
-	* backend/ebook/test-client.c (auth_user_cb): shoe-horn in some
-	spew about supported fields.
-
-2001-02-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: Remove PISOCK_LIBDIR
-
-2001-02-19  Jon Trowbridge  <trow@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): When creating the entry,
-	open up an ebook (corresponding to the local addressbook) and make
-	the entry use an EAddressCompletion.
-	(completion_handler): Added; this is the actual completion
-	handler, which manipulates the entry when the user selects
-	something from the drop-down.
-
-	* gui/component/select-names/e-select-names-model.c: Various hacks
-	by clahey to unbreak e_select_names_model_add_item,
-	e_select_names_model_replace_item (which I added) and
-	e_select_names_model_remove_item.
-	
-	* gui/component/select-names/e-select-names-text-model.c
-	(e_select_names_text_model_obj_count,
-	e_select_names_text_model_get_nth_obj): Make chunks of text that
-	correspond to ECards in the ESelectNamesModel be embedded objects.
-	(e_select_names_text_model_activate_obj): On activation, pop up a
-	contact editor for the embedded object's card.
-	(e_select_names_text_model_model_changed): Fixed to work with
-	ETextModel API changes.
-	(e_select_names_text_model_set_text): Make const correct.
-	(e_select_names_text_model_insert): Make const correct.
-	(e_select_names_text_model_insert_length): Make const correct.
-
-	* backend/ebook/e-address-completion.h,
-	backend/ebook/e-address-completion.c: Added.  EAddressCompletion
-	is a derived class of ECompletion that does asynchronous address
-	lookups for completions.
-
-2001-02-17  Chris Toshok  <toshok@ximian.com>
-
-	* backend/idl/addressbook.idl: add sequence<string> typedef, and
-	add getSupportedFields method.
-
-	* backend/pas/pas-book.c
-	(impl_GNOME_Evolution_Addressbook_Book_getSupportedFields): new
-	function.
-
-	* backend/pas/pas-backend.c (pas_backend_class_init): init
-	get_supported_fields = NULL.
-	(pas_backend_get_supported_fields): new function.
-
-	* backend/pas/pas-backend.h: add prototype for
-	pas_backend_get_supported_fields.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_get_supported_fields): new function.
-	(pas_backend_file_class_init): fill in get_supported_fields.
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_get_supported_fields): new function.
-	(pas_backend_ldap_class_init): fill in get_supported_fields.
-
-2001-02-14  Christopher James Lahey  <clahey@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: Undefine E_STRING_PROP and
-	E_LIST_PROP here.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h (e_contact_editor_raise): Added
-	this function.
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h
-	(e_minicard_event): Added an editor field to the EMinicard object.
-	Made it so that if you double click on the same card twice, it
-	doesn't open a new window, but instead raises the old.
-
-2001-02-08  Iain Holmes  <iain@ximian.com>
-
-	* gui/component/addressbook-storage.c (addressbook_source_free):
-	Free the ldap.binddn.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Free the dir strings.
-
-2001-02-08  Christopher James Lahey  <clahey@ximian.com>
-
-	* contact-editor/e-contact-editor.c (categories_clicked): Set the
-	header on the category dialog we pop up.
-
-2001-02-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in: Translations.
-	* gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in:
-	Marked strings for translation in this newly created file.
-	* gui/component/select-names/Makefile.am: Hook up the .oaf.in files in the
-	xml-i18n-tools framework.
-	* gui/component/Makefile.am: Same as above.
-	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Marked stuff for translation here
-	too.
-	
-2001-02-11  Jason Leach  <jasonleach@usa.net>
-
-	* gui/component/addressbook.c: Removed an ancient #include
-	<libgnorba/gnorba.h>
-
-2001-02-11  Gediminas Paulauskas <menesis@delfi.lt>
-
-	Really use xml-i18n-tools.
-	
-	* conduit/e-address-conduit-control-applet.desktop: removed.
-	* conduit/e-address-conduit-control-applet.desktop.in: added empty.
-	* conduit/Makefile.am: reflect above changes, merge translations.
-	
-	* contact-editor/e-contact-editor-strings.h,
-	contact-editor/fulladdr.glade.h, contact-editor/fullname-strings.h,
-	contact-editor/e-contact-editor-confirm-delete.glade.h,
-	gui/component/select-names/select-names.glade.h:
-	removed these files, xml-i18n-extract takes care of strings itself.
-	
-	* contact-editor/*.glade,
-	gui/component/select-names/select-names.glade,
-	gui/widgets/alphabet.glade, printing/e-contact-print.glade:
-	changed project options to not output_translatable_strings.
-	
-	* contact-editor/Makefile.am, gui/widgets/Makefile.am,
-	gui/component/select-names/Makefile.am, printing/Makefile.am:
-	do not include removed files in EXTRA_DIST.
-
-2001-02-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (check_for_evolve_person): flesh
-	out this check.  #ifdef the entire thing OPENLDAP2, as it only
-	works with the new schema stuff in openldap 2.x (both on server
-	and client, so upgrade your server.)
-	
-2001-02-07  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c: Added N_("* Click here to add
-	a contact *").
-
-2001-02-07  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_connect): only
-	set the DEBUG_LEVEL if we're OPENLDAP2.
-
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (email_compare): return TRUE if
-	equal, FALSE otherwise.
-	(business_compare): same.
-	(homephone_compare): same.
-	(email_ber): return NULL if there are no elements in our list.
-	(homephone_ber): same.
-	(business_ber): same.
-	(build_mods_from_ecards): add smarts to handle list elements
-	properly (like email, business_phone, home_phone.)  now we'll
-	properly send updates if any element in the list changes.
-
-2001-02-06  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/widgets/Makefile.am (INCLUDES): Added
-	-DEVOLUTION_DATADIR=\""$(datadir)"\".
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Changed the local and system
-	directories.
-
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_card_handler): doh,
-	didn't mean to commit this.
-	
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/evolveperson.schema: new file.  this will eventually
-	form the suggested additions to an existing openldap server that,
-	along with support for inetorgperson, will allow people to store
-	all evolution attributes in ldap.
-	
-2001-02-06  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_init): don't
-	need the = NULL's since we g_new0.
-	(check_for_evolve_person): new function.
-	(pas_backend_ldap_connect): check to see if the evolvePerson
-	objectclass is there.
-	(build_mods_from_ecards): right now, just silently skip the extra
-	attributes if we don't support evolvePerson.
-	(add_objectclass_mod): new function, add both inetOrgPerson and
-	(if it's available) evolvePerson as objectclasses.
-	(pas_backend_ldap_process_authenticate_user): also check to see if
-	evolvePerson is there, if we couldn't do it (due to auth reasons)
-	in the connect method.
-	(prop_info): change the telephoneNumber LDAP attribute to be used
-	for evolution's business phone numbers.  the primary phone number
-	will be a single valued attribute on evolvePerson.
-	(business_populate): new function.
-	(business_ber): new function.
-	(business_compare): new function.
-
-2001-02-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (create_card_handler): err,
-	allocate 2 char*s when i assign 2 char*s.
-
-2001-02-05  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (modify_card_handler): switch to
-	ldap_modify_ext_s if OPENLDAP2, as ldap_modify_s is deprecated.
-	(build_mods_from_ecards): don't include the mod if the value is ""
-	- this isn't valid on schema checking ldap servers.
-	(homephone_populate): new function.
-	(homephone_ber): new function.
-	(homephone_compare): new function.
-	(create_card_handler): add spew when adding cards so I can see
-	what's going on.
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-config.c (table_add_elem): Save the
-	help_text in the closure.
-
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): Added
-	gal-view-factory-minicard.c, gal-view-factory-minicard.h,
-	gal-view-minicard.c, and gal-view-minicard.h.
-
-	* gui/widgets/gal-view-factory-minicard.c,
-	gui/widgets/gal-view-factory-minicard.h,
-	gui/widgets/gal-view-minicard.c, and
-	gui/widgets/gal-view-minicard.h: New classes for minicard view
-	type.
-
-	* gui/widgets/e-addressbook-view.c: Deploy gal-view stuff
-	properly.
-	
-2001-02-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (e_card_get_vcard): Make the Note field
-	be quoted printable.
-
-2001-01-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): This should be a close button,
-	not a cancel button.
-
-2001-02-04  Christopher James Lahey  <clahey@ximian.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_activate_dialog): Call
-	e_select_names_set_default when appropriate.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Added support for
-	double clicking sending the selected contacts to the default
-	section.  Added a set_default function.  Made multiple selection
-	work.
-
-2001-01-29  Chris Toshok  <toshok@ximian.com>
-
-	* gui/component/addressbook-config.c
-	(addressbook_config_source_label): #ifdef INCLUDE_FILE_SOURCE.
-	(table_add_elem): add help_text parameter and set up focus_in
-	events to display the help in the dialog's html area.
-	(focus_help): new function, calls put_html on the help text.
-	(addressbook_ldap_auth_item_new): add help texts.
-	(addressbook_source_item_new): add help texts.
-	(addressbook_source_dialog): add help texts.
-
-2001-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_add_section): Remove the butt-ugly arrow icon and
-	replace it with a less invasive "->" icon.
-
-2001-01-25  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (build_mods_from_ecards): add
-	comment about the else block here.
-	(prop_info): add home_address, business_address, business_fax,
-	assistant, and isdn.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_load_uri): Made
-	this only add the initial VCard if it finds a file
-	"create-initial" in the directory it's creating the database in.
-
-	* gui/component/addressbook-component.c (factory_fn): Added a
-	create_folder function.
-
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Fixed an unused variable
-	warning.
-
-2001-01-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_setup_menus): Setup the view collection
-	properly and handle the "display_view" signal.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-	
-	* gui/component/addressbook.c (update_pixmaps): Consider the
-	placeholder in the path for the "Print" item.
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (update_pixmaps): Set the icon for
-	"/Toolbar/Find" to "24_find_contact.xpm".
-
-2001-01-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	* gui/component/addressbook.c (set_pixmap): New.
-	(update_pixmaps): New function, setting the pixmaps for the items
-	of type "pixbuf", using `set_pixmap'.
-	(control_activate): Call it.
-
-2001-01-25  Not Zed  <NotZed@Ximian.com>
-
-	* backend/pas/pas-backend-ldap.c: esexp api change fixes.
-
-	* backend/pas/pas-backend-file.c (entry_compare): Fix for e_sexp api changes.
-	(vcard_matches_search): esexp api fixes.
-	(pas_backend_file_search): Ouch, unref the e-sexp properly (not gtk object).
-
-2001-01-24  Chris Toshok  <toshok@ximian.com>
-
-	* backend/pas/pas-backend-ldap.c (email_ber_func): make sure to
-	add the lengths here (include the \0?  anyone?).
-	(build_mods_from_ecards): if we're filling in mod->mod_bvalues,
-	set mod_op |= LDAP_MOD_BVALUES.
-
-2001-01-23  Jason Leach  <jasonleach@usa.net>
-	
-	(Fix #1225: advanced search cancel/close)
-	
-	* gui/search/e-addressbook-search-dialog.c
-	(e_addressbook_search_dialog_init): Set it up with Search and a
-	Cancel button, Search is still the default.
-
-2001-01-23  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): properly ref
-	the ecard. still need to kill some memory leaks.
-
-2001-01-22  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: remove vfs dependency
-
-2001-01-21  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (delete_record):  Remove
-	deleted records from the pilot map so we don't have dupes in the future
-	
-2001-01-19  Dan Winship  <danw@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c (table_right_click): 
-	* gui/widgets/e-minicard.c (e_minicard_event): Update for
-	e_popup_menu_run prototype change.
-
-2001-01-19  Jason Leach  <jasonleach@usa.net>
-
-	(Adding a boolean "entry_changed" BonoboPropertyBag arg)
-	
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_set_property_fn): Use a gtk_object_set_data to set the
-	property to TRUE here.
-
-	(entry_changed): New function, calls bonobo_control_set_property
-	if entry_changed hasn't been set to TRUE yet.
-	
-	(impl_SelectNames_get_entry_for_section): Connect "changed" on
-	each entry_widget to the new entry_changed() func.
-
-2001-01-19  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): always free 
-	the delivery elements and correct embarrassingly stupid memory error 
-	that was causing the addressbook conduit problems.
-
-	* backend/ebook/e-book-view-listener.c 
-	(e_book_view_listener_check_queue): ref/unref ourself when processing 
-	in case someone we signal unrefs us.
-
-	* conduit/address-conduit.c (sequence_complete): disconnect signals
-	when complete
-
-2001-01-17  Federico Mena Quintero  <federico@ximian.com>
-
-	* backend/pas/pas-book-factory.c (pas_book_factory_activate): Made
-	it return a gboolean; it was completely ignoring the return value
-	from register_factory().
-
-2001-01-17  Larry Ewing  <lewing@helixcode.com>
-
-	* backend/ebook/.cvsignore: add evolution-gnomecard-importer.
-
-	* backend/ebook/Makefile.am (oaf_DATA): don't require the pine
-	oainfo file until it is actually added to the repository.  We need
-	to keep the build working for nightlies to work.
-
-2001-01-16  Jason Leach  <jasonleach@usa.net>
-
-	* backend/pas/pas-backend-file.c (INITIAL_VCARD): s/Helix
-	Code/Ximian/ for the initial contact card.
-
-2001-01-15  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/address-conduit.c (print_local): prevent segfaults and 
-	buffer overflows
-	(print_remote): ditto
-
-2001-01-14  JP Rosevear  <jpr@ximian.com>
-
-	* conduit/Makefile.am: pass -module and -avoid-version to conduit
-	linker
-
-2001-01-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Pass NULL as
-	the @copy_folder_fn arg to `evolution_shell_component_new'.
-
-2001-01-12  Miguel de Icaza  <miguel@ximian.com>
-
-	* gui/widgets/e-addressbook-view.c: added i18n for etable.
-
-2001-01-11  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_process_create_card): get a book view from
-	somewhere so we can give status messages - choose the first one in
-	the list.
-	(pas_backend_ldap_process_modify_card): same.
-	(pas_backend_ldap_process_remove_card): same.
-	(prop_info): add more properties, like home_phone, mobile, pager,
-	uri, org_unit, office, title, and manager.
-
-2001-01-09  Miguel de Icaza  <miguel@gnu.org>
-
-	* gui/widgets/Makefile.am (minicard_widget_test_LDADD): Put GNOME
-	libraries at the end to make the thing compile.
-
-	* printing/Makefile.am: Order LDADD flags correctly so it compiles.
-
-2001-01-09  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	connect with the EAddressbookView's status_message signal.
-	(set_status_message): set the status message on the ShellView
-	Interface associated with our control.
-	(retrieve_shell_view_interface_from_control): new function.  get
-	the shell view inteface associated with a control.
-
-	* gui/widgets/e-addressbook-view.c
-	(e_addressbook_view_class_init): register status_message signal.
-	(status_message): new function, emit our status_message signal.
-	(change_view_type): connect with the view->object's
-	"status_message" signal.
-
-	* gui/widgets/e-addressbook-view.h (struct
-	_EAddressbookViewClass): add status_message signal.
-
-2001-01-09  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/widgets/e-minicard-view-widget.c
-	(e_minicard_view_widget_class_init): register our status_message
-	signal.
-	(status_message): new function, emit our status_message signal.
-	(e_minicard_view_widget_realize): connect to the EMinicardView's
-	status_message signal.
-
-	* gui/widgets/e-minicard-view-widget.h: add status_message signal.
-
-	* gui/widgets/e-minicard-view.c (e_minicard_view_class_init):
-	register our status_message signal.
-	(e_minicard_view_init): init status_message_id.
-	(status_message): new function, emit our status_message signal.
-	(book_view_loaded): connect to the EBookView's status_message
-	signal.
-	(disconnect_signals): disconnect status_message_id.
-
-	* gui/widgets/e-minicard-view.h: add status_mesage_id, and
-	status_message signal.
-
-	* gui/widgets/e-addressbook-model.c (status_message): new
-	function, emit our status_message.
-	(e_addressbook_model_class_init): register our "status_message"
-	signal.
-	(book_view_loaded): connect to the EBookView's status_message
-	signal, so we can chain it to our parent.
-	(e_addressbook_model_init): init status_message_id.
-	(remove_book_view): disconnect status_message_id.
-
-	* gui/widgets/e-addressbook-model.h: add status_message_id, and
-	status_message signal.
-
-	* backend/pas/pas-backend-ldap.c change the objectclass we create
-	objects with to "inetOrgPerson" as it encompasses the fields we
-	use.
-	(create_dn_from_ecard): remove the mail/org handling from
-	here.  we just prepend cn=$cn onto the base dn.
-	(create_card_handler): remove the NULL that build_mods_from_ecards
-	adds at the end, and insert our objectClass.
-	(modify_card_handler): call search_for_dn to get the ECardSimple
-	of the old card, since it might (and does in the current code)
-	doing a brute force search.
-	(search_for_dn): new function, to search for an entry by its dn.
-	right now we brute force (objectclass=*) under the base dn and
-	compare dn's.  going to add a first pass that explodes the dn and
-	searches that way, using (objectclass=*) as a last resort.  also,
-	here's where we'd put the extensibleMatch code if we want to go
-	that route.
-
-	* backend/ebook/e-card.c (e_card_set_arg): if we're setting the
-	full name regenerate ecard->name.
-
-2001-01-04  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-book-listener.c
-	(e_book_listener_queue_authentication_response): new function.
-	(impl_BookListener_respond_authentication_result): new function.
-	(e_book_listener_get_epv): fill in
-	epv->notifyAuthenticationResult.
-
-	* backend/ebook/e-book-listener.h: add AuthenticationResponse to
-	EBookListenerOperation.
-
-	* backend/ebook/e-book.c (e_book_authenticate_user): new function.
-
-	* backend/ebook/e-book.h: add prototype for
-	e_book_authenticate_user.
-
-	* backend/idl/addressbook.idl (GNOME:Evolution:Addressbook:Book):
-	add authenticateUser method.
-	(GNOME:Evolution:Addressbook:BookListener): add
-	AuthenticationFailed and AuthenticationRequired to CallStatus.
-	also add notifyAuthenticationResult method.
-
-	* backend/pas/pas-backend-file.c
-	(pas_backend_file_process_authenticate_user): dummy
-	authenticate_user function that always succeeds.
-	(pas_backend_file_process_client_requests): respond to the
-	AuthenticateUser request.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_build_query):
-	gtk_object_unref(sexp) => s_exp_unref(sexp).
-	(pas_backend_ldap_process_authenticate_user): fill in to use
-	ldap_simple_bind_s.
-	(pas_backend_ldap_process_client_requests): respond to the
-	AuthenticateUser request.
-
-	* backend/pas/pas-book.c (pas_book_queue_authenticate_user): new
-	function.
-	(impl_GNOME_Evolution_Addressbook_Book_authenticateUser): new
-	function.
-	(pas_book_respond_authenticate_user): new function.
-	(pas_book_get_epv): fill in epv->authenticateUser.
-
-	* backend/pas/pas-book.h: add AuthenticateUser operation type, and
-	add user/passwd to the PASRequest struct.
-
-	* gui/component/addressbook-storage.c
-	(addressbook_storage_get_source_by_uri): new function.  should use
-	a hashtable, perhaps, but the lists will generally be small
-	anyway.
-
-	* gui/component/addressbook-storage.h: add prototype for
-	addressbook_storage_get_source_by_uri.
-
-	* gui/component/addressbook-config.c
-	(addressbook_source_dialog_set_source): fill in the binddn if the
-	auth page is shown.
-
-	* gui/component/addressbook.c (book_open_cb): shoe-horn
-	authentication in here.  if the source was configured to use
-	authentication, authenticate the user after opening the ebook.
-	also, be paranoid and clear out the password after authenticating.
-	(book_auth_cb): callback for auth.  set the "book" arg on the
-	view->view here.
-	(passwd_cb): set the view's passwd that'll be used in
-	book_open_cb.
-	(addressbook_view_free): g_free view->passwd.
-
-2001-01-04  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-component.c,
-	gui/component/addressbook-component.h
-	(addressbook_component_get_shell_client): Added this function.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Added code for the
-	ability to switch between different folders.  This doesn't work
-	yet.
-
-	* gui/component/select-names/select-names.glade,
-	gui/component/select-names/select-names.glade.h: Added an option
-	menu to this dialog.
-
-2001-01-04  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/Makefile.am: Fix hard coded library names that were 
-	accidentally committed (i'm looking at you miggie)
-
-	* contact-editor/e-contact-editor.c (categories_clicked): Reflect
-	renaming.
-
-	* contact-editor/e-contact-editor-categories.[hc]: These are
-	living in gal now
-	
-2001-01-04  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_free): 
-	Need to e_sexp_unref the the sexp, not gtk_object_unref it.
-
-2001-01-03  Michael Meeks  <michael@helixcode.com>
-
-	* gui/widgets/e-addressbook-model.c (get_view): check
-	capabilities is valid before doing a strstr.
-
-2001-01-03  Michael Meeks  <michael@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_search):
-	g_strdup things we g_free.
-
-2001-01-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (delete_cb): Make sure this
-	won't crash if the given contact is removed from the database
-	while this function is being called.
-
-	* gui/widgets/e-minicard.c: Made sure this won't crash if the
-	given contact is removed from the database while the right click
-	menu is being displayed.
-
-2000-12-30  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook-config.c (edit_source_clicked): copy
-	the dialog's source, destroy the dialog after we're done, and make
-	sure to update both columns in the clist.
-	(add_source_clicked): copy the dialog's source, and destroy the
-	dialog when we're done.
-	(addressbook_source_dialog_destroy): free up all the dialog's
-	memory.
-
-	* gui/component/addressbook.c (set_prop): allow file: uri's that
-	point to files, not just dirs that contain addressbook.db.  The
-	rule is the addressbook file has to end in .db.
-
-	* gui/component/addressbook-storage.c (file_source_foreach):
-	contactserver => contactfile.  cut and paste error.
-	(addressbook_storage_init_source_uri): use file://%s to build the
-	uri.
-
-	* gui/component/e-ldap-server-dialog.[ch]: forgot to remove these
-	in my last commit.
-
-2000-12-29  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (config_cb): new function, calling
-	our new config ui code.
-	(control_activate): no longer load evolution-addressbook-ldap.xml,
-	as it's not there.
-
-	* gui/component/addressbook-component.c (owner_set_cb):
-	setup_ldap_storage => addressbook_storage_setup.
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES):
-	remove e-ldap-storage.[ch] and add addressbook-storage.[ch].
-	(glade_DATA): remove ldap-server-dialog.glade and add
-	addressbook-config.glade.
-	(EXTRA_DIST): same.
-
-	* gui/component/addressbook-config.[ch]: add another dialog to
-	give a list of our sources and offer the Add/Delete/Edit
-	interface.  This plugs into the previous dialog work (the source
-	editor.)
-
-	* gui/component/addressbook-storage.[ch]: new files, containing
-	the remains of e-ldap-storage.[ch] and adding the new
-	AddressbookSource type and it's subordinates.  Also, the xml
-	format has changed slightly and the file name is no longer
-	~/evolution/ldap-servers.xml - it's
-	~/evolution/addressbook-sources.xml.
-
-	* gui/component/addressbook-config.glade: new file, new config
-	interface.
-
-	* gui/component/ldap-server-dialog.glade: removed.
-
-	* gui/component/e-ldap-storage.[ch]: removed.
-
-2000-12-28  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): add
-	addressbook-config.[ch].
-
-	* gui/component/addressbook-config.c,
-	gui/component/addressbook-config.h: new files, containing at the
-	moment a beautiful "new/edit source dialog" inspired by the
-	mail-config-gui code.  It'll be ready for prime time after rev'ing
-	the .xml file the addressbook uses to store it's "other sources"
-	to include files, and the addition of the ldap auth stuff.
-
-2000-12-25  Miguel de Icaza  <miguel@helixcode.com>
-
-	* gui/widgets/e-minicard.c (e_minicard_realize): Set draw
-	background to FALSE.
-	
-	* gui/widgets/e-minicard-label.c (e_minicard_label_construct): ditto.
-	(e_minicard_label_construct): ditto
-
-2000-12-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fullname-strings.h,
-	contact-editor/fullname.glade: Added Ms. and Miss to the prefix
-	drop down box.  Patch submitted by Martin Hicks <mort@bork.org>.
-
-2000-12-21  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (cursor_cb): Ref the cards that get put
-	in the change list
-	(next_changed_item): util function to get the real next changed item
-	(compute_status): really compute the status of the record
-	(local_record_from_uid): Set the id of the temporary card
-	(check_for_slow_setting): Make this check a little saner
-	(card_added): Only record the CardObjectChange if the card is not
-	archived
-	(card_changed): ditto
-	(card_removed): ditto
-	(set_status_cleared): actually clear the status
-	(for_each_modified): Clean out cruft and use next_changed_item
-	(add_record): Set the new id properly in our local card copy
-	(replace_record): handle the case where the record has been deleted
-	and we need to call add.  need to update the changed_hash entry
-	(delete_record): Don't panic if the card is not found, its already
-	been deleted.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): 
-	The change_context no longer has a del_cards member
-	(pas_backend_file_book_view_free): ditto
-	(pas_backend_file_process_get_changes): ditto
-	(pas_backend_file_changes_foreach_key): just record the id
-	(pas_backend_file_changes): notify_remove needs an id not a vcard
-
-2000-12-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (match): Use my own wrapper
-	functions instead of trying to *directly* access the the data 
-	structures my self
-	(post_sync): Put in hack to prevent syncing the same records twice
-	(local_record_from_uid): set the card id when creating a blank one
-	(add_record): Set the id of the card we have and don't go to the
-	server to get the latest version
-
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): Convert
-	pilot strings to utf for the e-cards.
-	
-2000-12-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (local_record_from_ecard): Convert ecard
-	strings to pilot encodings
-
-2000-12-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c (delete): Made it so that if
-	you select multiple contacts, the right click menu to delete
-	deletes them all.
-
-2000-12-18  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response): always
-	use LDAP_NAME_ERROR (in the openldap1 case it's #defined to
-	NAME_ERROR).
-	(build_card_from_entry): ldap_get_values can return NULL.  also,
-	openldap2 keeps us from getting at ldap->ld_errno, so we can't
-	tell if there was a decoding error like we used to.  the double
-	free problem where ldap would free the ber if there was a decoding
-	problem might be fixed now..  further investigation is needed.
-	for now we leak in openldap2.
-	(ldap_search_handler): the ldap structure is opaque, so use
-	ldap_search_ext to give the extra information (the max responses,
-	timeout, etc.) in the openldap2 case.
-
-2000-12-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_error_to_response): Test
-	for the existance of LDAP_NAME_ERROR and if it exists as a macro,
-	use it instead of NAME_ERROR.
-
-2000-12-14  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/GNOME_Evolution_Addressbook.oafinfo: update cut
-	and paste description error.
-
-2000-12-13  Dan Winship  <danw@helixcode.com>
-
-	* gui/widgets/e-minicard-control.c (stream_read): NULL-terminate
-	the returned vcard so we don't sometimes end up with trailing
-	junk that makes libversit unhappy.
-
-2000-12-13  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c 
-	(e_select_names_add_section): Make the -> into a GNOME stock image.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_init): Connect to the "cursor_change" signal on
-	the ETable here instead of the ETableScrolled.
-	(remove_address): Added the col and event parameters to this
-	callback to match the added parameters to the double click signal.
-	(e_select_names_add_section): Connect to the "double_click" signal
-	on the ETable here instead of the ETableScrolled.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (e_card_set_arg): When setting the "name"
-	argument, copy the incoming name.  This fixes a crash.
-
-2000-12-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Made editing the name using
-	the full name button set the file as entry properly.  Made it
-	so that the address parse that the user chooses after
-	clicking on the Full Address... button gets saved.
-
-2000-12-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (full_name_clicked): Made it
-	so that the editor->name is set after the entry is changed.  This
-	means that the reparse that the person chose is saved.
-
-2000-12-07  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Pass NULL
-	as the @toplevel_node_handler_id argument to
-	`evolution_storage_new'.
-
-2000-12-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Fixed some formatting.
-
-	* contact-editor/e-contact-editor-categories.h: Removed an
-	unneeded #include.
-
-	* gui/widgets/e-addressbook-view.c: Connect to the signals on the
-	ETable instead of the ETableScrolled.
-
-2000-12-07  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (local_record_from_uid): Pass "" rather
-	than NULL to e_card_new.
-	(local_record_from_ecard): Make sure ecard->name is valid
-	(check_for_slow_setting): Remove hard coded test value
-	(card_added): g_strdup the resul of e_card_get_id
-	(card_changed): ditto
-
-2000-12-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c: Got rid of code referencing
-	the ETableScrolled proxy functions.
-
-2000-12-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Moved the gal view menu stuff from
-	here to EAddressbookView.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h: New function to set up the menus
-	for the EAddressbookView.
-
-2000-12-06  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/Makefile.am: Another conduit build fix
-
-2000-12-05  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_changes_foreach_key): 
-	Create an empty vcard with the appropriate id for deleted cards
-
-	* conduit/address-conduit.c (ecard_from_remote_record): Ensure the
-	address fields are added sensibly
-
-2000-12-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Updated the
-	call to `evolution_storage_new()': pass NULL for
-	@toplevel_node_uri.
-
-2000-11-28  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (local_record_to_pilot_record): Return
-	a struct rather than a pointer to a struct
-	(view_cb): kill warning
-	(compare): local_record_to_pilot_record now returns a struct
-	(prepare): ditto
-	(free_prepare): remove as per gnome-pilot changes
-	(conduit_get_gpilot_conduit): don't listen for free_prepare signal
-
-2000-11-27  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: Remove "complete" field
-
-	* conduit/address-conduit.c (print_local): Make it print useful debug
-	info
-	(print_remote): ditto
-	(local_record_from_ecard): Make sure phone numbers get out to the pilot
-	(ecard_from_remote_record): Set phone strings to "" if they are null
-	(sequence_complete): unref the book view
-	(view_cb): ref the book view
-	(free_prepare): do nothing
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_free): 
-	Destroy the card lists with the rest of the view.
-	(pas_backend_file_changes): Don't destroy the card lists here
-	(pas_backend_file_book_view_free): Free the card/id lists in the
-	change context here, the correct place.
-	(pas_backend_file_changes): instead of here...
-
-2000-11-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Set view.change_context to NULL
-	in pas_backend_file_process_get_book_view.  Changed
-	pas_backend_file_book_view_copy a bit.
-
-	* backend/pas/pas-backend-ldap.c: Got rid of a warning.
-
-2000-11-18  Matt Bissiri  <matt@bissiri.org>
-
-	* gui/component/Makefile.am:
-	Add widgets/menus/libmenus.la to evolution_addressbook_LDADD
-	so that it will link properly now that gal-view-menus.[ch]
-	was moved from gal into evolution.
-
-2000-11-15  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): 
-	Initialize destination struct with '0's.
-
-2000-11-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Changed the mime type from "text/vcard"
-	to "text/x-vcard".
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* backend/ebook/.cvsignore: Add idl-generated files.
-	* backend/ebook/e-book.c: (e_book_do_response_get_changes):
-	* backend/ebook/e-card.c: (e_card_send):
-	s/Evolution_/GNOME_Evolution_/g;
-
-2000-11-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Link in composer bonobo code.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added code to
-	send mail to an ECard or send an ECard as a VCard attachment.
-
-	* contact-editor/e-contact-editor.c: Add verbs to send the contact
-	as a VCard or send mail to the contact.
-
-	* gui/search/e-addressbook-search-dialog.c: Removed some unused
-	variables.
-
-	* gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c:
-	Added menu items to send the contact as a VCard or send mail to
-	the contact.
-
-2000-11-11  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* gui/component/addressbook.oafinfo:
-	* gui/component/select-names/evolution-addressbook-select-names.oafinfo:
-	Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*"
-	to sync up with yesterday's IDL re-scoping.
-
-2000-11-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: Fixed a warning.
-
-	* gui/component/addressbook.c: Put in gal view menus for testing
-	purposes.
-
-	* printing/e-contact-print-envelope.c: Fixed up envelope printing
-	a bit.  Added code for printing return addresses.
-
-2000-11-09  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: Add changed_hash, change list and complete bool
-
-	* conduit/address-conduit.c (local_record_from_ecard): Add empty field checks
-	(card_added): callback for book view
-	(card_changed): ditto
-	(card_removed): ditto
-	(sequence_complete): ditto
-	(view_cb): callback for the get changes call
-	(pre_sync): force synchronous loading of book view
-	(for_each): we already have the card so create the local record directly
-	(for_each_modified): Uncomment and fix
-	(delete_record): ditto
-
-	* conduit/Makefile.am: link against gal for ebook - needs fixing
-
-	* backend/ebook/e-book.c (e_book_do_response_get_changes): Properly respond
-	to a get_changes call
-	(e_book_check_listener_queue): define the get changes response operation
-
-	* backend/ebook/e-book-listener.c (e_book_listener_queue_get_changes_response):
-	Queue up a get changes response
-	(impl_BookListener_respond_get_changes): Implement the get_changes method
-	(e_book_listener_get_epv): add get_changes implementation to epv
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): Only
-	copy the search_context and change_context elements if they actually exist
-	(pas_backend_file_changes): Hard code a path for now, only notify if
-	there is something to notify about
-
-2000-11-07  JP Rosevear  <jpr@helixcode.com>
-
-	* backend/pas/pas-book.h: Update PASRequest structure
-
-	* backend/pas/pas-book.c (impl_Evolution_Book_get_changes): update param name
-	(pas_book_queue_get_changes): Use PASRequest change_id slot
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_book_view_copy): 
-	Properly copy change_id and change_context
-	(pas_backend_file_book_view_free): Free change_id/change_context
-	(pas_backend_file_changes_foreach_key): Callback to figure out the
-	deleted cards
-	(pas_backend_file_changes): Use new e-dbhash stuff to implement.
-	Write out updated hash
-
-	* backend/idl/addressbook.idl: Rename get_changes param
-
-2000-11-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Switched from EAddressbookSearch to
-	ESearchBar.
-
-	* gui/widgets/Makefile.am, gui/widgets/e-addressbook-search.c,
-	gui/widgets/e-addressbook-search.h: Removed EAddressbookSearch.
-	This has been moved to filter/ and renamed ESearchBar.
-
-	* printing/e-contact-print-envelope.c: Forgot to set the font.
-	This works for me now.
-
-2000-11-06  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(impl_SelectNames_get_entry_for_section): Duplicate the object
-	reference before returning.
-
-2000-11-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c,
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c: Add
-	menus items to the envelope printing stuff.
-
-	* gui/component/addressbook.c: Hook up the search menu.
-
-	* gui/widgets/e-addressbook-search.c,
-	gui/widgets/e-addressbook-search.h: Add the search menu.
-
-	* printing/Makefile.am: Add e-contact-print-envelope.c and
-	e-contact-print-envelope.h.
-
-	* printing/e-contact-print-envelope.c,
-	printing/e-contact-print-envelope.h: Added envelope printing.
-
-2000-11-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/component/select-names/Makefile.am: Clean the idl-generated
-	files properly.
-
-2000-11-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ename/.cvsignore, gui/minicard/.cvsignore: Removed these
-	unnecessary .cvsignores.
-
-	* gui/component/addressbook.c: Switch to using EAddressbookSearch
-	instead of custom quick search widget.
-
-	* gui/component/select-names/e-select-names.c: Made this do a
-	slightly better job of rendering names.
-
-	* gui/widgets/Makefile.am: Added e-addressbook-search.c and
-	e-addressbook-search.h.
-
-	* gui/widgets/e-addressbook-search.c,
-	gui/widgets/e-addressbook-search.h: New class that puts up an
-	entry and a combo box.
-
-2000-11-01  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (load_ldap_data): 
-	(e_ldap_storage_add_server): Add "highlighted" flag to
-	evolution_storage_new_folder
-
-2000-10-31  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (cursor_cb): Let the warning make sense
-	(compute_pid): remove
-	(local_record_from_ecard): Create local record from ecard - not finished
-	(local_record_from_uid): Obtain local_record from uid with the proper
-	e-book way
-	(set_status_cleared): Add empty callback
-	(add_archive_record): kill
-	(delete_archive_record): kill
-	(archive_record): Add empty callback
-	(conduit_get_gpilot_conduit): Update signal connects
-
-	* backend/pas/pas-backend-file.c (vcard_change_type): Function to determine
-	the type of change - not finished
-	(pas_backend_file_search_changes): Create a view and callback based on 
-	how the cards have changed
-	(pas_backend_file_process_get_changes): Implement the get changes operation
-	for files
-	(pas_backend_file_process_client_requests): Add GetChanges method for
-	processing
-
-	* backend/pas/pas-book.c (pas_book_queue_get_changes): Add changes to
-	the list
-	(impl_Evolution_Book_get_changes): implement object method
-	(pas_book_get_epv): Add get changes to epv
-	(pas_book_respond_get_changes): Respond to the get changes operation
-
-	* backend/pas/pas-book.h: Add GetChanges PASOperation
-
-	* backend/idl/addressbook.idl: add get_changes and respond_get_changes
-	methods
-
-	* backend/ebook/e-book.c (e_book_get_changes): Client function
-	to a view of the changed objects
-
-	* backend/ebook/e-book.h: New prototype
-
-2000-10-30  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* backend/e-book/e-card.c: Fixed marking of strings
-	for translation. Use "_(" instead of "_ (".
-	* gui/component/addressbook-factory.c: Add missing
-	calls to bindtextdomain() and textdomain noticed by
-	Dan Winship.
-	* gui/component/addressbook.c: Marked string for translation.
-	
-2000-10-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/Makefile.am, gui/search/Makefile.am,
-	printing/Makefile.am: Fixed these to include EXTRA_GNOME_CFLAGS.
-
-	* gui/component/select-names/e-select-names-manager.c: Turned off
-	newlines in header fields.
-
-2000-10-26  Michael Meeks  <michael@helixcode.com>
-
-	* printing/e-contact-print.c (e_contact_print_letter_tab),
-	(complete_sequence, e_contact_do_print_phone_list, lowify):
-	unsigned charness.
-
-2000-10-25  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (ldap_op_process_current): only
-	call the handler if the if we're connected, and if we fail to
-	connect finish the op and post a message.
-	(pas_backend_ldap_connect): add debug spew if DEBUG is defined.
-	(modify_card_handler): LDAP_RES_SEARCH_ENTRY => LDAP_SUCCESS.
-	(modify_card_handler): only perform the ldap_modify_s if we have a
-	list of modifications.
-	(get_cursor_handler): use ldap_error_to_response here.
-	(pas_backend_ldap_load_uri): use LDAP_PORT instead of the constant
-	389.
-
-2000-10-23  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/select-names/Makefile.am (INCLUDES): 
-	* gui/component/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
-
-	* backend/pas/Makefile.am (INCLUDES): 
-	* backend/ebook/Makefile.am (INCLUDES): Update GNOMELOCALEDIR.
-
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: Use new libeconduit calls and
-	abstraction
-
-	* conduit/address-conduit.c: ditto
-	
-2000-10-23  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.c (pre_sync): Use e_pilot_map_read
-	(post_sync): Use e_pilot_map_write
-
-	* conduit/Makefile.am: Link libeconduit and not libical
-
-2000-10-20  Michael Meeks  <michael@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (tb_save_and_close_cb): 
-
-	* gui/component/addressbook.c (toggle_view_as_cb): 
-
-2000-10-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduit/address-conduit.h: New structure of file - similar
-	to calendar/todo conduits
-
-	* conduit/address-conduit.c: ditto
-
-	* conduit/address-conduit-config.h: Config stuff for conduit
-
-	* conduit/.cvsignore: Update
-
-	* conduit/Makefile.am: Build fixes
-
-	* conduit/address-conduit-control-applet.desktop: Renamed
-	to e-address-conduit-control-applet.desktop
-
-	* conduit/address.conduit.in: Renamed to e-address.conduit.in
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c (SPEC): Remove Family name
-	column since it's a bit weird.  This also fixes the initial state
-	since all of the column choices were off by one.
-
-2000-10-19  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* printing/Makefile.am (glade_DATA): Remove
-	`e-contact-print.glade.h'.
-	(EXTRA_DIST): Move here.
-
-	* gui/component/Makefile.am (glade_DATA): Remove
-	`ldap-server-dialog.glade.h'.
-	(EXTRA_DIST): Move here.
-
-2000-10-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Change how the extension field acts when
-	converting delivery addresses to labels.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added the
-	function e_card_delivery_address_to_label.
-
-	* contact-editor/e-contact-editor-address.c: Fixed a potential
-	crash.
-
-	* contact-editor/e-contact-editor.c: Made this save the changed
-	data to the string version of the address.
-
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (change_view_type): update to new
-	UI handler.
-	(update_view_type): split from (change_view_type).
-	(control_activate): add an update_view_type.
-
-2000-10-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Change NAME_OR_ORG to return the
-	email address if both name and organization are taken.
-
-	* gui/component/select-names/e-select-names.c: Fixed up the spec
-	strings in this class.  Removed the "cursor_mode" argument to
-	ETable since it's part of the spec now.
-
-2000-10-17  Iain Holmes  <iain@helixcode.com>
-
-	* contact-editor/contact-editor.glade: Change the initial dialog 
-	visibility to FALSE
-	so the contact editor doesn't flash when it appears.
-
-2000-10-16  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c 
-	(e_select_names_manager_activate_dialog): Only allow one dialog
-	per manager.
-
-2000-10-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fulladdr.glade: Fixed a typo.  Made this look a
-	bit better.
-
-2000-10-15  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/select-names/Makefile.am:
-	* gui/component/Makefile.am: Remove CPPFLAGS since they just
-	duplicate flags that were already in INCLUDES.
-
-	* printing/Makefile.am (ecpsdir): 
-	* gui/widgets/Makefile.am:
-	* contact-editor/Makefile.am: Move -D flags from CPPFLAGS to
-	INCLUDES so they don't override any CPPFLAGS set at configure
-	time.
-
-2000-10-14  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): if we are in
-	LDAP mode then merge in the extra few items, otherwise just merge
-	the standard thing; saves duplication.
-
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: Added
-	"evolution:shell-component-icon" property.
-
-2000-10-14  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c 
-	(e_select_names_manager_activate_dialog): Only allow one dialog
-	per id.
-	(e_select_names_manager_destroy): Destroy the hashtable.
-	(e_select_names_manager_init): Init the hashtable.
-
-2000-10-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:
-	Rearranged these fields a bit more.
-
-2000-10-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/select-names/e-select-names.c,
-	gui/widgets/e-addressbook-view.c: Changed these for boolean
-	ascending attribute instead of int ascending attribute.  Fixed
-	e-select-names to not use a column past the end of its array.
-
-	* contact-editor/e-contact-editor-address.c,
-	contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:
-	Rearranged the address editor dialog.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed the column
-	elements, the no-headers attribute and added a cursor-mode=line
-	attribute.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/widgets/e-addressbook-view.c: Fixed the column elements here.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/select-names/e-select-names.c,
-	gui/widgets/e-addressbook-view.c: Updated these to the new style
-	ETables.
-
-2000-10-06  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/search/e-addressbook-search-dialog.c (get_widget): Removed
-	ondemand callback nonsense from rule_context_load().
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (create_ui): upd.
-	(e_contact_editor_init): upd.
-
-	* gui/component/addressbook.c (control_activate_cb): upd.
-	(control_deactivate): kill.
-	(control_activate): upd.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): update.
-
-	* contact-editor/e-contact-editor.c (create_ui): upd.
-
-Fri Sep 29 07:33:54 2000  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Made it so
- 	that minicard doesn't write out changes to the backend unless
- 	something's actually changed.
-
-Tue Sep 26 16:28:47 2000  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Make sure that card->name and
- 	card->full_name are always valid.
-
-	* contact-editor/e-contact-editor.c: Removed some unused
- 	variables.
-
-2000-09-22  Matt Bissiri  <bissiri@eecs.umich.edu>
-
-	* contact-editor/e-contact-editor-fullname.c (extract_info): If
-	(editor->name == NULL), store ptr to newly allocated ECardName in
- 	editor->name, not just in a stack variable.  This fixes a crash
- 	which happened when you click "New", then click "Full Name...",
- 	then enter name, then click "OK".
-
-	* backend/ebook/e-card.c (e_card_name_to_string): Add
- 	g_return_val_if_fail.
-
-2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/widgets/Makefile.am:
-	* gui/component/Makefile.am:
-	* contact-editor/Makefile.am:
-	* printing/Makefile.am: Look for ename in /e-util/ename instead of
-	/addressbook/ename
-	
-	* backend/ebook/e-card.c: Updated to include e-util/ename/*.h
-
-	* ename: Moved to /e-util so it could be shared
-
-	* Makefile.am (SUBDIRS): took out ename
-
-2000-09-25  Nat Friedman  <nat@helixcode.com>
-
-	* ename/e-name-western-tables.h: Added a ton of new prefixes and
-	suffixes.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): update.
-
-	* contact-editor/e-contact-editor.c (create_ui): upd.
-
-2000-09-22  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: lots of changes.  flesh out the
- 	remove/modify/create functions.  add another flag for the property
- 	table, PROP_DN, which makes it easy for us to determine when we
- 	need to create a new DN for a record when we're modifying.  also
- 	add a ber_func to the table for PROP_TYPE_LIST fields, which fills
- 	in the list of bvalues that we send to the ldap server.  The
- 	add/modify/delete stuff hasn't been tested yet, and it hopelessly
- 	complex (yay ldap).
-	(ldap_search_handler): act synchronous when ldap_search responds
- 	with -1.
-	(view_destroy): use pas_book_view_notify_status_message.
-	(ldap_op_process_current): same
-	(ldap_op_process): same
-	(poll_ldap): same
-	(ldap_search_handler): same
-
-2000-09-22  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-card-simple.h: add
- 	E_CARD_SIMPLE_FIELD_FAMILY_NAME to the enum.
-
-	* backend/ebook/e-card-simple.c (field_data): add
- 	E_CARD_SIMPLE_FIELD_FAMILY_NAME.
-	(e_card_simple_get): add getter for FAMILY_NAME.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Made addresses be quoted printable again
- 	so that they will encode properly if they have carriage returns in
- 	them.  This is possible now because of a fix in libversit.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book-view-listener.c,
- 	backend/ebook/e-book-view-listener.h, backend/ebook/e-book-view.c,
- 	backend/ebook/e-book-view.h, backend/idl/addressbook.idl,
- 	backend/pas/pas-book-view.c, backend/pas/pas-book-view.h: Added a
- 	function to set the status message associated with a given view.
-  	This is not yet implemented in the gui.
-
-2000-09-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book.c, backend/ebook/e-book.h,
-	backend/idl/addressbook.idl, backend/pas/pas-backend-file.c,
-	backend/pas/pas-backend-ldap.c, backend/pas-backend.c,
-	backend/pas/pas-backend.h, backend/pas/pas-book.c,
-	backend/pas/pas-book.h: Added a function to query static
-	capabilities (capabilities that can be reported immediately) and
-	implemented them in the 2 servers.
-
-	* gui/component/addressbook.c: Added a View All button and a Stop
-	button.  Sorted out the new directory server stuff a bit.
-
-	* gui/widgets/e-addressbook-model.c,
-	gui/widgets/e-addressbook-model.h: Cleaned up a bit.  Added a stop
-	function.  Check for capabilities before deciding whether to load
-	all cards when initially viewed.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h: Added stop and view all
-	functions.
-
-	* gui/widgets/e-minicard-view-widget.c,
-	gui/widgets/e-minicard-view-widget.h,
-	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h:
-	Added a stop function.  Check for capabilities before deciding
-	whether to load all cards when initially viewed.
-
-2000-09-21  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): remove _UIHandler
-
-2000-09-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c: Added a missing include
-	of ctype.h.
-
-	* backend/pas/pas-backend-file.c: Fixed a problem where using a
-	GList was causing us to not be reentrant.  We now use an EList
-	here and so now this is reentrant.  This should fix the "wombat
-	crashes every time you run evolution" bug.
-
-	* contact-editor/e-contact-editor.c: Fixed a type mismatch.
-
-2000-09-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c: Make this work when a
-	field is spread across multiple lines.
-
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added a
-	wants_html field to cards.  Uses "x-mozilla-html".
-
-	* contact-editor/Makefile.am: Added definition of
-	EVOLUTION_DATADIR.
-
-	* contact-editor/contact-editor.glade: Make Wants HTML check
-	button visible.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Make Wants HTML check button
-	active.  Fix UI stuff to use XML.  Set parent window of
-	confirm_delete dialog.
-
-	* gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c: Set
-	the parent window of the confirm_delete dialog.
-	
-2000-09-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/e-addressbook-view.c: Fixed display of the minicards
-	when the addressbook was first loading.  (It was overwriting a
-	string with NULL during init.)
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* gui/search/Makefile.am (ruledir): Use $(datadir), not
-	$(prefix)/share
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am, contact-editor/Makefile.am,
-	ename/Makefile.am, gui/component/Makefile.am,
-	gui/widgets/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* backend/ebook/e-card.c, backend/pas/pas-backend-file.c,
-	contact-editor/e-contact-editor-address.c,
-	contact-editor/e-contact-editor-categories.c,
-	contact-editor/e-contact-editor-categories.h,
-	contact-editor/e-contact-editor-fullname.c,
-	contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-save-as.c, ename/e-address-western.c,
-	ename/test-ename-western-gtk.c,
-	gui/component/addressbook-factory.c, gui/component/addressbook.c,
-	gui/component/e-cardlist-model.h, gui/component/e-ldap-storage.c,
-	gui/component/select-names/e-select-names-bonobo.c,
-	gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-table-model.h,
-	gui/component/select-names/e-select-names-text-model.h,
-	gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/search/e-addressbook-search-dialog.c,
-	gui/widgets/e-addressbook-model.h,
-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard-label.c,
-	gui/widgets/e-minicard-view-widget.c,
-	gui/widgets/e-minicard-view-widget.h,
-	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h,
-	gui/widgets/e-minicard-widget.h, gui/widgets/e-minicard.c,
-	gui/widgets/test-minicard-label.c, gui/widgets/test-reflow.c,
-	printing/e-contact-print.c: Fixed the #include lines to deal
-	properly with gal.
-	
-2000-09-15  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.h,
-	contact-editor/e-contact-save-as.h,
-	gui/widgets/e-addressbook-model.h,
-	gui/widgets/e-minicard-view-widget.h,
-	gui/widgets/e-minicard-view.h, gui/widgets/e-minicard.c,
-	gui/widgets/e-minicard.h: Fixed the paths of some .h #includes.
-
-	* gui/component/addressbook.c: Removed all of the code to actually
-	create and display the correct view of the addressbook and moved
-	it to the new class gui/widgets/e-addressbook-view.c.
-
-	* gui/widgets/Makefile.am: Added everything necessary for
-	e-addressbook-view.c and e-addressbook-view.h.
-
-	* gui/widgets/e-addressbook-view.c,
-	gui/widgets/e-addressbook-view.h: New class to deal with actual
-	display of addresses and switching between card view and table
-	view.
-
-	* gui/widgets/e-minicard-view-widget.c: Made this deal more
-	gracefully with having the book set to NULL.
-
-2000-09-16  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c: fix broken include.
-
-	* gui/component/Makefile.am (INCLUDES): define datadir.
-	(evolution_addressbook_SOURCES): remove e-addressbook-model.[ch]
-
-	* gui/component/addressbook.c (control_activate): use datadir.
-
-2000-09-16  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/widgets/Makefile.am (gladedir): Define.
-	(glade_DATA): Install `alphabet.glade'.
-	(EXTRA_DIST): Define.
-
-	* gui/component/Makefile.am (glade_DATA): Remove `alphabet.glade'.
-	(EXTRA_DIST): Remove `alphabet.glade.h'.
-
-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): Add
-	`e-addressbook-model.c' and `e-addressbook-model.h'.  I hope this
-	is what Chris meant to do.
-
-	* gui/component/Makefile.am (INCLUDES): Add
-	`-I$(top_srcdir)/addressbook/gui/widgets'.
-	(evolution_addressbook_SOURCES): Remove `e-addressbook-model.c'
-	and `e-addressbook-model.h'.
-
-	* gui/component/select-names/e-select-names.c: #include
-	"e-addressbook-model.h" from "addressbook/gui/widgets" instead of
-	"addressbook/gui/component", as it has been moved there.
-
-2000-09-15  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: split all the ldap operations
-	into 2 halves, a handler, and destructor, and create a structure
-	containing two function pointers and any data they need.  this
-	allows us queue up pending operations (since the LDAP*'s are no
-	longer view specific.  there's one per backend.)  also, add
-	support for restarting async operations if the SERVER DOWN error
-	isn't communicated until sometime after the handler is called (as
-	is the case with the async search stuff.)
-
-2000-09-14  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook-factory.c (main): Call unicode_init
-	for e-font stuff.
-
-2000-09-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/Makefile.am, gui/widgets/Makefile.am: Added
-	$(GNOME_PRINT_LIBS) to all of the test files in these directories.
-
-2000-09-14  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): fix path.
-
-	* gui/component/addressbook.c: update include.
-
-	* gui/component/addressbook-factory.c: update include.
-
-	* gui/widgets/e-minicard-view.h: update include.
-
-	* gui/search/e-addressbook-search-dialog.c: update include path.
-
-2000-09-13  Michael Meeks  <michael@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_init): hack.
-	(create_toolbar): ditto.
-
-2000-09-07  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c: Radicaly update UI handler code.
-
-2000-09-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/widgets/*, gui/minicard/*: Moved gui/minicard to
-	gui/widgets, except for e-reflow.c, e-reflow.h, e-reflow-sorted.c,
-	and e-reflow-sorted.h.
-
-	* gui/widgets/Makefile.am: Added e-reflow to the INCLUDES list and
-	libereflow.a to a bunch of LDADD lines.
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added
-	libereflow.a here.
-
-	* gui/Makefile.am (SUBDIRS): Replaced minicard with widgets.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/select-names/Makefile.am: Add space after `-I'
-	when invoking `orbit-idl'.
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/Makefile.am (EXTRA_DIST): Remove `ui.xml'.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Fixed a crash error.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ename/e-address-western.c: Fixed some warnings.
-
-2000-09-11  Jesse Pavel <jpavel@helixcode.com>
-
-	* ename/e-address-western.c: fixed certain address parsing
-	problems.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/fulladdr.glade: Made this a bit better balanced.
-
-	* gui/component/addressbook.c: Make the toolbar button for find do
-	the same thing that the menu item for search does.
-
-	* gui/search/e-addressbook-search-dialog.c: Made the top half of
-	this not expand.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Removed a bunch of redundant code.  Made it so that when you set
-	an address label, it sets the delivery address as well.  Added
-	functions to set and get the delivery address.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added code to
-	convert and address label to a delivery address.
-
-	* contact-editor/Makefile.am: Added e-contact-editor-address.[ch],
-	fulladdr.glade, fulladdr.glade.h.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Switched from a label
-	to a button to show the parsed address.
-
-	* contact-editor/e-contact-editor-address.c,
-	contact-editor/e-contact-editor-address.h: New class to implement
-	the parsed address dialog.
-
-	* contact-editor/e-contact-editor-fullname.c,
-	contact-editor/e-contact-editor-fullname.h: Added const to the
-	_new function.
-
-	* contact-editor/e-contact-editor.c: Implemented clicking on the
-	address button.
-
-	* contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:
-	New glade files for the parsed address dialog.
-
-	* contact-editor/fullname-strings.h, fullname.glade: Changed these
-	accellabels to labels.
-
-	* ename/Makefile.am: Added e-address-western.c.
-
-	* ename/e-address-western.c: Fixed some warnings.
-
-2000-09-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* ename/e-address-western.c: Added by Jesse.
-
-2000-09-08  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* gui/minicard/e-minicard-label.c (e_minicard_label_construct):
-	Use canvas default font
-
-	* gui/minicard/e-minicard.c (e_minicard_realize): Ditto
-	(get_left_width): Ditto
-
-2000-09-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a few warnings.
-
-2000-09-02  Lauris kaplinski  <lauris@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: e_utf8 wrappers
-
-	* contact-editor/e-contact-editor.c: e_utf8 wrappers
-
-2000-09-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (load_ldap_data): Updated for the
-	extra arg now needed by `evolution_storage_new_folder()'.
-	(e_ldap_storage_add_server): Likewise.
-
-2000-08-31  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* conduit/Makefile.am (INCLUDES): Add `BONOBO_GNOME_CFLAGS' and
-	`-I$(top_srcdir)'.
-
-2000-08-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Install load-gnomecard-addressbook
-	and load-pine-addressbook.
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* printing/e-contact-print.c: Countless small changes for gnome-print 0.21+
-
-2000-08-30  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: Add a name to the minicard
-	viewer.
-
-2000-08-29  Dan Winship  <danw@helixcode.com>
-
-	* backend/ebook/e-book.c: 
-	* backend/ebook/test-client.c: 
-	* backend/ebook/test-client-list.c: 
-	* backend/ebook/load-gnomecard-addressbook.c: 
-	* backend/ebook/load-pine-addressbook.c: 
-	* backend/pas/pas-book-factory.c: 
-	* conduit/address-conduit.h: Remove USING_OAF checks
-
-2000-08-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Use the right argument name to turn
-	on grid lines.
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/minicard/Makefile.am: Comment out minicard-view-test
-	since its gnorba dependent
-	
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/component/addressbook-component.c: Remove gnorba stuff
-
-	* gui/minicard/e-minicard-control.c (e_minicard_control_factory_init):
-	ditto
-
-	* gui/component/addressbook.c: ditto
-
-	* gui/component/addressbook-factory.c: ditto
-
-2000-08-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* demo/* Removed the demo directory since it's no longer used.
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/minicard/Makefile.am: Remove gnorba stuff
-
-	* gui/minicard/e-minicard-control.gnorba: Kill
-	
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/component/addressbook.gnorba: Kill
-
-	* gui/component/Makefile.am:  Remove gnorba stuff
-
-2000-08-25  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_LDFLAGS): Add
-	-export-dynamic so libglade will be able to resolve custom widget
-	callbacks.
-
-2000-08-23  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* backend/pas/pas-backend-file.c (func_contains): Use e_utf8_strstrcase
-
-	* contact-editor/e-contact-editor-fullname.c (fill_in_field): Use e_utf8 wrapper
-	(extract_field): Same
-
-	* contact-editor/e-contact-editor.c (full_name_clicked): Don't crash
-
-	* ename/Makefile.am: Link demo with libeutil.la
-
-	* ename/test-ename-western-gtk.c (full_changed_cb): Use e_utf8 wrapper
-
-	* gui/component/addressbook.c (find_contact_cb): Use e_utf8 wrapper
-	(search_entry_activated): Same
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/e-addressbook-search-dialog.c: Fix an error in the
-	arguments to rule_context_load.
-
-	* backend/ebook/e-card.c: Fix this to not mess up if the person
-	passes a VCard with a carriage return in the mailing address.
-
-2000-08-14  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/search/addresstypes.xml: Fixed fullname->full_name for
-	search field.
-
-	* gui/search/e-addressbook-search-dialog.c (get_widget): Check we
-	actually got any parts to build the dialogue with.
-
-2000-08-13  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/component/addressbook-component.c (owner_set_cb): Set the
-	global_shell_client nastyhack when we know it.
-	This is only required to link with the filter code ...
-
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added
-	libfilter.a to the link line.
-
-	* gui/search/Makefile.am (noinst_LIBRARIES): Change library name
-	from libaddressbooksearchdialog to libaddressbooksearch, as used
-	elsewhere.
-
-	* gui/search/e-addressbook-search-dialog.c (get_widget):
-	Implement.
-	(get_query): Likewise.
-	(e_addressbook_search_dialog_destroy): Unref filter stuff when
-	done.
-
-	* gui/component/addressbook.c (control_deactivate): Added chris's
-	patch to put the meny in
-
-2000-08-22  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Use e_utf8 wrappers everywhere
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/e-card.h: Started adding a time zone field to ECard.
-
-	* gui/component/e-addressbook-model.c: Added
-	e_table_model_pre_change where appropriate.
-
-	* gui/minicard/e-minicard-control.c: Added a ref and unref pair.
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Linked in the search dialog again.
-	It looks like some changes in the shell made this not work.
-
-2000-08-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* conduit/address-conduit.c, conduit/address-conduit.h: Changed
-	this to use ECardSimple.
-
-	* contact-editor/e-contact-editor.c: Fixed a memory leak.
-
-	* gui/component/addressbook.c: Added stuff to the right click
-	menu.  Activated the new search dialog that doesn't quite work
-	yet.
-
-	* gui/minicard/e-minicard-view.c: Fixed some run time warnings.
-
-2000-08-15  Larry Ewing  <lewing@helixcode.com>
-
-	* gui/minicard/e-minicard.c (e_minicard_event): use style colors
-	for the selected state.  This doesn't properly redraw the minicard
-	when there is a style_change event, that is next.
-	(e_minicard_realize): use style colors.
-
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Include the proper db1/db.h
-	as in RedHat 7.0 -- patch from Kenny Graunke <kwg@teleport.com>
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/Makefile.am (libaddress_conduit_la_SOURCES): add
-	address-conduit.h
-
-	* Makefile.am (CONDUIT_SUBDIR): only set subdir if
-	ENABLE_PILOT_CONDUITS is set.
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* Makefile.am (SUBDIRS): add conduit subdir.
-
-2000-08-13  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (conduit_get_gpilot_conduit): add
-	special oaf initialization hack so conduit can find wombat, and
-	accept all cookies so that we can actually talk to oaf.
-
-2000-08-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Fixed a typo that cause the
-	wrong field to be searched.
-
-	* gui/component/select-names/e-select-names.c: Made the select
-	names dialog only display entries with email addresses.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade: Fixed a typo in the name of
-	the first phone entry.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/Makefile.am,
-	gui/search/e-addressbook-search-dialog.c,
-	gui/search/e-addressbook-search-dialog.h: A few small interface
-	fixes.
-
-	* gui/component/Makefile.am: Link in the addressbook search
-	dialog.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added the search directory.
-
-	* backend/ebook/e-book.c: Fixed a potential crash.
-
-	* gui/minicard/e-reflow-sorted.h: Fixed an include line.
-
-	* gui/search/.cvsignore, gui/search/Makefile.am: New files.
-
-	* gui/search/e-addressbook-search-dialog.c: Fixed compilation.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* printing/Makefile.am: Ettore fixed compilation.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/.cvsignore: Added load-gnomecard-addressbook.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/e-addressbook-search-dialog.c,
-	gui/search/e-addressbook-search-dialog.h: Made this into a Gtk
-	object.
-
-2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-book-view.c: Ref our book view listener.
-
-	* gui/component/addressbook.c: Updated to use new minicard view
-	widget.
-
-	* gui/minicard/Makefile.am: Added e-minicard-view-widget.c and
-	e-minicard-view-widget.h.
-
-	* gui/minicard/e-minicard-view-widget.c,
-	gui/minicard/e-minicard-view-widget.h: New class that's just a
-	minicard view in an ECanvas.
-
-	* gui/search/e-addressbook-search-dialog.c: New file for
-	implementing a search dialog.
-
-2000-08-11  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (transmit): implement code to encode
-	the first email address and send to the pilot.
-	(get_phone_label_by_flag): rename find_phone_label_for_flags to
-	this, and implement by calling get_phone_label_by_name.
-
-2000-08-11  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (ecard_from_remote_record): add code
-	for handling email addresses from pilot (which stores it as a
-	phone number entry.  go figure.)
-	(check_for_slow_setting): #if 0 out, since we don't use it (yet).
-	(update_record): un #if 0 the code to handle the case where the
-	pilot info has changed for a local record.
-	(merge_ecard_with_remote_record): implement function, but for now
-	just return the existing (desktop) record - we still don't allow
-	merge from the pilot.
-
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/addresstypes.xml: Changed a couple of input field
-	names.
-
-2000-08-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c: Remove prototype for
-	`setup_ldap_storage()', which shouldn't be here anyway.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/search/, gui/search/addresstypes.xml: New search dialog for
-	addressbook.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook-component.c (owner_set_cb): Update for
-	changed prototype, pass evolution_homedir arg to
-	setup_ldap_storage.
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Now takes
-	an evolution_homedir arg, uses that to generate the path to the
-	ldapservers.xml file, and stores the result in a static variable.
-	(e_ldap_storage_add_server, e_ldap_storage_remove_server): Use that
-	static variable rather than hardcoding the path to the file.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Fixed any search to not crash on
-	missing phone numbers or email addresses.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-control.c: Added a button to save to
-	your addressbook.
-
-2000-08-09  Cody Russell  <bratsche@gnome.org>
-
-	* gui/component/addressbook.c: Make the toolbar honor the user's
-	gnomecc settings for detachable toolbars.
-
-2000-08-09  Nat Friedman  <nat@helixcode.com>
-
-	* ename/e-name-western-tables.h: Added some military prefixes.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Fixed a warning.
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Add the stock
-	print icon to the print item.
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Put the print
-	item in the right placeholder so that it gets the right position
-	in the "File" menu.
-	(control_deactivate): Updated accordingly.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c, gui/minicard/e-minicard.c: Changed
-	e_popup_menu_run call to match the new arguments.
-
-	* gui/component/addressbook.oafinfo: Fixed this file to work
-	properly.
-
-	* gui/minicard/e-minicard-control.c: Use the correct oafinfo ID
-	here.  Also cleaned up the code a bit with the help of Michael
-	Meeks.
-
-2000-08-08  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-addressbook-model.c (e_addressbook_model_init):
-	use x-evolution-any-field.
-
-	* gui/component/addressbook.c (search_entry_activated): use
-	x-evolution-any-field.
-	(change_view_type): same.
-
-	* gui/minicard/e-minicard-view.c (e_minicard_view_init): set query
-	to x-evolution-any-field.
-
-	* backend/pas/pas-backend-ldap.c (func_contains): support
-	x-evolution-any-field for matching any evolution supported field.
-
-	* backend/pas/pas-backend-file.c (compare_email): switch to using
-	ECardSimple calls.
-	(compare_phone): same.
-	(compare_address): same.
-	(entry_compare): switch to using ECardSimple calls, and support a
-	'x-evolution-any-field' wildcard field.
-	(vcard_matches_search): use an ECardSimple.
-
-2000-08-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Removed the next and prev
-	toolbar buttons since they don't do anything.
-
-2000-08-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor.c: Fixed the tab order to not
-	repeat the web page address field.
-
-2000-08-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Fixed the tab order for this
-	dialog.
-
-2000-08-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed a warning.
-
-	* backend/ebook/e-card.c: Cast to (char *) in
-	e_card_load_cards_from_file since libversit isn't const correct.
-
-	* backend/pas/pas-backend-file.c: Fixed a warning.
-
-2000-08-04  Michael Meeks  <michael@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): unref.
-
-	* demo/addressbook.c (control_activate): unref.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/e-addressbook-model.c: Emit "model_pre_change"
-	signal as appropriate.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c: Adapted this to supply the
-	new append_row API of ETableModel.
-
-2000-07-31  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Changed the default set of columns.
-
-2000-07-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added load-gnomecard-addressbook
-	compilation.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	e_card_load_cards_from_file helper function to load multiple cards
-	from a single file.
-
-	* backend/ebook/load-gnomecard-addressbook.c: New file to load
-	vcard files.  I think this is the format that gnomecard uses so if
-	you copy your gnomecard file to gnomecard.vcf and then run this
-	program in the same directory, it'll copy all your gnome contacts
-	into evolution.  It needs to be changed to take a filename as a
-	parameter.  Some fields (phone and address information, for
-	example) aren't displayed properly, but are saved.  This is new
-	code, so some other than phone and address may be lost.
-
-2000-07-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* backend/pas/Makefile.am: Add `pas-backend-ldap.c' and
-	`pas-backend-ldap.h' to `EXTRA_DIST' so they get distributed even
-	if the OpenLDAP support is not enabled.
-
-2000-07-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c: Changed the URI to load
-	to.
-
-2000-07-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-widget-test.c: Fixed a warning.
-
-2000-07-26  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (view_destroy): wait to free the
-	view until we've taken care of freeing its internals.  also, close
-	the ldap connection here.
-	(pas_backend_ldap_connect): rename p_b_l_ensure_connected to this,
-	since it's always called when we create a view.
-	(pas_backend_ldap_build_all_cards_list): open an ldap connection
-	in this function and close it at the end.
-	(poll_ldap): make sure to call ldap_unbind to close the view's
-	connection here.
-	(pas_backend_ldap_search): call pas_backend_ldap_connect here -
-	ldap_unbind will either be called from poll_ldap or from
-	view_destroy.
-	(pas_backend_ldap_get_vcard): the PASBackendLDAP no longer has an
-	LDAP*.
-
-2000-07-26  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_build_all_cards_list): add support for user settable scope.
-	(pas_backend_ldap_search): same.
-	(pas_backend_ldap_load_uri): same.
-
-2000-07-26  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: lowercasify the
-	supported_mime_types
-
-2000-07-25  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-card-types.h: add enum for e-card pilot status.
-
-	* conduit/address-conduit.c: #ifdef out all the archiving code with SUPPORT_ARCHIVING.
-	(purge): implement correctly - deleting ecards whose pilot status is DELETED.
-	(set_status): implement.
-	(set_pilot_id): add gtk_main call here to change commit_card into a synchronous
-	(delete_all): implement correctly - don't delete the records, just set their status to DELETED.
-	(local_record_from_ecard): get the current status from the ecard.
-
-	* backend/ebook/e-card.c (e_card_get_vcard): add vcard support for pilot status.
-	(parse_pilot_status): new function.
-	(e_card_class_init): add pilot status object arg.
-	(e_card_set_arg): add pilot status support.
-	(e_card_get_arg): same.
-	(e_card_init): initialize pilot_status to 0.
-
-2000-07-25  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c: add comment headers to signals that
-	didn't have any.
-	
-2000-07-25  Chris Toshok  <toshok@helixcode.com>
-
-	* conduit/address-conduit.c (start_address_server): use the user's
-	Contact db.  not toshok's.
-
-2000-07-25  Michael Meeks  <michael@helixcode.com>
-
-	* backend/ebook/load-pine-addressbook.c (book_open_cb): check we
-	opened ok.
-
-2000-07-25  Seth Alves  <alves@hungry.com>
-
-	* ename/Makefile.am (libename_static_la_LDFLAGS): build static
-	version of the library for address conduit to use
-
-	* backend/ebook/Makefile.am: build a static version of the library
-	to link into the conduit
-
-2000-07-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Added a #define for
-	"X-EVOLUTION-PILOTID".  Added a parse_pilot_id to read pilot id's
-	in properly from VCards.  Rearranged some field orders.  Added a
-	get_arg case for ARG_PILOTID.  Initialize pilot_id field to 0.
-
-2000-07-24  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-card.h: add pilot_id.
-
-	* backend/ebook/e-card.c (e_card_get_vcard): add support for
-	X-EVOLUTION-PILOTD vcard field.
-	(e_card_class_init): add pilot_id arg.
-	(e_card_set_arg): handle pilot_id arg.
-
-2000-07-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book-view-listener.c: Remove the idle handler
-	when we're destroyed.
-
-	* printing/e-contact-print.c: Fixed the spacing on the card
-	header.
-
-2000-07-20  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.oafinfo: Fixed the oaf info.
-
-	* gui/minicard/.cvsignore, gui/minicard/Makefile.am,
-	gui/minicard/e-minicard-widget-test.c: Added a test for the
-	minicard widget.
-
-	* gui/minicard/e-minicard-control.c: Fixed the mime type.
-
-	* gui/minicard/e-minicard.c: Fixed some crashes if your parent
-	isn't a minicard view.
-
-	* gui/minicard/e-minicard-control.oafinfo: Removed.
-
-2000-07-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Update for
-	the new `evolution_shell_component_new()'.
-
-2000-07-19  Fatih Demir	<kabalak@gmx.net>
-	
-	* conduit/address-conduit-control-applet.desktop:
-		Added the Turkish desktop entry.
-
-2000-07-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-control.c: Added "text/vCard" to the
-	list of mime types we support.
-
-2000-07-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/Makefile.am: Added
-	gui/minicard/e-minicard-control.c,
-	gui/minicard/e-minicard-control.h,
-	gui/minicard/e-minicard-widget.c, and
-	gui/minicard/e-minicard-widget.h.
-
-	* gui/minicard/e-minicard-control.c,
-	gui/minicard/e-minicard-control.h,
-	gui/minicard/e-minicard-widget.c,
-	gui/minicard/e-minicard-widget.h: Got these to compile.
-
-	* gui/minicard/e-minicard-control.gnorba,
-	gui/minicard/e-minicard-control.oafinfo: Copied directly from
-	bonobo-clock-control.  These aren't done yet.
-
-2000-07-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-control.c,
-	gui/minicard/e-minicard-control.h,
-	gui/minicard/e-minicard-widget.c,
-	gui/minicard/e-minicard-widget.h: New files for using a minicard
-	as a widget or a bonobo control.
-
-2000-07-14  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (ldap_server_foreach): duh.
-	don't save the port in the host slot either.
-
-2000-07-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-confirm-delete.glade,
-	contact-editor/e-contact-editor-confirm-delete.glade.h: Added
-	these.
-
-2000-07-13  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Switched the order of compilation of printing and
-	contact-editor.
-
-	* contact-editor/Makefile.am: Added printing libraries and a
-	confirm delete dialog glade file.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Enabled the delete and print
-	functions as well as providing a confirm delete dialog to the
-	outside world.
-
-	* gui/component/addressbook.c: Made the delete button on new cards
-	active.
-
-	* gui/minicard/Makefile.am: Added printing libraries to a number
-	of test programs.
-
-	* gui/minicard/e-minicard.c: Added print and delete to the right
-	click menu.  Made the delete button on the card editor active.
-
-	* printing/e-contact-print.c, printing/e-contact-print.h: Added a
-	function to print a single card.
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-ldap-storage.c (ldap_server_foreach): oops.  fix
-	typo that was saving the port in the rootdn spot.
-	(save_ldap_data): make this a bit safer - writing to a new file
-	and renaming it.
-	(load_ldap_data): make this a bit smarter - if parsing the
-	ldapservers.xml file fails and there's a .new file there,
-	rename it.
-	
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Do case insensitive compares.
-
-	* addressbook/gui/component/addressbook.c: Make quick search
-	search both name and company name.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Add icons to the toolbars.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/Makefile.am: Added installation of arrow.png.
-
-	* contact-editor/e-contact-editor.c: Use EVOLUTIONDIR #define.
-
-2000-07-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Removed an unused function
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/select-names/Makefile.am (EXTRA_DIST): add idl
-	file to EXTRA_DIST
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Remove the
-	SelectNames test.
-
-2000-07-10  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* gui/component/select-names/e-select-names-model.c: (Clahey's fix)
-	Make multiple addresses be concatenated correctly.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c,
-	gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Switched from ETable
-	to ETableScrolled.
-
-	* addressbook/gui/minicard/e-minicard.c: Don't display mailer or
-	"name or org" fields.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added a field that gives the name if it exists and the company
-	name otherwise.
-
-	* gui/component/e-addressbook-model.c: Formatting changes.
-
-	* gui/component/select-names/e-select-names-table-model.c: Added
-	stripping of names and display of company name if name doesn't
-	exist.
-
-	* gui/component/select-names/e-select-names.c: Fixed up the
-	display so that we display both name and email address.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-model.c: Fixed a small
-	off by one error that was causing an extra character to get
-	deleted sometimes.
-
-2000-07-09  Anders Carlsson  <andersca@gnu.org>
-
-	* gui/minicard/test-reflow.c (allocate_callback): Fix off by one bug with
-	scroll region setting.
-	(resize): Likewise.
-	(main): Put the contacts list in an EScrolledFrame instead of using a
-	separate GtkScrollbar.
-
-	* gui/minicard/e-reflow.c (e_reflow_event): Don't change mouse cursor and
-	don't allow drags on dividers that aren't visible.
-
-	* gui/component/addressbook.c (allocate_callback): Fix off by one bug with
-	scroll region setting.
-	(resize): Likewise.
-	(create_minicard_view): Put the contacts list in an EScrolledFrame instead of
-	using a separate GtkScrollbar.
-
-2000-07-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Removed unused do_nothing_cb
-	function.
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-manager.h: Made the OK
-	and Cancel buttons in the ESelectNames dialog we create work
-	properly.
-	
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h: Added
-	e_select_names_model_duplicate.
-
-	* gui/component/select-names/e-select-names-text-model.c: Made the
-	text be set correctly if there's already data in the source when
-	the text model is created.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Removed handling of
-	the buttons (the user of this dialog will have to handle them.)
-	Added e_select_names_get_source.  Fixed some typos.
-
-2000-07-09  Not Zed  <NotZed@HelixCode.com>
-
-	* gui/component/addressbook.c: Link the toolbar print button to
-	the print callback.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c
-	(e_select_names_clicked): Hitting OK or Cancel at least closes the
-	dialog now.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_create_entry): Set the returned entry to
-	use the ellipsis.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-factory.c: Include
-	e-select-names-factory.h.
-
-	* gui/component/select-names/e-select-names-model.c: Handle a NULL
-	iterator properly in the replace function.
-
-	* gui/component/select-names/e-select-names-table-model.c: Fill in
-	info properly in the value_at function.
-
-	* gui/component/select-names/e-select-names-text-model.c: Don't
-	strlen a NULL text object.
-
-	* gui/component/select-names/e-select-names.c: Close if the person
-	hits ok or cancel (doesn't yet actually undo changes if Cancel is
-	hit.)  Handle removing addresses when they're double clicked on.
-
-	* gui/component/select-names/select-names.glade,
-	gui/component/select-names/select-names.glade.h: Hid some unused
-	fields and changed the text at the top of the dialog.
-
-2000-07-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/component/select-names/.cvsignore: Ignore dynamically 
-	created source files
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/select-names/e-select-names-bonobo.c
-	(entry_get_property_fn): New function to set the properties.
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-factory.c (main): Start up the factory
-	for `Evolution::Addressbook::SelectNames'.
-
-	* gui/component/select-names/evolution-addressbook-select-names.oafinfo:
-	New.
-
-	* gui/component/select-names/e-select-names-factory.c: New.
-	* gui/component/select-names/e-select-names-factory.h: New.
-
-	* gui/component/select-names/e-select-names-bonobo.c: New.
-	* gui/component/select-names/e-select-names-bonobo.h: New.
-
-	* gui/component/addressbook-factory.c (main): Call
-	`e_select_names_factory_init()'.
-
-	* gui/component/select-names/e-select-names-manager.c
-	(e_select_names_manager_add_section): Made const-aware.
-	(e_select_names_manager_create_entry): Made const-aware.
-	(e_select_names_manager_activate_dialog): Made const-aware.
-
-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:
-	New.
-
-2000-07-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c,
-	gui/component/e-addressbook-model.h: Added an "editable" argument.
-
-	* gui/component/select-names/e-select-names.c: Set our
-	EAddressModel to not be editable.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names.c: Changed to line
-	mode.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-model.c: Implemented the
-	get_cards function.
-
-	* gui/component/select-names/e-select-names.c: Implemented adding
-	cards through the interface.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c: Make the
-	entry widgets we create editable.
-
-	* gui/component/select-names/e-select-names-model.c: Use
-	e_strsplit instead of g_strsplit.  Fixed an off by 1 error.
-
-	* gui/component/select-names/e-select-names-table-model.c: When
-	the model changes, send a model changed signal.
-
-	* gui/component/select-names/e-select-names-text-model.c: Made
-	changing this work correctly if it's empty.  Made change signals
-	propagate properly.  Is a bit better about freeing iterators when
-	done.
-
-	* gui/component/select-names/e-select-names.c: Made the finished
-	lists be in order instead of being sorted.
-
-2000-07-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c (new_server_cb): Since
-	ELDAPServer->port is a char *, allocate a string with the number
-	389 contained.
-
-	* gui/component/addressbook.c: Make the select names test test the
-	new code instead of the old way of getting to an ESelectNames
-	dialog.
-
-	* gui/component/select-names/e-select-names-manager.c: Coded
-	storing the model for each section, creating an entry and
-	returning it, and for activating the dialog.  Wrote a bit of the
-	get_cards code, but not all of it.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h: Coded all of
-	the code needed to make ESelectNamesTextModel work (it doesn't
-	yet, but all the code should be there.)  Removed
-	E_SELECT_NAMES_MODEL_DATA_TYPE_SEPARATION_MATERIAL.
-
-	* gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-text-model.c: Changed
-	these to compensate for removal of
-	E_SELECT_NAMES_MODEL_DATA_TYPE_SEPARATION_MATERIAL.
-
-	* gui/component/select-names/e-select-names-table-model.h,
-	gui/component/select-names/e-select-names-text-model.h: Fixed some
-	silly typos.
-
-	* gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h: Added a parameter to
-	add_section that lets you specify the source ESelectNamesModel.
-	
-2000-07-06  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/e-ldap-storage.h: add scope to ELDAPServer, and
-	make port a string.
-
-	* gui/component/e-ldap-storage.c (load_ldap_data): don't load a
-	uri, load all the bits and pieces and build up the uri when
-	creating the folder, according to the openldap url format.
-	(ldap_server_foreach): store out each of the individual uri
-	pieces.
-	(e_ldap_storage_remove_server): free the new fields.
-	(get_string_value): if the text is empty, return the empty string
-	instead of NULL.
-
-	* gui/component/e-ldap-server-dialog.c (extract_server_info): port is a string now.
-	(fill_in_server_info): port is a string now.
-
-2000-07-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Changed "FIXME: Save and
-	Close" to "Save and Close".  Removed some toolbar items that will
-	never be used.
-
-	* gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h: Added functions
-	to allow you to modify the model (not implemented yet.)
-
-	* gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-table-model.h: Finished
-	this.  Doesn't support changing the model at all.
-
-	* gui/component/select-names/e-select-names-text-model.c: Finished
-	this.  Changing the model by typing is done, but doesn't work
-	since none of the functions in the base model are implemented.
-
-2000-07-05  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (new_server_cb): call
-	e_ldap_storage_add_server call.
-
-	* gui/component/ldap-server-dialog.glade: add name row.
-
-	* gui/component/e-ldap-server-dialog.h: remove the ELDAPServer type.
-
-	* gui/component/e-ldap-server-dialog.c (extract_server_info): add
-	support for the name-entry.
-
-	* gui/component/e-ldap-server-dialog.c (fill_in_server_info): same.
-
-	* gui/component/e-ldap-storage.h: add ELDAPServer type, and add
-	prototypes for e_ldap_storage_add_server and
-	e_ldap_storage_remove_server.
-
-	* gui/component/e-ldap-storage.c (e_ldap_storage_add_server): new
-	function, add it to our hash table, add a shell folder, and save
-	out the metadata.
-	(ldap_server_foreach): add the ldap server info under a
-	"contactserver" node.
-	(setup_ldap_storage): create our hashtable.
-
-2000-07-05  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (set_prop): remove hack to read
-	"uri" file from local directory.
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): add
-	e-ldap-storage.{c,h}
-
-	* gui/component/addressbook-component.c (owner_set_cb): call
-	setup_ldap_storage.
-
-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Register
-	the LDAP storage and load the .xml file.
-	(load_ldap_data): function to load our xml file.
-	(save_ldap_data): function to save our xml file.
-
-	* gui/component/e-ldap-storage.h: new file.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-text-model.c,
-	gui/component/select-names/e-select-names.c: Fixed more compile
-	errors.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/Makefile.am: Fixed compile error.
-
-2000-07-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Removed e-card-iterator.c,
-	e-card-iterator.h, e-card-list-iterator.c, e-card-list-iterator.h,
-	e-card-list.c, e-card-list.h.
-
-	* backend/ebook/e-card-iterator.c,
-	backend/ebook/e-card-iterator.h,
-	backend/ebook/e-card-list-iterator.c,
-	backend/ebook/e-card-list-iterator.h, backend/ebook/e-card-list.c,
-	backend/ebook/e-card-list.h: Removed in favor or versions without
-	the -card in the e-util directory since these classes are not
-	specific to cards at all.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h,
-	backend/ebook/e-card.c, backend/ebook/e-card.h,
-	backend/ebook/load-pine-addressbook.c, backend/ebook/test-card.c,
-	backend/pas/pas-backend-file.c: Changed the references to
-	e-card-list.c and friends to e-list.c and friends.
-
-	* contact-editor/e-contact-editor.c: Added #include
-	<e-contact-save-as.h> to fix a warning.
-
-	* gui/component/Makefile.am: Moved a number of classes associated
-	with the select-names object to the new select-names directory.
-
-	* gui/component/addressbook.c: Changed the reference to
-	e-select-names.h.
-
-	* gui/component/e-select-names.c, gui/component/e-select-names.h,
-	gui/component/select-names.glade,
-	gui/component/select-names.glade.h: Moved these files into
-	select-names/.
-
-	* gui/component/select-names/.cvsignore,
-	gui/component/select-names/Makefile.am,
-	gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-manager.h,
-	gui/component/select-names/e-select-names-model.c,
-	gui/component/select-names/e-select-names-model.h,
-	gui/component/select-names/e-select-names-table-model.c,
-	gui/component/select-names/e-select-names-table-model.h,
-	gui/component/select-names/e-select-names-text-model.c,
-	gui/component/select-names/e-select-names-text-model.h,
-	gui/component/select-names/e-select-names.c,
-	gui/component/select-names/e-select-names.h,
-	gui/component/select-names/recipient.glade,
-	gui/component/select-names/select-names.glade,
-	gui/component/select-names/select-names.glade.h: New files for
-	select names dialog (e-select-names.c, e-select-names.h,
-	select-names.glade, select-names.glade.h and recipient.glade moved
-	from gui/component/.)
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (owner_set_cb): Get an
-	EvolutionShellClient instead of an Evolution_Shell to match the
-	changes in libeshell.
-
-2000-06-28  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names/,
-	gui/component/select-names/e-select-names-manager.c,
-	gui/component/select-names/e-select-names-manager.h: New select
-	names manager interface (Not complete.)
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	addressbook/gui/component/e-cardlist-model.c: Added
-	value_to_string handlers.
-
-	* demo/addressbook-widget.c, demo/demo.c: Removed usage of "x" and
-	"y" arguments.
-
-	* addressbook/gui/component/addressbook.c: Activated Click To Add
-	and set the click to add message.
-
-	* addressbook/gui/component/e-addressbook-model.c: Added
-	value_to_string and append_row handlers.
-
-	* addressbook/gui/component/e-select-names.c: Added a column.
-
-2000-06-26  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (poll_ldap): remove spew.
-	(pas_backend_ldap_ensure_connected): duh, don't access a pointer
-	we know to be NULL.
-	(query_prop_to_ldap): rename map_e_card_prop_to_ldap to this.
-	easier to type.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/test-minicard-label.c,
-	gui/minicard/test-minicard.c, gui/minicard/test-reflow.c: Remove
-	usage of "x" and "y" arguments.
-
-2000-06-18    <ettore@helixcode.com>
-
-	* contact-editor/Makefile.am (INCLUDES): Use
-	`$(BONOBO_GNOME_CFLAGS)' so that we compile when Bonobo is not in
-	the default GNOME prefix.
-
-2000-06-17  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-label.c,
-	gui/minicard/e-minicard-label.h, gui/minicard/e-minicard.c: Made
-	the left column of minicards not get any wider than the widest
-	possible name.
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/Makefile.am (SHELL_OBJS): Removed.
-	(evolution_addressbook_LDADD): Link with
-	`$(top_builddir)/shell/libeshell.a'.
-
-2000-06-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Removed the
-	ETableModel thaw handler.
-	* gui/component/e-cardlist-model.c: Likewise.
-
-2000-06-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-select-names.c: Fixed the widget reparenting.
-
-2000-06-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/Makefile.am: Added glade files.
-
-	* gui/component/addressbook.c: Added a test of the Select Names
-	functionality.
-
-	* gui/component/e-addressbook-model.c: Made this class_init
-	function a bit cleaner.
-
-	* gui/component/e-select-names.c: Tested this and fixed some
-	obvious errors.
-
-	* gui/component/select-names.glade: The main window shouldn't be
-	visible by default.
-
-2000-06-11  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* contact-editor/Makefile.am (contact_editor_test_LDADD): Link
-	with libemiscwidgets.a.
-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Likewise.
-	* gui/minicard/Makefile.am (minicard_test_LDADD): Likewise.
-	(reflow_test_LDADD): Likewise.
-	(minicard_view_test_LDADD): Likewise.
-
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-cardlist-model.c: Renamed a bunch of functions
-	for better readability.
-
-	* gui/component/e-select-names.c, gui/component/e-select-names.h:
-	This should be a working dialog now.
-
-	* gui/component/select-names.glade: Changed the name & creation
-	function of the ETable here.
-
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/select-names.glade,
-	gui/component/select-names.glade.h: Glade files for Select Names
-	dialog.
-
-2000-06-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Do e_card_simple_sync and
-	extract_info more often.
-
-	* gui/component/addressbook.c: Added table printing code.
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (factory_fn): Pass NULL
-	for the new args @create_folder_fn and @remove_folder_fn.
-
-2000-06-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook-component.c (create_view): Updated for
-	the new `EvolutionShellComponentCreateViewFn'.  Return
-	`EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE' if @type is not
-	"contacts".
-
-2000-06-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Bind Save As to save the
-	current view of the contact as a vcard.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* contact-editor/e-contact-editor.c (save_card): Doh, sync the
-	card simple and extract the card info.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* contact-editor/e-contact-editor.h (EContactEditor): Now this
-	derives from GtkObject.  It follows the same strategy as the
-	EventEditor in the calendar.
-	(EContactEditor): Added an is_new_card field so that we can know
-	whether to add() or commit() the card.
-
-	* contact-editor/e-contact-editor.c (e_contact_editor_get_type):
-	Derive from GtkObject.
-	(e_contact_editor_class_init): Likewise.
-	(e_contact_editor_class_init): Added an "is_new_card" argument.
-	(e_contact_editor_set_arg): Handle ARG_IS_NEW_CARD.
-	(e_contact_editor_get_arg): Likewise.
-	(e_contact_editor_new): Take in an is_new_arg argument and set it
-	on the object.
-	(e_contact_editor_init): Load the app widget into the app field of
-	the EContactEditor structure.  Create its UIHandler as well.
-	(e_contact_editor_class_init): New "add_card", "commit_card", and
-	"editor_closed" signals.
-
-	* contact-editor/test-editor.c (main): Modified for the new API.
-	(editor_closed_cb): Tweaked for the new API.
-	Since this test program does not use Bonobo, it doesn't work,
-	though.
-
-	* gui/component/addressbook.c (new_contact_cb): Use the new
-	contact editor API.
-	(table_double_click): Ditto.
-
-	* gui/minicard/e-minicard-view.c (e_minicard_view_event): Use the
-	new contact editor API.
-
-	* gui/minicard/e-minicard.c (e_minicard_event): Use the new
-	contact editor API.
-
-2000-06-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* contact-editor/Makefile.am (contact_editor_test_LDADD): Remove
-	the `$(srcdir)/' prefix from `libecontacteditor.a' because [of
-	course] the library is built in the build directory, not in the
-	source directory.
-	* gui/minicard/Makefile.am (minicard_test_LDADD): Likewise with
-	`libeminicard.a'.
-	(minicard_label_test_LDADD): Likewise.
-	(reflow_test_LDADD): Likewise.
-	(minicard_view_test_LDADD): Likewise.
-
-2000-06-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Bind right click on the ETable to
-	"Save to VCard."
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Made phone/email/address
-	labels change correctly again.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook-component.c: Made
-	evolution-addressbook shut down when the shell is done with it.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard.c: Made
-	double click only work on the first button.
-
-2000-06-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard.c: return TRUE if opening a contact
-	editor so that we don't get a "new dialog" contact editor.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (new_contact_cb): Use the stock
-	cancel button for the dialog.
-	(table_double_click): Likewise.
-	(find_contact_cb): Likewise.
-
-2000-05-31  Miguel de Icaza  <miguel@helixcode.com>
-
-	* contact-editor/contact-editor.glade: Added accelerators for
-	the remaining items.
-
-	Add spacing, beautify the dialogs.
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Put the toolbar
-	into a frame to make it look like standard GNOME toolbars.  Also,
-	set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not do
-	evil things when its moved to the left or the right of the window.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-cardlist-model.c,
-	gui/component/e-cardlist-model.h: New files for card list.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Fixed a memory leak.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/alphabet.glade: Made the alphabet buttons not
-	focusable.
-
-	* gui/minicard/e-minicard-view.c: Made the "123" button work.
-
-	* gui/minicard/e-reflow-sorted.c: Made all buttons past the last
-	letter available work.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/alphabet.glade: Added a bit of space around the
-	alphabet bar.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/Makefile.am: Added alphabet.glade and
-	alphabet.glade.h.
-
-	* gui/component/addressbook.c, gui/component/alphabet.glade,
-	gui/component/alphabet.glade.h: Added an alphabet bar.
-
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard-view.h,
-	gui/minicard/e-reflow-sorted.c, gui/minicard/e-reflow-sorted.h:
-	Added the ability to just to a particular spot in the reflow.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* printing/Makefile.am: Added BONOBO_GNOME_CFLAGS to CPPFLAGS.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-view.c: Made double clicking create a
-	new card.  Set the empty message.
-
-	* gui/minicard/e-minicard.c: Made sorting be case insensitive.
-
-	* gui/minicard/e-reflow-sorted.c, e-reflow.c, e-reflow.h: Added a
-	message for when the reflow is empty.
-
-	* printing/e-contact-print.c, printing/medbook.ecps: Made the
-	default printout be full page.  Made sorting case insensitive.
-
-2000-05-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book-view-listener.c,
-	backend/ebook/e-book-view-listener.h, backend/ebook/e-book-view.c,
-	backend/ebook/e-book-view.h, backend/idl/addressbook.idl,
-	backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c,
-	backend/pas/pas-book-factory.c, backend/pas/pas-book-view.c,
-	backend/pas/pas-book-view.h: Added "sequence_complete" signal.
-
-	* printing/e-contact-print.c: Made printing wait for
-	"sequence_complete" signal and made it sort.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c,
-	gui/component/e-addressbook-model.c,
-	gui/component/e-addressbook-model.h: Added double click to open
-	contact editor.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Removed some columns.
-
-2000-05-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component/addressbook.c (addressbook_factory_new_control):
-	New function.
-	(addressbook_factory): Use it.
-
-	* Makefile.am (evolution_addressbook_LDADD): Link with
-	`evolution-shell-component.o' from the shell directory.
-
-	* gui/component/addressbook-component.c: New.
-	* gui/component/addressbook-component.h: New.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Switched printing and gui.
-
-	* backend/ebook/e-book-view-listener.h,
-	backend/ebook/e-book-view.h, backend/ebook/e-book.h,
-	backend/ebook/e-card-cursor.h, backend/ebook/e-card-list.h,
-	backend/ebook/e-card-simple.h, backend/ebook/e-card.h: Fixed the
-	#defines to work elsewhere in evolution.
-
-	* gui/component/Makefile.am: Added linking to libecontactprint.
-
-	* gui/component/addressbook.c: Added a menu item to print the
-	current query.
-
-	* printing/Makefile.am: Add linking to libebook and requirements.
-	Add installation of ecps files.
-
-	* printing/e-contact-print.c, printing/e-contact-print.h: Changed
-	this to use real data from an EBook.
-
-	* printing/test-print.c: Made this pass NULL, NULL to
-	e_contact_print_dialog_new so that it will compile.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-save-as.c: Fixed some memory leaks.
-
-2000-05-23  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/Makefile.am: Added e-contact-editor-save-as.c and
-	e-contact-editor-save-as.h.
-
-	* contact-editor/e-contact-save-as.c,
-	contact-editor/e-contact-save-as.h: New files that display a save
-	as dialog and then save the given card to that file.
-
-	* gui/minicard/e-minicard.c: Call e_contact_save_as in a right
-	click menu.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c,
-	gui/component/e-addressbook-model.c: Added initialize_value and
-	value_is_empty callbacks.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Fixed a bug that broke
-	address field support.
-
-2000-05-19  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Added support for arbitrary
-	fields in the contact editor.
-
-2000-05-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Fixed e_card_name_copy and
-	e_card_arbitrary_copy to deal correctly with a passed NULL.
-
-	* contact-editor/Makefile.am: Removed imagesdir stuff.
-
-	* contact-editor/arrow.png: Made this transparent.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Renamed some widgets
-	and added custom widgets for all of the images.
-
-	* contact-editor/e-contact-editor.c: Worked on making this work
-	decently well with messed up glade files.  Cleaned up a lot of code.
-
-2000-05-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Fixed the code to write out and read in
-	arbitrary fields.
-
-2000-05-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h,
-	backend/ebook/e-card-types.h, backend/ebook/e-card.c,
-	backend/ebook/e-card.h: Implemented "MAILER" field.  Added
-	arbitrary field support.
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a warning.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Added E_CARD_SIMPLE_FIELD_MAILER.  Not implemented yet.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (construct_email_list): convert to use ECardSimple.
-	(poll_ldap): same.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-book.h: add typedefs for the can_write
-	functions, and add parameters to pas_book_new.
-
-	* backend/pas/pas-book.c (pas_book_construct): add can_write/can_write_card params.
-	(pas_book_new): same.
-	(impl_Evolution_Book_can_write): new function.
-	(impl_Evolution_Book_can_write_card): same.
-	(pas_book_get_epv): assign the can_write/can_write_card slots in the epv.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_can_write): new function.
-	(pas_backend_ldap_can_write_card): same.
-	(pas_backend_ldap_add_client): add can_write/can_write_card to pas_book_new call.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_can_write_card): new function, calls can_write.
-	(pas_backend_file_can_write): same.
-	(can_write): return TRUE if we can write to the addressbook file.
-	(pas_backend_file_add_client): add can_write/can_write_card to pas_book_new call.
-
-	* backend/idl/addressbook.idl (Evolution): add can_write and
-	can_write_card permission requests.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (e_card_get_vcard): Fixed a large memory leak.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c (add_list_unique): Fixed another memory
-	leak.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/pas/pas-backend-file.c,
-	contact-editor/e-contact-editor.c, ename/e-name-western.c,
-	gui/component/addressbook.c, gui/minicard/e-minicard-view.c: Fixed
-	some memory leaks.
-
-	* backend/ebook/e-card.c: Rearranged some code.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a reference
-	leak.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Fixed a compile
-	error.
-
-2000-05-16  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Got rid of a
-	memory leak.  Rearranged a couple functions.
-	
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard-view.h:
-	Added some code to stop watching the EBook when the canvas is
-	destroyed (apparently the canvas is destroyed before our widget is
-	destroyed.)
-
-2000-05-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-categories.c: Use the correct
-	policy for resize.
-
-2000-05-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added libeutil for e-card's support
-	for categories.
-
-	* backend/ebook/e-card-list.c, backend/ebook/e-card-list.h: Added
-	a function to get the length.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added categories
-	support (accessible either as "categories" or "category_list".)
-
-	* contact-editor/Makefile.am: Added e-table and all of the
-	categories files.
-
-	* contact-editor/categories.glade,
-	contact-editor/categories-strings.h,
-	contact-editor/e-contact-editor-categories.c,
-	contact-editor/e-contact-editor-categories.h:
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Rearranged this dialog.
-
-	* contact-editor/e-contact-editor.c: Rearranged dialog a bit.
-	Added opening of categories dialog.
-
-	* gui/component/Makefile.am: Rearranged libraries so that
-	libetable would be available for the contact editor categories
-	dialog.
-
-	* gui/component/addressbook.c: Fix for new ETable resizing.  Make
-	contact editor dialog resizable.
-
-	* gui/minicard/Makefile.am: Added libetable contact editor
-	categories dialog.
-
-	* gui/minicard/e-minicard.c: Make contact editor dialog resizable.
-
-2000-05-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* contact-editor/fulname.glade: Use accelerators here.
-
-2000-05-13  Valek Filippov  <frob@df.ru>
-
-	* gui/component/ldap-server-dialog.glade: save translatable strings
-	* gui/component/ldap-server-dialog.glade.h: file with strings
-	* printing/e-contact-print.glade: save translatable strings
-	* printing/e-contact-print.glade.h: file with strings
-		
-2000-05-11  Dan Winship  <danw@helixcode.com>
-
-	* gui/component/addressbook.c (control_activate): Now that we
-	depend on recent gnome-libs we can make the toolbar detachable
-	again.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Make the table view be sorted by
-	name initially.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-book-factory.c: Send a proper response when you
-	can't find the ldap URI.
-
-	* gui/component/addressbook.c: Cleaned up the open error dialog a
-	bit.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Added a dialog for when you can't
-	open an addressbook.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added e-book-types.h, e-card-pairs.h,
-	e-card-types.h.
-
-	* backend/pas/Makefile.am: Added pas-backend-ldap.h.
-
-	* contact-editor/Makefile.am: Added a proper EXTRA_DIST section.
-	Removed some old defines.
-
-	* ename/Makefile.am: Added e-name-western-tables.h.
-
-	* gui/component/Makefile.am: Added e-ldap-server-dialog.h.  Added
-	a proper EXTRA_DIST section.
-
-	* gui/minicard/e-reflow.c: Added a missed cast.
-
-	* printing/Makefile.am: Added a proper EXTRA_DIST section.
-	
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Make sure that the canvas
-	doesn't intercept keyboard focus.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Use new art.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Replaced the Address
-	button with a label and rearranged the address area a bit.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard.c: Reenable editting.
-
-	* gui/minicard/e-reflow-sorted.c: Make reflow flow on deletion.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Destroy the view object when
-	leaving the minicard view.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-reflow-sorted.c: Fixed reflow sorting to call
-	reflow_request when sorting on an item changes.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Make File As change if name or
-	company are changed pretty much anywhere.
-
-	* gui/minicard/e-minicard.c: Turned off having minicard editing
-	effect anything since it's so crashy.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c: Enabled a couple more fields
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Added a default card to all new
-	file backends.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c: Rearranged order of things
-	getting destroyed.
-
-	* gui/minicard/e-minicard-view.c: Rearranged order of things
-	getting destroyed.  Don't set attributes of non-null or destroyed
-	items.  Destroy parent object when destroyed.  Maintain ref_count
-	of items in list.
-
-	* gui/minicard/e-minicard.c: Don't set attributes of non-null
-	items.
-
-	* gui/minicard/e-reflow-sorted.c: Maintain ref_count of items in
-	list.
-
-	* gui/minicard/e-reflow.c: Maintain ref_count of items in list.
-	Destroy parent object when destroyed.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed some indentation.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Changed Email to
-	Primary Email.
-
-	* contact-editor/e-contact-editor.c: Added checkmarks to indicate
-	if data exists in the pull down menus for the phone, address, and
-	email fields.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed the string duplication
-	problem.  Fixed the business/home address string mix up.
-
-	* gui/component/addressbook.c: Made the minicard view the default
-	view.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c: Fixed this up a bit.  Syncing
-	should work better now.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard.c,
-	gui/minicard/e-minicard.h, gui/minicard/e-reflow-sorted.c,
-	gui/minicard/e-reflow-sorted.h: Made a minimal number of things be
-	destroyed and recreated when updating a field.
-
-2000-05-07    <toshok@the-dot-in.helixcode.com>
-
-	* gui/minicard/e-minicard.c (remodel): make sure to free the
-	return value of e_card_simple_get.
-
-	* gui/component/addressbook.c (teardown_table_view): destroy the
-	ECardSimple here, plug memory leak.
-	(create_table_view): use view->simple so we can destroy the
-	ECardSimple later on.
-
-2000-05-07  Chris Toshok  <toshok@helixcode.com>
-
-	* ename/e-name-western.c (e_name_western_extract_middle): comment
-	function, and fix an ABR.
-
-2000-05-07  Chris Toshok  <toshok@helixcode.com>
-
-	* ename/e-name-western.c (e_name_western_cleanup_string): comment
-	function, and fix an ABR.
-
-2000-05-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/minicard/e-minicard.c: Added saving in minicard view.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c: Fixed an off by 2 error.
-
-2000-05-07  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (set_prop): don't create a new
-	ebook.  instead, unload the current uri (if there is one) and load
-	the new one.
-	(addressbook_factory): create the ebook once.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/e-addressbook-model.c: Replaced some model_changed
-	calls with row_inserted calls.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c:
-	Removed some code that was notifying too many clients at the wrong
-	times.
-
-	* gui/component/addressbook.c: Set view->book.  Unreffed
-	view->book.  Unreffed the model instead of destroying it.  Removed
-	the /tmp/test.db stuff.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Make the addressbook create the
-	correct file uri.  Added a default query.  Initialize view->model
-	and view->view to NULL.
-
-	* gui/component/e-addressbook-model.c,
-	gui/minicard/e-minicard-view.c: Only call get_book_view if both
-	book and query and non-null.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (control_deactivate): remove the
-	separator and toggle view items as well.
-	(toggle_view_as_cb): callback for the "/View/Toggle View" menu
-	item.
-	(get_query): getter for the query string that takes into account
-	the two view types.
-	(set_query): setter for the query string that takes into account
-	the two view types.
-	(set_book): setter for the EBook type - not really a setter, since
-	the book is kept in the AddressbookView, but this method actually
-	sets the "book" property on the current view.
-	(find_contact_cb): make use of get/set_query
-	(search_entry_activated): make use of set_query.
-	(control_activate): add a menu separator and an item to toggle
-	between view types.
-	(book_open_cb): make use of set_book.
-	(ebook_create): no longer needs to return the EBook, since we set
-	the book field in our view.
-	(teardown_minicard_view): destructor function for the minicard
-	specific ui.
-	(create_minicard_view): constructor function for the minicard
-	specific ui.
-	(teardown_table_view): destructor function for the e-table
-	specific ui.
-	(create_table_view): constructor function for the e-table specific
-	ui.
-	(change_view_type): destroy the old and create the new view ui,
-	change the label of the Toggle View menu item, and reset the book
-	and query on the new view type.
-	(addressbook_factory): create an all-encompassing vbox that the
-	view uses to create the bonobo control, which contains 1 widget
-	per ui specific view (the e-table in the table case, and another
-	vbox in the minicard case.)  use change_view_type to create the
-	initial view.
-
-2000-05-07  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-book.c: Made a NULL callback just mean to not
-	call back.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Reordered fields.  Added a get_const function to get a constant
-	string that persists until the simple is destroyed.
-
-	* gui/component/Makefile.am: Added e-addressbook-model.c and
-	e-addressbook-model.h and all of the libraries and includes that
-	they are dependent on.
-
-	* gui/component/addressbook-factory.c: Initialize e cursors.
-
-	* gui/component/addressbook.c: Added inactive code to display an
-	ETable view of the addressbook.
-
-	* gui/component/e-addressbook-model.c,
-	gui/component/e-addressbook-model.h: New files to implement an
-	ETable model with a EBook back end.
-	
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	Mostly finished ECardSimple.
-
-	* contact-editor/e-contact-editor.c: Changed this to match with
-	some of the changes to ECardSimple.
-
-	* gui/component/addressbook.c: Changed this to look for
-	"addressbook.db" in the given directory if it doesn't find the
-	file "uri".
-
-	* gui/minicard/e-minicard.c, gui/minicard/e-minicard.h: Changed
-	this to use ECardSimple.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-	
-	* gui/component/.cvsignore: ignore evolution-addressbook.pure
-
-	* gui/component/Makefile.am: add support for generating 
-	evolution-addressbook.pure.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_load_uri): if a
-	port isn't specified in the uri default to 389.
-
-2000-05-06  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component/addressbook.c: Made this take a uri through its
-	property bag.
-
-2000-05-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added e-card-simple.c and
-	e-card-simple.h.
-
-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:
-	New card wrapper class to simplify things.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Changed e-contact-editor to use
-	ECardSimple a bit.
-
-2000-05-03  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/addressbook.c (control_deactivate): #ifdef
-	HAVE_LDAP the ldap specific stuff.
-	(null_cb): same.
-	(control_activate): same.
-
-2000-05-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* backend/ebook/Makefile.am (INCLUDES): Add
-	`-I$(top_srcdir)/addressbook/ename'.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* demo/Makefile.am: set G_LOG_DOMAIN.
-	* printing/Makefile.am: same.
-
-2000-05-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-book-factory.c: Add back in the
-	CORBA_Object_release.
-
-	* backend/pas/pas-book.c: Properly duplicate and release the
-	listener passed to us.
-
-2000-05-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c:
-	Made uri slightly better managed.
-	
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_process_request): Remove this
-	CORBA_Object_release that causes things not to work.  This is just
-	a temporary fix until we figure out what's actually wrong.
-
-	* backend/pas/pas-book.c: Fixed a copy and paste error in a warning.
-	
-2000-05-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Switched the subdirs order since backend depends on
-	ename.
-
-2000-05-01  Larry Ewing  <lewing@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_remove_client):
-	fix a typo in the for loop.
-
-2000-05-01  Michael Meeks  <michael@helixcode.com>
-
-	* backend/pas/pas-book-factory.c: include gtk.
-
-2000-04-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* backend/ebook/e-book-types.h (EBookStatus): Added new status
-	values for the IDL stuff.
-
-	* backend/pas/pas-book-factory.h (PASBookFactoryClass): New
-	"last_book_gone" signal.
-
-	* backend/pas/pas-book-factory.c
-	(pas_book_factory_launch_backend): Better error handling.
-	(pas_book_factory_process_queue): Let
-	pas_book_factory_process_request() free the request.
-	(pas_book_factory_process_request): Free the request here.
-	Perform better error handling.
-	(free_active_server_map_entry): Free an active server map entry;
-	free the URI key and unref the backend value.  This function was
-	renamed; the old one was trying to CORBA_Object_unref() a GTK+
-	object!
-	(remove_backends_entry): Free a backend table entry; free the URI
-	key.
-	(backend_last_client_gone_cb): Remove the backend from the active
-	server map and emit the "last_book_gone" signal if appropriate.
-	(pas_book_factory_get_n_backends): New function to query the
-	number of running backends in an addressbook factory.
-
-	* backend/idl/addressbook.idl (BookListener::CallStatus): Added a
-	ProtocolNotSupported code.  This is for when the addressbook
-	factory cannot find a provider for the requested URI.
-
-	* backend/pas/pas-backend.h (PASBackendClass): New
-	"last_client_gone" signal.
-	(PASBackendClass): New get_uri virtual method.
-
-	* backend/pas/pas-backend.c (pas_backend_load_uri): Return a
-	gboolean success code.
-	(pas_backend_add_client): Return a gboolean success code.
-	(pas_backend_last_client_gone): New function used by backend
-	implementations to notify upwards when the backend's last client
-	is destroyed.
-	(pas_backend_get_uri): New function to get the URI of a backend.
-
-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):
-	Pass the backend as the closure data to the "destroy" handler of
-	the book.  We cannot call pas_book_get_backend() in the callback
-	since the book's private data has already been destroyed when the
-	callback is invoked.  Alternatively, we could move the private
-	data destruction step to the book's ::finalize() method.
-	(pas_backend_file_book_destroy_cb): Get the backend from the
-	callback's data, not from the book.
-	(pas_backend_file_remove_client): Remove the book from the list of
-	clients.  When all clients go away, call
-	pas_backend_last_client_gone().
-	(PASBackendFilePrivate): Added an uri field.
-	(pas_backend_file_get_uri): Implement the get_uri method.
-	(pas_backend_file_load_uri): Return a gboolean success code.
-	Also, store the URI in the private structure.
-	(pas_backend_file_add_client): Return a gboolean success code.
-	Also, call pas_backend_last_client_gone() if appropriate.
-	(pas_backend_file_destroy): Free the bf->priv->uri.
-
-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):
-	Pass the backend as the closure data to the "destroy" handler of
-	the book.  See above for rationale.
-	(pas_backend_ldap_book_destroy_cb): Get the backend from the
-	callback's data.
-	(pas_backend_ldap_remove_client): Remove the book from the list of
-	clients.  When all clients go away, call
-	pas_backend_last_client_gone().
-	(pas_backend_ldap_load_uri): Return a gboolean success code.
-	(pas_backend_ldap_add_client): Return a gboolean success code.
-	Also, call pas_backend_last_client_gone() if appropriate.
-	(PASBackendLDAPPrivate): New uri field.
-	(pas_backend_ldap_get_uri): Implement the get_uri method.
-	(pas_backend_ldap_load_uri): Store the uri in the private
-	structure.
-	(pas_backend_ldap_destroy): Free the bl->priv->uri.
-
-2000-04-30  Chris Toshok  <toshok@helixcode.com>
-
-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): added
-	e-ldap-server-dialog.c
-	(glade_DATA): added ldap-server-dialog.glade
-
-	* gui/component/ldap-server-dialog.glade: new file.
-
-	* gui/component/e-ldap-server-dialog.h: new file.
-
-	* gui/component/e-ldap-server-dialog.c: new file, contains logic
-	associated with ldap server dialog.
-
-	* gui/component/addressbook.c (control_deactivate): remove the
-	directory server menu item.
-	(null_cb): do nothing callback for e_book_load_uri call.  should
-	change to (at the very least) pop up a dialog if there was an
-	error.
-	(new_server_cb): new function - really just switches to a
-	particular ldap server, since the information isn't saved
-	anywhere.
-	(control_activate): add directory server menu item.
-
-2000-04-30  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/ebook/e-book.c (e_book_load_uri): create the book
-	listener here, since it's destroyed in unload_uri.
-	(e_book_construct): remove the book listener construction here.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/.cvsignore: Added load-pine-addressbook.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor.c, gui/minicard/e-minicard.c: Made
-	some fields invisible that were visible before.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c: Make file as not have the : after it if
-	it's empty.  If there's no name, or file_as, fill in these fields
-	with defaults based on full_name or name respectively.
-
-	* backend/ebook/load-pine-addressbook.c: New file to do import of
-	pine .addressbook files.
-
-	* backend/pas/pas-backend-file.c: Made empty fields act as the
-	empty string for searches.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Made the File As field update
-	properly as you edit the name and company fields.  Added the pull
-	down list of File As choices.  Made sure that all fields will
-	be set to NULL if they are deleted to the empty string.
-
-	* gui/minicard/e-minicard.c: Use the File As field instead of the
-	Full Name field for the header.  Make identical compares on the
-	File As field do a compare on the uid.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor-fullname.c,
-	contact-editor/fullname.glade: Fixed a string mismatch.
-
-2000-04-30  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/Makefile.am: Added ename includes and libs.
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	e_card_name_from_string.  Added header for
-	e_card_delivery_address_from_string, even though it's not
-	implemented yet.
-
-	* contact-editor/Makefile.am: Removed the ename includes since we
-	no longer use ename directly here.
-
-	* contact-editor/e-contact-editor.c: Fixed this to properly save
-	the address labels displayed.  Updated this to use the function
-	e_card_name_from_string instead of doing it by hand.
-
-	* contact-editor/fullname-strings.h,
-	contact-editor/fullname.glade: Deleted an unused field.  Changed
-	the set of prefixes and suffixes.
-
-2000-04-30  Chris Toshok  <toshok@helixcode.com>
-
-	* backend/pas/pas-backend-ldap.c
-	(pas_backend_ldap_ensure_connected): add support for a rootdn in
-	the uri.
-	(pas_backend_ldap_build_all_cards_list): make use of the rootdn in
-	the call to ldap_search_s.
-	(pas_backend_ldap_search): same.
-	(pas_backend_ldap_load_uri): get the rootdn out of the passed in uri.
-
-2000-04-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added
-	e_card_phone_new e_card_delivery_address_new,
-	e_card_delivery_address_to_string, e_card_name_copy,
-	e_card_name_new, e_card_name_to_string, and made e_card_name_free
-	public.  Removed some unused code.
-
-	* backend/pas/pas-backend-file.c: Fixed a warning.
-
-	* contact-editor/Makefile.am: Added e-contact-editor-fullname.[ch]
-	and fullname.glade.  Added e-name libs and includes.
-
-	* contact-editor/e-contact-editor-fullname.c,
-	contact-editor/e-contact-editor-fullname.h,
-	contact-editor/fullname-strings.h, contact-editor/fullname.glade:
-	New dialog for editing the fields of a name separately.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Create an
-	EContactEditorFullname when you click on the Full Name button.
-	Maintain a parsed name at all times.
-
-	* gui/component/Makefile.am, gui/minicard/Makefile.am: Added
-	e-name libs.
-
-2000-04-28  Larry Ewing  <lewing@helixcode.com>
-
-	* backend/pas/pas-book-factory.c (register_factory): fix the
-	`USING_OAF' changes so that they work for when we are not using
-	oaf.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* ename/Makefile.am
-	(gnome_libs): Use `BONOBO_GNOME_LIBS'.
-	(INCLUDES): Add `-I$(srcdir)/..'.
-
-	* backend/pas/pas-book-factory.c
-	(register_factory): New function to register the factory.
-	Implementation different according to `USING_OAF'.
-	(pas_book_factory_activate): Use `register_factory()'.
-
-	* gui/component/addressbook.c: New #define `CONTROL_FACTORY_ID',
-	varying depending on whether we are `USING_OAF'.
-	(addressbook_factory_init): Use `CONTROL_FACTORY_ID'.
-
-	* backend/ebook/test-client.c (init_corba): New function,
-	implemented differently according to the `USING_OAF' #define.
-
-	* backend/ebook/e-book.c: New #define `CARDSERVER_OAF_ID'.
-	(e_book_construct): Work with OAF #if `USING_OAF'.
-
-	* backend/ebook/Makefile.am (gnome_libs): Removed.
-	(corbadir): Removed.
-	(ebook_libs): Removed.
-	(test_client_LDADD): Just add `libebook.la'.
-	(test_card_LDADD): Likewise.
-	(test_client_list_LDADD): Likewise.
-
-	* gui/component/addressbook-factory.c
-	(init_corba): New helper function, implemented differently
-	according to `USING_OAF'.
-	(main): Call `init_corba()'.
-
-2000-04-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added file as,
-	office, manager, assistant, spouse, and anniversary fields.  These
-	all use "X-EVOLUTION-" fields in the VCards.
-
-	* backend/pas/pas-backend-file.c: Added all the new fields (except
-	anniversary) to the list of fields.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Fixed some misnamed
-	fields and fixed the placement of the comments field.
-
-	* contact-editor/e-contact-editor.c: Made the newly added fields
-	display properly.
-
-	* Makefile.am: Added ename.
-
-	* ename/e-name-western.h, ename/test-ename-western-gtk.c,
-	ename/test-ename-western.c: Fixed up some #includes.
-
-	* ename/.cvsignore: Added .cvsignore.
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-types.h, backend/ebook/e-card.c,
-	backend/ebook/e-card.h: Added an address label field.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Got rid of some unused
-	fields.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Added the address label field.
-	Load only.  Editing these fields seems to mess things up.
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* contact-editor/e-contact-editor.c: Added proper handling of the
-	email field.
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* backend/ebook/e-card-types.h, backend/ebook/e-card.c,
-	gui/minicard/e-minicard.c: Prefixed the ADDR_ flags.
-
-	* contact-editor/contact-editor.glade,
-	contact-editor/e-contact-editor-strings.h: Edited the glade file.
-	Removed all the fields that we don't use.
-
-	* contact-editor/e-contact-editor.c,
-	contact-editor/e-contact-editor.h: Made the phone fields work
-	properly.  The address and email fields are temporarily turned off
-	until they can be made to work as the phone fields do.
-
-2000-04-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/minicard/Makefile.am (INCLUDES): Use
-	`$(BONOBO_GNOME_CFLAGS)'.
-
-	* backend/pas/Makefile.am (idl_flags): Add `-I $(datadir)/idl' to
-	pick up IDL files in the installation prefix as well.
-	(INCLUDES): Use `$(BONOBO_GNOME_CFLAGS)'.
-
-	* backend/ebook/Makefile.am (ORBIT_IDL): Use `-I $(datadir)/idl'
-	to get the IDLs from the installation prefix as well.
-	(INCLUDES): Add `$(BONOBO_GNOME_CFLAGS)'.
-	(test_client_LDADD): Use `$(BONOBO_GNOME_LIBS)' instead of
-	hardcoding `-lbonobo'!  Also get rid of some other useless flags,
-	as `$(BONOBO_GNOME_LIBS)' really has all what we need.
-	(test_client_list_LDADD): Likewise.
-	(test_card_LDADD): Likewise.
-
-2000-04-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/minicard/Makefile.am (INCLUDES): Use "e-minicard" as the log
-	domain.
-
-	* gui/component/Makefile.am (INCLUDES): Use
-	"evolution-addressbook" as the log domain.
-
-	* backend/pas/Makefile.am: Build libpas.a, not a shared library.
-	Do not install any header files.
-	(INCLUDES): Remove spurious include paths.
-
-	* backend/pas/*.[ch]: Fix includes.
-
-	* backend/ebook/Makefile.am: Do not install the test programs.
-	Fixed some include weirdness.
-
-	* backend/ebook/*.[ch]: Fix includes.
-
-	* contact-editor/Makefile.am (INCLUDES): Set the log domain to
-	"contact-editor".
-	(INCLUDES): Fix.
-
-	* contact-editor/*.[ch]: Fix includes.
-
-	* gui/minicard/*.[ch]: Fix includes.
-
-	* ChangeLog: Started a ChangeLog here.
diff --git a/addressbook/E-CARD-NEEDED-FIELDS b/addressbook/E-CARD-NEEDED-FIELDS
deleted file mode 100644
index e227d1b130..0000000000
--- a/addressbook/E-CARD-NEEDED-FIELDS
+++ /dev/null
@@ -1,9 +0,0 @@
-I will add these fields as I get a chance to.
-
-Thanks,
-    Chris Lahey
-
-X-EVOLUTION-LIST			boolean if this is a mailing list.
-X-EVOLUTION-LIST-SHOW-ADDRESSES		boolean whether to list all email addresses in the To: line or to treat the list kind of like a BCC.
-X-EVOLUTION-RELATED-CONTACTS		EDestionationList of related contacts.
-REV					last changed date.
-\ No newline at end of file
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
deleted file mode 100644
index 9aad9c1b30..0000000000
--- a/addressbook/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-if ENABLE_PILOT_CONDUITS
-CONDUIT_SUBDIR=conduit
-endif
-
-SUBDIRS =	\
-	backend printing gui $(CONDUIT_SUBDIR)
-
diff --git a/addressbook/backend/.cvsignore b/addressbook/backend/.cvsignore
deleted file mode 100644
index 09980ae6ba..0000000000
--- a/addressbook/backend/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/backend/Makefile.am b/addressbook/backend/Makefile.am
deleted file mode 100644
index b2807b2480..0000000000
--- a/addressbook/backend/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = idl ebook pas
diff --git a/addressbook/backend/ebook/.cvsignore b/addressbook/backend/ebook/.cvsignore
deleted file mode 100644
index deec6ea2e7..0000000000
--- a/addressbook/backend/ebook/.cvsignore
+++ /dev/null
@@ -1,25 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-addressbook-stubs.c
-addressbook-skels.c
-addressbook-common.c
-addressbook.h
-test-card
-test-client
-test-client-list
-load-pine-addressbook
-load-gnomecard-addressbook
-evolution-vcard-importer
-evolution-gnomecard-importer
-evolution-ldif-importer
-Evolution-Composer-stubs.c
-Evolution-Composer-skels.c
-Evolution-Composer-common.c
-Evolution-Composer.h
-GNOME_Evolution_Addressbook_VCard_Importer.oaf
-GNOME_Evolution_Addressbook_LDIF_Importer.oaf
diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in
deleted file mode 100644
index b022dcde67..0000000000
--- a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory"
-	    type="exe"
-	    location="evolution-ldif-importer">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import LDIF files into Evolution."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_LDIF_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu-name" type="string"
-		       value="LDAP Data Interchange Format (.ldif)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports LDIF files into Evolution."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in b/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in
deleted file mode 100644
index 9cd4699633..0000000000
--- a/addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory"
-	    type="exe"
-	    location="evolution-vcard-importer">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory to import VCard files into Evolution."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_VCard_Importer"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Importer:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="evolution:menu-name" type="string"
-		       value="VCard (.vcf, .gcrd)"/>
-	<oaf_attribute name="description" type="string"
-		       _value="Imports VCard files into Evolution."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
deleted file mode 100644
index ea49ad47f3..0000000000
--- a/addressbook/backend/ebook/Makefile.am
+++ /dev/null
@@ -1,203 +0,0 @@
-noinst_PROGRAMS = test-card test-client test-client-list
-
-bin_PROGRAMS =	evolution-vcard-importer 		\
-		evolution-ldif-importer			\
-		load-pine-addressbook			\
-		load-gnomecard-addressbook
-
-CORBA_SOURCE =						\
-	addressbook.h					\
-	addressbook-common.c				\
-	addressbook-stubs.c				\
-	addressbook-skels.c				\
-        Evolution-Composer.h              \
-        Evolution-Composer-common.c       \
-        Evolution-Composer-skels.c        \
-        Evolution-Composer-stubs.c
-
-idls =							\
-	$(srcdir)/../idl/addressbook.idl		\
-	$(srcdir)/../../../composer/Evolution-Composer.idl
-
-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
-
-$(CORBA_SOURCE): $(idls)
-	$(ORBIT_IDL) -I $(srcdir) $(idls) $(idl_flags)
-
-INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"        \
-	-DG_LOG_DOMAIN=\"EBook\"			\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/camel				\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_srcdir)/addressbook/ename		\
-	-I$(top_builddir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/ename		\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-        $(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-lib_LTLIBRARIES = libebook.la
-
-libebook_la_SOURCES =					\
-	$(CORBA_SOURCE)					\
-	e-book-listener.c				\
-	e-book-view-listener.c				\
-	e-book-view.c					\
-	e-book.c					\
-	e-book-util.c					\
-	e-card-cursor.c					\
-	e-card-simple.c					\
-	e-card.c					\
-	e-card-compare.c				\
-	e-destination.c
-
-libebookincludedir = $(includedir)/evolution/ebook
-
-libebookinclude_HEADERS =				\
-	e-book-listener.h				\
-	e-book-types.h					\
-	e-book-view-listener.h				\
-	e-book-view.h					\
-	e-book.h					\
-	e-book-util.h					\
-	e-card-cursor.h					\
-	e-card-simple.h					\
-	e-card-types.h					\
-	e-card.h					\
-	e-card-compare.h				\
-	e-destination.h
-
-
-#
-# make a static library for use by addressbook's conduit's shared library
-#
-noinst_LTLIBRARIES = libebook-static.la
-libebook_static_la_SOURCES = $(libebook_la_SOURCES)
-libebook_static_la_LDFLAGS = --all-static
-
-
-test_client_SOURCES =					\
-	test-client.c
-
-test_client_LDADD =					\
-	libebook.la					\
-	$(BONOBO_CONF_LIBS)				\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/camel/libcamel.la		\
-	$(top_builddir)/libibex/libibex.la		\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/e-util/libeutil.la
-
-test_client_list_SOURCES =				\
-	test-client-list.c
-
-test_client_list_LDADD =				\
-	libebook.la					\
-	$(BONOBO_CONF_LIBS)				\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/camel/libcamel.la		\
-	$(top_builddir)/libibex/libibex.la		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-test_card_SOURCES =					\
-	test-card.c
-
-test_card_LDADD =					\
-	libebook.la					\
-	$(BONOBO_CONF_LIBS)				\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/camel/libcamel.la		\
-	$(top_builddir)/libibex/libibex.la		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-evolution_vcard_importer_SOURCES =			\
-	evolution-vcard-importer.c
-evolution_vcard_importer_LDADD =				\
-	libebook.la						\
-	$(BONOBO_CONF_LIBS)					\
-	$(BONOBO_GNOME_LIBS)					\
-	$(EXTRA_GNOME_LIBS)					\
-	$(top_builddir)/camel/libcamel.la			\
-	$(top_builddir)/libibex/libibex.la		\
-	$(top_builddir)/shell/importer/libevolution-importer.la \
-	$(DB3_LDADD)						\
-	$(top_builddir)/e-util/ename/libename.la		\
-	$(top_builddir)/libversit/libversit.la			\
-	$(top_builddir)/e-util/libeutil.la
-
-evolution_ldif_importer_SOURCES =			\
-	evolution-ldif-importer.c
-evolution_ldif_importer_LDADD =				\
-	libebook.la						\
-	$(BONOBO_CONF_LIBS)					\
-	$(BONOBO_GNOME_LIBS)					\
-	$(EXTRA_GNOME_LIBS)					\
-	$(top_builddir)/camel/libcamel.la			\
-	$(top_builddir)/libibex/libibex.la		\
-	$(top_builddir)/shell/importer/libevolution-importer.la \
-	$(DB3_LDADD)						\
-	$(top_builddir)/e-util/ename/libename.la		\
-	$(top_builddir)/libversit/libversit.la			\
-	$(top_builddir)/e-util/libeutil.la
-
-load_pine_addressbook_SOURCES =				\
-	load-pine-addressbook.c
-
-load_pine_addressbook_LDADD =				\
-	libebook.la					\
-	$(BONOBO_CONF_LIBS)				\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/camel/libcamel.la		\
-	$(top_builddir)/libibex/libibex.la		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-
-load_gnomecard_addressbook_SOURCES =			\
-	load-gnomecard-addressbook.c
-
-load_gnomecard_addressbook_LDADD =			\
-	libebook.la					\
-	$(BONOBO_CONF_LIBS)				\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/camel/libcamel.la		\
-	$(top_builddir)/libibex/libibex.la		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-
-BUILT_SOURCES = $(CORBA_SOURCE)
-CLEANFILES    = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
-oafdir = $(datadir)/oaf
-oaf_in_files =	GNOME_Evolution_Addressbook_VCard_Importer.oaf.in \
-		GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-@XML_I18N_MERGE_OAF_RULE@
-
-# add this back when you add the file to the archive ;)
-#	GNOME_Evolution_Addressbook_Pine_Importer.oafinfo
-
-EXTRA_DIST = $(oaf_in_files) $(oaf_DATA)
-
-
-
-
diff --git a/addressbook/backend/ebook/TODO b/addressbook/backend/ebook/TODO
deleted file mode 100644
index a69703cd92..0000000000
--- a/addressbook/backend/ebook/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* Make sure open_book_progress does not use the EBook op queue; make
-  sure it works.
diff --git a/addressbook/backend/ebook/e-book-listener.c b/addressbook/backend/ebook/e-book-listener.c
deleted file mode 100644
index a66701847d..0000000000
--- a/addressbook/backend/ebook/e-book-listener.c
+++ /dev/null
@@ -1,826 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Exports the BookListener interface.  Maintains a queue of messages
- * which come in on the interface.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-book-listener.h"
-
-static EBookStatus e_book_listener_convert_status (GNOME_Evolution_Addressbook_BookListener_CallStatus status);
-
-enum {
-	RESPONSES_QUEUED,
-	LAST_SIGNAL
-};
-
-static guint e_book_listener_signals [LAST_SIGNAL];
-
-static BonoboObjectClass          *e_book_listener_parent_class;
-POA_GNOME_Evolution_Addressbook_BookListener__vepv  e_book_listener_vepv;
-
-struct _EBookListenerPrivate {
-	GList   *response_queue;
-	gint     timeout_id;
-
-	guint timeout_lock : 1;
-	guint stopped      : 1;
-};
-
-static void
-response_free (EBookListenerResponse *resp)
-{
-	if (resp == NULL)
-		return;
-
-	g_free (resp->msg);
-	g_free (resp->id);
-
-	if (resp->book != CORBA_OBJECT_NIL) {
-		CORBA_Environment ev;
-		
-		CORBA_exception_init (&ev);
-		
-		bonobo_object_release_unref (resp->book, &ev);
-		
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("e_book_listener_destroy: "
-				   "Exception destroying book "
-				   "in response queue!\n");
-		}
-		
-		CORBA_exception_free (&ev);
-	}
-
-	if (resp->cursor != CORBA_OBJECT_NIL) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		
-		bonobo_object_release_unref (resp->cursor, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("e_book_listener_destroy: "
-				   "Exception destroying cursor "
-				   "in response queue!\n");
-		}
-		
-		CORBA_exception_free (&ev);
-	}
-
-	if (resp->book_view != CORBA_OBJECT_NIL) {
-		CORBA_Environment ev;
-		
-		CORBA_exception_init (&ev);
-		
-		bonobo_object_release_unref (resp->book_view, &ev);
-		
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("e_book_listener_destroy: "
-				   "Exception destroying book_view "
-				   "in response queue!\n");
-		}
-		
-		CORBA_exception_free (&ev);
-	}
-	
-	g_free (resp);
-}
-
-static gboolean
-e_book_listener_check_queue (EBookListener *listener)
-{
-	if (listener->priv->timeout_lock)
-		return TRUE;
-
-	listener->priv->timeout_lock = TRUE;
-
-	if (listener->priv->response_queue != NULL && !listener->priv->stopped) {
-		gtk_signal_emit (GTK_OBJECT (listener), e_book_listener_signals [RESPONSES_QUEUED]);
-	}
-
-	if (listener->priv->response_queue == NULL || listener->priv->stopped) {
-		listener->priv->timeout_id = 0;
-		listener->priv->timeout_lock = FALSE;
-		bonobo_object_unref (BONOBO_OBJECT (listener)); /* release the timeout's reference */
-		return FALSE;
-	}
-
-	listener->priv->timeout_lock = FALSE;
-	return TRUE;
-}
-
-static void
-e_book_listener_queue_response (EBookListener         *listener,
-				EBookListenerResponse *response)
-{
-	if (response == NULL)
-		return;
-
-	if (listener->priv->stopped) {
-		response_free (response);
-		return;
-	}
-
-	listener->priv->response_queue = g_list_append (listener->priv->response_queue, response);
-
-	if (listener->priv->timeout_id == 0) {
-
-		/* 20 == an arbitrary small integer */
-		listener->priv->timeout_id = g_timeout_add (20, (GSourceFunc) e_book_listener_check_queue, listener);
-
-		/* Hold a reference on behalf of the timeout */
-		bonobo_object_ref (BONOBO_OBJECT (listener));
-		
-	}
-}
-
-/* Add, Remove, Modify */
-static void
-e_book_listener_queue_generic_response (EBookListener          *listener,
-					EBookListenerOperation  op,
-					EBookStatus             status)
-{
-	EBookListenerResponse *resp;
-
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = op;
-	resp->status = status;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_open_response (EBookListener  *listener,
-				     EBookStatus     status,
-				     GNOME_Evolution_Addressbook_Book  book)
-{
-	EBookListenerResponse *resp;
-
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = OpenBookResponse;
-	resp->status = status;
-	resp->book   = book;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_open_progress (EBookListener *listener,
-				     const char    *msg,
-				     short          percent)
-{
-	EBookListenerResponse *resp;
-
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op      = OpenProgressEvent;
-	resp->msg     = g_strdup (msg);
-	resp->percent = percent;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-
-static void
-e_book_listener_queue_create_card_response (EBookListener *listener,
-					    EBookStatus    status,
-					    const char    *id)
-{
-	EBookListenerResponse *resp;
-
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = CreateCardResponse;
-	resp->status = status;
-	resp->id     = g_strdup (id);
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_get_vcard_response (EBookListener        *listener,
-					  EBookStatus           status,
-					  const char           *vcard)
-{
-	EBookListenerResponse *resp;
-	
-	if (listener->priv->stopped)
-		return;
-
-	resp         = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = GetCardResponse;
-	resp->status = status;
-	resp->vcard  = g_strdup (vcard);
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_get_cursor_response (EBookListener        *listener,
-					   EBookStatus           status,
-					   GNOME_Evolution_Addressbook_CardCursor  cursor)
-{
-	EBookListenerResponse *resp;
-	
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = GetCursorResponse;
-	resp->status = status;
-	resp->cursor = cursor;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_get_view_response (EBookListener        *listener,
-					 EBookStatus           status,
-					 GNOME_Evolution_Addressbook_BookView    book_view)
-{
-	EBookListenerResponse *resp;
-	
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op        = GetBookViewResponse;
-	resp->status    = status;
-	resp->book_view = book_view;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_get_changes_response (EBookListener        *listener,
-					    EBookStatus           status,
-					    GNOME_Evolution_Addressbook_BookView book_view)
-{
-	EBookListenerResponse *resp;
-	
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op        = GetChangesResponse;
-	resp->status    = status;
-	resp->book_view = book_view;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_link_status (EBookListener *listener,
-				   gboolean       connected)
-{
-	EBookListenerResponse *resp;
-
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op        = LinkStatusEvent;
-	resp->connected = connected;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_writable_status (EBookListener *listener,
-				       gboolean       writable)
-{
-	EBookListenerResponse *resp;
-
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op        = WritableStatusEvent;
-	resp->writable  = writable;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_authentication_response (EBookListener *listener,
-					       EBookStatus    status)
-{
-	EBookListenerResponse *resp;
-
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = AuthenticationResponse;
-	resp->status = status;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_get_supported_fields_response (EBookListener *listener,
-						     EBookStatus status,
-						     const GNOME_Evolution_Addressbook_stringlist *fields)
-{
-	EBookListenerResponse *resp;
-	int i;
-
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = GetSupportedFieldsResponse;
-	resp->status = status;
-	resp->fields = e_list_new ((EListCopyFunc)g_strdup, (EListFreeFunc)g_free, NULL);
-
-	for (i = 0; i < fields->_length; i ++) {
-		e_list_append (resp->fields, fields->_buffer[i]);
-	}
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-impl_BookListener_respond_create_card (PortableServer_Servant                   servant,
-				       const GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-				       const GNOME_Evolution_Addressbook_CardId id,
-				       CORBA_Environment                       *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_create_card_response (
-		listener,
-		e_book_listener_convert_status (status),
-		id);
-}
-
-static void
-impl_BookListener_respond_remove_card (PortableServer_Servant servant,
-				       const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-				       CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_generic_response (
-		listener, RemoveCardResponse,
-		e_book_listener_convert_status (status));
-}
-
-static void
-impl_BookListener_respond_modify_card (PortableServer_Servant servant,
-				       const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-				       CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_generic_response (
-		listener, ModifyCardResponse,
-		e_book_listener_convert_status (status));
-}
-
-static void
-impl_BookListener_respond_get_vcard (PortableServer_Servant servant,
-				     const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-				     const GNOME_Evolution_Addressbook_VCard card,
-				     CORBA_Environment *ev)
-{
-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_get_vcard_response (
-		listener,
-		e_book_listener_convert_status (status),
-		g_strdup (card));
-}
-
-static void
-impl_BookListener_respond_get_cursor (PortableServer_Servant servant,
-				      const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-				      const GNOME_Evolution_Addressbook_CardCursor cursor,
-				      CORBA_Environment *ev)
-{
-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	GNOME_Evolution_Addressbook_CardCursor  cursor_copy;
-
-	cursor_copy = bonobo_object_dup_ref (cursor, ev);
-
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("EBookListener: Exception while duplicating CardCursor!\n");
-		return;
-	}
-
-	e_book_listener_queue_get_cursor_response (
-		listener,
-		e_book_listener_convert_status (status),
-		cursor_copy);
-}
-
-static void
-impl_BookListener_respond_get_view (PortableServer_Servant servant,
-				    const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-				    const GNOME_Evolution_Addressbook_BookView book_view,
-				    CORBA_Environment *ev)
-{
-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	GNOME_Evolution_Addressbook_BookView    book_view_copy;
-
-	book_view_copy = bonobo_object_dup_ref (book_view, ev);
-
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("EBookListener: Exception while duplicating BookView.\n");
-		return;
-	}
-
-	e_book_listener_queue_get_view_response (
-		listener,
-		e_book_listener_convert_status (status),
-		book_view_copy);
-}
-
-static void
-impl_BookListener_respond_get_changes (PortableServer_Servant servant,
-				       const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-				       const GNOME_Evolution_Addressbook_BookView book_view,
-				       CORBA_Environment *ev)
-{
-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	GNOME_Evolution_Addressbook_BookView    book_view_copy;
-
-	book_view_copy = bonobo_object_dup_ref (book_view, ev);
-
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("EBookListener: Exception while duplicating BookView.\n");
-		return;
-	}
-
-	e_book_listener_queue_get_changes_response (
-		listener,
-		e_book_listener_convert_status (status),
-		book_view_copy);
-}
-
-static void
-impl_BookListener_respond_open_book (PortableServer_Servant servant,
-				     const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-				     const GNOME_Evolution_Addressbook_Book book,
-				     CORBA_Environment *ev)
-{
-	EBookListener  *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	GNOME_Evolution_Addressbook_Book  book_copy;
-
-	book_copy = bonobo_object_dup_ref (book, ev);
-
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("EBookListener: Exception while duplicating Book!\n");
-		return;
-	}
-
-	e_book_listener_queue_open_response (
-		listener,
-		e_book_listener_convert_status (status),
-		book_copy);
-}
-
-static void
-impl_BookListener_report_open_book_progress (PortableServer_Servant servant,
-					     const CORBA_char *status_message,
-					     const CORBA_short percent,
-					     CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_open_progress (
-		listener, status_message, percent);
-}
-
-static void
-impl_BookListener_respond_authentication_result (PortableServer_Servant servant,
-						 const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-						 CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_authentication_response (
-				       listener, status);
-}
-
-static void
-impl_BookListener_response_get_supported_fields (PortableServer_Servant servant,
-						 const GNOME_Evolution_Addressbook_BookListener_CallStatus status,
-						 const GNOME_Evolution_Addressbook_stringlist *fields,
-						 CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_get_supported_fields_response (
-				     listener, status, fields);
-}
-
-static void
-impl_BookListener_report_connection_status (PortableServer_Servant servant,
-					    const CORBA_boolean connected,
-					    CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_link_status (
-		listener, connected);
-}
-
-static void
-impl_BookListener_report_writable (PortableServer_Servant servant,
-				   const CORBA_boolean writable,
-				   CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_writable_status (listener, writable);
-}
-
-/**
- * e_book_listener_check_pending:
- * @listener: the #EBookListener 
- *
- * Returns: the number of items on the response queue,
- * or -1 if the @listener is isn't an #EBookListener.
- */
-int
-e_book_listener_check_pending (EBookListener *listener)
-{
-	g_return_val_if_fail (listener != NULL,              -1);
-	g_return_val_if_fail (E_IS_BOOK_LISTENER (listener), -1);
-
-	return g_list_length (listener->priv->response_queue);
-}
-
-/**
- * e_book_listener_pop_response:
- * @listener: the #EBookListener for which a request is to be popped
- *
- * Returns: an #EBookListenerResponse if there are responses on the
- * queue to be returned; %NULL if there aren't, or if the @listener
- * isn't an EBookListener.
- */
-EBookListenerResponse *
-e_book_listener_pop_response (EBookListener *listener)
-{
-	EBookListenerResponse *resp;
-	GList                 *popped;
-
-	g_return_val_if_fail (listener != NULL,              NULL);
-	g_return_val_if_fail (E_IS_BOOK_LISTENER (listener), NULL);
-
-	if (listener->priv->response_queue == NULL)
-		return NULL;
-
-	resp = listener->priv->response_queue->data;
-
-	popped = listener->priv->response_queue;
-	listener->priv->response_queue =
-		g_list_remove_link (listener->priv->response_queue,
-				    listener->priv->response_queue);
-	g_list_free_1 (popped);
-
-	return resp;
-}
-
-static EBookStatus
-e_book_listener_convert_status (const GNOME_Evolution_Addressbook_BookListener_CallStatus status)
-{
-	switch (status) {
-	case GNOME_Evolution_Addressbook_BookListener_Success:
-		return E_BOOK_STATUS_SUCCESS;
-	case GNOME_Evolution_Addressbook_BookListener_RepositoryOffline:
-		return E_BOOK_STATUS_REPOSITORY_OFFLINE;
-	case GNOME_Evolution_Addressbook_BookListener_PermissionDenied:
-		return E_BOOK_STATUS_PERMISSION_DENIED;
-	case GNOME_Evolution_Addressbook_BookListener_CardNotFound:
-		return E_BOOK_STATUS_CARD_NOT_FOUND;
-	case GNOME_Evolution_Addressbook_BookListener_CardIdAlreadyExists:
-		return E_BOOK_STATUS_CARD_ID_ALREADY_EXISTS;
-	case GNOME_Evolution_Addressbook_BookListener_ProtocolNotSupported:
-		return E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED;
-	case GNOME_Evolution_Addressbook_BookListener_OtherError:
-		return E_BOOK_STATUS_OTHER_ERROR;
-	default:
-		g_warning ("e_book_listener_convert_status: Unknown status "
-			   "from card server: %d\n", (int) status);
-		return E_BOOK_STATUS_UNKNOWN;
-
-	}
-}
-
-static EBookListener *
-e_book_listener_construct (EBookListener *listener)
-{
-	POA_GNOME_Evolution_Addressbook_BookListener *servant;
-	CORBA_Environment           ev;
-	CORBA_Object                obj;
-
-	g_assert (listener != NULL);
-	g_assert (E_IS_BOOK_LISTENER (listener));
-
-	servant = (POA_GNOME_Evolution_Addressbook_BookListener *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &e_book_listener_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Addressbook_BookListener__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (listener), servant);
-	if (obj == CORBA_OBJECT_NIL) {
-		g_free (servant);
-
-		return NULL;
-	}
-
-	bonobo_object_construct (BONOBO_OBJECT (listener), obj);
-
-	return listener;
-}
-
-/**
- * e_book_listener_new:
- * @book: the #EBook for which the listener is to be bound
- *
- * Creates and returns a new #EBookListener for the book.
- *
- * Returns: a new #EBookListener
- */
-EBookListener *
-e_book_listener_new ()
-{
-	EBookListener *listener;
-	EBookListener *retval;
-
-	listener = gtk_type_new (E_BOOK_LISTENER_TYPE);
-
-	retval = e_book_listener_construct (listener);
-
-	if (retval == NULL) {
-		g_warning ("e_book_listener_new: Error constructing "
-			   "EBookListener!\n");
-		bonobo_object_unref (BONOBO_OBJECT (listener));
-		return NULL;
-	}
-
-	return retval;
-}
-
-static void
-e_book_listener_init (EBookListener *listener)
-{
-	listener->priv = g_new0 (EBookListenerPrivate, 1);
-}
-
-void
-e_book_listener_stop (EBookListener *listener)
-{
-	g_return_if_fail (E_IS_BOOK_LISTENER (listener));
-
-	listener->priv->stopped = TRUE;
-}
-
-static void
-e_book_listener_destroy (GtkObject *object)
-{
-	EBookListener *listener = E_BOOK_LISTENER (object);
-	GList *l;
-
-	/* Remove our response queue handler: In theory, this can never happen since we
-	 always hold a reference to the listener while the timeout is running. */
-	if (listener->priv->timeout_id) {
-		g_source_remove (listener->priv->timeout_id);
-	}
-
-	/* Clean up anything still sitting in response_queue */
-	for (l = listener->priv->response_queue; l != NULL; l = l->next) {
-		EBookListenerResponse *resp = l->data;
-
-		response_free (resp);
-	}
-	g_list_free (listener->priv->response_queue);
-
-	g_free (listener->priv);
-	
-	GTK_OBJECT_CLASS (e_book_listener_parent_class)->destroy (object);
-}
-
-POA_GNOME_Evolution_Addressbook_BookListener__epv *
-e_book_listener_get_epv (void)
-{
-	POA_GNOME_Evolution_Addressbook_BookListener__epv *epv;
-
-	epv                             = g_new0 (POA_GNOME_Evolution_Addressbook_BookListener__epv, 1);
-
-	epv->notifyOpenBookProgress     = impl_BookListener_report_open_book_progress;
-	epv->notifyBookOpened           = impl_BookListener_respond_open_book;
-
-	epv->notifyCardCreated          = impl_BookListener_respond_create_card;
-	epv->notifyCardRemoved          = impl_BookListener_respond_remove_card;
-	epv->notifyCardModified         = impl_BookListener_respond_modify_card;
-
-	epv->notifyAuthenticationResult = impl_BookListener_respond_authentication_result;
-	epv->notifySupportedFields      = impl_BookListener_response_get_supported_fields;
-
-	epv->notifyCardRequested        = impl_BookListener_respond_get_vcard;
-	epv->notifyCursorRequested      = impl_BookListener_respond_get_cursor;
-	epv->notifyViewRequested        = impl_BookListener_respond_get_view;
-	epv->notifyChangesRequested     = impl_BookListener_respond_get_changes;
-
-	epv->notifyConnectionStatus     = impl_BookListener_report_connection_status;
-	epv->notifyWritable             = impl_BookListener_report_writable;
-
-	return epv;
-}
-
-static void
-e_book_listener_corba_class_init (void)
-{
-	e_book_listener_vepv.Bonobo_Unknown_epv          = bonobo_object_get_epv ();
-	e_book_listener_vepv.GNOME_Evolution_Addressbook_BookListener_epv = e_book_listener_get_epv ();
-}
-
-static void
-e_book_listener_class_init (EBookListenerClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	e_book_listener_parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	e_book_listener_signals [RESPONSES_QUEUED] =
-		gtk_signal_new ("responses_queued",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookListenerClass, responses_queued),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_book_listener_signals, LAST_SIGNAL);
-
-	object_class->destroy = e_book_listener_destroy;
-
-	e_book_listener_corba_class_init ();
-}
-
-/**
- * e_book_listener_get_type:
- */
-GtkType
-e_book_listener_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"EBookListener",
-			sizeof (EBookListener),
-			sizeof (EBookListenerClass),
-			(GtkClassInitFunc)  e_book_listener_class_init,
-			(GtkObjectInitFunc) e_book_listener_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/ebook/e-book-listener.h b/addressbook/backend/ebook/e-book-listener.h
deleted file mode 100644
index f546c9a029..0000000000
--- a/addressbook/backend/ebook/e-book-listener.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * A client-side GtkObject which exposes the
- * Evolution:BookListener interface.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#ifndef __E_BOOK_LISTENER_H__
-#define __E_BOOK_LISTENER_H__
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-#include <ebook/addressbook.h>
-#include <ebook/e-book-types.h>
-#include <e-util/e-list.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _EBookListener EBookListener;
-typedef struct _EBookListenerClass EBookListenerClass;
-typedef struct _EBookListenerPrivate EBookListenerPrivate;
-
-struct _EBookListener {
-	BonoboObject           parent;
-	EBookListenerPrivate *priv;
-};
-
-struct _EBookListenerClass {
-	BonoboObjectClass parent;
-
-	/*
-	 * Signals
-	 */
-	void (*responses_queued) (void);
-};
-
-typedef enum {
-	/* Async responses */
-	OpenBookResponse,
-	CreateCardResponse,
-	RemoveCardResponse,
-	ModifyCardResponse,
-	GetCardResponse,
-	GetCursorResponse,
-	GetBookViewResponse,
-	GetChangesResponse,
-	AuthenticationResponse,
-	GetSupportedFieldsResponse,
-
-	/* Async events */
-	LinkStatusEvent,
-	WritableStatusEvent,
-	OpenProgressEvent,
-} EBookListenerOperation;
-
-typedef struct {
-	EBookListenerOperation  op;
-
-	/* For most Response notifications */
-	EBookStatus             status;
-
-	/* For OpenBookResponse */
-	GNOME_Evolution_Addressbook_Book          book;
-
-	/* For GetCursorResponse */
-	GNOME_Evolution_Addressbook_CardCursor    cursor;
-
-	/* For GetBookViewReponse */
-	GNOME_Evolution_Addressbook_BookView      book_view;
-
-	/* For GetSupportedFields */
-	EList                                    *fields;
-
-	/* For OpenProgressEvent */
-	char                   *msg;
-	short                   percent;
-
-	/* For LinkStatusEvent */
-	gboolean                connected;
-
-	/* For WritableStatusEvent */
-	gboolean                writable;
-
-	/* For Card[Added|Removed|Modified]Event */
-	char                   *id;
-	char                   *vcard;
-} EBookListenerResponse;
-
-EBookListener         *e_book_listener_new            (void);
-int                    e_book_listener_check_pending  (EBookListener *listener);
-EBookListenerResponse *e_book_listener_pop_response   (EBookListener *listener);
-GtkType                e_book_listener_get_type       (void);
-void                   e_book_listener_stop           (EBookListener *listener);
-
-POA_GNOME_Evolution_Addressbook_BookListener__epv *e_book_listener_get_epv (void);
-
-#define E_BOOK_LISTENER_TYPE        (e_book_listener_get_type ())
-#define E_BOOK_LISTENER(o)          (GTK_CHECK_CAST ((o), E_BOOK_LISTENER_TYPE, EBookListener))
-#define E_BOOK_LISTENER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_BOOK_LISTENER_TYPE, EBookListenerClass))
-#define E_IS_BOOK_LISTENER(o)       (GTK_CHECK_TYPE ((o), E_BOOK_LISTENER_TYPE))
-#define E_IS_BOOK_LISTENER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BOOK_LISTENER_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __E_BOOK_LISTENER_H__ */
diff --git a/addressbook/backend/ebook/e-book-types.h b/addressbook/backend/ebook/e-book-types.h
deleted file mode 100644
index 0a477678eb..0000000000
--- a/addressbook/backend/ebook/e-book-types.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * A client-side GtkObject which exposes the
- * Evolution:BookListener interface.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#ifndef __E_BOOK_TYPES_H__
-#define __E_BOOK_TYPES_H__
-
-#include <libgnome/gnome-defs.h>
-
-BEGIN_GNOME_DECLS
-
-typedef enum {
-	E_BOOK_STATUS_SUCCESS,
-	E_BOOK_STATUS_UNKNOWN,
-	E_BOOK_STATUS_REPOSITORY_OFFLINE,
-	E_BOOK_STATUS_PERMISSION_DENIED,
-	E_BOOK_STATUS_CARD_NOT_FOUND,
-	E_BOOK_STATUS_CARD_ID_ALREADY_EXISTS,
-	E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED,
-	E_BOOK_STATUS_CANCELLED,
-	E_BOOK_STATUS_OTHER_ERROR
-} EBookStatus;
-
-typedef enum {
-	E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS,
-	E_BOOK_SIMPLE_QUERY_STATUS_CANCELLED,
-	E_BOOK_SIMPLE_QUERY_STATUS_OTHER_ERROR
-} EBookSimpleQueryStatus;
-
-END_GNOME_DECLS
-
-#endif /* ! __E_BOOK_TYPES_H__ */
diff --git a/addressbook/backend/ebook/e-book-util.c b/addressbook/backend/ebook/e-book-util.c
deleted file mode 100644
index f141deb791..0000000000
--- a/addressbook/backend/ebook/e-book-util.c
+++ /dev/null
@@ -1,597 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-book-util.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#include <config.h>
-#include "e-book-util.h"
-
-#include <gtk/gtkobject.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-util.h>
-#include "e-card-compare.h"
-
-gboolean
-e_book_load_local_address_book (EBook *book, EBookCallback open_response, gpointer closure)
-{
-	gchar *filename;
-	gchar *uri;
-	gboolean rv;
-
-	g_return_val_if_fail (book != NULL,          FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book),      FALSE);
-	g_return_val_if_fail (open_response != NULL, FALSE);
-
-	filename = gnome_util_prepend_user_home ("evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", filename);
-
-	rv = e_book_load_uri (book, uri, open_response, closure);
-
-	if (!rv) {
-		g_warning ("Couldn't load local addressbook %s", uri);
-	}
-
-	g_free (filename);
-	g_free (uri);
-
-	return rv;
-}
-
-static EBook *common_local_book = NULL;
-
-typedef struct _CommonBookInfo CommonBookInfo;
-struct _CommonBookInfo {
-	EBookCommonCallback cb;
-	gpointer closure;
-};
-
-static void
-got_local_book_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	CommonBookInfo *info = (CommonBookInfo *) closure;
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-
-		/* We try not to leak in a race condition where the
-		   local book got loaded twice. */
-
-		if (common_local_book) {
-			gtk_object_unref (GTK_OBJECT (book));
-			book = common_local_book;
-		}
-		
-		info->cb (book, info->closure);
-
-		if (common_local_book == NULL) {
-			common_local_book = book;
-		}
-		
-	} else {
-
-		info->cb (NULL, info->closure);
-
-	}
-	g_free (info);
-}
-
-void
-e_book_use_local_address_book (EBookCommonCallback cb, gpointer closure)
-{
-	EBook *book;
-	CommonBookInfo *info;
-
-	g_return_if_fail (cb != NULL);
-
-	if (common_local_book != NULL) {
-		cb (common_local_book, closure);
-		return;
-	}
-
-	info = g_new0 (CommonBookInfo, 1);
-	info->cb = cb;
-	info->closure = closure;
-
-	book = e_book_new ();
-	if (! e_book_load_local_address_book (book, got_local_book_cb, info)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		g_free (info);
-	}
-}
-
-/*
- *
- * Simple Query Stuff
- *
- */
-
-typedef struct _SimpleQueryInfo SimpleQueryInfo;
-struct _SimpleQueryInfo {
-	guint tag;
-	EBook *book;
-	gchar *query;
-	EBookSimpleQueryCallback cb;
-	gpointer closure;
-	EBookView *view;
-	guint add_tag;
-	guint seq_complete_tag;
-	GList *cards;
-	gboolean cancelled;
-};
-
-static void
-book_add_simple_query (EBook *book, SimpleQueryInfo *info)
-{
-	GList *pending = gtk_object_get_data (GTK_OBJECT (book), "sq_pending");
-	pending = g_list_prepend (pending, info);
-	gtk_object_set_data (GTK_OBJECT (book), "sq_pending", pending);
-}
-
-static SimpleQueryInfo *
-book_lookup_simple_query (EBook *book, guint tag)
-{
-	GList *pending = gtk_object_get_data (GTK_OBJECT (book), "sq_pending");
-	while (pending) {
-		SimpleQueryInfo *sq = pending->data;
-		if (sq->tag == tag)
-			return sq;
-		pending = g_list_next (pending);
-	}
-	return NULL;
-}
-
-static void
-book_remove_simple_query (EBook *book, SimpleQueryInfo *info)
-{
-	GList *pending = gtk_object_get_data (GTK_OBJECT (book), "sq_pending");
-	GList *i;
-
-	for (i=pending; i != NULL; i = g_list_next (i)) {
-		if (i->data == info) {
-			pending = g_list_remove_link (pending, i);
-			g_list_free_1 (i);
-			break;
-		}
-	}
-	gtk_object_set_data (GTK_OBJECT (book), "sq_pending", pending);
-}
-
-static guint
-book_issue_tag (EBook *book)
-{
-	gpointer ptr = gtk_object_get_data (GTK_OBJECT (book), "sq_tag");
-	guint tag = GPOINTER_TO_UINT (ptr);
-	if (tag == 0)
-		tag = 1;
-	gtk_object_set_data (GTK_OBJECT (book), "sq_tag", GUINT_TO_POINTER (tag+1));
-	return tag;
-}
-
-static SimpleQueryInfo *
-simple_query_new (EBook *book, const char *query, EBookSimpleQueryCallback cb, gpointer closure)
-{
-	SimpleQueryInfo *sq = g_new0 (SimpleQueryInfo, 1);
-
-	sq->tag = book_issue_tag (book);
-	sq->book = book;
-	gtk_object_ref (GTK_OBJECT (book));
-	sq->query = g_strdup (query);
-	sq->cb = cb;
-	sq->closure = closure;
-	sq->cancelled = FALSE;
-
-	/* Automatically add ourselves to the EBook's pending list. */
-	book_add_simple_query (book, sq);
-
-	return sq;
-}
-
-static void
-simple_query_disconnect (SimpleQueryInfo *sq)
-{
-	if (sq->add_tag) {
-		gtk_signal_disconnect (GTK_OBJECT (sq->view), sq->add_tag);
-		sq->add_tag = 0;
-	}
-
-	if (sq->seq_complete_tag) {
-		gtk_signal_disconnect (GTK_OBJECT (sq->view), sq->seq_complete_tag);
-		sq->seq_complete_tag = 0;
-	}
-
-	if (sq->view) {
-		gtk_object_unref (GTK_OBJECT (sq->view));
-		sq->view = NULL;
-	}
-}
-
-static void
-simple_query_free (SimpleQueryInfo *sq)
-{
-	simple_query_disconnect (sq);
-
-	/* Remove ourselves from the EBook's pending list. */
-	book_remove_simple_query (sq->book, sq);
-
-	g_free (sq->query);
-
-	if (sq->book)
-		gtk_object_unref (GTK_OBJECT (sq->book));
-
-	g_list_foreach (sq->cards, (GFunc) gtk_object_unref, NULL);
-	g_list_free (sq->cards);
-
-	g_free (sq);
-}
-
-static void
-simple_query_card_added_cb (EBookView *view, const GList *cards, gpointer closure)
-{
-	SimpleQueryInfo *sq = closure;
-
-	if (sq->cancelled)
-		return;
-
-	sq->cards = g_list_concat (sq->cards, g_list_copy ((GList *) cards));
-	g_list_foreach ((GList *) cards, (GFunc) gtk_object_ref, NULL);
-}
-
-static void
-simple_query_sequence_complete_cb (EBookView *view, gpointer closure)
-{
-	SimpleQueryInfo *sq = closure;
-
-	/* Disconnect signals, so that we don't pick up any changes to the book that occur
-	   in our callback */
-	simple_query_disconnect (sq);
-	if (! sq->cancelled)
-		sq->cb (sq->book, E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS, sq->cards, sq->closure);
-	simple_query_free (sq);
-}
-
-static void
-simple_query_book_view_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure)
-{
-	SimpleQueryInfo *sq = closure;
-
-	if (sq->cancelled) {
-		simple_query_free (sq);
-		return;
-	}
-
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		simple_query_disconnect (sq);
-		sq->cb (sq->book, E_BOOK_SIMPLE_QUERY_STATUS_OTHER_ERROR, NULL, sq->closure);
-		simple_query_free (sq);
-		return;
-	}
-
-	sq->view = book_view;
-	gtk_object_ref (GTK_OBJECT (book_view));
-
-	sq->add_tag = gtk_signal_connect (GTK_OBJECT (sq->view),
-					  "card_added",
-					  GTK_SIGNAL_FUNC (simple_query_card_added_cb),
-					  sq);
-	sq->seq_complete_tag = gtk_signal_connect (GTK_OBJECT (sq->view),
-						   "sequence_complete",
-						   GTK_SIGNAL_FUNC (simple_query_sequence_complete_cb),
-						   sq);
-}
-
-guint
-e_book_simple_query (EBook *book, const char *query, EBookSimpleQueryCallback cb, gpointer closure)
-{
-	SimpleQueryInfo *sq;
-
-	g_return_val_if_fail (book && E_IS_BOOK (book), 0);
-	g_return_val_if_fail (query, 0);
-	g_return_val_if_fail (cb, 0);
-
-	sq = simple_query_new (book, query, cb, closure);
-	e_book_get_book_view (book, (gchar *) query, simple_query_book_view_cb, sq);
-
-	return sq->tag;
-}
-
-void
-e_book_simple_query_cancel (EBook *book, guint tag)
-{
-	SimpleQueryInfo *sq;
-
-	g_return_if_fail (book && E_IS_BOOK (book));
-
-	sq = book_lookup_simple_query (book, tag);
-
-	if (sq) {
-		sq->cancelled = TRUE;
-		sq->cb (sq->book, E_BOOK_SIMPLE_QUERY_STATUS_CANCELLED, NULL, sq->closure);
-	} else {
-		g_warning ("Simple query tag %d is unknown", tag);
-	}
-}
-
-/*
- *
- * Specialized Queries
- *
- */
-
-typedef struct _NameEmailQueryInfo NameEmailQueryInfo;
-struct _NameEmailQueryInfo {
-	gchar *name;
-	gchar *email;
-	EBookSimpleQueryCallback cb;
-	gpointer closure;
-};
-
-static void
-name_email_query_info_free (NameEmailQueryInfo *info)
-{
-	if (info) {
-		g_free (info->name);
-		g_free (info->email);
-		g_free (info);
-	}
-}
-
-static void
-name_and_email_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)
-{
-	NameEmailQueryInfo *info = closure;
-	GList *filtered_cards = NULL;
-
-	while (cards) {
-		ECard *card = E_CARD (cards->data);
-		if ((info->name == NULL || e_card_compare_name_to_string (card, info->name) >= E_CARD_MATCH_VAGUE)
-		    && (info->email == NULL || e_card_email_match_string (card, info->email))) {
-			filtered_cards = g_list_append (filtered_cards, card);
-		}
-		cards = g_list_next (cards);
-	}
-
-	info->cb (book, status, filtered_cards, info->closure);
-
-	g_list_free (filtered_cards);
-
-	name_email_query_info_free (info);
-}
-
-guint
-e_book_name_and_email_query (EBook *book,
-			     const gchar *name,
-			     const gchar *email,
-			     EBookSimpleQueryCallback cb,
-			     gpointer closure)
-{
-	NameEmailQueryInfo *info;
-	gchar *email_query=NULL, *name_query=NULL, *query;
-	guint tag;
-
-	g_return_val_if_fail (book && E_IS_BOOK (book), 0);
-	g_return_val_if_fail (cb != NULL, 0);
-
-	if (name && !*name)
-		name = NULL;
-	if (email && !*email)
-		email = NULL;
-
-	if (name == NULL && email == NULL)
-		return 0;
-
-	/* Build our e-mail query.
-	 * We only query against the username part of the address, to avoid not matching
-	 * fred@foo.com and fred@mail.foo.com.  While their may be namespace collisions
-	 * in the usernames of everyone out there, it shouldn't be that bad.  (Famous last words.)
-	 */
-	if (email) {
-		const gchar *t = email;
-		while (*t && *t != '@')
-			++t;
-		if (*t == '@') {
-			email_query = g_strdup_printf ("(beginswith \"email\" \"%.*s@\")", t-email, email);
-
-		} else {
-			email_query = g_strdup_printf ("(beginswith \"email\" \"%s\")", email);
-		}
-	}
-
-	/* Build our name query.
-	 * We only do name-query stuff if we don't have an e-mail address.  Our basic assumption
-	 * is that the username part of the email is good enough to keep the amount of stuff returned
-	 * in the query relatively small.
-	 */
-	if (name && !email) {
-		gchar *name_cpy = g_strdup (name), *qjoined;
-		gchar **namev;
-		gint i, count=0;
-
-		g_strstrip (name_cpy);
-		namev = g_strsplit (name_cpy, " ", 0);
-		for (i=0; namev[i]; ++i) {
-			if (*namev[i]) {
-				char *str = namev[i];
-
-				namev[i] = g_strdup_printf ("(contains \"file_as\" \"%s\")", namev[i]);
-				++count;
-
-				g_free (str);
-			}
-		}
-
-		qjoined = g_strjoinv (" ", namev);
-		if (count > 1) {
-			name_query = g_strdup_printf ("(or %s)", qjoined);
-		} else {
-			name_query = qjoined;
-			qjoined = NULL;
-		}
-		
-		g_free (name_cpy);
-		g_strfreev (namev);
-		g_free (qjoined);
-	}
-
-	/* Assemble our e-mail & name queries */
-	if (email_query && name_query) {
-		query = g_strdup_printf ("(and %s %s)", email_query, name_query);
-	} else if (email_query) {
-		query = email_query;
-		email_query = NULL;
-	} else if (name_query) {
-		query = name_query;
-		name_query = NULL;
-	} else
-		return 0;
-
-	info = g_new0 (NameEmailQueryInfo, 1);
-	info->name = g_strdup (name);
-	info->email = g_strdup (email);
-	info->cb = cb;
-	info->closure = closure;
-
-	tag = e_book_simple_query (book, query, name_and_email_cb, info);
-
-	g_free (email_query);
-	g_free (name_query);
-	g_free (query);
-
-	return tag;
-}
-
-/*
- * Simple nickname query
- */
-
-typedef struct _NicknameQueryInfo NicknameQueryInfo;
-struct _NicknameQueryInfo {
-	gchar *nickname;
-	EBookSimpleQueryCallback cb;
-	gpointer closure;
-};
-
-static void
-nickname_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)
-{
-	NicknameQueryInfo *info = closure;
-
-	if (info->cb)
-		info->cb (book, status, cards, info->closure);
-
-	g_free (info->nickname);
-	g_free (info);
-}
-
-guint
-e_book_nickname_query (EBook *book,
-		       const char *nickname,
-		       EBookSimpleQueryCallback cb,
-		       gpointer closure)
-{
-	NicknameQueryInfo *info;
-	gchar *query;
-	guint retval;
-
-	g_return_val_if_fail (E_IS_BOOK (book), 0);
-	g_return_val_if_fail (nickname != NULL, 0);
-
-	/* The empty-string case shouldn't generate a warning. */
-	if (! *nickname)
-		return 0;
-
-	info = g_new0 (NicknameQueryInfo, 1);
-	info->nickname = g_strdup (nickname);
-	info->cb = cb;
-	info->closure = closure;
-
-	query = g_strdup_printf ("(is \"nickname\" \"%s\")", info->nickname);
-
-	retval = e_book_simple_query (book, query, nickname_cb, info);
-
-	g_free (query);
-
-	return retval;
-}
-
-/*
- *  Convenience routine to check for addresses in the local address book.
- */
-
-typedef struct _HaveAddressInfo HaveAddressInfo;
-struct _HaveAddressInfo {
-	gchar *email;
-	EBookHaveAddressCallback cb;
-	gpointer closure;
-};
-
-static void
-have_address_query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)
-{
-	HaveAddressInfo *info = (HaveAddressInfo *) closure;
-	
-	info->cb (book, 
-		  info->email,
-		  cards && (status == E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS) ? E_CARD (cards->data) : NULL,
-		  info->closure);
-
-	g_free (info->email);
-	g_free (info);
-}
-
-static void
-have_address_book_open_cb (EBook *book, gpointer closure)
-{
-	HaveAddressInfo *info = (HaveAddressInfo *) closure;
-
-	if (book) {
-
-		e_book_name_and_email_query (book, NULL, info->email, have_address_query_cb, info);
-
-	} else {
-
-		info->cb (NULL, info->email, NULL, info->closure);
-
-		g_free (info->email);
-		g_free (info);
-
-	}
-}
-
-void
-e_book_query_address_locally (const gchar *email,
-			      EBookHaveAddressCallback cb,
-			      gpointer closure)
-{
-	HaveAddressInfo *info;
-
-	g_return_if_fail (email != NULL);
-	g_return_if_fail (cb != NULL);
-
-	info = g_new0 (HaveAddressInfo, 1);
-	info->email = g_strdup (email);
-	info->cb = cb;
-	info->closure = closure;
-
-	e_book_use_local_address_book (have_address_book_open_cb, info);
-}
diff --git a/addressbook/backend/ebook/e-book-util.h b/addressbook/backend/ebook/e-book-util.h
deleted file mode 100644
index 2fad0d9e9c..0000000000
--- a/addressbook/backend/ebook/e-book-util.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-book-util.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __E_BOOK_UTIL_H__
-#define __E_BOOK_UTIL_H__
-
-#include <libgnome/gnome-defs.h>
-#include "e-book.h"
-
-BEGIN_GNOME_DECLS
-
-/* Callbacks for asynchronous functions. */
-typedef void (*EBookCommonCallback)      (EBook *book, gpointer closure);
-typedef void (*EBookSimpleQueryCallback) (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure);
-typedef void (*EBookHaveAddressCallback) (EBook *book, const gchar *addr, ECard *card, gpointer closure);
-
-gboolean e_book_load_local_address_book (EBook *book, 
-					 EBookCallback open_response, 
-					 gpointer closure);
-
-void     e_book_use_local_address_book  (EBookCommonCallback cb, gpointer closure);
-
-/* Simple Query Interface. */
-
-guint     e_book_simple_query             (EBook                    *book,
-					   const char               *query,
-					   EBookSimpleQueryCallback  cb,
-					   gpointer                  closure);
-void      e_book_simple_query_cancel      (EBook                    *book,
-					   guint                     tag);
-
-/* Specialized Name/Email Queries */
-
-guint e_book_name_and_email_query (EBook *book,
-				   const char *name,
-				   const char *email,
-				   EBookSimpleQueryCallback cb,
-				   gpointer closure);
-
-guint e_book_nickname_query (EBook *book,
-			     const char *nickname,
-			     EBookSimpleQueryCallback cb,
-			     gpointer closure);
-
-/* Returns the ECard associated to email in the callback,
-   or NULL if no match is found in the local address book. */
-void e_book_query_address_locally (const gchar *email,
-				   EBookHaveAddressCallback cb,
-				   gpointer closure);
-
-END_GNOME_DECLS
-
-
-#endif /* __E_BOOK_UTIL_H__ */
-
diff --git a/addressbook/backend/ebook/e-book-view-listener.c b/addressbook/backend/ebook/e-book-view-listener.c
deleted file mode 100644
index 40e467ef93..0000000000
--- a/addressbook/backend/ebook/e-book-view-listener.c
+++ /dev/null
@@ -1,461 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Exports the BookViewListener interface.  Maintains a queue of messages
- * which come in on the interface.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-book-view-listener.h"
-#include "e-book-view.h"
-#include "e-card.h"
-
-enum {
-	RESPONSES_QUEUED,
-	LAST_SIGNAL
-};
-
-static guint e_book_view_listener_signals [LAST_SIGNAL];
-
-static BonoboObjectClass          *e_book_view_listener_parent_class;
-POA_GNOME_Evolution_Addressbook_BookViewListener__vepv  e_book_view_listener_vepv;
-
-struct _EBookViewListenerPrivate {
-	GList   *response_queue;
-	gint     timeout_id;
-
-	guint timeout_lock : 1;
-	guint stopped      : 1;
-};
-
-static gboolean
-e_book_view_listener_check_queue (EBookViewListener *listener)
-{
-	if (listener->priv->timeout_lock)
-		return TRUE;
-
-	listener->priv->timeout_lock = TRUE;
-
-	if (listener->priv->response_queue != NULL && !listener->priv->stopped) {
-		gtk_signal_emit (GTK_OBJECT (listener), e_book_view_listener_signals [RESPONSES_QUEUED]);
-	}
-
-	if (listener->priv->response_queue == NULL || listener->priv->stopped) {
-		listener->priv->timeout_id = 0;
-		listener->priv->timeout_lock = FALSE;
-		bonobo_object_unref (BONOBO_OBJECT (listener));
-		return FALSE;
-	}
-
-	listener->priv->timeout_lock = FALSE;
-	return TRUE;
-}
-
-static void
-e_book_view_listener_queue_response (EBookViewListener         *listener,
-				     EBookViewListenerResponse *response)
-{
-	if (response == NULL)
-		return;
-
-	if (listener->priv->stopped) {
-		/* Free response and return */
-		g_free (response->id);
-		g_list_foreach (response->cards, (GFunc) gtk_object_unref, NULL);
-		g_list_free (response->cards);
-		g_free (response->message);
-		g_free (response);
-		return;
-	}
-	
-	listener->priv->response_queue = g_list_append (listener->priv->response_queue, response);
-
-	if (listener->priv->timeout_id == 0) {
-
-		/* Here, 20 == an arbitrary small number */		
-		listener->priv->timeout_id = g_timeout_add (20, (GSourceFunc) e_book_view_listener_check_queue, listener);
-
-		/* Hold a reference to the listener on behalf of the timeout */
-		bonobo_object_ref (BONOBO_OBJECT (listener));
-	}
-}
-
-/* Add, Remove, Modify */
-static void
-e_book_view_listener_queue_empty_event (EBookViewListener          *listener,
-					EBookViewListenerOperation  op)
-{
-	EBookViewListenerResponse *resp;
-
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookViewListenerResponse, 1);
-
-	resp->op        = op;
-	resp->id        = NULL;
-	resp->cards     = NULL;
-	resp->message   = NULL;
-
-	e_book_view_listener_queue_response (listener, resp);
-}
-
-/* Add, Remove, Modify */
-static void
-e_book_view_listener_queue_id_event (EBookViewListener          *listener,
-				     EBookViewListenerOperation  op,
-				     const char             *id)
-{
-	EBookViewListenerResponse *resp;
-
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookViewListenerResponse, 1);
-
-	resp->op        = op;
-	resp->id        = g_strdup (id);
-	resp->cards     = NULL;
-	resp->message   = NULL;
-
-	e_book_view_listener_queue_response (listener, resp);
-}
-
-/* Add, Remove, Modify */
-static void
-e_book_view_listener_queue_sequence_event (EBookViewListener          *listener,
-					   EBookViewListenerOperation  op,
-					   const GNOME_Evolution_Addressbook_VCardList  *cards)
-{
-	EBookViewListenerResponse *resp;
-	int i;
-
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookViewListenerResponse, 1);
-
-	resp->op        = op;
-	resp->id        = NULL;
-	resp->cards     = NULL;
-	resp->message   = NULL;
-	
-	for ( i = 0; i < cards->_length; i++ ) {
-		resp->cards = g_list_append(resp->cards, e_card_new(cards->_buffer[i]));
-	}
-
-	e_book_view_listener_queue_response (listener, resp);
-}
-
-/* Status Message */
-static void
-e_book_view_listener_queue_message_event (EBookViewListener          *listener,
-					  EBookViewListenerOperation  op,
-					  const char                 *message)
-{
-	EBookViewListenerResponse *resp;
-
-	if (listener->priv->stopped)
-		return;
-
-	resp = g_new0 (EBookViewListenerResponse, 1);
-
-	resp->op        = op;
-	resp->id        = NULL;
-	resp->cards     = NULL;
-	resp->message   = g_strdup(message);
-
-	e_book_view_listener_queue_response (listener, resp);
-}
-
-static void
-impl_BookViewListener_notify_card_added (PortableServer_Servant servant,
-					 const GNOME_Evolution_Addressbook_VCardList *cards,
-					 CORBA_Environment *ev)
-{
-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_view_listener_queue_sequence_event (
-		listener, CardAddedEvent, cards);
-}
-
-static void
-impl_BookViewListener_notify_card_removed (PortableServer_Servant servant,
-					   const GNOME_Evolution_Addressbook_CardId id,
-					   CORBA_Environment *ev)
-{
-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_view_listener_queue_id_event (
-		listener, CardRemovedEvent, (const char *) id);
-}
-
-static void
-impl_BookViewListener_notify_card_changed (PortableServer_Servant servant,
-					   const GNOME_Evolution_Addressbook_VCardList *cards,
-					   CORBA_Environment *ev)
-{
-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_view_listener_queue_sequence_event (
-		listener, CardModifiedEvent, cards);
-}
-
-static void
-impl_BookViewListener_notify_sequence_complete (PortableServer_Servant servant,
-						CORBA_Environment *ev)
-{
-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_view_listener_queue_empty_event (listener, SequenceCompleteEvent);
-}
-
-static void
-impl_BookViewListener_notify_status_message (PortableServer_Servant  servant,
-					     const char             *message,
-					     CORBA_Environment      *ev)
-{
-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_view_listener_queue_message_event (listener, StatusMessageEvent, message);
-}
-
-/**
- * e_book_view_listener_check_pending:
- * @listener: the #EBookViewListener 
- *
- * Returns: the number of items on the response queue,
- * or -1 if the @listener is isn't an #EBookViewListener.
- */
-int
-e_book_view_listener_check_pending (EBookViewListener *listener)
-{
-	g_return_val_if_fail (listener != NULL,              -1);
-	g_return_val_if_fail (E_IS_BOOK_VIEW_LISTENER (listener), -1);
-
-	return g_list_length (listener->priv->response_queue);
-}
-
-/**
- * e_book_view_listener_pop_response:
- * @listener: the #EBookViewListener for which a request is to be popped
- *
- * Returns: an #EBookViewListenerResponse if there are responses on the
- * queue to be returned; %NULL if there aren't, or if the @listener
- * isn't an EBookViewListener.
- */
-EBookViewListenerResponse *
-e_book_view_listener_pop_response (EBookViewListener *listener)
-{
-	EBookViewListenerResponse *resp;
-	GList                 *popped;
-
-	g_return_val_if_fail (listener != NULL,              NULL);
-	g_return_val_if_fail (E_IS_BOOK_VIEW_LISTENER (listener), NULL);
-
-	if (listener->priv->response_queue == NULL)
-		return NULL;
-
-	resp = listener->priv->response_queue->data;
-
-	popped = listener->priv->response_queue;
-	listener->priv->response_queue =
-		g_list_remove_link (listener->priv->response_queue,
-				    listener->priv->response_queue);
-	g_list_free_1 (popped);
-
-	return resp;
-}
-
-static EBookViewListener *
-e_book_view_listener_construct (EBookViewListener *listener)
-{
-	POA_GNOME_Evolution_Addressbook_BookViewListener *servant;
-	CORBA_Environment           ev;
-	CORBA_Object                obj;
-
-	g_assert (listener != NULL);
-	g_assert (E_IS_BOOK_VIEW_LISTENER (listener));
-
-	servant = (POA_GNOME_Evolution_Addressbook_BookViewListener *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &e_book_view_listener_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Addressbook_BookViewListener__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (listener), servant);
-	if (obj == CORBA_OBJECT_NIL) {
-		g_free (servant);
-
-		return NULL;
-	}
-
-	bonobo_object_construct (BONOBO_OBJECT (listener), obj);
-
-	return listener;
-}
-
-/**
- * e_book_view_listener_new:
- * @book: the #EBookView for which the listener is to be bound
- *
- * Creates and returns a new #EBookViewListener for the book.
- *
- * Returns: a new #EBookViewListener
- */
-EBookViewListener *
-e_book_view_listener_new ()
-{
-	EBookViewListener *listener;
-	EBookViewListener *retval;
-
-	listener = gtk_type_new (E_BOOK_VIEW_LISTENER_TYPE);
-
-	retval = e_book_view_listener_construct (listener);
-
-	if (retval == NULL) {
-		g_warning ("e_book_view_listener_new: Error constructing "
-			   "EBookViewListener!\n");
-		bonobo_object_unref (BONOBO_OBJECT (listener));
-		return NULL;
-	}
-
-	return retval;
-}
-
-static void
-e_book_view_listener_init (EBookViewListener *listener)
-{
-	listener->priv                 = g_new0 (EBookViewListenerPrivate, 1);
-	listener->priv->response_queue = NULL;
-	listener->priv->timeout_id     = 0;
-	listener->priv->timeout_lock   = FALSE;
-	listener->priv->stopped        = FALSE;
-}
-
-void
-e_book_view_listener_stop (EBookViewListener *listener)
-{
-	g_return_if_fail (E_IS_BOOK_VIEW_LISTENER (listener));
-	listener->priv->stopped = TRUE;
-}
-
-static void
-e_book_view_listener_destroy (GtkObject *object)
-{
-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (object);
-	GList *l;
-	
-	/* Remove our response queue handler: In theory, this can never happen since we
-	 always hold a reference to the listener while the timeout is running. */
-	if (listener->priv->timeout_id) {
-		g_source_remove (listener->priv->timeout_id);
-	}
-
-	/* Clear out the queue */
-	for (l = listener->priv->response_queue; l != NULL; l = l->next) {
-		EBookViewListenerResponse *resp = l->data;
-
-		g_free(resp->id);
-
-		g_list_foreach(resp->cards, (GFunc) gtk_object_unref, NULL);
-		g_list_free(resp->cards);
-		resp->cards = NULL;
-
-		g_free (resp->message);
-		resp->message = NULL;
-
-		g_free (resp);
-	}
-	g_list_free (listener->priv->response_queue);
-	
-	g_free (listener->priv);
-	listener->priv = NULL;
-	
-	GTK_OBJECT_CLASS (e_book_view_listener_parent_class)->destroy (object);
-}
-
-POA_GNOME_Evolution_Addressbook_BookViewListener__epv *
-e_book_view_listener_get_epv (void)
-{
-	POA_GNOME_Evolution_Addressbook_BookViewListener__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookViewListener__epv, 1);
-
-	epv->notifyCardChanged      = impl_BookViewListener_notify_card_changed;
-	epv->notifyCardRemoved      = impl_BookViewListener_notify_card_removed;
-	epv->notifyCardAdded        = impl_BookViewListener_notify_card_added;
-	epv->notifySequenceComplete = impl_BookViewListener_notify_sequence_complete;
-	epv->notifyStatusMessage    = impl_BookViewListener_notify_status_message;
-
-	return epv;
-}
-
-static void
-e_book_view_listener_corba_class_init (void)
-{
-	e_book_view_listener_vepv.Bonobo_Unknown_epv          = bonobo_object_get_epv ();
-	e_book_view_listener_vepv.GNOME_Evolution_Addressbook_BookViewListener_epv = e_book_view_listener_get_epv ();
-}
-
-static void
-e_book_view_listener_class_init (EBookViewListenerClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	e_book_view_listener_parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	e_book_view_listener_signals [RESPONSES_QUEUED] =
-		gtk_signal_new ("responses_queued",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookViewListenerClass, responses_queued),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_book_view_listener_signals, LAST_SIGNAL);
-
-	object_class->destroy = e_book_view_listener_destroy;
-
-	e_book_view_listener_corba_class_init ();
-}
-
-/**
- * e_book_view_listener_get_type:
- */
-GtkType
-e_book_view_listener_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"EBookViewListener",
-			sizeof (EBookViewListener),
-			sizeof (EBookViewListenerClass),
-			(GtkClassInitFunc)  e_book_view_listener_class_init,
-			(GtkObjectInitFunc) e_book_view_listener_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/ebook/e-book-view-listener.h b/addressbook/backend/ebook/e-book-view-listener.h
deleted file mode 100644
index d373872ad0..0000000000
--- a/addressbook/backend/ebook/e-book-view-listener.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * A client-side GtkObject which exposes the
- * Evolution:BookViewListener interface.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#ifndef __E_BOOK_VIEW_LISTENER_H__
-#define __E_BOOK_VIEW_LISTENER_H__
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-#include <addressbook/backend/ebook/addressbook.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _EBookViewListener EBookViewListener;
-typedef struct _EBookViewListenerClass EBookViewListenerClass;
-typedef struct _EBookViewListenerPrivate EBookViewListenerPrivate;
-
-struct _EBookViewListener {
-	BonoboObject           parent;
-	EBookViewListenerPrivate *priv;
-};
-
-struct _EBookViewListenerClass {
-	BonoboObjectClass parent;
-
-	/*
-	 * Signals
-	 */
-	void (*responses_queued) (void);
-};
-
-typedef enum {
-	/* Async events */
-	CardAddedEvent,
-	CardRemovedEvent,
-	CardModifiedEvent,
-	SequenceCompleteEvent,
-	StatusMessageEvent,
-} EBookViewListenerOperation;
-
-typedef struct {
-	EBookViewListenerOperation  op;
-
-	/* For CardRemovedEvent */
-	char                   *id;
-
-	/* For Card[Added|Modified]Event */
-	GList                  *cards; /* Of type ECard. */
-
-	/* For StatusMessageEvent */
-	char                   *message;
-	
-} EBookViewListenerResponse;
-
-EBookViewListener         *e_book_view_listener_new            (void);
-int                        e_book_view_listener_check_pending  (EBookViewListener *listener);
-EBookViewListenerResponse *e_book_view_listener_pop_response   (EBookViewListener *listener);
-GtkType                    e_book_view_listener_get_type       (void);
-void                       e_book_view_listener_stop           (EBookViewListener *listener);
-
-POA_GNOME_Evolution_Addressbook_BookViewListener__epv *e_book_view_listener_get_epv (void);
-
-#define E_BOOK_VIEW_LISTENER_TYPE        (e_book_view_listener_get_type ())
-#define E_BOOK_VIEW_LISTENER(o)          (GTK_CHECK_CAST ((o), E_BOOK_VIEW_LISTENER_TYPE, EBookViewListener))
-#define E_BOOK_VIEW_LISTENER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_BOOK_VIEW_LISTENER_TYPE, EBookViewListenerClass))
-#define E_IS_BOOK_VIEW_LISTENER(o)       (GTK_CHECK_TYPE ((o), E_BOOK_VIEW_LISTENER_TYPE))
-#define E_IS_BOOK_VIEW_LISTENER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BOOK_VIEW_LISTENER_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __E_BOOK_VIEW_LISTENER_H__ */
diff --git a/addressbook/backend/ebook/e-book-view.c b/addressbook/backend/ebook/e-book-view.c
deleted file mode 100644
index 1af893bcd6..0000000000
--- a/addressbook/backend/ebook/e-book-view.c
+++ /dev/null
@@ -1,351 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 1999, 2000, Ximian, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkmarshal.h>
-
-#include "addressbook.h"
-#include "e-card-cursor.h"
-#include "e-book-view-listener.h"
-#include "e-book-view.h"
-#include "e-book.h"
-
-GtkObjectClass *e_book_view_parent_class;
-
-struct _EBookViewPrivate {
-	GNOME_Evolution_Addressbook_BookView     corba_book_view;
-
-	EBook                 *book;
-	
-	EBookViewListener     *listener;
-
-	int                    responses_queued_id;
-};
-
-enum {
-	CARD_CHANGED,
-	CARD_REMOVED,
-	CARD_ADDED,
-	SEQUENCE_COMPLETE,
-	STATUS_MESSAGE,
-	LAST_SIGNAL
-};
-
-static guint e_book_view_signals [LAST_SIGNAL];
-
-static void
-add_book_iterator (gpointer data, gpointer closure)
-{
-	ECard *card = E_CARD (data);
-	EBook *book = E_BOOK (closure);
-
-	e_card_set_book (card, book);
-}
-
-static void
-e_book_view_do_added_event (EBookView                 *book_view,
-			    EBookViewListenerResponse *resp)
-{
-	if (book_view->priv->book)
-		g_list_foreach (resp->cards, add_book_iterator, book_view->priv->book);
-
-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [CARD_ADDED],
-			 resp->cards);
-
-	g_list_foreach (resp->cards, (GFunc) gtk_object_unref, NULL);
-	g_list_free (resp->cards);
-}
-
-static void
-e_book_view_do_modified_event (EBookView                 *book_view,
-			       EBookViewListenerResponse *resp)
-{
-	if (book_view->priv->book)
-		g_list_foreach (resp->cards, add_book_iterator, book_view->priv->book);
-
-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [CARD_CHANGED],
-			 resp->cards);
-
-	g_list_foreach (resp->cards, (GFunc) gtk_object_unref, NULL);
-	g_list_free (resp->cards);
-}
-
-static void
-e_book_view_do_removed_event (EBookView                 *book_view,
-			      EBookViewListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [CARD_REMOVED],
-			 resp->id);
-
-	g_free(resp->id);
-}
-
-static void
-e_book_view_do_complete_event (EBookView                 *book_view,
-			      EBookViewListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [SEQUENCE_COMPLETE]);
-}
-
-static void
-e_book_view_do_status_message_event (EBookView                 *book_view,
-				     EBookViewListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [STATUS_MESSAGE],
-			 resp->message);
-	g_free(resp->message);
-}
-
-
-/*
- * Reading notices out of the EBookViewListener's queue.
- */
-static void
-e_book_view_check_listener_queue (EBookViewListener *listener, EBookView *book_view)
-{
-	EBookViewListenerResponse *resp;
-
-	resp = e_book_view_listener_pop_response (listener);
-	
-	if (resp == NULL)
-		return;
-
-	switch (resp->op) {
-	case CardAddedEvent:
-		e_book_view_do_added_event (book_view, resp);
-		break;
-	case CardModifiedEvent:
-		e_book_view_do_modified_event (book_view, resp);
-		break;
-	case CardRemovedEvent:
-		e_book_view_do_removed_event (book_view, resp);
-		break;
-	case SequenceCompleteEvent:
-		e_book_view_do_complete_event (book_view, resp);
-		break;
-	case StatusMessageEvent:
-		e_book_view_do_status_message_event (book_view, resp);
-		break;
-	default:
-		g_error ("EBookView: Unknown operation %d in listener queue!\n",
-			 resp->op);
-		break;
-	}
-
-	g_free (resp);
-}
-
-static gboolean
-e_book_view_construct (EBookView *book_view, GNOME_Evolution_Addressbook_BookView corba_book_view, EBookViewListener *listener)
-{
-	CORBA_Environment  ev;
-	g_return_val_if_fail (book_view != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK_VIEW (book_view), FALSE);
-
-	/*
-	 * Copy in the corba_book_view.
-	 */
-	CORBA_exception_init (&ev);
-
-	book_view->priv->corba_book_view = bonobo_object_dup_ref(corba_book_view, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_view_construct: Exception duplicating corba_book_view.\n");
-		CORBA_exception_free (&ev);
-		book_view->priv->corba_book_view = NULL;
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	/*
-	 * Create our local BookListener interface.
-	 */
-	book_view->priv->listener = listener;
-	book_view->priv->responses_queued_id = gtk_signal_connect (GTK_OBJECT (book_view->priv->listener), "responses_queued",
-								   e_book_view_check_listener_queue, book_view);
-
-	bonobo_object_ref(BONOBO_OBJECT(book_view->priv->listener));
-
-	return TRUE;
-}
-
-/**
- * e_book_view_new:
- */
-EBookView *
-e_book_view_new (GNOME_Evolution_Addressbook_BookView corba_book_view, EBookViewListener *listener)
-{
-	EBookView *book_view;
-
-	book_view = gtk_type_new (E_BOOK_VIEW_TYPE);
-
-	if (! e_book_view_construct (book_view, corba_book_view, listener)) {
-		gtk_object_unref (GTK_OBJECT (book_view));
-		return NULL;
-	}
-
-	return book_view;
-}
-
-void
-e_book_view_set_book (EBookView *book_view, EBook *book)
-{
-	g_return_if_fail (book_view && E_IS_BOOK_VIEW (book_view));
-	g_return_if_fail (book && E_IS_BOOK (book));
-	g_return_if_fail (book_view->priv->book == NULL);
-
-	book_view->priv->book = book;
-	gtk_object_ref (GTK_OBJECT (book));
-}
-
-void
-e_book_view_stop (EBookView *book_view)
-{
-	g_return_if_fail (book_view && E_IS_BOOK_VIEW (book_view));
-	if (book_view->priv->listener)
-		e_book_view_listener_stop (book_view->priv->listener);
-}
-
-static void
-e_book_view_init (EBookView *book_view)
-{
-	book_view->priv                      = g_new0 (EBookViewPrivate, 1);
-	book_view->priv->book                = NULL;
-	book_view->priv->corba_book_view     = CORBA_OBJECT_NIL;
-	book_view->priv->listener            = NULL;
-	book_view->priv->responses_queued_id = 0;
-}
-
-static void
-e_book_view_destroy (GtkObject *object)
-{
-	EBookView             *book_view = E_BOOK_VIEW (object);
-	CORBA_Environment  ev;
-
-	if (book_view->priv->book) {
-		gtk_object_unref (GTK_OBJECT (book_view->priv->book));
-	}
-
-	if (book_view->priv->corba_book_view) {
-		CORBA_exception_init (&ev);
-
-		bonobo_object_release_unref (book_view->priv->corba_book_view, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("EBookView: Exception while releasing BookView\n");
-		}
-
-		CORBA_exception_free (&ev);
-	}
-
-	if (book_view->priv->listener) {
-		if (book_view->priv->responses_queued_id)
-			gtk_signal_disconnect(GTK_OBJECT(book_view->priv->listener),
-					      book_view->priv->responses_queued_id);
-		e_book_view_listener_stop (book_view->priv->listener);
-		bonobo_object_unref (BONOBO_OBJECT(book_view->priv->listener));
-	}
-
-	g_free (book_view->priv);
-
-	if (GTK_OBJECT_CLASS (e_book_view_parent_class)->destroy)
-		GTK_OBJECT_CLASS (e_book_view_parent_class)->destroy (object);
-}
-
-static void
-e_book_view_class_init (EBookViewClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	e_book_view_parent_class = gtk_type_class (gtk_object_get_type ());
-
-	e_book_view_signals [CARD_CHANGED] =
-		gtk_signal_new ("card_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookViewClass, card_changed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-
-	e_book_view_signals [CARD_ADDED] =
-		gtk_signal_new ("card_added",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookViewClass, card_added),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	e_book_view_signals [CARD_REMOVED] =
-		gtk_signal_new ("card_removed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookViewClass, card_removed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-
-	e_book_view_signals [SEQUENCE_COMPLETE] =
-		gtk_signal_new ("sequence_complete",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookViewClass, sequence_complete),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_book_view_signals [STATUS_MESSAGE] =
-		gtk_signal_new ("status_message",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookViewClass, status_message),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, e_book_view_signals,
-				      LAST_SIGNAL);
-
-	klass->card_changed = NULL;
-	klass->card_added = NULL;
-	klass->card_removed = NULL;
-	klass->sequence_complete = NULL;
-	klass->status_message = NULL;
-
-	object_class->destroy = e_book_view_destroy;
-}
-
-/**
- * e_book_view_get_type:
- */
-GtkType
-e_book_view_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"EBookView",
-			sizeof (EBookView),
-			sizeof (EBookViewClass),
-			(GtkClassInitFunc)  e_book_view_class_init,
-			(GtkObjectInitFunc) e_book_view_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/ebook/e-book-view.h b/addressbook/backend/ebook/e-book-view.h
deleted file mode 100644
index 86326ca5b7..0000000000
--- a/addressbook/backend/ebook/e-book-view.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 1999, 2000, Ximian, Inc.
- */
-
-#ifndef __E_BOOK_VIEW_H__
-#define __E_BOOK_VIEW_H__
-
-#include <libgnome/gnome-defs.h>
-
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-book-view-listener.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _EBookView        EBookView;
-typedef struct _EBookViewClass   EBookViewClass;
-typedef struct _EBookViewPrivate EBookViewPrivate;
-
-struct _EBook;  /* Forward reference */
-
-struct _EBookView {
-	GtkObject     parent;
-	EBookViewPrivate *priv;
-};
-
-struct _EBookViewClass {
-	GtkObjectClass parent;
-
-	/*
-	 * Signals.
-	 */
-	void (* card_changed)      (EBookView *book_view, const GList *cards);
-	void (* card_removed)      (EBookView *book_view, const char *id);
-	void (* card_added)        (EBookView *book_view, const GList *cards);
-	void (* sequence_complete) (EBookView *book_view);
-	void (* status_message)    (EBookView *book_view, const char *message);
-};
-
-/* Creating a new addressbook. */
-EBookView         *e_book_view_new                    (GNOME_Evolution_Addressbook_BookView corba_book_view, EBookViewListener *listener);
-
-GtkType            e_book_view_get_type               (void);
-
-void               e_book_view_set_book               (EBookView *book_view, struct _EBook *book);
-
-void               e_book_view_stop                   (EBookView *book_view);
-
-#define E_BOOK_VIEW_TYPE        (e_book_view_get_type ())
-#define E_BOOK_VIEW(o)          (GTK_CHECK_CAST ((o), E_BOOK_VIEW_TYPE, EBookView))
-#define E_BOOK_VIEW_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_BOOK_VIEW_TYPE, EBookViewClass))
-#define E_IS_BOOK_VIEW(o)       (GTK_CHECK_TYPE ((o), E_BOOK_VIEW_TYPE))
-#define E_IS_BOOK_VIEW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BOOK_VIEW_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __E_BOOK_VIEW_H__ */
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
deleted file mode 100644
index c260f3402a..0000000000
--- a/addressbook/backend/ebook/e-book.c
+++ /dev/null
@@ -1,1499 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 1999, 2000, Ximian, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkmarshal.h>
-#include <libgnome/gnome-defs.h>
-#include <liboaf/liboaf.h>
-
-#include "addressbook.h"
-#include "e-card-cursor.h"
-#include "e-book-listener.h"
-#include "e-book.h"
-
-GtkObjectClass *e_book_parent_class;
-
-#define CARDSERVER_OAF_ID "OAFIID:GNOME_Evolution_Wombat_ServerFactory"
-
-typedef enum {
-	URINotLoaded,
-	URILoading,
-	URILoaded
-} EBookLoadState;
-
-struct _EBookPrivate {
-	GList *book_factories;
-	GList *iter;
-
-	EBookListener	      *listener;
-
-	GNOME_Evolution_Addressbook_Book         corba_book;
-
-	EBookLoadState         load_state;
-
-	/*
-	 * The operation queue.  New operations are appended to the
-	 * end of the queue.  When responses come back from the PAS,
-	 * the op structures are popped off the front of the queue.
-	 */
-	GList                 *pending_ops;
-
-	guint op_tag;
-
-	gchar *uri;
-};
-
-enum {
-	OPEN_PROGRESS,
-	WRITABLE_STATUS,
-	LINK_STATUS,
-	LAST_SIGNAL
-};
-
-static guint e_book_signals [LAST_SIGNAL];
-
-typedef struct {
-	guint     tag;
-	gboolean  active;
-	gpointer  cb;
-	gpointer  closure;
-	EBookViewListener *listener;
-} EBookOp;
-
-/*
- * Local response queue management.
- */
-
-static void
-e_book_op_free (EBookOp *op)
-{
-	if (op->listener) {
-		bonobo_object_unref (BONOBO_OBJECT (op->listener));
-		op->listener = NULL;
-	}
-	g_free (op);
-}
-
-static guint
-e_book_queue_op (EBook    *book,
-		 gpointer  cb,
-		 gpointer  closure,
-		 EBookViewListener *listener)
-{
-	EBookOp *op;
-
-	op           = g_new0 (EBookOp, 1);
-	op->tag      = book->priv->op_tag++;
-	op->active   = TRUE;
-	op->cb       = cb;
-	op->closure  = closure;
-	op->listener = listener;
-
-	if (op->listener)
-		bonobo_object_ref (BONOBO_OBJECT (op->listener));
-
-	book->priv->pending_ops =
-		g_list_append (book->priv->pending_ops, op);
-
-	return op->tag;
-}
-
-/*
- * Local response queue management.
- */
-static void
-e_book_unqueue_op (EBook    *book)
-{
-	EBookOp *op;
-	GList *removed;
-
-	removed = g_list_last (book->priv->pending_ops);
-
-	if (removed) {
-		book->priv->pending_ops = g_list_remove_link (book->priv->pending_ops,
-							      removed);
-		op = removed->data;
-		e_book_op_free (op);
-		g_list_free_1 (removed);
-		book->priv->op_tag--;
-	}
-}
-
-static EBookOp *
-e_book_pop_op (EBook *book)
-{
-	GList   *popped;
-	EBookOp *op;
-
-	if (book->priv->pending_ops == NULL)
-		return NULL;
-
-	op = book->priv->pending_ops->data;
-
-	popped = book->priv->pending_ops;
-	book->priv->pending_ops =
-		g_list_remove_link (book->priv->pending_ops,
-				    book->priv->pending_ops);
-
-	g_list_free_1 (popped);
-
-	return op;
-}
-
-static gboolean
-e_book_cancel_op (EBook *book, guint tag)
-{
-	GList *iter;
-	gboolean cancelled = FALSE;
-
-	for (iter = book->priv->pending_ops; iter != NULL && !cancelled; iter = g_list_next (iter)) {
-		EBookOp *op = iter->data;
-		if (op->tag == tag) {
-			op->active = FALSE;
-			cancelled = TRUE;
-		}
-	}
-	
-	return cancelled;
-}
-
-static void
-e_book_do_response_create_card (EBook                 *book,
-				EBookListenerResponse *resp)
-{
-	EBookOp *op;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_create_card: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	if (op->cb)
-		((EBookIdCallback) op->cb) (book, resp->status, resp->id, op->closure);
-	g_free (resp->id);
-	e_book_op_free (op);
-}
-
-static void
-e_book_do_response_generic (EBook                 *book,
-			    EBookListenerResponse *resp)
-{
-	EBookOp *op;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_generic: Cannot find operation "
-			   "in local op queue!\n");
-	}
-
-	if (op->cb)
-		((EBookCallback) op->cb) (book, resp->status, op->closure);
-
-	e_book_op_free (op);
-}
-
-static void
-e_book_do_response_get_vcard (EBook                 *book,
-			      EBookListenerResponse *resp)
-{
-	EBookOp *op;
-	ECard *card;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_get_vcard: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-	if (resp->vcard != NULL) {
-
-		card = e_card_new(resp->vcard);
-
-		if (card != NULL) {
-			e_card_set_book (card, book);
-			if (op->cb) {
-				if (op->active)
-					((EBookCardCallback) op->cb) (book, resp->status, card, op->closure);
-				else
-					((EBookCardCallback) op->cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op->closure);
-			}
-
-			gtk_object_unref(GTK_OBJECT(card));
-		} else {
-			((EBookCursorCallback) op->cb) (book, resp->status, NULL, op->closure);
-		}
-	} else {
-		((EBookCardCallback) op->cb) (book, resp->status, NULL, op->closure);
-	}
-
-	g_free (resp->vcard);
-	e_book_op_free (op);
-}
-
-static void
-e_book_do_response_get_cursor (EBook                 *book,
-			       EBookListenerResponse *resp)
-{
-	CORBA_Environment ev;
-	EBookOp *op;
-	ECardCursor *cursor;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_get_cursor: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	cursor = e_card_cursor_new(resp->cursor);
-
-	if (cursor != NULL) {
-		if (op->cb) {
-			if (op->active)
-				((EBookCursorCallback) op->cb) (book, resp->status, cursor, op->closure);
-			else
-				((EBookCursorCallback) op->cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op->closure);
-		}
-
-		/*
-		 * Release the remote GNOME_Evolution_Addressbook_Book in the PAS.
-		 */
-		CORBA_exception_init (&ev);
-
-		bonobo_object_release_unref (resp->cursor, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("e_book_do_response_get_cursor: Exception releasing "
-				   "remote GNOME_Evolution_Addressbook_CardCursor interface!\n");
-		}
-
-		CORBA_exception_free (&ev);
-
-		gtk_object_unref(GTK_OBJECT(cursor));
-	} else {
-		((EBookCursorCallback) op->cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op->closure);
-	}
-	
-	e_book_op_free (op);
-}
-
-static void
-e_book_do_response_get_view (EBook                 *book,
-			     EBookListenerResponse *resp)
-{
-	CORBA_Environment ev;
-	EBookOp *op;
-	EBookView *book_view;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_get_view: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-	
-	book_view = e_book_view_new (resp->book_view, op->listener);
-
-	if (book_view != NULL) {
-		e_book_view_set_book (book_view, book);
-
-		/* Only execute the callback if the operation is still flagged as active (i.e. hasn't
-		   been cancelled.  This is mildly wasteful since we unnecessaryily create the
-		   book_view, etc... but I'm leery of tinkering with the CORBA magic. */
-		if (op->cb) {
-			if (op->active)
-				((EBookBookViewCallback) op->cb) (book, resp->status, book_view, op->closure);
-			else
-				((EBookBookViewCallback) op->cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op->closure);
-		}
-	
-		/*
-		 * Release the remote GNOME_Evolution_Addressbook_Book in the PAS.
-		 */
-		CORBA_exception_init (&ev);
-
-		bonobo_object_release_unref  (resp->book_view, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("e_book_do_response_get_view: Exception releasing "
-				   "remote GNOME_Evolution_Addressbook_BookView interface!\n");
-		}
-
-		CORBA_exception_free (&ev);
-
-		gtk_object_unref(GTK_OBJECT(book_view));
-	} else {
-		e_book_view_listener_stop (op->listener);
-		((EBookBookViewCallback) op->cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op->closure);
-	}
-
-	e_book_op_free (op);
-}
-
-static void
-e_book_do_response_get_changes (EBook                 *book,
-				EBookListenerResponse *resp)
-{
-	CORBA_Environment ev;
-	EBookOp *op;
-	EBookView *book_view;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_get_changes: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	book_view = e_book_view_new (resp->book_view, op->listener);
-
-	if (book_view != NULL) {
-		e_book_view_set_book (book_view, book);
-	
-		if (op->cb) {
-			if (op->active)
-				((EBookBookViewCallback) op->cb) (book, resp->status, book_view, op->closure);
-			else
-				((EBookBookViewCallback) op->cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op->closure);
-		}
-
-		/*
-		 * Release the remote GNOME_Evolution_Addressbook_BookView in the PAS.
-		 */
-		CORBA_exception_init (&ev);
-
-		bonobo_object_release_unref  (resp->book_view, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("e_book_do_response_get_changes: Exception releasing "
-				   "remote GNOME_Evolution_Addressbook_BookView interface!\n");
-		}
-
-		CORBA_exception_free (&ev);
-
-		gtk_object_unref(GTK_OBJECT(book_view));
-	} else {
-		e_book_view_listener_stop (op->listener);
-		((EBookBookViewCallback) op->cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op->closure);
-	}
-
-	e_book_op_free (op);
-}
-
-static void
-e_book_do_response_open (EBook                 *book,
-			 EBookListenerResponse *resp)
-{
-	EBookOp *op;
-
-	if (resp->status == E_BOOK_STATUS_SUCCESS) {
-		book->priv->corba_book  = resp->book;
-		book->priv->load_state  = URILoaded;
-	}
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_open: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	if (op->cb)
-		((EBookCallback) op->cb) (book, resp->status, op->closure);
-	e_book_op_free (op);
-}
-
-static void
-e_book_do_progress_event (EBook                 *book,
-			  EBookListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book), e_book_signals [OPEN_PROGRESS],
-			 resp->msg, resp->percent);
-
-	g_free (resp->msg);
-}
-
-static void
-e_book_do_link_event (EBook                 *book,
-		      EBookListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book), e_book_signals [LINK_STATUS],
-			 resp->connected);
-}
-
-static void
-e_book_do_writable_event (EBook                 *book,
-			  EBookListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book), e_book_signals [WRITABLE_STATUS],
-			 resp->writable);
-}
-
-static void
-e_book_do_response_get_supported_fields (EBook                 *book,
-					 EBookListenerResponse *resp)
-{
-	EBookOp *op;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_get_supported_fields: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	if (op->cb) {
-		if (op->active)
-			((EBookFieldsCallback) op->cb) (book, resp->status, resp->fields, op->closure);
-		else
-			((EBookFieldsCallback) op->cb) (book, E_BOOK_STATUS_CANCELLED, NULL, op->closure);
-	}
-
-	e_book_op_free (op);
-}
-
-/*
- * Reading notices out of the EBookListener's queue.
- */
-static void
-e_book_check_listener_queue (EBookListener *listener, EBook *book)
-{
-	EBookListenerResponse *resp;
-
-	resp = e_book_listener_pop_response (listener);
-
-	if (resp == NULL)
-		return;
-
-	switch (resp->op) {
-	case CreateCardResponse:
-		e_book_do_response_create_card (book, resp);
-		break;
-	case RemoveCardResponse:
-	case ModifyCardResponse:
-	case AuthenticationResponse:
-		e_book_do_response_generic (book, resp);
-		break;
-	case GetCardResponse:
-		e_book_do_response_get_vcard (book, resp);
-		break;
-	case GetCursorResponse:
-		e_book_do_response_get_cursor (book, resp);
-		break;
-	case GetBookViewResponse:
-		e_book_do_response_get_view(book, resp);
-		break;
-	case GetChangesResponse:
-		e_book_do_response_get_changes(book, resp);
-		break;
-	case OpenBookResponse:
-		e_book_do_response_open (book, resp);
-		break;
-	case GetSupportedFieldsResponse:
-		e_book_do_response_get_supported_fields (book, resp);
-		break;
-
-	case OpenProgressEvent:
-		e_book_do_progress_event (book, resp);
-		break;
-	case LinkStatusEvent:
-		e_book_do_link_event (book, resp);
-		break;
-	case WritableStatusEvent:
-		e_book_do_writable_event (book, resp);
-		break;
-	default:
-		g_error ("EBook: Unknown operation %d in listener queue!\n",
-			 resp->op);
-	}
-
-	g_free (resp);
-}
-
-/**
- * e_book_load_uri:
- */
-
-typedef struct {
-	char                      *uri;
-	EBookCallback              open_response;
-	gpointer                   closure;
-} EBookLoadURIData;
-
-static void e_book_load_uri_from_factory (EBook *book,
-					  GNOME_Evolution_Addressbook_BookFactory factory,
-					  EBookLoadURIData *load_uri_data);
-
-static void
-e_book_load_uri_step (EBook *book, EBookStatus status, EBookLoadURIData *data)
-{
-	/* iterate to the next possible CardFactory, or fail
-	   if it's the last one */
-	book->priv->iter = book->priv->book_factories->next;
-	if (book->priv->iter) {
-		GNOME_Evolution_Addressbook_BookFactory factory = book->priv->iter->data;
-		e_book_load_uri_from_factory (book, factory, data);
-	}
-	else {
-		EBookCallback cb = data->open_response;
-		gpointer closure = data->closure;
-		
-		/* reset the load_state to NotLoaded so people can
-                   attempt another load_uri on the book. */
-		book->priv->load_state = URINotLoaded;
-
-		g_free (data);
-
-		cb (book, status, closure);
-	}
-}
-
-static void
-e_book_load_uri_open_cb (EBook *book, EBookStatus status, EBookLoadURIData *data)
-{
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		EBookCallback cb = data->open_response;
-		gpointer closure = data->closure;
-
-		g_free (data);
-
-		cb (book, status, closure);
-	}
-	else {
-		e_book_load_uri_step (book, status, data);
-	}
-}
-
-static void
-e_book_load_uri_from_factory (EBook *book,
-			      GNOME_Evolution_Addressbook_BookFactory factory,
-			      EBookLoadURIData *load_uri_data)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	e_book_queue_op (book, e_book_load_uri_open_cb, load_uri_data, NULL);
-
-	GNOME_Evolution_Addressbook_BookFactory_openBook (
-		factory, book->priv->uri,
-		bonobo_object_corba_objref (BONOBO_OBJECT (book->priv->listener)),
-		&ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_load_uri: CORBA exception while opening addressbook!\n");
-		e_book_unqueue_op (book);
-		CORBA_exception_free (&ev);
-		e_book_load_uri_step (book, E_BOOK_STATUS_OTHER_ERROR, load_uri_data);
-	}
-
-	CORBA_exception_free (&ev);
-
-}
-
-static gboolean
-activate_factories_for_uri (EBook *book, const char *uri)
-{
-	CORBA_Environment ev;
-	OAF_ServerInfoList *info_list = NULL;
-	int i;
-	char *protocol, *query, *colon;
-	gboolean retval = FALSE;
-
-	colon = strchr (uri, ':');
-	if (!colon) {
-		g_warning ("e_book_load_uri: Unable to determine protocol in the URI\n");
-		return FALSE;
-	}
-
-	protocol = g_strndup (uri, colon-uri);
-	query = g_strdup_printf ("repo_ids.has ('IDL:GNOME/Evolution/BookFactory:1.0')"
-#if 0
-				 " AND addressbook:supported_protocols.has ('%s')", protocol
-#endif
-				 );
-
-	CORBA_exception_init (&ev);
-	
-	info_list = oaf_query (query, NULL, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Eeek!  Cannot perform OAF query for book factories.");
-		CORBA_exception_free (&ev);
-		goto shutdown;
-	}
-
-	if (info_list->_length == 0) {
-		g_warning ("Can't find installed BookFactory that handles protocol '%s'.", protocol);
-		CORBA_exception_free (&ev);
-		goto shutdown;
-	}
-
-	CORBA_exception_free (&ev);
-
-	for (i = 0; i < info_list->_length; i ++) {
-		const OAF_ServerInfo *info;
-		GNOME_Evolution_Addressbook_BookFactory factory;
-
-		info = info_list->_buffer + i;
-
-		factory = oaf_activate_from_id (info->iid, 0, NULL, NULL);
-
-		if (factory == CORBA_OBJECT_NIL)
-			g_warning ("e_book_construct: Could not obtain a handle "
-				   "to the Personal Addressbook Server with IID `%s'\n", info->iid);
-		else
-			book->priv->book_factories = g_list_append (book->priv->book_factories,
-								    factory);
-	}
-
-	if (!book->priv->book_factories) {
-		g_warning ("Couldn't activate any book factories.");
-		goto shutdown;
-	}
-
-	retval = TRUE;
-
- shutdown:
-	if (info_list)
-		CORBA_free (info_list);
-	g_free (query);
-	g_free (protocol);
-
-	return retval;
-}
-
-gboolean
-e_book_load_uri (EBook                     *book,
-		 const char                *uri,
-		 EBookCallback              open_response,
-		 gpointer                   closure)
-{
-	EBookLoadURIData *load_uri_data;
-	GNOME_Evolution_Addressbook_BookFactory factory;
-
-	g_return_val_if_fail (book != NULL,          FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book),      FALSE);
-	g_return_val_if_fail (uri != NULL,           FALSE);
-	g_return_val_if_fail (open_response != NULL, FALSE);
-
-	if (book->priv->load_state != URINotLoaded) {
-		g_warning ("e_book_load_uri: Attempted to load a URI "
-			   "on a book which already has a URI loaded!\n");
-		return FALSE;
-	}
-
-	/* try to find a list of factories that can handle the protocol */
-	if (!activate_factories_for_uri (book, uri)) {
-		open_response (NULL, E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED, closure);
-		return FALSE;
-	}
-		
-	g_free (book->priv->uri);
-	book->priv->uri = g_strdup (uri);
-
-	/*
-	 * Create our local BookListener interface.
-	 */
-	book->priv->listener = e_book_listener_new ();
-	if (book->priv->listener == NULL) {
-		g_warning ("e_book_load_uri: Could not create EBookListener!\n");
-		return FALSE;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (book->priv->listener), "responses_queued",
-			    e_book_check_listener_queue, book);
-
-	load_uri_data = g_new (EBookLoadURIData, 1);
-	load_uri_data->open_response = open_response;
-	load_uri_data->closure = closure;
-
-	/* initialize the iterator, and load from the first one*/
-	book->priv->iter = book->priv->book_factories;
-
-	factory = book->priv->iter->data;
-
-	e_book_load_uri_from_factory (book, factory, load_uri_data);
-
-	book->priv->load_state = URILoading;
-
-	/* Now we play the waiting game. */
-
-	return TRUE;
-}
-
-/**
- * e_book_unload_uri:
- */
-void
-e_book_unload_uri (EBook *book)
-{
-	CORBA_Environment ev;
-
-	g_return_if_fail (book != NULL);
-	g_return_if_fail (E_IS_BOOK (book));
-
-	/*
-	 * FIXME: Make sure this works if the URI is still being
-	 * loaded.
-	 */
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_unload_uri: No URI is loaded!\n");
-		return;
-	}
-
-	/*
-	 * Release the remote GNOME_Evolution_Addressbook_Book in the PAS.
-	 */
-	CORBA_exception_init (&ev);
-
-	bonobo_object_release_unref  (book->priv->corba_book, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_unload_uri: Exception releasing "
-			   "remote book interface!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	e_book_listener_stop (book->priv->listener);
-	bonobo_object_unref (BONOBO_OBJECT (book->priv->listener));
-
-	book->priv->listener   = NULL;
-	book->priv->load_state = URINotLoaded;
-}
-
-const char *
-e_book_get_uri (EBook *book)
-{
-	g_return_val_if_fail (book && E_IS_BOOK (book), NULL);
-
-	return book->priv->uri;
-}
-
-char *
-e_book_get_static_capabilities (EBook *book)
-{
-	CORBA_Environment ev;
-	char *temp;
-	char *ret_val;
-
-	CORBA_exception_init (&ev);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_unload_uri: No URI is loaded!\n");
-		return g_strdup("");
-	}
-
-	temp = GNOME_Evolution_Addressbook_Book_getStaticCapabilities(book->priv->corba_book, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_static_capabilities: Exception "
-			   "during get_static_capabilities!\n");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	ret_val = g_strdup(temp);
-	CORBA_free(temp);
-
-	CORBA_exception_free (&ev);
-
-	return ret_val;
-}
-
-guint
-e_book_get_supported_fields (EBook              *book,
-			     EBookFieldsCallback cb,
-			     gpointer            closure)
-{
-	CORBA_Environment ev;
-	guint tag;
-
-	CORBA_exception_init (&ev);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_unload_uri: No URI is loaded!\n");
-		return 0;
-	}
-
-	tag = e_book_queue_op (book, cb, closure, NULL);
-
-	GNOME_Evolution_Addressbook_Book_getSupportedFields(book->priv->corba_book, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_supported_fields: Exception "
-			   "during get_supported_fields!\n");
-		CORBA_exception_free (&ev);
-		e_book_unqueue_op (book);
-		return 0;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return tag;
-}
-
-static gboolean
-e_book_construct (EBook *book)
-{
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-
-	book->priv->book_factories = NULL;
-
-	return TRUE;
-}
-
-/**
- * e_book_new:
- */
-EBook *
-e_book_new (void)
-{
-	EBook *book;
-
-	book = gtk_type_new (E_BOOK_TYPE);
-
-	if (! e_book_construct (book)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		return NULL;
-	}
-
-	return book;
-}
-
-/* User authentication. */
-
-void
-e_book_authenticate_user (EBook         *book,
-			  const char    *user,
-			  const char    *passwd,
-			  EBookCallback cb,
-			  gpointer      closure)
-{
-	CORBA_Environment  ev;
-
-	g_return_if_fail (book != NULL);
-	g_return_if_fail (E_IS_BOOK (book));
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_authenticate_user: No URI loaded!\n");
-		return;
-	}
-
-	CORBA_exception_init (&ev);
-
-	e_book_queue_op (book, cb, closure, NULL);
-
-	GNOME_Evolution_Addressbook_Book_authenticateUser (book->priv->corba_book,
-							   user,
-							   passwd,
-							   &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_authenticate_user: Exception authenticating user with the PAS!\n");
-		CORBA_exception_free (&ev);
-		e_book_unqueue_op (book);
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/* Fetching cards */
-
-/**
- * e_book_get_card:
- */
-guint
-e_book_get_card (EBook             *book,
-		 const char        *id,
-		 EBookCardCallback  cb,
-		 gpointer           closure)
-{
-	CORBA_Environment ev;
-	guint tag;
-
-	g_return_val_if_fail (book != NULL,     0);
-	g_return_val_if_fail (E_IS_BOOK (book), 0);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_card: No URI loaded!\n");
-		return 0;
-	}
-
-	CORBA_exception_init (&ev);
-
-	tag = e_book_queue_op (book, cb, closure, NULL);
-
-	GNOME_Evolution_Addressbook_Book_getVCard (book->priv->corba_book, (const GNOME_Evolution_Addressbook_VCard) id, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_card: Exception "
-			   "getting card!\n");
-		CORBA_exception_free (&ev);
-		e_book_unqueue_op (book);
-		return 0;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return tag;
-}
-
-/* Deleting cards. */
-
-/**
- * e_book_remove_card:
- */
-gboolean
-e_book_remove_card (EBook         *book,
-		    ECard         *card,
-		    EBookCallback  cb,
-		    gpointer       closure)
-{
-	const char *id;
-
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (card != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_CARD (card), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_remove_card: No URI loaded!\n");
-		return FALSE;
-	}
-
-	id = e_card_get_id (card);
-	g_assert (id != NULL);
-
-	return e_book_remove_card_by_id (book, id, cb, closure);
-}
-
-/**
- * e_book_remove_card_by_id:
- */
-gboolean
-e_book_remove_card_by_id (EBook         *book,
-			  const char    *id,
-			  EBookCallback  cb,
-			  gpointer       closure)
-
-{
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (id != NULL,       FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_remove_card_by_id: No URI loaded!\n");
-		return FALSE;
-	}
-
-	CORBA_exception_init (&ev);
-
-	e_book_queue_op (book, cb, closure, NULL);
-
-	GNOME_Evolution_Addressbook_Book_removeCard (
-		book->priv->corba_book, (const GNOME_Evolution_Addressbook_CardId) id, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_remove_card_by_id: CORBA exception "
-			   "talking to PAS!\n");
-		CORBA_exception_free (&ev);
-		e_book_unqueue_op (book);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	return TRUE;
-}
-
-/* Adding cards. */
-
-/**
- * e_book_add_card:
- */
-gboolean
-e_book_add_card (EBook           *book,
-		 ECard           *card,
-		 EBookIdCallback  cb,
-		 gpointer         closure)
-
-{
-	char     *vcard;
-	gboolean  retval;
-
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (card != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_CARD (card), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_add_card: No URI loaded!\n");
-		return FALSE;
-	}
-
-	vcard = e_card_get_vcard_assume_utf8 (card);
-
-	if (vcard == NULL) {
-		g_warning ("e_book_add_card: Cannot convert card to VCard string!\n");
-		return FALSE;
-	}
-
-	retval = e_book_add_vcard (book, vcard, cb, closure);
-
-	g_free (vcard);
-
-	if (card->book && card->book != book)
-		gtk_object_unref (GTK_OBJECT (card->book));
-	card->book = book;
-	gtk_object_ref (GTK_OBJECT (card->book));
-
-	return retval;
-}
-
-/**
- * e_book_add_vcard:
- */
-gboolean
-e_book_add_vcard (EBook           *book,
-		  const char      *vcard,
-		  EBookIdCallback  cb,
-		  gpointer         closure)
-{
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (book  != NULL,    FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (vcard != NULL,    FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_add_vcard: No URI loaded!\n");
-		return FALSE;
-	}
-
-	CORBA_exception_init (&ev);
-
-	e_book_queue_op (book, (EBookCallback) cb, closure, NULL);
-
-	GNOME_Evolution_Addressbook_Book_addCard (
-		book->priv->corba_book, (const GNOME_Evolution_Addressbook_VCard) vcard, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_add_vcard: Exception adding card to PAS!\n");
-		CORBA_exception_free (&ev);
-		e_book_unqueue_op (book);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return TRUE;
-}
-
-/* Modifying cards. */
-
-/**
- * e_book_commit_card:
- */
-gboolean
-e_book_commit_card (EBook         *book,
-		    ECard         *card,
-		    EBookCallback  cb,
-		    gpointer       closure)
-{
-	char     *vcard;
-	gboolean  retval;
-	
-	g_return_val_if_fail (book  != NULL,    FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (card != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_CARD (card), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_commit_card: No URI loaded!\n");
-		return FALSE;
-	}
-
-	vcard = e_card_get_vcard_assume_utf8 (card);
-
-	if (vcard == NULL) {
-		g_warning ("e_book_commit_card: Error "
-			   "getting VCard for card!\n");
-		return FALSE;
-	}
-
-	retval = e_book_commit_vcard (book, vcard, cb, closure);
-
-	g_free (vcard);
-
-	if (card->book && card->book != book)
-		gtk_object_unref (GTK_OBJECT (card->book));
-	card->book = book;
-	gtk_object_ref (GTK_OBJECT (card->book));
-
-	return retval;
-}
-
-/**
- * e_book_commit_vcard:
- */
-gboolean
-e_book_commit_vcard (EBook         *book,
-		     const char    *vcard,
-		     EBookCallback  cb,
-		     gpointer       closure)
-{
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (book  != NULL,    FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (vcard != NULL,    FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_commit_vcard: No URI loaded!\n");
-		return FALSE;
-	}
-
-	CORBA_exception_init (&ev);
-
-	e_book_queue_op (book, cb, closure, NULL);
-
-	GNOME_Evolution_Addressbook_Book_modifyCard (
-		book->priv->corba_book, (const GNOME_Evolution_Addressbook_VCard) vcard, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_commit_vcard: Exception "
-			   "modifying card in PAS!\n");
-		CORBA_exception_free (&ev);
-		e_book_unqueue_op (book);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return TRUE;
-}
-
-/**
- * e_book_check_connection:
- */
-gboolean
-e_book_check_connection (EBook *book)
-{
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_check_connection: No URI loaded!\n");
-		return FALSE;
-	}
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_Book_checkConnection (book->priv->corba_book, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_check_connection: Exception "
-			   "querying the PAS!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	return TRUE;
-}
-
-guint
-e_book_get_cursor       (EBook               *book,
-			 gchar               *query,
-			 EBookCursorCallback  cb,
-			 gpointer             closure)
-{
-	CORBA_Environment ev;
-	guint tag;
-  
-	g_return_val_if_fail (book != NULL,     0);
-	g_return_val_if_fail (E_IS_BOOK (book), 0);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_check_connection: No URI loaded!\n");
-		return 0;
-	}
-	
-	CORBA_exception_init (&ev);
-
-	tag = e_book_queue_op (book, cb, closure, NULL);
-	
-	GNOME_Evolution_Addressbook_Book_getCursor (book->priv->corba_book, query, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_all_cards: Exception "
-			   "querying list of cards!\n");
-		CORBA_exception_free (&ev);
-		e_book_unqueue_op (book);
-		return 0;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	return tag;
-}
-
-guint
-e_book_get_book_view       (EBook                 *book,
-			    const gchar           *query,
-			    EBookBookViewCallback  cb,
-			    gpointer               closure)
-{
-	CORBA_Environment ev;
-	EBookViewListener *listener;
-	guint tag;
-  
-	g_return_val_if_fail (book != NULL,     0);
-	g_return_val_if_fail (E_IS_BOOK (book), 0);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_book_view: No URI loaded!\n");
-		return 0;
-	}
-
-	listener = e_book_view_listener_new();
-	
-	CORBA_exception_init (&ev);
-
-	tag = e_book_queue_op (book, cb, closure, listener);
-	
-	GNOME_Evolution_Addressbook_Book_getBookView (book->priv->corba_book, bonobo_object_corba_objref(BONOBO_OBJECT(listener)), query, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_book_view: Exception "
-			   "getting book_view!\n");
-		CORBA_exception_free (&ev);
-		e_book_unqueue_op (book);
-		return 0;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	return tag;
-}
-
-guint
-e_book_get_changes         (EBook                 *book,
-			    gchar                 *changeid,
-			    EBookBookViewCallback  cb,
-			    gpointer               closure)
-{
-	CORBA_Environment ev;
-	EBookViewListener *listener;
-	guint tag;
-  
-	g_return_val_if_fail (book != NULL,     0);
-	g_return_val_if_fail (E_IS_BOOK (book), 0);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_changes: No URI loaded!\n");
-		return FALSE;
-	}
-
-	listener = e_book_view_listener_new();
-	
-	CORBA_exception_init (&ev);
-
-	tag = e_book_queue_op (book, cb, closure, listener);
-	
-	GNOME_Evolution_Addressbook_Book_getChanges (book->priv->corba_book, bonobo_object_corba_objref(BONOBO_OBJECT(listener)), changeid, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_changes: Exception "
-			   "getting changes!\n");
-		CORBA_exception_free (&ev);
-		e_book_unqueue_op (book);
-		return 0;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	return tag;
-}
-
-/**
- * e_book_cancel
- */
-
-void
-e_book_cancel (EBook *book, guint tag)
-{
-	g_return_if_fail (book != NULL);
-	g_return_if_fail (E_IS_BOOK (book));
-	g_return_if_fail (tag != 0);
-
-	/* In an attempt to be useful, we take a bit of extra care in reporting
-	   errors.  This might come in handy someday. */
-	if (tag >= book->priv->op_tag)
-		g_warning ("Attempt to cancel unassigned operation (%u)", tag);
-	else if (! e_book_cancel_op (book, tag))
-		g_warning ("Attempt to cancel unknown operation (%u)", tag); 
-}
-
-/**
- * e_book_get_name:
- */
-char *
-e_book_get_name (EBook *book)
-{
-	CORBA_Environment  ev;
-	char              *retval;
-	char              *name;
-
-	g_return_val_if_fail (book != NULL,     NULL);
-	g_return_val_if_fail (E_IS_BOOK (book), NULL);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_name: No URI loaded!\n");
-		return NULL;
-	}
-
-	CORBA_exception_init (&ev);
-
-	name = GNOME_Evolution_Addressbook_Book_getName (book->priv->corba_book, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_name: Exception getting name from PAS!\n");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	if (name == NULL) {
-		g_warning ("e_book_get_name: Got NULL name from PAS!\n");
-		return NULL;
-	}
-
-	retval = g_strdup (name);
-	CORBA_free (name);
-
-	return retval;
-}
-
-static void
-e_book_init (EBook *book)
-{
-	book->priv             = g_new0 (EBookPrivate, 1);
-	book->priv->load_state = URINotLoaded;
-	book->priv->op_tag     = 1;
-	book->priv->uri        = NULL;
-}
-
-static void
-e_book_destroy (GtkObject *object)
-{
-	EBook             *book = E_BOOK (object);
-	CORBA_Environment  ev;
-	GList *l;
-
-	if (book->priv->load_state == URILoaded)
-		e_book_unload_uri (book);
-
-	CORBA_exception_init (&ev);
-
-	for (l = book->priv->book_factories; l; l = l->next) {
-		CORBA_Object_release ((CORBA_Object)l->data, &ev);
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("EBook: Exception while releasing BookFactory\n");
-
-			CORBA_exception_free (&ev);
-			CORBA_exception_init (&ev);
-		}
-	}
-
-	g_free (book->priv->uri);
-
-	g_free (book->priv);
-
-	GTK_OBJECT_CLASS (e_book_parent_class)->destroy (object);
-}
-
-static void
-e_book_class_init (EBookClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	e_book_parent_class = gtk_type_class (gtk_object_get_type ());
-
-	e_book_signals [LINK_STATUS] =
-		gtk_signal_new ("link_status",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookClass, link_status),
-				gtk_marshal_NONE__BOOL,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_BOOL);
-
-	e_book_signals [WRITABLE_STATUS] =
-		gtk_signal_new ("writable_status",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EBookClass, writable_status),
-				gtk_marshal_NONE__BOOL,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_BOOL);
-
-	gtk_object_class_add_signals (object_class, e_book_signals,
-				      LAST_SIGNAL);
-
-	object_class->destroy = e_book_destroy;
-}
-
-/**
- * e_book_get_type:
- */
-GtkType
-e_book_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"EBook",
-			sizeof (EBook),
-			sizeof (EBookClass),
-			(GtkClassInitFunc)  e_book_class_init,
-			(GtkObjectInitFunc) e_book_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/ebook/e-book.h b/addressbook/backend/ebook/e-book.h
deleted file mode 100644
index cf90c8c57d..0000000000
--- a/addressbook/backend/ebook/e-book.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 1999, 2000, Ximian, Inc.
- */
-
-#ifndef __E_BOOK_H__
-#define __E_BOOK_H__
-
-#include <libgnome/gnome-defs.h>
-
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-cursor.h>
-#include <addressbook/backend/ebook/e-book-view.h>
-#include <addressbook/backend/ebook/e-book-types.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _EBook        EBook;
-typedef struct _EBookClass   EBookClass;
-typedef struct _EBookPrivate EBookPrivate;
-
-struct _EBook {
-	GtkObject     parent;
-	EBookPrivate *priv;
-};
-
-struct _EBookClass {
-	GtkObjectClass parent;
-
-	/*
-	 * Signals.
-	 */
-	void (* open_progress)   (EBook *book, const char *msg, short percent);
-	void (* link_status)     (EBook *book, gboolean connected);
-	void (* writable_status) (EBook *book, gboolean writable);
-};
-
-/* Callbacks for asynchronous functions. */
-typedef void (*EBookCallback) (EBook *book, EBookStatus status, gpointer closure);
-typedef void (*EBookOpenProgressCallback)     (EBook          *book,
-					       const char     *status_message,
-					       short           percent,
-					       gpointer        closure);
-typedef void (*EBookIdCallback)       (EBook *book, EBookStatus status, const char *id, gpointer closure);
-typedef void (*EBookCardCallback)     (EBook *book, EBookStatus status, ECard *card, gpointer closure);
-typedef void (*EBookCursorCallback)   (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure);
-typedef void (*EBookBookViewCallback) (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure);
-typedef void (*EBookFieldsCallback)   (EBook *book, EBookStatus status, EList *fields, gpointer closure);
-
-/* Creating a new addressbook. */
-EBook    *e_book_new                      (void);
-
-gboolean  e_book_load_uri                 (EBook                 *book,
-					   const char            *uri,
-					   EBookCallback          open_response,
-					   gpointer               closure);
-void      e_book_unload_uri               (EBook                 *book);
-
-const char *e_book_get_uri                (EBook                 *book);
-
-char     *e_book_get_static_capabilities  (EBook                 *book);
-
-guint     e_book_get_supported_fields     (EBook                 *book,
-					   EBookFieldsCallback    cb,
-					   gpointer               closure);
-
-
-/* User authentication. */
-void      e_book_authenticate_user        (EBook                 *book,
-					   const char            *user,
-					   const char            *passwd,
-					   EBookCallback         cb,
-					   gpointer              closure);
-
-/* Fetching cards. */
-guint     e_book_get_card                 (EBook                 *book,
-					   const char            *id,
-					   EBookCardCallback      cb,
-					   gpointer               closure);
-
-/* Deleting cards. */
-gboolean  e_book_remove_card              (EBook                 *book,
-					   ECard                 *card,
-					   EBookCallback          cb,
-					   gpointer               closure);
-gboolean  e_book_remove_card_by_id        (EBook                 *book,
-					   const char            *id,
-					   EBookCallback          cb,
-					   gpointer               closure);
-
-/* Adding cards. */
-gboolean  e_book_add_card                 (EBook                 *book,
-					   ECard                 *card,
-					   EBookIdCallback        cb,
-					   gpointer               closure);
-gboolean  e_book_add_vcard                (EBook                 *book,
-					   const char            *vcard,
-					   EBookIdCallback        cb,
-					   gpointer               closure);
-
-/* Modifying cards. */
-gboolean  e_book_commit_card              (EBook                 *book,
-					   ECard                 *card,
-					   EBookCallback          cb,
-					   gpointer               closure);
-gboolean  e_book_commit_vcard             (EBook                 *book,
-					   const char            *vcard,
-					   EBookCallback          cb,
-					   gpointer               closure);
-
-/* Checking to see if we're connected to the card repository. */
-gboolean  e_book_check_connection         (EBook                 *book);
-guint     e_book_get_cursor               (EBook                 *book,
-					   char                  *query,
-					   EBookCursorCallback    cb,
-					   gpointer               closure);
-
-guint     e_book_get_book_view            (EBook                 *book,
-					   const gchar           *query,
-					   EBookBookViewCallback  cb,
-					   gpointer               closure);
-
-guint     e_book_get_changes              (EBook                 *book,
-					   char                  *changeid,
-					   EBookBookViewCallback  cb,
-					   gpointer               closure);
-
-/* Cancel a pending operation. */
-void      e_book_cancel                   (EBook                 *book,
-					   guint                  tag);
-
-
-/* Getting the name of the repository. */
-char     *e_book_get_name                 (EBook                 *book);
-
-GtkType   e_book_get_type                 (void);
-
-#define E_BOOK_TYPE        (e_book_get_type ())
-#define E_BOOK(o)          (GTK_CHECK_CAST ((o), E_BOOK_TYPE, EBook))
-#define E_BOOK_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_BOOK_TYPE, EBookClass))
-#define E_IS_BOOK(o)       (GTK_CHECK_TYPE ((o), E_BOOK_TYPE))
-#define E_IS_BOOK_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_BOOK_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __E_BOOK_H__ */
diff --git a/addressbook/backend/ebook/e-card-compare.c b/addressbook/backend/ebook/e-card-compare.c
deleted file mode 100644
index 4723f95b41..0000000000
--- a/addressbook/backend/ebook/e-card-compare.c
+++ /dev/null
@@ -1,701 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-card-compare.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#include <config.h>
-#include <ctype.h>
-#include <gal/unicode/gunicode.h>
-#include "e-book-util.h"
-#include "e-card-compare.h"
-
-/* This is an "optimistic" combiner: the best of the two outcomes is
-   selected. */
-static ECardMatchType
-combine_comparisons (ECardMatchType prev,
-		     ECardMatchType new_info)
-{
-	if (new_info == E_CARD_MATCH_NOT_APPLICABLE)
-		return prev;
-	return (ECardMatchType) MAX ((gint) prev, (gint) new_info);
-}
-
-
-/*** Name comparisons ***/
-
-/* This *so* doesn't belong here... at least not implemented in a
-   sucky way like this.  But it can be fixed later. */
-
-/* This is very Anglocentric. */
-static gchar *name_synonyms[][2] = {
-	{ "jon", "john" },   /* Ah, the hacker's perogative */
-	{ "joseph", "joe" },
-	{ "robert", "bob" },
-	{ "gene", "jean" },
-	{ "jesse", "jessie" },
-	{ "ian", "iain" },
-	{ "richard", "dick" },
-	{ "william", "bill" },
-	{ "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" },
-	{ "rebecca", "becca" },
-	{ "rebecca", "becky" },
-	{ "anderson", "andersen" },
-	{ "johnson", "johnsen" },
-	/* We could go on and on... */
-	{ NULL, NULL }
-};
-	
-static gboolean
-name_fragment_match (const gchar *a, const gchar *b, gboolean strict)
-{
-	gint len;
-
-	if (!(a && b && *a && *b))
-		return FALSE;
-
-	/* If we are in 'strict' mode, b must match the beginning of a.
-	   So "Robert", "Rob" would match, but "Robert", "Robbie" wouldn't.
-
-	   If strict is FALSE, it is sufficient for the strings to share
-	   some leading characters.  In this case, "Robert" and "Robbie"
-	   would match, as would "Dave" and "Dan". */
-	
-	if (strict) {
-		len = g_utf8_strlen (b, -1);
-	} else {
-		len = MIN (g_utf8_strlen (a, -1), g_utf8_strlen (b, -1));
-	}
-
-	return !g_utf8_strncasecmp (a, b, len);
-}
-
-static gboolean
-name_fragment_match_with_synonyms (const gchar *a, const gchar *b, gboolean strict)
-{
-	gint i;
-
-	if (!(a && b && *a && *b))
-		return FALSE;
-
-	if (name_fragment_match (a, b, strict))
-		return TRUE;
-
-	/* Check for nicknames.  Yes, the linear search blows. */
-	for (i=0; name_synonyms[i][0]; ++i) {
-
-		if (!g_utf8_strcasecmp (name_synonyms[i][0], a)
-		    && !g_utf8_strcasecmp (name_synonyms[i][1], b))
-			return TRUE;
-		
-		if (!g_utf8_strcasecmp (name_synonyms[i][0], b)
-		    && !g_utf8_strcasecmp (name_synonyms[i][1], a))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-ECardMatchType
-e_card_compare_name_to_string (ECard *card, const gchar *str)
-{
-	return e_card_compare_name_to_string_full (card, str, FALSE, NULL, NULL, NULL);
-}
-
-ECardMatchType
-e_card_compare_name_to_string_full (ECard *card, const gchar *str, gboolean allow_partial_matches,
-				    gint *matched_parts_out, ECardMatchPart *first_matched_part_out, gint *matched_character_count_out)
-{
-	gchar **namev, **givenv = NULL, **addv = NULL, **familyv = NULL;
-
-	gint matched_parts = E_CARD_MATCH_PART_NONE;
-	ECardMatchPart first_matched_part = E_CARD_MATCH_PART_NONE;
-	ECardMatchPart this_part_match = E_CARD_MATCH_PART_NOT_APPLICABLE;
-	ECardMatchType match_type;
-
-	gint match_count = 0, matched_character_count = 0, fragment_count;
-	gint i, j;
-	gchar *str_cpy, *s;
-
-	g_return_val_if_fail (E_IS_CARD (card), E_CARD_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (card->name != NULL, E_CARD_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (str != NULL, E_CARD_MATCH_NOT_APPLICABLE);
-
-	str_cpy = s = g_strdup (str);
-	while (*s) {
-		if (*s == ',' || *s == '"')
-			*s = ' ';
-		++s;
-	}
-	namev   = g_strsplit (str_cpy, " ", 0);
-	g_free (str_cpy);
-
-	if (card->name->given)
-		givenv = g_strsplit (card->name->given, " ", 0);
-	if (card->name->additional)
-		addv = g_strsplit (card->name->additional, " ", 0);
-	if (card->name->family)
-		familyv = g_strsplit (card->name->family, " ", 0);
-
-	fragment_count = 0;
-	for (i = 0; givenv && givenv[i]; ++i)
-		++fragment_count;
-	for (i = 0; addv && addv[i]; ++i)
-		++fragment_count;
-	for (i = 0; familyv && familyv[i]; ++i)
-		++fragment_count;
-	
-	for (i = 0; namev[i] && this_part_match != E_CARD_MATCH_PART_NONE; ++i) {
-
-		if (*namev[i]) {
-
-			this_part_match = E_CARD_MATCH_PART_NONE;
-
-			/* When we are allowing partials, we are strict about the matches we allow.
-			   Does this make sense?  Not really, but it does the right thing for the purposes
-			   of completion. */
-
-			if (givenv && this_part_match == E_CARD_MATCH_PART_NONE) {
-				for (j = 0; givenv[j]; ++j) {
-					if (name_fragment_match_with_synonyms (givenv[j], namev[i], allow_partial_matches)) {
-
-						this_part_match = E_CARD_MATCH_PART_GIVEN_NAME;
-
-						/* We remove a piece of a name once it has been matched against, so
-						   that "john john" won't match "john doe". */
-						g_free (givenv[j]);
-						givenv[j] = g_strdup ("");
-						break;
-					}
-				}
-			}
-
-			if (addv && this_part_match == E_CARD_MATCH_PART_NONE) {
-				for (j = 0; addv[j]; ++j) {
-					if (name_fragment_match_with_synonyms (addv[j], namev[i], allow_partial_matches)) {
-						
-						this_part_match = E_CARD_MATCH_PART_ADDITIONAL_NAME;
-
-						g_free (addv[j]);
-						addv[j] = g_strdup ("");
-						break;
-					}
-				}
-			}
-
-			if (familyv && this_part_match == E_CARD_MATCH_PART_NONE) {
-				for (j = 0; familyv[j]; ++j) {
-					if (allow_partial_matches ? name_fragment_match_with_synonyms (familyv[j], namev[i], allow_partial_matches)
-					    : !g_utf8_strcasecmp (familyv[j], namev[i])) {
-
-						this_part_match = E_CARD_MATCH_PART_FAMILY_NAME;
-
-						g_free (familyv[j]);
-						familyv[j] = g_strdup ("");
-						break;
-					}
-				}
-			}
-
-			if (this_part_match != E_CARD_MATCH_PART_NONE) {
-				++match_count;
-				matched_character_count += g_utf8_strlen (namev[i], -1);
-				matched_parts |= this_part_match;
-				if (first_matched_part == E_CARD_MATCH_PART_NONE)
-					first_matched_part = this_part_match;
-			}
-		}
-	}
-
-	match_type = E_CARD_MATCH_NONE;
-
-	if (this_part_match != E_CARD_MATCH_PART_NONE) {
-
-		if (match_count > 0)
-			match_type = E_CARD_MATCH_VAGUE;
-		
-		if (fragment_count == match_count) {
-
-			match_type = E_CARD_MATCH_EXACT;
-
-		} else if (fragment_count == match_count + 1) {
-
-			match_type = E_CARD_MATCH_PARTIAL;
-
-		}
-	}
-
-	if (matched_parts_out)
-		*matched_parts_out = matched_parts;
-	if (first_matched_part_out)
-		*first_matched_part_out = first_matched_part;
-	if (matched_character_count_out)
-		*matched_character_count_out = matched_character_count;
-
-	g_strfreev (namev);
-	g_strfreev (givenv);
-	g_strfreev (addv);
-	g_strfreev (familyv);
-
-	return match_type;
-}
-
-ECardMatchType
-e_card_compare_name (ECard *card1, ECard *card2)
-{
-	ECardName *a, *b;
-	gint matches=0, possible=0;
-	gboolean given_match = FALSE, additional_match = FALSE, family_match = FALSE;
-
-	g_return_val_if_fail (E_IS_CARD (card1), E_CARD_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (E_IS_CARD (card2), E_CARD_MATCH_NOT_APPLICABLE);
-
-	a = card1->name;
-	b = card2->name;
-
-	if (a == NULL || b == NULL)
-		return E_CARD_MATCH_NOT_APPLICABLE;
-
-	if (a->given && b->given) {
-		++possible;
-		if (name_fragment_match_with_synonyms (a->given, b->given, FALSE /* both inputs are complete */)) {
-			++matches;
-			given_match = TRUE;
-		}
-	}
-
-	if (a->additional && b->additional) {
-		++possible;
-		if (name_fragment_match_with_synonyms (a->additional, b->additional, FALSE /* both inputs are complete */)) {
-			++matches;
-			additional_match = TRUE;
-		}
-	}
-
-	if (a->family && b->family) {
-		++possible;
-		/* We don't allow "loose matching" (i.e. John vs. Jon) on family names */
-		if (! g_utf8_strcasecmp (a->family, b->family)) {
-			++matches;
-			family_match = TRUE;
-		}
-	}
-
-	/* Now look at the # of matches and try to intelligently map
-	   an E_CARD_MATCH_* type to it.  Special consideration is given
-	   to family-name matches. */
-
-	if (possible == 0)
-		return E_CARD_MATCH_NOT_APPLICABLE;
-
-	if (possible == 1)
-		return family_match ? E_CARD_MATCH_VAGUE : E_CARD_MATCH_NONE;
-
-	if (possible == matches)
-		return family_match ? E_CARD_MATCH_EXACT : E_CARD_MATCH_PARTIAL;
-
-	if (possible == matches+1)
-		return family_match ? E_CARD_MATCH_VAGUE : E_CARD_MATCH_NONE;
-
-	return E_CARD_MATCH_NONE;
-}
-
-
-/*** Nickname Comparisons ***/
-
-ECardMatchType
-e_card_compare_nickname (ECard *card1, ECard *card2)
-{
-	g_return_val_if_fail (card1 && E_IS_CARD (card1), E_CARD_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (card2 && E_IS_CARD (card2), E_CARD_MATCH_NOT_APPLICABLE);
-
-	return E_CARD_MATCH_NOT_APPLICABLE;
-}
-
-
-
-/*** E-mail Comparisons ***/
-
-static gboolean
-match_email_username (const gchar *addr1, const gchar *addr2)
-{
-	gint c1, c2;
-	if (addr1 == NULL || addr2 == NULL)
-		return FALSE;
-
-	while (*addr1 && *addr2 && *addr1 != '@' && *addr2 != '@') {
-		c1 = isupper (*addr1) ? tolower (*addr1) : *addr1;
-		c2 = isupper (*addr2) ? tolower (*addr2) : *addr2;
-		if (c1 != c2)
-			return FALSE;
-		++addr1;
-		++addr2;
-	}
-
-	return *addr1 == *addr2;
-}
-
-static gboolean
-match_email_hostname (const gchar *addr1, const gchar *addr2)
-{
-	gint c1, c2;
-	gboolean seen_at1, seen_at2;
-	if (addr1 == NULL || addr2 == NULL)
-		return FALSE;
-
-	/* Walk to the end of each string. */
-	seen_at1 = FALSE;
-	if (*addr1) {
-		while (*addr1) {
-			if (*addr1 == '@')
-				seen_at1 = TRUE;
-			++addr1;
-		}
-		--addr1;
-	}
-
-	seen_at2 = FALSE;
-	if (*addr2) {
-		while (*addr2) {
-			if (*addr2 == '@')
-				seen_at2 = TRUE;
-			++addr2;
-		}
-		--addr2;
-	}
-
-	if (!seen_at1 && !seen_at2)
-		return TRUE;
-	if (!seen_at1 || !seen_at2)
-		return FALSE;
-
-	while (*addr1 != '@' && *addr2 != '@') {
-		c1 = isupper (*addr1) ? tolower (*addr1) : *addr1;
-		c2 = isupper (*addr2) ? tolower (*addr2) : *addr2;
-		if (c1 != c2)
-			return FALSE;
-		--addr1;
-		--addr2;
-	}
-
-	/* This will match bob@foo.ximian.com and bob@ximian.com */
-	return *addr1 == '.' || *addr2 == '.';
-}
-
-static ECardMatchType
-compare_email_addresses (const gchar *addr1, const gchar *addr2)
-{
-	if (addr1 == NULL || addr2 == NULL)
-		return E_CARD_MATCH_NOT_APPLICABLE;
-
-	if (match_email_username (addr1, addr2)) 
-		return match_email_hostname (addr1, addr2) ? E_CARD_MATCH_EXACT : E_CARD_MATCH_PARTIAL;
-
-	return E_CARD_MATCH_NONE;
-}
-
-ECardMatchType
-e_card_compare_email (ECard *card1, ECard *card2)
-{
-	EIterator *i1, *i2;
-	ECardMatchType match = E_CARD_MATCH_NOT_APPLICABLE;
-
-	g_return_val_if_fail (card1 && E_IS_CARD (card1), E_CARD_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (card2 && E_IS_CARD (card2), E_CARD_MATCH_NOT_APPLICABLE);
-
-	if (card1->email == NULL || card2->email == NULL)
-		return E_CARD_MATCH_NOT_APPLICABLE;
-
-	i1 = e_list_get_iterator (card1->email);
-	i2 = e_list_get_iterator (card2->email);
-
-	/* Do pairwise-comparisons on all of the e-mail addresses.  If
-	   we find an exact match, there is no reason to keep
-	   checking. */
-	e_iterator_reset (i1);
-	while (e_iterator_is_valid (i1) && match != E_CARD_MATCH_EXACT) {
-		const gchar *addr1 = (const gchar *) e_iterator_get (i1);
-
-		e_iterator_reset (i2);
-		while (e_iterator_is_valid (i2) && match != E_CARD_MATCH_EXACT) {
-			const gchar *addr2 = (const gchar *) e_iterator_get (i2);
-
-			match = combine_comparisons (match, compare_email_addresses (addr1, addr2));
-			
-			e_iterator_next (i2);
-		}
-
-		e_iterator_next (i1);
-	}
-
-	gtk_object_unref (GTK_OBJECT (i1));
-	gtk_object_unref (GTK_OBJECT (i2));
-
-	return match;
-}
-
-ECardMatchType
-e_card_compare_address (ECard *card1, ECard *card2)
-{
-	g_return_val_if_fail (card1 && E_IS_CARD (card1), E_CARD_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (card2 && E_IS_CARD (card2), E_CARD_MATCH_NOT_APPLICABLE);
-
-	/* Unimplemented */
-
-	return E_CARD_MATCH_NOT_APPLICABLE;
-}
-
-ECardMatchType
-e_card_compare_telephone (ECard *card1, ECard *card2)
-{
-	g_return_val_if_fail (card1 && E_IS_CARD (card1), E_CARD_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (card2 && E_IS_CARD (card2), E_CARD_MATCH_NOT_APPLICABLE);
-
-	/* Unimplemented */
-
-	return E_CARD_MATCH_NOT_APPLICABLE;
-}
-
-ECardMatchType
-e_card_compare (ECard *card1, ECard *card2)
-{
-	ECardMatchType result;
-
-	g_return_val_if_fail (card1 && E_IS_CARD (card1), E_CARD_MATCH_NOT_APPLICABLE);
-	g_return_val_if_fail (card2 && E_IS_CARD (card2), E_CARD_MATCH_NOT_APPLICABLE);
-
-	result = E_CARD_MATCH_NONE;
-	result = combine_comparisons (result, e_card_compare_name      (card1, card2));
-	result = combine_comparisons (result, e_card_compare_nickname  (card1, card2));
-	result = combine_comparisons (result, e_card_compare_email     (card1, card2));
-	result = combine_comparisons (result, e_card_compare_address   (card1, card2));
-	result = combine_comparisons (result, e_card_compare_telephone (card1, card2));
-
-	return result;
-}
-
-typedef struct _MatchSearchInfo MatchSearchInfo;
-struct _MatchSearchInfo {
-	ECard *card;
-	GList *avoid;
-	ECardMatchQueryCallback cb;
-	gpointer closure;
-};
-
-static void
-match_search_info_free (MatchSearchInfo *info)
-{
-	if (info) {
-		gtk_object_unref (GTK_OBJECT (info->card));
-
-		/* This should already have been deallocated, but just in case... */
-		if (info->avoid) {
-			g_list_foreach (info->avoid, (GFunc) gtk_object_unref, NULL);
-			g_list_free (info->avoid);
-			info->avoid = NULL;
-		}
-
-		g_free (info);
-	}
-}
-
-static void
-simple_query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)
-{
-	MatchSearchInfo *info = (MatchSearchInfo *) closure;
-	ECardMatchType best_match = E_CARD_MATCH_NONE;
-	ECard *best_card = NULL;
-	GList *remaining_cards = NULL;
-	const GList *i;
-
-	if (status != E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS) {
-		info->cb (info->card, NULL, E_CARD_MATCH_NONE, info->closure);
-		match_search_info_free (info);
-		return;
-	}
-
-	/* remove the cards we're to avoid from the list, if they're present */
-	for (i = cards; i != NULL; i = g_list_next (i)) {
-		ECard *this_card = E_CARD (i->data);
-		GList *iterator;
-		gboolean avoid = FALSE;
-		for (iterator = info->avoid; iterator; iterator = iterator->next) {
-			if (!strcmp (e_card_get_id (iterator->data), e_card_get_id (this_card))) {
-				avoid = TRUE;
-				break;
-			}
-		}
-		if (!avoid)
-			remaining_cards = g_list_prepend (remaining_cards, this_card);
-	}
-
-	remaining_cards = g_list_reverse (remaining_cards);
-
-	for (i = remaining_cards; i != NULL; i = g_list_next (i)) {
-		ECard *this_card = E_CARD (i->data);
-		ECardMatchType this_match = e_card_compare (info->card, this_card);
-		if ((gint)this_match > (gint)best_match) {
-			best_match = this_match;
-			best_card  = this_card;
-		}
-	}
-
-	g_list_free (remaining_cards);
-
-	info->cb (info->card, best_card, best_match, info->closure);
-	match_search_info_free (info);
-}
-
-#define MAX_QUERY_PARTS 10
-static void
-use_common_book_cb (EBook *book, gpointer closure)
-{
-	MatchSearchInfo *info = (MatchSearchInfo *) closure;
-	ECard *card = info->card;
-	gchar *query_parts[MAX_QUERY_PARTS];
-	gint p=0;
-	gchar *query, *qj;
-	int i;
-
-	if (book == NULL) {
-		info->cb (info->card, NULL, E_CARD_MATCH_NONE, info->closure);
-		match_search_info_free (info);
-		return;
-	}
-
-	if (card->nickname)
-		query_parts[p++] = g_strdup_printf ("(beginswith \"nickname\" \"%s\")", card->nickname);
-
-
-	if (card->name->given && strlen (card->name->given) > 1)
-		query_parts[p++] = g_strdup_printf ("(contains \"full_name\" \"%s\")", card->name->given);
-
-	if (card->name->additional && strlen (card->name->additional) > 1)
-		query_parts[p++] = g_strdup_printf ("(contains \"full_name\" \"%s\")", card->name->additional);
-
-	if (card->name->family && strlen (card->name->family) > 1)
-		query_parts[p++] = g_strdup_printf ("(contains \"full_name\" \"%s\")", card->name->family);
-
-		
-	if (card->email) {
-		EIterator *iter = e_list_get_iterator (card->email);
-		while (e_iterator_is_valid (iter) && p < MAX_QUERY_PARTS) {
-			gchar *addr = g_strdup (e_iterator_get (iter));
-			if (addr) {
-				gchar *s = addr;
-				while (*s) {
-					if (*s == '@') {
-						*s = '\0';
-						break;
-					}
-					++s;
-				}
-				query_parts[p++] = g_strdup_printf ("(beginswith \"email\" \"%s\")", addr);
-				g_free (addr);
-			}
-			e_iterator_next (iter);
-		}
-	}
-
-	
-	
-	/* Build up our full query from the parts. */
-	query_parts[p] = NULL;
-	qj = g_strjoinv (" ", query_parts);
-	for(i = 0; query_parts[i] != NULL; i++)
-		g_free(query_parts[i]);
-	if (p > 0) {
-		query = g_strdup_printf ("(or %s)", qj);
-		g_free (qj);
-	} else {
-		query = qj;
-	}
-
-	e_book_simple_query (book, query, simple_query_cb, info);
-
-	g_free (query);
-}
-
-void
-e_card_locate_match (ECard *card, ECardMatchQueryCallback cb, gpointer closure)
-{
-	MatchSearchInfo *info;
-
-	g_return_if_fail (card && E_IS_CARD (card));
-	g_return_if_fail (cb != NULL);
-
-	info = g_new (MatchSearchInfo, 1);
-	info->card = card;
-	gtk_object_ref (GTK_OBJECT (card));
-	info->cb = cb;
-	info->closure = closure;
-	info->avoid = NULL;
-
-	e_book_use_local_address_book (use_common_book_cb, info);
-}
-
-/**
- * e_card_locate_match_full:
- * @book: The book to look in.  If this is NULL, use the main local
- * addressbook.
- * @card: The card to compare to.
- * @avoid: A list of cards to not match.  These will not show up in the search.
- * @cb: The function to call.
- * @closure: The closure to add to the call.
- * 
- * Look for the best match and return it using the ECardMatchQueryCallback.
- **/
-void
-e_card_locate_match_full (EBook *book, ECard *card, GList *avoid, ECardMatchQueryCallback cb, gpointer closure)
-{
-	MatchSearchInfo *info;
-
-	g_return_if_fail (card && E_IS_CARD (card));
-	g_return_if_fail (cb != NULL);
-
-	info = g_new (MatchSearchInfo, 1);
-	info->card = card;
-	gtk_object_ref (GTK_OBJECT (card));
-	info->cb = cb;
-	info->closure = closure;
-	info->avoid = g_list_copy (avoid);
-	g_list_foreach (info->avoid, (GFunc) gtk_object_ref, NULL);
-
-	if (book)
-		use_common_book_cb (book, info);
-	else
-		e_book_use_local_address_book (use_common_book_cb, info);
-}
-
diff --git a/addressbook/backend/ebook/e-card-compare.h b/addressbook/backend/ebook/e-card-compare.h
deleted file mode 100644
index 07ccb54e89..0000000000
--- a/addressbook/backend/ebook/e-card-compare.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-card-compare.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __E_CARD_COMPARE_H__
-#define __E_CARD_COMPARE_H__
-
-#include "e-book.h"
-#include "e-card.h"
-
-typedef enum {
-	E_CARD_MATCH_NOT_APPLICABLE = 0,
-	E_CARD_MATCH_NONE           = 1,
-	E_CARD_MATCH_VAGUE          = 2,
-	E_CARD_MATCH_PARTIAL        = 3,
-	E_CARD_MATCH_EXACT          = 4
-} ECardMatchType;
-
-typedef enum {
-	E_CARD_MATCH_PART_NOT_APPLICABLE   = -1,
-	E_CARD_MATCH_PART_NONE             = 0,
-	E_CARD_MATCH_PART_GIVEN_NAME       = 1<<0,
-	E_CARD_MATCH_PART_ADDITIONAL_NAME  = 1<<2,
-	E_CARD_MATCH_PART_FAMILY_NAME      = 1<<3
-} ECardMatchPart;
-
-typedef void (*ECardMatchQueryCallback) (ECard *card, ECard *match, ECardMatchType type, gpointer closure);
-
-ECardMatchType e_card_compare_name_to_string      (ECard *card, const gchar *str);
-
-ECardMatchType e_card_compare_name_to_string_full (ECard *card, const gchar *str,
-						   gboolean allow_partial_matches,
-						   gint *matched_parts, ECardMatchPart *first_matched_part,
-						   gint *matched_character_count);
-
-ECardMatchType e_card_compare_name      (ECard *card1, ECard *card2);
-ECardMatchType e_card_compare_nickname  (ECard *card1, ECard *card2);
-ECardMatchType e_card_compare_email     (ECard *card1, ECard *card2);
-ECardMatchType e_card_compare_address   (ECard *card1, ECard *card2);
-ECardMatchType e_card_compare_telephone (ECard *card1, ECard *card2);
-
-ECardMatchType e_card_compare           (ECard *card1, ECard *card2);
-
-void           e_card_locate_match      (ECard *card, ECardMatchQueryCallback cb, gpointer closure);
-void           e_card_locate_match_full (EBook *book, ECard *card, GList *avoid, ECardMatchQueryCallback cb, gpointer closure);
-
-
-
-#endif /* __E_CARD_COMPARE_H__ */
-
diff --git a/addressbook/backend/ebook/e-card-cursor.c b/addressbook/backend/ebook/e-card-cursor.c
deleted file mode 100644
index 171f83d736..0000000000
--- a/addressbook/backend/ebook/e-card-cursor.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-card-cursor.c: Implements card cursors.
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com.
- */
-
-#include <config.h>
-#include <gtk/gtkobject.h>
-#include "addressbook.h"
-#include "e-card-cursor.h"
-
-struct _ECardCursorPrivate {
-	GNOME_Evolution_Addressbook_CardCursor corba_cursor;
-};
-
-/*
- * A pointer to our parent object class
- */
-static GtkObjectClass *parent_class;
-
-/*
- * Implemented GtkObject::destroy
- */
-static void
-e_card_cursor_destroy (GtkObject *object)
-{
-	ECardCursor *cursor = E_CARD_CURSOR (object);
-	CORBA_Environment      ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_CardCursor_unref( cursor->priv->corba_cursor, &ev );
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("e_card_cursor_destroy: Exception unreffing "
-			  "corba cursor.\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-
-	CORBA_Object_release (cursor->priv->corba_cursor, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("e_card_cursor_destroy: Exception releasing "
-			  "corba cursor.\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	if ( cursor->priv )
-		g_free ( cursor->priv );
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-/**
- * e_card_cursor_get_length:
- * @cursor: the #ECardCursor whose length is being queried
- *
- * Returns: the number of items the cursor references, or -1 there's
- * an error.
- */
-long
-e_card_cursor_get_length (ECardCursor *cursor)
-{
-	if ( cursor->priv->corba_cursor != CORBA_OBJECT_NIL ) {
-		CORBA_Environment      ev;
-		long ret_val;
-
-		CORBA_exception_init (&ev);
-
-		ret_val = GNOME_Evolution_Addressbook_CardCursor_count (cursor->priv->corba_cursor, &ev);
-		
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning("e_card_cursor_get_length: Exception during "
-				  "get_length corba call.\n");
-			ret_val = -1;
-		}
-
-		CORBA_exception_free (&ev);
-
-		return ret_val;
-	}
-	else
-		return -1;
-}
-
-/**
- * e_card_cursor_get_nth:
- * @cursor: an #ECardCursor object
- * @n: the index of the item requested
- *
- * Gets an #ECard based on an index.
- *
- * Returns: a new #ECard on success, or %NULL on failure.
- */
-ECard *
-e_card_cursor_get_nth (ECardCursor *cursor,
-		       const long   n)
-{
-	if ( cursor->priv->corba_cursor != CORBA_OBJECT_NIL ) {
-		CORBA_Environment      en;
-		CORBA_char *vcard;
-		ECard *card;
-
-		CORBA_exception_init (&en);
-
-		vcard = GNOME_Evolution_Addressbook_CardCursor_getNth(cursor->priv->corba_cursor, n, &en);
-		
-		if (en._major != CORBA_NO_EXCEPTION) {
-			g_warning("e_card_cursor_get_nth: Exception during "
-				  "get_nth corba call.\n");
-		}
-		
-		CORBA_exception_free (&en);
-
-		card = e_card_new (vcard);
-
-		CORBA_free(vcard);
-
-		return card;
-	}
-	else
-		return e_card_new("");
-}
-
-static void
-e_card_cursor_class_init (ECardCursorClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-
-	object_class->destroy = e_card_cursor_destroy;
-}
-
-static void
-e_card_cursor_init (ECardCursor *cursor)
-{
-	cursor->priv = g_new(ECardCursorPrivate, 1);
-	cursor->priv->corba_cursor = CORBA_OBJECT_NIL;
-}
-
-GtkType
-e_card_cursor_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ECardCursor",
-			sizeof (ECardCursor),
-			sizeof (ECardCursorClass),
-			(GtkClassInitFunc) e_card_cursor_class_init,
-			(GtkObjectInitFunc) e_card_cursor_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
-
-/**
- * e_card_cursor_construct:
- * @cursor: an #ECardCursor object
- * @corba_cursor: an #GNOME_Evolution_Addressbook_CardCursor
- *
- * Wraps an #GNOME_Evolution_Addressbook_CardCursor object inside the #ECardCursor
- * @cursor object.
- *
- * Returns: a new #ECardCursor on success, or %NULL on failure.
- */
-ECardCursor *
-e_card_cursor_construct (ECardCursor          *cursor,
-			 GNOME_Evolution_Addressbook_CardCursor  corba_cursor)
-{
-	CORBA_Environment      ev;
-	g_return_val_if_fail (cursor != NULL, NULL);
-	g_return_val_if_fail (E_IS_CARD_CURSOR (cursor), NULL);
-	g_return_val_if_fail (corba_cursor != CORBA_OBJECT_NIL, NULL);
-
-	CORBA_exception_init (&ev);
-
-	/*
-	 * Initialize cursor
-	 */
-	cursor->priv->corba_cursor = CORBA_Object_duplicate(corba_cursor, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("e_card_cursor_construct: Exception duplicating "
-			  "corba cursor.\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-	
-	GNOME_Evolution_Addressbook_CardCursor_ref(cursor->priv->corba_cursor, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("e_card_cursor_construct: Exception reffing "
-			  "corba cursor.\n");
-	}
-
-	CORBA_exception_free (&ev);
-	
-	/*
-	 * Success: return the GtkType we were given
-	 */
-	return cursor;
-}
-
-/**
- * e_card_cursor_new:
- * @cursor: the #GNOME_Evolution_Addressbook_CardCursor to be wrapped
- *
- * Creates a new #ECardCursor, which wraps an #GNOME_Evolution_Addressbook_CardCursor
- * object.
- *
- * Returns: a new #ECardCursor on success, or %NULL on failure.
- */
-ECardCursor *
-e_card_cursor_new (GNOME_Evolution_Addressbook_CardCursor corba_cursor)
-{
-	ECardCursor *cursor;
-
-	cursor = gtk_type_new (e_card_cursor_get_type ());
-	
-	return e_card_cursor_construct (cursor,
-					corba_cursor);
-}
diff --git a/addressbook/backend/ebook/e-card-cursor.h b/addressbook/backend/ebook/e-card-cursor.h
deleted file mode 100644
index e042268635..0000000000
--- a/addressbook/backend/ebook/e-card-cursor.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#ifndef __E_CARD_CURSOR_H__
-#define __E_CARD_CURSOR_H__
-
-#include <gtk/gtkobject.h>
-#include <libgnome/gnome-defs.h>
-#include <addressbook/backend/ebook/addressbook.h>
-#include <addressbook/backend/ebook/e-card.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _ECardCursor        ECardCursor;
-typedef struct _ECardCursorPrivate ECardCursorPrivate;
-typedef struct _ECardCursorClass   ECardCursorClass;
-
-struct _ECardCursor {
-	GtkObject           parent;
-	ECardCursorPrivate *priv;
-};
-
-struct _ECardCursorClass {
-	GtkObjectClass parent;
-};
-
-/* Creating a new addressbook. */
-ECardCursor *e_card_cursor_new       (GNOME_Evolution_Addressbook_CardCursor  corba_cursor);
-ECardCursor *e_card_cursor_construct (ECardCursor          *cursor,
-				      GNOME_Evolution_Addressbook_CardCursor  corba_cursor);
-
-GtkType      e_card_cursor_get_type    (void);
-
-/* Fetching cards. */
-long         e_card_cursor_get_length  (ECardCursor          *cursor);
-ECard       *e_card_cursor_get_nth     (ECardCursor          *cursor,
-					const long            nth);
-#define E_CARD_CURSOR_TYPE        (e_card_cursor_get_type ())
-#define E_CARD_CURSOR(o)          (GTK_CHECK_CAST ((o), E_CARD_CURSOR_TYPE, ECardCursor))
-#define E_CARD_CURSOR_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CARD_CURSOR_TYPE, ECardCursorClass))
-#define E_IS_CARD_CURSOR(o)       (GTK_CHECK_TYPE ((o), E_CARD_CURSOR_TYPE))
-#define E_IS_CARD_CURSOR_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CARD_CURSOR_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __E_CARD_CURSOR_H__ */
diff --git a/addressbook/backend/ebook/e-card-pairs.h b/addressbook/backend/ebook/e-card-pairs.h
deleted file mode 100644
index f82f948ebb..0000000000
--- a/addressbook/backend/ebook/e-card-pairs.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* GnomeCard - a graphical contact manager.
- *
- * pairs.h: This file is part of GnomeCard.
- * 
- * Copyright (C) 1999 The Free Software Foundation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_CARD_PAIRS_H__
-#define __E_CARD_PAIRS_H__
-
-#include <libversit/vcc.h>
-#include <ebook/e-card.h>
-
-
-#if 0
-struct pair
-{
-	char *str;
-	ECardPropertyType i ;
-};
-
-struct pair prop_lookup[] = {
-		{        VCFullNameProp, PROP_FNAME },
-		{            VCNameProp, PROP_NAME },
-		{           VCPhotoProp, PROP_PHOTO },
-		{       VCBirthDateProp, PROP_BDAY },
-		{             VCAdrProp, PROP_DELADDR },
-		{   VCDeliveryLabelProp, PROP_DELLABEL },
-		{       VCTelephoneProp, PROP_PHONE },
-		{    VCEmailAddressProp, PROP_EMAIL },
-		{          VCMailerProp, PROP_MAILER },
-		{        VCTimeZoneProp, PROP_TIMEZN },
-		{             VCGeoProp, PROP_GEOPOS },
-		{           VCTitleProp, PROP_TITLE },
-		{    VCBusinessRoleProp, PROP_ROLE },
-		{            VCLogoProp, PROP_LOGO },
-		{           VCAgentProp, PROP_AGENT },
-		{             VCOrgProp, PROP_ORG },
-		{      VCCategoriesProp, PROP_CATEGORIES },
-		{         VCCommentProp, PROP_COMMENT },
-		{     VCLastRevisedProp, PROP_REV },
-		{   VCPronunciationProp, PROP_SOUND },
-		{             VCURLProp, PROP_URL },
-		{    VCUniqueStringProp, PROP_UID },
-		{         VCVersionProp, PROP_VERSION },
-		{       VCPublicKeyProp, PROP_KEY },
-		{           VCValueProp, PROP_VALUE },
-		{        VCEncodingProp, PROP_ENCODING },
-		{ VCQuotedPrintableProp, PROP_QUOTED_PRINTABLE },
-		{            VC8bitProp, PROP_8BIT },
-		{          VCBase64Prop, PROP_BASE64 },
-		{        VCLanguageProp, PROP_LANG },
-		{         VCCharSetProp, PROP_CHARSET },
-		{ NULL, PROP_NONE} };
-
-struct pair photo_pairs[] = {
-		{ VCGIFProp, PHOTO_GIF },
-		{ VCCGMProp, PHOTO_CGM },
-		{ VCWMFProp, PHOTO_WMF },
-		{ VCBMPProp, PHOTO_BMP },
-		{ VCMETProp, PHOTO_MET },
-		{ VCPMBProp, PHOTO_PMB },
-		{ VCDIBProp, PHOTO_DIB },
-		{ VCPICTProp, PHOTO_PICT },
-		{ VCTIFFProp, PHOTO_TIFF },
-		{ VCPDFProp, PHOTO_PDF },
-		{ VCPSProp, PHOTO_PS },
-		{ VCJPEGProp, PHOTO_JPEG },
-		{ VCMPEGProp, PHOTO_MPEG },
-		{ VCMPEG2Prop, PHOTO_MPEG2 },
-		{ VCAVIProp, PHOTO_AVI },
-		{ VCQuickTimeProp, PHOTO_QTIME },
-		{ NULL, 0 } };
-
-struct pair email_pairs[] = {
-		{ VCAOLProp, EMAIL_AOL },
-		{ VCAppleLinkProp, EMAIL_APPLE_LINK },
-		{ VCATTMailProp, EMAIL_ATT },
-		{ VCCISProp, EMAIL_CIS },
-		{ VCEWorldProp, EMAIL_EWORLD },
-		{ VCInternetProp, EMAIL_INET },
-		{ VCIBMMailProp, EMAIL_IBM },
-		{ VCMCIMailProp, EMAIL_MCI },
-		{ VCPowerShareProp, EMAIL_POWERSHARE },
-		{ VCProdigyProp, EMAIL_PRODIGY },
-		{ VCTLXProp, EMAIL_TLX },
-		{ VCX400Prop, EMAIL_X400 },
-		{ NULL, 0 } };
-
-struct pair sound_pairs[] = {
-		{ VCAIFFProp, SOUND_AIFF },
-		{ VCPCMProp, SOUND_PCM },
-		{ VCWAVEProp, SOUND_WAVE },
-		{ NULL, 0 } };
-
-struct pair key_pairs[] = {
-		{ VCX509Prop, KEY_X509 },
-		{ VCPGPProp, KEY_PGP },
-		{ NULL, 0 } };
-	  
-
-#endif
-#endif /* ! __E_CARD_PAIRS_H__ */
diff --git a/addressbook/backend/ebook/e-card-simple.c b/addressbook/backend/ebook/e-card-simple.c
deleted file mode 100644
index 0af55bc8d9..0000000000
--- a/addressbook/backend/ebook/e-card-simple.c
+++ /dev/null
@@ -1,1270 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@ximian.com>
- *   Arturo Espinosa (arturo@nuclecu.unam.mx)
- *   Nat Friedman    (nat@ximian.com)
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtkobject.h>
-#include <gal/util/e-unicode-i18n.h>
-#include <gal/util/e-util.h>
-
-#include <libversit/vcc.h>
-#include "e-card-simple.h"
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_CARD,
-};
-
-
-typedef enum _ECardSimpleInternalType ECardSimpleInternalType;
-typedef struct _ECardSimpleFieldData ECardSimpleFieldData;
-
-enum _ECardSimpleInternalType {
-	E_CARD_SIMPLE_INTERNAL_TYPE_STRING,
-	E_CARD_SIMPLE_INTERNAL_TYPE_DATE,
-	E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS,
-	E_CARD_SIMPLE_INTERNAL_TYPE_PHONE,
-	E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL,
-	E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL,
-	E_CARD_SIMPLE_INTERNAL_TYPE_BOOL,
-};
-
-struct _ECardSimpleFieldData {
-	ECardSimpleField         field;
-	char                    *ecard_field;
-	char                    *name;
-	char                    *short_name;
-	int                      list_type_index;
-	ECardSimpleInternalType  type;
-};
-
-/* This order must match the order in the .h. */
-
-/* the ecard_field data below should only be used for TYPE_STRING,
-   TYPE_DATE, and TYPE_SPECIAL fields.  that is, it's only valid for
-   e-cards for those types.  it is used as a unique name for fields
-   for the get_supported functionality.  */
-static ECardSimpleFieldData field_data[] =
-{
-	{ E_CARD_SIMPLE_FIELD_FILE_AS,            "file_as",         N_("File As"),       "",             0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_FULL_NAME,          "full_name",       N_("Name"),          N_("Name"),     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_EMAIL,              "email",           N_("Email"),         N_("Email"),    E_CARD_SIMPLE_EMAIL_ID_EMAIL,        E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },
-	{ E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,      "primary_phone",   N_("Primary"),       N_("Prim"),     E_CARD_SIMPLE_PHONE_ID_PRIMARY,      E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_ASSISTANT,    "assistant_phone", N_("Assistant"),     N_("Assistant"),E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,     "business_phone",  N_("Business"),      N_("Bus"),      E_CARD_SIMPLE_PHONE_ID_BUSINESS,     E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_CALLBACK,     "callback_phone",  N_("Callback"),      N_("Callback"), E_CARD_SIMPLE_PHONE_ID_CALLBACK,     E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_COMPANY,      "company_phone",   N_("Company"),       N_("Comp"),     E_CARD_SIMPLE_PHONE_ID_COMPANY,      E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME,         "home_phone",      N_("Home"),          N_("Home"),     E_CARD_SIMPLE_PHONE_ID_HOME,         E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_ORG,                "org",             N_("Organization"),  N_("Org"),      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS,   "business_address",N_("Business"),      N_("Bus"),      E_CARD_SIMPLE_ADDRESS_ID_BUSINESS,   E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },
-	{ E_CARD_SIMPLE_FIELD_ADDRESS_HOME,       "home_address",    N_("Home"),          N_("Home"),     E_CARD_SIMPLE_ADDRESS_ID_HOME,       E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },
-	{ E_CARD_SIMPLE_FIELD_PHONE_MOBILE,       "mobile_phone",    N_("Mobile"),        N_("Mobile"),   E_CARD_SIMPLE_PHONE_ID_MOBILE,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_CAR,          "car_phone",       N_("Car"),           N_("Car"),      E_CARD_SIMPLE_PHONE_ID_CAR,          E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX, "business_fax",    N_("Business Fax"),  N_("Bus Fax"),  E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX, E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,     "home_fax",        N_("Home Fax"),      N_("Home Fax"), E_CARD_SIMPLE_PHONE_ID_HOME_FAX,     E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2,   "business_phone_2",N_("Business 2"),    N_("Bus 2"),    E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,   E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME_2,       "home_phone_2",    N_("Home 2"),        N_("Home 2"),   E_CARD_SIMPLE_PHONE_ID_HOME_2,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_ISDN,         "isdn",            N_("ISDN"),          N_("ISDN"),     E_CARD_SIMPLE_PHONE_ID_ISDN,         E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_OTHER,        "other_phone",     N_("Other"),         N_("Other"),    E_CARD_SIMPLE_PHONE_ID_OTHER,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX,    "other_fax",       N_("Other Fax"),     N_("Other Fax"), E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,   E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_PAGER,        "pager",           N_("Pager"),         N_("Pager"),    E_CARD_SIMPLE_PHONE_ID_PAGER,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_RADIO,        "radio",           N_("Radio"),         N_("Radio"),    E_CARD_SIMPLE_PHONE_ID_RADIO,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_TELEX,        "telex",           N_("Telex"),         N_("Telex"),    E_CARD_SIMPLE_PHONE_ID_TELEX,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_TTYTTD,       "tty",             N_("TTY"),           N_("TTY"),      E_CARD_SIMPLE_PHONE_ID_TTYTTD,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,      "other_address",   N_("Other"),         N_("Other"),    E_CARD_SIMPLE_ADDRESS_ID_OTHER,      E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },
-	{ E_CARD_SIMPLE_FIELD_EMAIL_2,            "email_2",         N_("Email 2"),       N_("Email 2"),  E_CARD_SIMPLE_EMAIL_ID_EMAIL_2,      E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },
-	{ E_CARD_SIMPLE_FIELD_EMAIL_3,            "email_3",         N_("Email 3"),       N_("Email 3"),  E_CARD_SIMPLE_EMAIL_ID_EMAIL_3,      E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },
-	{ E_CARD_SIMPLE_FIELD_URL,                "url",             N_("Web Site"),      N_("Url"),      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ORG_UNIT,           "org_unit",        N_("Department"),    N_("Dep"),      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_OFFICE,             "office",          N_("Office"),        N_("Off"),      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_TITLE,              "title",           N_("Title"),         N_("Title"),    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ROLE,               "role",            N_("Profession"),    N_("Prof"),     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_MANAGER,            "manager",         N_("Manager"),       N_("Man"),      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ASSISTANT,          "assistant",       N_("Assistant"),     N_("Ass"),      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_NICKNAME,           "nickname",        N_("Nickname"),      N_("Nick"),     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_SPOUSE,             "spouse",          N_("Spouse"),        N_("Spouse"),   0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_NOTE,               "note",            N_("Note"),          N_("Note"),     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
- 	{ E_CARD_SIMPLE_FIELD_CALURI,             "caluri",          N_("Calendar URI"),  N_("CALUri"),   0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_FBURL,              "fburl",           N_("Free-busy URL"), N_("FBUrl"),    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ANNIVERSARY,        "anniversary",     N_("Anniversary"),   N_("Anniv"),    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_DATE },
-	{ E_CARD_SIMPLE_FIELD_BIRTH_DATE,         "birth_date",      N_("Birth Date"),    "",             0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_DATE },
-	{ E_CARD_SIMPLE_FIELD_MAILER,             "mailer",          "",                  "",             0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_NAME_OR_ORG,        "nameororg",       "",                  "",             0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },
-	{ E_CARD_SIMPLE_FIELD_CATEGORIES,         "categories",      N_("Categories"),    N_("Categories"), 0,                                 E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_FAMILY_NAME,        "family_name",     N_("Family Name"),   N_("Family Name"), 0,                                E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },
- 	{ E_CARD_SIMPLE_FIELD_GIVEN_NAME,         "given_name",      "Given Name",    "Given Name",  0,                                E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },
- 	{ E_CARD_SIMPLE_FIELD_ADDITIONAL_NAME,    "additional_name",  "Additional Name", "Additional Name",  0,                        E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },
- 	{ E_CARD_SIMPLE_FIELD_NAME_SUFFIX,        "name_suffix",     "Name Suffix",   "Name Suffix",  0,                               E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },
- 	{ E_CARD_SIMPLE_FIELD_WANTS_HTML,         "wants_html",      "Wants HTML",    "Wants HTML",   0,                               E_CARD_SIMPLE_INTERNAL_TYPE_BOOL },
- 	{ E_CARD_SIMPLE_FIELD_IS_LIST,            "list",            "Is List",       "Is List",      0,                               E_CARD_SIMPLE_INTERNAL_TYPE_BOOL },
-};
-static int field_data_count = sizeof (field_data) / sizeof (field_data[0]);
-
-static void e_card_simple_init (ECardSimple *simple);
-static void e_card_simple_class_init (ECardSimpleClass *klass);
-
-static void e_card_simple_destroy (GtkObject *object);
-static void e_card_simple_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_card_simple_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void fill_in_info(ECardSimple *simple);
-
-ECardPhoneFlags phone_correspondences[] = {
-	E_CARD_PHONE_ASSISTANT, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    */
-	E_CARD_PHONE_WORK | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS,	   */
-	E_CARD_PHONE_WORK | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,   */
-	E_CARD_PHONE_WORK | E_CARD_PHONE_FAX, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX, */
-	E_CARD_PHONE_CALLBACK, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */
-	E_CARD_PHONE_CAR, /* E_CARD_SIMPLE_PHONE_ID_CAR,	   */
-	E_CARD_PHONE_WORK, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */
-	E_CARD_PHONE_HOME, /* E_CARD_SIMPLE_PHONE_ID_HOME,	   */
-	E_CARD_PHONE_HOME, /* E_CARD_SIMPLE_PHONE_ID_HOME_2,	   */
-	E_CARD_PHONE_HOME | E_CARD_PHONE_FAX, /* E_CARD_SIMPLE_PHONE_ID_HOME_FAX,	   */
-	E_CARD_PHONE_ISDN, /* E_CARD_SIMPLE_PHONE_ID_ISDN,	   */
-	E_CARD_PHONE_CELL, /* E_CARD_SIMPLE_PHONE_ID_MOBILE,	   */
-	E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_OTHER,	   */
-	E_CARD_PHONE_FAX, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */
-	E_CARD_PHONE_PAGER, /* E_CARD_SIMPLE_PHONE_ID_PAGER,	   */
-	E_CARD_PHONE_PREF, /* E_CARD_SIMPLE_PHONE_ID_PRIMARY,	   */
-	E_CARD_PHONE_RADIO, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */
-	E_CARD_PHONE_TELEX, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */
-	E_CARD_PHONE_TTYTDD, /* E_CARD_SIMPLE_PHONE_ID_TTYTTD,	   */
-};
-
-char *phone_names[] = {
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    */
-	"Business",
-	"Business 2",
-	"Business Fax",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */
-	"Car",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */
-	"Home",
-	"Home 2",
-	"Home Fax",
-	"ISDN",
-	"Mobile",
-	"Other",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */
-	"Pager",
-	"Primary",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TTYTTD,	   */
-};
-
-char *phone_short_names[] = {
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    */
-	"Bus",
-	"Bus 2",
-	"Bus Fax",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */
-	"Car",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */
-	"Home",
-	"Home 2",
-	"Home Fax",
-	"ISDN",
-	"Mob",
-	"Other",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */
-	"Pag",
-	"Prim",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TTYTTD,	   */
-};
-
-ECardAddressFlags addr_correspondences[] = {
-	E_CARD_ADDR_WORK, /* E_CARD_SIMPLE_ADDRESS_ID_BUSINESS, */
-	E_CARD_ADDR_HOME, /* E_CARD_SIMPLE_ADDRESS_ID_HOME,	 */
-	E_CARD_ADDR_POSTAL, /* E_CARD_SIMPLE_ADDRESS_ID_OTHER,    */
-};
-
-char *address_names[] = {
-	"Business",
-	"Home",
-	"Other",
-};
-
-/**
- * e_card_simple_get_type:
- * @void: 
- * 
- * Registers the &ECardSimple class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ECardSimple class.
- **/
-GtkType
-e_card_simple_get_type (void)
-{
-	static GtkType simple_type = 0;
-
-	if (!simple_type) {
-		GtkTypeInfo simple_info = {
-			"ECardSimple",
-			sizeof (ECardSimple),
-			sizeof (ECardSimpleClass),
-			(GtkClassInitFunc) e_card_simple_class_init,
-			(GtkObjectInitFunc) e_card_simple_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		simple_type = gtk_type_unique (gtk_object_get_type (), &simple_info);
-	}
-
-	return simple_type;
-}
-
-/**
- * e_card_simple_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ECardSimple that wraps the @VCard.
- */
-ECardSimple *
-e_card_simple_new (ECard *card)
-{
-	ECardSimple *simple = E_CARD_SIMPLE(gtk_type_new(e_card_simple_get_type()));
-	gtk_object_set(GTK_OBJECT(simple),
-		       "card", card,
-		       NULL);
-	return simple;
-}
-
-ECardSimple *
-e_card_simple_duplicate(ECardSimple *simple)
-{
-	ECard *card = simple->card ? e_card_duplicate (simple->card) : e_card_new ("");
-	ECardSimple *new_simple = e_card_simple_new(card);
-	return new_simple;
-}
-
-/**
- * e_card_simple_get_id:
- * @simple: an #ECardSimple
- *
- * Returns: a string representing the id of the simple, which is unique
- * within its book.
- */
-const char *
-e_card_simple_get_id (ECardSimple *simple)
-{
-	if (simple->card)
-		return e_card_get_id(simple->card);
-	else
-		return "";
-}
-
-/**
- * e_card_simple_get_id:
- * @simple: an #ECardSimple
- * @id: a id in string format
- *
- * Sets the identifier of a simple, which should be unique within its
- * book.
- */
-void
-e_card_simple_set_id (ECardSimple *simple, const char *id)
-{
-	if ( simple->card )
-		e_card_set_id(simple->card, id);
-}
-
-/**
- * e_card_simple_get_vcard:
- * @simple: an #ECardSimple
- *
- * Returns: a string in vcard format, which is wrapped by the @simple.
- */
-char *
-e_card_simple_get_vcard (ECardSimple *simple)
-{
-	if (simple->card)
-		return e_card_get_vcard(simple->card);
-	else
-		return g_strdup("");
-}
-
-/**
- * e_card_simple_get_vcard_assume_utf8:
- * @simple: an #ECardSimple
- *
- * Returns: a string in vcard format, which is wrapped by the @simple.
- */
-char *
-e_card_simple_get_vcard_assume_utf8 (ECardSimple *simple)
-{
-	if (simple->card)
-		return e_card_get_vcard_assume_utf8(simple->card);
-	else
-		return g_strdup("");
-}
-
-static void
-e_card_simple_class_init (ECardSimpleClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	gtk_object_add_arg_type ("ECardSimple::card",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CARD);
-
-	object_class->destroy = e_card_simple_destroy;
-	object_class->get_arg = e_card_simple_get_arg;
-	object_class->set_arg = e_card_simple_set_arg;
-}
-
-/*
- * ECardSimple lifecycle management and vcard loading/saving.
- */
-
-static void
-e_card_simple_destroy (GtkObject *object)
-{
-	ECardSimple *simple;
-	int i;
-	
-	simple = E_CARD_SIMPLE (object);
-
-	if (simple->card)
-		gtk_object_unref(GTK_OBJECT(simple->card));
-	g_list_foreach(simple->temp_fields, (GFunc) g_free, NULL);
-	g_list_free(simple->temp_fields);
-	simple->temp_fields = NULL;
-
-	for(i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i++)
-		e_card_phone_unref (simple->phone[i]);
-	for(i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++)
-		g_free(simple->email[i]);
-	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++)
-		e_card_address_label_unref(simple->address[i]);
-	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++)
-		e_card_delivery_address_unref(simple->delivery[i]);
-}
-
-
-/* Set_arg handler for the simple */
-static void
-e_card_simple_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECardSimple *simple;
-	
-	simple = E_CARD_SIMPLE (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		if (simple->card)
-			gtk_object_unref(GTK_OBJECT(simple->card));
-		g_list_foreach(simple->temp_fields, (GFunc) g_free, NULL);
-		g_list_free(simple->temp_fields);
-		simple->temp_fields = NULL;
-		if (GTK_VALUE_OBJECT(*arg))
-			simple->card = E_CARD(GTK_VALUE_OBJECT(*arg));
-		else
-			simple->card = NULL;
-		if(simple->card)
-			gtk_object_ref(GTK_OBJECT(simple->card));
-		fill_in_info(simple);
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the simple */
-static void
-e_card_simple_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECardSimple *simple;
-
-	simple = E_CARD_SIMPLE (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		e_card_simple_sync_card(simple);
-		GTK_VALUE_OBJECT (*arg) = (GtkObject *) simple->card;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-
-/**
- * e_card_simple_init:
- */
-static void
-e_card_simple_init (ECardSimple *simple)
-{
-	int i;
-	simple->card = NULL;
-	for(i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i++)
-		simple->phone[i] = NULL;
-	for(i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++)
-		simple->email[i] = NULL;
-	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++)
-		simple->address[i] = NULL;
-	simple->temp_fields = NULL;
-
-	simple->changed = TRUE;
-}
-
-static void
-fill_in_info(ECardSimple *simple)
-{
-	ECard *card = simple->card;
-	if (card) {
-		EList *address_list;
-		EList *phone_list;
-		EList *email_list;
-		EList *delivery_list;
-		const ECardPhone *phone;
-		const char *email;
-		const ECardAddrLabel *address;
-		const ECardDeliveryAddress *delivery;
-		int i;
-
-		EIterator *iterator;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "address_label", &address_list,
-			       "address",       &delivery_list,
-			       "phone",         &phone_list,
-			       "email",         &email_list,
-			       NULL);
-		for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i++) {
-			e_card_phone_unref(simple->phone[i]);
-			simple->phone[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(phone_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			gboolean found = FALSE;
-			phone = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-				if ((phone->flags == phone_correspondences[i]) && (simple->phone[i] == NULL)) {
-					simple->phone[i] = e_card_phone_ref(phone);
-					found = TRUE;
-					break;
-				}
-			}
-			if (found)
-				continue;
-			for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-				if (((phone->flags & phone_correspondences[i]) == phone_correspondences[i]) && (simple->phone[i] == NULL)) {
-					simple->phone[i] = e_card_phone_ref(phone);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++) {
-			g_free(simple->email[i]);
-			simple->email[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(email_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			email = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-				if ((simple->email[i] == NULL)) {
-					simple->email[i] = g_strdup(email);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-			e_card_address_label_unref(simple->address[i]);
-			simple->address[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(address_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			address = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if (((address->flags & addr_correspondences[i]) == addr_correspondences[i]) && (simple->address[i] == NULL)) {
-					simple->address[i] = e_card_address_label_ref(address);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-			e_card_delivery_address_unref(simple->delivery[i]);
-			simple->delivery[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(delivery_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			delivery = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if (((delivery->flags & addr_correspondences[i]) == addr_correspondences[i]) && (simple->delivery[i] == NULL)) {
-					simple->delivery[i] = e_card_delivery_address_ref(delivery);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-		e_card_free_empty_lists (card);
-	}
-}
-
-void
-e_card_simple_sync_card(ECardSimple *simple)
-{
-	ECard *card = simple->card;
-	if (card && simple->changed) {
-		EList *address_list;
-		EList *phone_list;
-		EList *email_list;
-		EList *delivery_list;
-		const ECardPhone *phone;
-		const ECardAddrLabel *address;
-		const ECardDeliveryAddress *delivery;
-		const char *email;
-		int i;
-
-		EIterator *iterator;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "address_label", &address_list,
-			       "address",       &delivery_list,
-			       "phone",         &phone_list,
-			       "email",         &email_list,
-			       NULL);
-
-		for (iterator = e_list_get_iterator(phone_list); e_iterator_is_valid(iterator); e_iterator_next(iterator) ) {
-			int i;
-			gboolean found = FALSE;
-			phone = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-				if (phone->flags == phone_correspondences[i]) {
-					if (simple->phone[i]) {
-						simple->phone[i]->flags = phone_correspondences[i];
-						if (simple->phone[i]->number && *simple->phone[i]->number) {
-							e_iterator_set(iterator, simple->phone[i]);
-						} else {
-							e_iterator_delete(iterator);
-						}
-						e_card_phone_unref(simple->phone[i]);
-						simple->phone[i] = NULL;
-						found = TRUE;
-						break;
-					}
-				}
-			}
-			if (found)
-				continue;
-			for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-				if ((phone->flags & phone_correspondences[i]) == phone_correspondences[i]) {
-					if (simple->phone[i]) {
-						simple->phone[i]->flags = phone_correspondences[i];
-						if (simple->phone[i]->number && *simple->phone[i]->number) {
-							e_iterator_set(iterator, simple->phone[i]);
-						} else {
-							e_iterator_delete(iterator);
-						}
-						e_card_phone_unref(simple->phone[i]);
-						simple->phone[i] = NULL;
-						break;
-					}
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-			if (simple->phone[i]) {
-				simple->phone[i]->flags = phone_correspondences[i];
-				e_list_append(phone_list, simple->phone[i]);
-				e_card_phone_unref(simple->phone[i]);
-				simple->phone[i] = NULL;
-			}
-		}
-
-		for (iterator = e_list_get_iterator(email_list); e_iterator_is_valid(iterator); e_iterator_next(iterator) ) {
-			int i;
-			email = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-				if (simple->email[i]) {
-					if (*simple->email[i]) {
-						e_iterator_set(iterator, simple->email[i]);
-					} else {
-						e_iterator_delete(iterator);
-					}
-					g_free(simple->email[i]);
-					simple->email[i] = NULL;
-					break;
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-			if (simple->email[i]) {
-				e_list_append(email_list, simple->email[i]);
-				g_free(simple->email[i]);
-				simple->email[i] = NULL;
-			}
-		}
-
-		for (iterator = e_list_get_iterator(address_list); e_iterator_is_valid(iterator); e_iterator_next(iterator) ) {
-			int i;
-			address = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if ((address->flags & addr_correspondences[i]) == addr_correspondences[i]) {
-					if (simple->address[i]) {
-						simple->address[i]->flags = addr_correspondences[i];
-						if (simple->address[i]->data && *simple->address[i]->data) {
-							e_iterator_set(iterator, simple->address[i]);
-						} else {
-							e_iterator_delete(iterator);
-						}
-						e_card_address_label_unref(simple->address[i]);
-						simple->address[i] = NULL;
-						break;
-					}
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-			if (simple->address[i]) {
-				simple->address[i]->flags = addr_correspondences[i];
-				e_list_append(address_list, simple->address[i]);
-				e_card_address_label_unref(simple->address[i]);
-				simple->address[i] = NULL;
-			}
-		}
-
-		for (iterator = e_list_get_iterator(delivery_list); e_iterator_is_valid(iterator); e_iterator_next(iterator) ) {
-			int i;
-			delivery = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if ((delivery->flags & addr_correspondences[i]) == addr_correspondences[i]) {
-					if (simple->delivery[i]) {
-						simple->delivery[i]->flags = addr_correspondences[i];
-						if (!e_card_delivery_address_is_empty(simple->delivery[i])) {
-							e_iterator_set(iterator, simple->delivery[i]);
-						} else {
-							e_iterator_delete(iterator);
-						}
-						e_card_delivery_address_unref(simple->delivery[i]);
-						simple->delivery[i] = NULL;
-						break;
-					}
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-			if (simple->delivery[i]) {
-				simple->delivery[i]->flags = addr_correspondences[i];
-				e_list_append(delivery_list, simple->delivery[i]);
-				e_card_delivery_address_unref(simple->delivery[i]);
-				simple->delivery[i] = NULL;
-			}
-		}
-		fill_in_info(simple);
-		e_card_free_empty_lists (card);
-	}
-
-	simple->changed = FALSE;
-}
-
-const ECardPhone     *e_card_simple_get_phone   (ECardSimple          *simple,
-						 ECardSimplePhoneId    id)
-{
-	return simple->phone[id];
-}
-
-const char           *e_card_simple_get_email   (ECardSimple          *simple,
-						 ECardSimpleEmailId    id)
-{
-	return simple->email[id];
-}
-
-const ECardAddrLabel *e_card_simple_get_address (ECardSimple          *simple,
-						 ECardSimpleAddressId  id)
-{
-	return simple->address[id];
-}
-
-const ECardDeliveryAddress *e_card_simple_get_delivery_address (ECardSimple          *simple,
-								ECardSimpleAddressId  id)
-{
-	return simple->delivery[id];
-}
-
-void            e_card_simple_set_phone   (ECardSimple          *simple,
-					   ECardSimplePhoneId    id,
-					   const ECardPhone           *phone)
-{
-	e_card_phone_unref(simple->phone[id]);
-	simple->phone[id] = e_card_phone_ref(phone);
-	simple->changed = TRUE;
-}
-
-void            e_card_simple_set_email   (ECardSimple          *simple,
-					   ECardSimpleEmailId    id,
-					   const char                 *email)
-{
-	g_free(simple->email[id]);
-	simple->email[id] = g_strdup(email);
-	simple->changed = TRUE;
-}
-
-void
-e_card_simple_set_address (ECardSimple *simple, ECardSimpleAddressId id, const ECardAddrLabel *address)
-{
-	e_card_address_label_unref(simple->address[id]);
-	simple->address[id] = e_card_address_label_ref(address);
-	e_card_delivery_address_unref(simple->delivery[id]);
-	simple->delivery[id] = e_card_delivery_address_from_label(simple->address[id]);
-	simple->changed = TRUE;
-}
-
-void            e_card_simple_set_delivery_address (ECardSimple          *simple,
-						    ECardSimpleAddressId  id,
-						    const ECardDeliveryAddress *delivery)
-{
-	e_card_delivery_address_unref(simple->delivery[id]);
-	simple->delivery[id] = e_card_delivery_address_ref(delivery);
-	simple->changed = TRUE;
-}
-
-const char *e_card_simple_get_const    (ECardSimple          *simple,
-					ECardSimpleField      field)
-{
-	char *ret_val = e_card_simple_get(simple, field);
-	if (ret_val)
-		simple->temp_fields = g_list_prepend(simple->temp_fields, ret_val);
-	return ret_val;
-}
-
-char     *e_card_simple_get            (ECardSimple          *simple,
-					ECardSimpleField      field)
-{
-	ECardSimpleInternalType type = field_data[field].type;
-	const ECardAddrLabel *addr;
-	const ECardPhone *phone;
-	const char *string;
-	ECardDate *date;
-	ECardName *name;
-	switch(type) {
-	case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:
-		if (simple->card) {
-			gtk_object_get(GTK_OBJECT(simple->card),
-				       field_data[field].ecard_field, &string,
-				       NULL);
-			return g_strdup(string);
-		} else
-			return NULL;
-	case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:
-		if (simple->card) {
-			gtk_object_get(GTK_OBJECT(simple->card),
-				       field_data[field].ecard_field, &date,
-				       NULL);
-			if (date != NULL) {
-				char buf[26];
-				struct tm then;
-				then.tm_year = date->year;
-				then.tm_mon  = date->month - 1;
-				then.tm_mday = date->day;
-				then.tm_hour = 12;
-				then.tm_min  = 0;
-				then.tm_sec  = 0;
-				e_strftime_fix_am_pm (buf, 26, _("%x"), &then);
-				return g_strdup (buf);
-			} else {
-				return NULL;
-			}
-		} else
-			return NULL;
-	case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:
-		addr = e_card_simple_get_address(simple,
-						 field_data[field].list_type_index);
-		if (addr)
-			return g_strdup(addr->data);
-		else
-			return NULL;
-	case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:
-		phone = e_card_simple_get_phone(simple,
-						field_data[field].list_type_index);
-		if (phone)
-			return g_strdup(phone->number);
-		else
-			return NULL;
-	case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:
-		string = e_card_simple_get_email(simple,
-						 field_data[field].list_type_index);
-		return g_strdup(string);
-	case E_CARD_SIMPLE_INTERNAL_TYPE_BOOL:
-		if (simple->card) {
-			gboolean boole;
-			gtk_object_get (GTK_OBJECT (simple->card),
-					field_data[field].ecard_field, &boole,
-					NULL);
-			if (boole)
-				return "true";
-			else
-				return NULL;
-		} else {
-			return NULL;
-		}
-	case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:
-		switch (field) {
-		case E_CARD_SIMPLE_FIELD_NAME_OR_ORG:
-			if (simple->card) {
-				gtk_object_get(GTK_OBJECT(simple->card),
-					       "file_as", &string,
-					       NULL);
-				if (string && *string)
-					return g_strdup(string);
-				gtk_object_get(GTK_OBJECT(simple->card),
-					       "full_name", &string,
-					       NULL);
-				if (string && *string)
-					return g_strdup(string);
-				gtk_object_get(GTK_OBJECT(simple->card),
-					       "org", &string,
-					       NULL);
-				if (string && *string)
-					return g_strdup(string);
-				string = e_card_simple_get_email(simple,
-								 E_CARD_SIMPLE_EMAIL_ID_EMAIL); 
-				return g_strdup(string);
-			} else
-				return NULL;
-		case E_CARD_SIMPLE_FIELD_FAMILY_NAME:
-			if (simple->card) {
-				gtk_object_get (GTK_OBJECT(simple->card),
-						"name", &name,
-						NULL);
-				return g_strdup (name->family);
-			} else
-				return NULL;
-		case E_CARD_SIMPLE_FIELD_GIVEN_NAME:
-			if (simple->card) {
-				gtk_object_get (GTK_OBJECT(simple->card),
-						"name", &name,
-						NULL);
-				return g_strdup (name->given);
-			} else
-				return NULL;
-		case E_CARD_SIMPLE_FIELD_ADDITIONAL_NAME:
-			if (simple->card) {
-				gtk_object_get (GTK_OBJECT(simple->card),
-						"name", &name,
-						NULL);
-				return g_strdup (name->additional);
-			} else
-				return NULL;
-		case E_CARD_SIMPLE_FIELD_NAME_SUFFIX:
-			if (simple->card) {
-				gtk_object_get (GTK_OBJECT(simple->card),
-						"name", &name,
-						NULL);
-				return g_strdup (name->suffix);
-			} else
-				return NULL;
-		default:
-			return NULL;
-		}
-	default:
-		return NULL;
-	}
-}
-
-static char *
-name_to_style(const ECardName *name, char *company, int style)
-{
-	char *string;
-	char *strings[4], **stringptr;
-	char *substring;
-	switch (style) {
-	case 0:
-		stringptr = strings;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		*stringptr = NULL;
-		string = g_strjoinv(", ", strings);
-		break;
-	case 1:
-		stringptr = strings;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		*stringptr = NULL;
-		string = g_strjoinv(" ", strings);
-		break;
-	case 2:
-		string = g_strdup(company);
-		break;
-	case 3: /* Fall Through */
-	case 4:
-		stringptr = strings;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		*stringptr = NULL;
-		substring = g_strjoinv(", ", strings);
-		if (!(company && *company))
-			company = "";
-		if (style == 3)
-			string = g_strdup_printf("%s (%s)", substring, company);
-		else
-			string = g_strdup_printf("%s (%s)", company, substring);
-		g_free(substring);
-		break;
-	default:
-		string = g_strdup("");
-	}
-	return string;
-}
-
-static int
-file_as_get_style (ECardSimple *simple)
-{
-	char *filestring = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FILE_AS);
-	char *trystring;
-	char *company = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);
-	ECardName *name = NULL;
-	int i;
-	int style;
-	style = 0;
-	if (!company)
-		company = g_strdup("");
-	if (filestring) {
-		gtk_object_get (GTK_OBJECT (simple->card),
-				"name", &name,
-				NULL);
-		
-		if (!name) {
-			goto end;
-		}
-
-		style = -1;
-		
-		for (i = 0; i < 5; i++) {
-			trystring = name_to_style(name, company, i);
-			if (!strcmp(trystring, filestring)) {
-				g_free(trystring);
-				style = i;
-				goto end;
-			}
-			g_free(trystring);
-		}
-	}		
- end:
-		
-	g_free(filestring);
-	g_free(company);
-	
-	return style;
-}
-
-static void
-file_as_set_style(ECardSimple *simple, int style)
-{
-	if (style != -1) {
-		char *string;
-		char *company = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);
-		ECardName *name;
-
-		if (!company)
-			company = g_strdup("");
-		gtk_object_get (GTK_OBJECT (simple->card),
-				"name", &name,
-				NULL);
-		if (name) {
-			string = name_to_style(name, company, style);
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_FILE_AS, string);
-			g_free(string);
-		}
-		g_free(company);
-	}
-}
-
-void            e_card_simple_set            (ECardSimple          *simple,
-					      ECardSimpleField      field,
-					      const char           *data)
-{
-	ECardSimpleInternalType type = field_data[field].type;
-	ECardAddrLabel *address;
-	ECardPhone *phone;
-	int style;
-	simple->changed = TRUE;
-	switch (field) {
-	case E_CARD_SIMPLE_FIELD_FULL_NAME:
-	case E_CARD_SIMPLE_FIELD_ORG:
-		style = file_as_get_style(simple);
-		gtk_object_set(GTK_OBJECT(simple->card),
-			       field_data[field].ecard_field, data,
-			       NULL);
-		file_as_set_style(simple, style);
-		break;
-	default:
-		switch(type) {
-		case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:
-			gtk_object_set(GTK_OBJECT(simple->card),
-				       field_data[field].ecard_field, data,
-				       NULL);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:
-			break; /* FIXME!!!! */
-		case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:
-			address = e_card_address_label_new();
-			address->data = g_strdup (data);
-			e_card_simple_set_address(simple,
-						  field_data[field].list_type_index,
-						  address);
-			e_card_address_label_unref(address);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:
-			phone = e_card_phone_new();
-			phone->number = g_strdup (data);
-			e_card_simple_set_phone(simple,
-						field_data[field].list_type_index,
-						phone);
-			e_card_phone_unref(phone);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:
-			e_card_simple_set_email(simple,
-						field_data[field].list_type_index,
-						data);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_BOOL:
-			if (simple->card) {
-				gboolean boole = TRUE;
-				if (data == NULL)
-					boole = FALSE;
-				else if (!strcasecmp (data, "false"))
-					boole = FALSE;
-				gtk_object_set (GTK_OBJECT (simple->card),
-						field_data[field].ecard_field, boole,
-						NULL);
-			}
-			break;
-		}
-		break;
-	}
-}
-					     
-ECardSimpleType e_card_simple_type       (ECardSimple          *simple,
-					  ECardSimpleField      field)
-{
-	ECardSimpleInternalType type = field_data[field].type;
-	switch(type) {
-	case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:
-	default:
-		return E_CARD_SIMPLE_TYPE_STRING;
-
-	case E_CARD_SIMPLE_INTERNAL_TYPE_BOOL:
-		return E_CARD_SIMPLE_TYPE_BOOL;
-
-	case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:
-		return E_CARD_SIMPLE_TYPE_DATE;
-
-	case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:
-		return E_CARD_SIMPLE_TYPE_STRING;
-	}
-}
-
-const char     *e_card_simple_get_ecard_field (ECardSimple         *simple,
-					       ECardSimpleField     field)
-{
-	return field_data[field].ecard_field;
-}
-
-const char     *e_card_simple_get_name       (ECardSimple          *simple,
-					      ECardSimpleField      field)
-{
-	return U_(field_data[field].name);
-}
-
-gboolean
-e_card_simple_get_allow_newlines (ECardSimple          *simple,
-				  ECardSimpleField      field)
-{
-	ECardSimpleInternalType type = field_data[field].type;
-	switch(type) {
-	case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_BOOL:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:
-	default:
-		switch (field) {
-		case E_CARD_SIMPLE_FIELD_NOTE:
-			return TRUE;
-		default:
-			return FALSE;
-		}
-
-	case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:
-		return TRUE;
-	}
-}
-
-const char     *e_card_simple_get_short_name (ECardSimple          *simple,
-					      ECardSimpleField      field)
-{
-	return U_(field_data[field].short_name);
-}
-
-void                  e_card_simple_arbitrary_foreach (ECardSimple                  *simple,
-						       ECardSimpleArbitraryCallback *callback,
-						       gpointer                      closure)
-{
-	if (simple->card) {
-		EList *list;
-		EIterator *iterator;
-		gtk_object_get(GTK_OBJECT(simple->card),
-			       "arbitrary", &list,
-			       NULL);
-		for (iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);
-			if (callback)
-				(*callback) (arbitrary, closure);
-		}
-		e_card_free_empty_lists (simple->card);
-	}
-}
-
-const ECardArbitrary *e_card_simple_get_arbitrary     (ECardSimple          *simple,
-						       const char           *key)
-{
-	if (simple->card) {
-		EList *list;
-		EIterator *iterator;
-		gtk_object_get(GTK_OBJECT(simple->card),
-			       "arbitrary", &list,
-			       NULL);
-		for (iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);
-			if (!strcasecmp(arbitrary->key, key))
-				return arbitrary;
-		}
-		e_card_free_empty_lists (simple->card);
-	}
-	return NULL;
-}
-
-/* Any of these except key can be NULL */	      
-void                  e_card_simple_set_arbitrary     (ECardSimple          *simple,
-						       const char           *key,
-						       const char           *type,
-						       const char           *value)
-{
-	if (simple->card) {
-		ECardArbitrary *new_arb;
-		EList *list;
-		EIterator *iterator;
-
-		simple->changed = TRUE;
-		gtk_object_get(GTK_OBJECT(simple->card),
-			       "arbitrary", &list,
-			       NULL);
-		for (iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);
-			if (!strcasecmp(arbitrary->key, key)) {
-				new_arb = e_card_arbitrary_new();
-				new_arb->key = g_strdup(key);
-				new_arb->type = g_strdup(type);
-				new_arb->value = g_strdup(value);
-				e_iterator_set(iterator, new_arb);
-				e_card_arbitrary_unref(new_arb);
-				return;
-			}
-		}
-		new_arb = e_card_arbitrary_new();
-		new_arb->key = g_strdup(key);
-		new_arb->type = g_strdup(type);
-		new_arb->value = g_strdup(value);
-		e_list_append(list, new_arb);
-		e_card_arbitrary_unref(new_arb);
-	}
-}
-
-void
-e_card_simple_set_name (ECardSimple *simple, ECardName *name)
-{
-	int style;
-	style = file_as_get_style(simple);
-	gtk_object_set (GTK_OBJECT (simple->card),
-			"name", name,
-			NULL);
-	file_as_set_style(simple, style);
-}
-
-/* These map between the individual list types and ECardSimpleField */
-ECardSimpleField
-e_card_simple_map_phone_to_field (ECardSimplePhoneId phone_id)
-{
-	int i;
-
-	g_return_val_if_fail (phone_id < E_CARD_SIMPLE_PHONE_ID_LAST, 0);
-
-	for (i = 0; i < field_data_count; i ++)
-		if (field_data[i].list_type_index == phone_id
-		    && field_data[i].type == E_CARD_SIMPLE_INTERNAL_TYPE_PHONE)
-			return i;
-
-	g_warning ("couldn't find phone id %d, returning 0 (which is almost assuredly incorrect)\n", phone_id);
-
-	return 0;
-}
-
-ECardSimpleField
-e_card_simple_map_email_to_field (ECardSimpleEmailId email_id)
-{
-	int i;
-
-	g_return_val_if_fail (email_id < E_CARD_SIMPLE_EMAIL_ID_LAST, 0);
-
-	for (i = 0; i < field_data_count; i ++)
-		if (field_data[i].list_type_index == email_id
-		    && field_data[i].type == E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL)
-			return i;
-
-	g_warning ("couldn't find email id %d, returning 0 (which is almost assuredly incorrect)\n", email_id);
-	return 0;
-}
-
-ECardSimpleField
-e_card_simple_map_address_to_field (ECardSimpleAddressId address_id)
-{
-	int i;
-
-	g_return_val_if_fail (address_id < E_CARD_SIMPLE_ADDRESS_ID_LAST, 0);
-
-	for (i = 0; i < field_data_count; i ++)
-		if (field_data[i].list_type_index == address_id
-		    && field_data[i].type == E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS)
-			return i;
-
-	g_warning ("couldn't find address id %d, returning 0 (which is almost assuredly incorrect)\n", address_id);
-	return 0;
-}
diff --git a/addressbook/backend/ebook/e-card-simple.h b/addressbook/backend/ebook/e-card-simple.h
deleted file mode 100644
index 130819c853..0000000000
--- a/addressbook/backend/ebook/e-card-simple.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   Arturo Espinosa
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_CARD_SIMPLE_H__
-#define __E_CARD_SIMPLE_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-types.h>
-#include <e-util/e-list.h>
-
-#define E_TYPE_CARD_SIMPLE            (e_card_simple_get_type ())
-#define E_CARD_SIMPLE(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD_SIMPLE, ECardSimple))
-#define E_CARD_SIMPLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CARD_SIMPLE, ECardSimpleClass))
-#define E_IS_CARD_SIMPLE(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CARD_SIMPLE))
-#define E_IS_CARD_SIMPLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD_SIMPLE))
-
-typedef enum _ECardSimplePhoneId ECardSimplePhoneId;
-typedef enum _ECardSimpleEmailId ECardSimpleEmailId;
-typedef enum _ECardSimpleAddressId ECardSimpleAddressId;
-typedef enum _ECardSimpleType ECardSimpleType;
-typedef enum _ECardSimpleField ECardSimpleField;
-
-enum _ECardSimplePhoneId {
-	E_CARD_SIMPLE_PHONE_ID_ASSISTANT,
-	E_CARD_SIMPLE_PHONE_ID_BUSINESS,
-	E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,
-	E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX,
-	E_CARD_SIMPLE_PHONE_ID_CALLBACK,
-	E_CARD_SIMPLE_PHONE_ID_CAR,
-	E_CARD_SIMPLE_PHONE_ID_COMPANY,
-	E_CARD_SIMPLE_PHONE_ID_HOME,
-	E_CARD_SIMPLE_PHONE_ID_HOME_2,
-	E_CARD_SIMPLE_PHONE_ID_HOME_FAX,
-	E_CARD_SIMPLE_PHONE_ID_ISDN,
-	E_CARD_SIMPLE_PHONE_ID_MOBILE,
-	E_CARD_SIMPLE_PHONE_ID_OTHER,
-	E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,
-	E_CARD_SIMPLE_PHONE_ID_PAGER,
-	E_CARD_SIMPLE_PHONE_ID_PRIMARY,
-	E_CARD_SIMPLE_PHONE_ID_RADIO,
-	E_CARD_SIMPLE_PHONE_ID_TELEX,
-	E_CARD_SIMPLE_PHONE_ID_TTYTTD,
-	E_CARD_SIMPLE_PHONE_ID_LAST
-};
-
-/* We need HOME and WORK email addresses here. */
-enum _ECardSimpleEmailId {
-	E_CARD_SIMPLE_EMAIL_ID_EMAIL,
-	E_CARD_SIMPLE_EMAIL_ID_EMAIL_2,
-	E_CARD_SIMPLE_EMAIL_ID_EMAIL_3,
-	E_CARD_SIMPLE_EMAIL_ID_LAST
-};
-
-/* Should this include (BILLING/SHIPPING)? */
-enum _ECardSimpleAddressId {
-	E_CARD_SIMPLE_ADDRESS_ID_BUSINESS,
-	E_CARD_SIMPLE_ADDRESS_ID_HOME,
-	E_CARD_SIMPLE_ADDRESS_ID_OTHER,
-	E_CARD_SIMPLE_ADDRESS_ID_LAST
-};
-
-enum _ECardSimpleType {
-	E_CARD_SIMPLE_TYPE_STRING,
-	E_CARD_SIMPLE_TYPE_DATE,
-	E_CARD_SIMPLE_TYPE_BOOL,
-};
-
-enum _ECardSimpleField {
-	E_CARD_SIMPLE_FIELD_FILE_AS,
-        E_CARD_SIMPLE_FIELD_FULL_NAME,
-        E_CARD_SIMPLE_FIELD_EMAIL,
-        E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,
-	E_CARD_SIMPLE_FIELD_PHONE_ASSISTANT,
-        E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,
-        E_CARD_SIMPLE_FIELD_PHONE_CALLBACK,
-        E_CARD_SIMPLE_FIELD_PHONE_COMPANY,
-        E_CARD_SIMPLE_FIELD_PHONE_HOME,
-        E_CARD_SIMPLE_FIELD_ORG,
-        E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS,
-        E_CARD_SIMPLE_FIELD_ADDRESS_HOME,
-        E_CARD_SIMPLE_FIELD_PHONE_MOBILE,
-        E_CARD_SIMPLE_FIELD_PHONE_CAR,
-        E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX,
-        E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,
-        E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2,
-        E_CARD_SIMPLE_FIELD_PHONE_HOME_2,
-        E_CARD_SIMPLE_FIELD_PHONE_ISDN,
-        E_CARD_SIMPLE_FIELD_PHONE_OTHER,
-        E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX,
-        E_CARD_SIMPLE_FIELD_PHONE_PAGER,
-        E_CARD_SIMPLE_FIELD_PHONE_RADIO,
-        E_CARD_SIMPLE_FIELD_PHONE_TELEX,
-        E_CARD_SIMPLE_FIELD_PHONE_TTYTTD,
-        E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,
-        E_CARD_SIMPLE_FIELD_EMAIL_2,
-        E_CARD_SIMPLE_FIELD_EMAIL_3,
-        E_CARD_SIMPLE_FIELD_URL,
-        E_CARD_SIMPLE_FIELD_ORG_UNIT,
-        E_CARD_SIMPLE_FIELD_OFFICE,
-        E_CARD_SIMPLE_FIELD_TITLE,
-        E_CARD_SIMPLE_FIELD_ROLE,
-        E_CARD_SIMPLE_FIELD_MANAGER,
-        E_CARD_SIMPLE_FIELD_ASSISTANT,
-        E_CARD_SIMPLE_FIELD_NICKNAME,
-        E_CARD_SIMPLE_FIELD_SPOUSE,
-        E_CARD_SIMPLE_FIELD_NOTE,
-        E_CARD_SIMPLE_FIELD_CALURI,
-        E_CARD_SIMPLE_FIELD_FBURL,
-	/* If you add after FBURL, make sure to move LAST_SIMPLE_STRING */
-	E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING = E_CARD_SIMPLE_FIELD_FBURL,
-        E_CARD_SIMPLE_FIELD_ANNIVERSARY,
-        E_CARD_SIMPLE_FIELD_BIRTH_DATE,
-	E_CARD_SIMPLE_FIELD_MAILER,
-	E_CARD_SIMPLE_FIELD_NAME_OR_ORG,
-	E_CARD_SIMPLE_FIELD_CATEGORIES,
-        E_CARD_SIMPLE_FIELD_FAMILY_NAME,
-        E_CARD_SIMPLE_FIELD_GIVEN_NAME,
-        E_CARD_SIMPLE_FIELD_ADDITIONAL_NAME,
-        E_CARD_SIMPLE_FIELD_NAME_SUFFIX,
-	E_CARD_SIMPLE_FIELD_WANTS_HTML,
-	E_CARD_SIMPLE_FIELD_IS_LIST,
-        E_CARD_SIMPLE_FIELD_LAST
-};
-
-typedef struct _ECardSimple ECardSimple;
-typedef struct _ECardSimpleClass ECardSimpleClass;
-
-struct _ECardSimple {
-	GtkObject object;
-	ECard *card;
-
-	GList *temp_fields;
-
-	ECardPhone *phone[E_CARD_SIMPLE_PHONE_ID_LAST];
-	char *email[E_CARD_SIMPLE_EMAIL_ID_LAST];
-	ECardAddrLabel *address[E_CARD_SIMPLE_ADDRESS_ID_LAST];
-	ECardDeliveryAddress *delivery[E_CARD_SIMPLE_ADDRESS_ID_LAST];
-
-	gboolean changed;
-};
-
-struct _ECardSimpleClass {
-	GtkObjectClass parent_class;
-};
-
-typedef void (*ECardSimpleArbitraryCallback) (const ECardArbitrary *arbitrary, gpointer closure);
-ECardSimple                *e_card_simple_new                    (ECard                        *card);
-const char                 *e_card_simple_get_id                 (ECardSimple                  *simple);
-void                        e_card_simple_set_id                 (ECardSimple                  *simple,
-								  const gchar                  *character);
-char                       *e_card_simple_get_vcard              (ECardSimple                  *simple);
-char                       *e_card_simple_get_vcard_assume_utf8  (ECardSimple                  *simple);
-ECardSimple                *e_card_simple_duplicate              (ECardSimple                  *simple);
-char                       *e_card_simple_get                    (ECardSimple                  *simple,
-								  ECardSimpleField              field);
-const char                 *e_card_simple_get_const              (ECardSimple                  *simple,
-								  ECardSimpleField              field);
-void                        e_card_simple_set                    (ECardSimple                  *simple,
-								  ECardSimpleField              field,
-								  const char                   *data);
-ECardSimpleType             e_card_simple_type                   (ECardSimple                  *simple,
-								  ECardSimpleField              field);
-
-const char                 *e_card_simple_get_ecard_field        (ECardSimple                  *simple,
-								  ECardSimpleField              field);
-const char                 *e_card_simple_get_name               (ECardSimple                  *simple,
-								  ECardSimpleField              field);
-const char                 *e_card_simple_get_short_name         (ECardSimple                  *simple,
-								  ECardSimpleField              field);
-gboolean                    e_card_simple_get_allow_newlines     (ECardSimple                  *simple,
-								  ECardSimpleField              field);
-
-
-/* Use these only if building lists of specific types.  It should be
- * easier to use the above if you consider a phone field to be the
- * same as any other field.
- */
-const ECardPhone           *e_card_simple_get_phone              (ECardSimple                  *simple,
-								  ECardSimplePhoneId            id);
-const char                 *e_card_simple_get_email              (ECardSimple                  *simple,
-								  ECardSimpleEmailId            id);
-const ECardAddrLabel       *e_card_simple_get_address            (ECardSimple                  *simple,
-								  ECardSimpleAddressId          id);
-const ECardDeliveryAddress *e_card_simple_get_delivery_address   (ECardSimple                  *simple,
-								  ECardSimpleAddressId          id);
-void                        e_card_simple_set_phone              (ECardSimple                  *simple,
-								  ECardSimplePhoneId            id,
-								  const ECardPhone             *phone);
-void                        e_card_simple_set_email              (ECardSimple                  *simple,
-								  ECardSimpleEmailId            id,
-								  const char                   *email);
-void                        e_card_simple_set_address            (ECardSimple                  *simple,
-								  ECardSimpleAddressId          id,
-								  const ECardAddrLabel         *address);
-void                        e_card_simple_set_delivery_address   (ECardSimple                  *simple,
-								  ECardSimpleAddressId          id,
-								  const ECardDeliveryAddress   *delivery);
-void                        e_card_simple_arbitrary_foreach      (ECardSimple                  *simple,
-								  ECardSimpleArbitraryCallback *callback,
-								  gpointer                      closure);
-const ECardArbitrary       *e_card_simple_get_arbitrary          (ECardSimple                  *simple,
-								  const char                   *key);
-/* Any of these except key can be NULL */	      
-void                        e_card_simple_set_arbitrary          (ECardSimple                  *simple,
-								  const char                   *key,
-								  const char                   *type,
-								  const char                   *value);
-void                        e_card_simple_set_name               (ECardSimple                  *simple,
-								  ECardName                    *name);
-void                        e_card_simple_sync_card              (ECardSimple                  *simple);
-
-/* These map between the individual list types and ECardSimpleField */
-ECardSimpleField            e_card_simple_map_phone_to_field     (ECardSimplePhoneId            phone_id);
-ECardSimpleField            e_card_simple_map_email_to_field     (ECardSimpleEmailId            email_id);
-ECardSimpleField            e_card_simple_map_address_to_field   (ECardSimpleAddressId          address_id);
-
-/* Standard Gtk function */			      
-GtkType                     e_card_simple_get_type               (void);
-
-#endif /* ! __E_CARD_SIMPLE_H__ */
-
-
diff --git a/addressbook/backend/ebook/e-card-types.h b/addressbook/backend/ebook/e-card-types.h
deleted file mode 100644
index 588a1f5e68..0000000000
--- a/addressbook/backend/ebook/e-card-types.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Arturo Espinosa
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_CARD_TYPES_H__
-#define __E_CARD_TYPES_H__
-
-/* IDENTIFICATION PROPERTIES */
-
-typedef struct {
-	gint  ref_count;
-	char *prefix;        /* Mr. */
-	char *given;         /* John */
-	char *additional;    /* Quinlan */
-	char *family;        /* Public */
-	char *suffix;        /* Esq. */
-} ECardName;
-
-typedef struct {
-	int year;
-	int month;
-	int day;
-} ECardDate;
-
-/* TELECOMMUNICATIONS ADDRESSING PROPERTIES */
-
-typedef enum {
-	E_CARD_PHONE_PREF      = 1 << 0,
-	E_CARD_PHONE_WORK      = 1 << 1,
-	E_CARD_PHONE_HOME      = 1 << 2,
-	E_CARD_PHONE_VOICE     = 1 << 3,
-	E_CARD_PHONE_FAX       = 1 << 4,
-	E_CARD_PHONE_MSG       = 1 << 5,
-	E_CARD_PHONE_CELL      = 1 << 6,
-	E_CARD_PHONE_PAGER     = 1 << 7,
-	E_CARD_PHONE_BBS       = 1 << 8,
-	E_CARD_PHONE_MODEM     = 1 << 9,
-	E_CARD_PHONE_CAR       = 1 << 10,
-	E_CARD_PHONE_ISDN      = 1 << 11,
-	E_CARD_PHONE_VIDEO     = 1 << 12,
-	E_CARD_PHONE_ASSISTANT = 1 << 13,
-	E_CARD_PHONE_CALLBACK  = 1 << 14,
-	E_CARD_PHONE_RADIO     = 1 << 15,
-	E_CARD_PHONE_TELEX     = 1 << 16,
-	E_CARD_PHONE_TTYTDD    = 1 << 17,
-} ECardPhoneFlags;
-
-typedef struct {
-	gint ref_count;
-	ECardPhoneFlags  flags;
-	char            *number;
-} ECardPhone;
-
-/* DELIVERY ADDRESSING PROPERTIES */
-
-typedef enum {
-	E_CARD_ADDR_HOME   = 1 << 0, 
-	E_CARD_ADDR_WORK   = 1 << 1,
-	E_CARD_ADDR_POSTAL = 1 << 2, 
-	E_CARD_ADDR_PARCEL = 1 << 3, 
-	E_CARD_ADDR_DOM    = 1 << 4,
-	E_CARD_ADDR_INTL   = 1 << 5 
-} ECardAddressFlags;
-
-typedef struct {
-	gint ref_count;
-	ECardAddressFlags  flags;
-
-	char     	  *po;
-	char     	  *ext;
-	char     	  *street;
-	char     	  *city;
-	char     	  *region;
-	char     	  *code;
-	char     	  *country;
-} ECardDeliveryAddress;
-
-typedef struct {
-	gint ref_count;
-	ECardAddressFlags  flags;
-	char              *data;
-} ECardAddrLabel;
-
-/* ARBITRARY PROPERTIES */
-
-typedef struct {
-	gint ref_count;
-	char *key;
-	char *type;
-	char *value;
-} ECardArbitrary;
-
-#endif /* __E_CARD_TYPES_H__ */
diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c
deleted file mode 100644
index d7f5457326..0000000000
--- a/addressbook/backend/ebook/e-card.c
+++ /dev/null
@@ -1,4358 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Arturo Espinosa (arturo@nuclecu.unam.mx)
- *   Nat Friedman    (nat@ximian.com)
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#include <config.h>
-
-#include "e-card.h"
-
-#include <gal/util/e-i18n.h>
-#include <gal/widgets/e-unicode.h>
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <math.h>
-
-#include <gtk/gtkobject.h>
-#include <bonobo/bonobo-object-client.h>
-#include <gal/util/e-util.h>
-
-#include <libversit/vcc.h>
-#include "e-util/ename/e-name-western.h"
-#include "e-util/ename/e-address-western.h"
-#include "e-book.h"
-#include "e-destination.h"
-
-#define is_a_prop_of(obj,prop) (isAPropertyOf ((obj),(prop)))
-#define str_val(obj) (the_str = (vObjectValueType (obj))? fakeCString (vObjectUStringZValue (obj)) : calloc (1, 1))
-#define has(obj,prop) (vo = isAPropertyOf ((obj), (prop)))
-
-#define XEV_WANTS_HTML "X-MOZILLA-HTML"
-#define XEV_ARBITRARY "X-EVOLUTION-ARBITRARY"
-#define XEV_LIST "X-EVOLUTION-LIST"
-#define XEV_LIST_SHOW_ADDRESSES "X-EVOLUTION-LIST-SHOW_ADDRESSES"
-#define XEV_RELATED_CONTACTS "X-EVOLUTION-RELATED_CONTACTS"
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_FILE_AS,
-	ARG_FULL_NAME,
-	ARG_NAME,
-	ARG_ADDRESS,
-	ARG_ADDRESS_LABEL,
-	ARG_PHONE,
-	ARG_EMAIL,
-	ARG_BIRTH_DATE,
-	ARG_URL,
-	ARG_ORG,
-	ARG_ORG_UNIT,
-	ARG_OFFICE,
-	ARG_TITLE,
-	ARG_ROLE,
-	ARG_MANAGER,
-	ARG_ASSISTANT,
-	ARG_NICKNAME,
-	ARG_SPOUSE,
-	ARG_ANNIVERSARY,
-	ARG_MAILER,
-	ARG_CALURI,
-	ARG_FBURL,
-	ARG_NOTE,
-	ARG_RELATED_CONTACTS,
-	ARG_CATEGORIES,
-	ARG_CATEGORY_LIST,
-	ARG_WANTS_HTML,
-	ARG_WANTS_HTML_SET,
-	ARG_EVOLUTION_LIST,
-	ARG_EVOLUTION_LIST_SHOW_ADDRESSES,
-	ARG_ARBITRARY,
-	ARG_ID,
-	ARG_LAST_USE,
-	ARG_USE_SCORE,
-};
-
-#if 0
-static VObject *card_convert_to_vobject (ECard *crd);
-#endif
-static void parse(ECard *card, VObject *vobj, char *default_charset);
-static void e_card_init (ECard *card);
-static void e_card_class_init (ECardClass *klass);
-
-static void e_card_destroy (GtkObject *object);
-static void e_card_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_card_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void assign_string(VObject *vobj, char *default_charset, char **string);
-
-char *e_v_object_get_child_value(VObject *vobj, char *name, char *default_charset);
-
-static void parse_bday(ECard *card, VObject *object, char *default_charset);
-static void parse_full_name(ECard *card, VObject *object, char *default_charset);
-static void parse_file_as(ECard *card, VObject *object, char *default_charset);
-static void parse_name(ECard *card, VObject *object, char *default_charset);
-static void parse_email(ECard *card, VObject *object, char *default_charset);
-static void parse_phone(ECard *card, VObject *object, char *default_charset);
-static void parse_address(ECard *card, VObject *object, char *default_charset);
-static void parse_address_label(ECard *card, VObject *object, char *default_charset);
-static void parse_url(ECard *card, VObject *object, char *default_charset);
-static void parse_org(ECard *card, VObject *object, char *default_charset);
-static void parse_office(ECard *card, VObject *object, char *default_charset);
-static void parse_title(ECard *card, VObject *object, char *default_charset);
-static void parse_role(ECard *card, VObject *object, char *default_charset);
-static void parse_manager(ECard *card, VObject *object, char *default_charset);
-static void parse_assistant(ECard *card, VObject *object, char *default_charset);
-static void parse_nickname(ECard *card, VObject *object, char *default_charset);
-static void parse_spouse(ECard *card, VObject *object, char *default_charset);
-static void parse_anniversary(ECard *card, VObject *object, char *default_charset);
-static void parse_mailer(ECard *card, VObject *object, char *default_charset);
-static void parse_caluri(ECard *card, VObject *object, char *default_charset);
-static void parse_fburl(ECard *card, VObject *object, char *default_charset);
-static void parse_note(ECard *card, VObject *object, char *default_charset);
-static void parse_related_contacts(ECard *card, VObject *object, char *default_charset);
-static void parse_categories(ECard *card, VObject *object, char *default_charset);
-static void parse_wants_html(ECard *card, VObject *object, char *default_charset);
-static void parse_list(ECard *card, VObject *object, char *default_charset);
-static void parse_list_show_addresses(ECard *card, VObject *object, char *default_charset);
-static void parse_arbitrary(ECard *card, VObject *object, char *default_charset);
-static void parse_id(ECard *card, VObject *object, char *default_charset);
-static void parse_last_use(ECard *card, VObject *object, char *default_charset);
-static void parse_use_score(ECard *card, VObject *object, char *default_charset);
-
-static ECardPhoneFlags get_phone_flags (VObject *vobj);
-static void set_phone_flags (VObject *vobj, ECardPhoneFlags flags);
-static ECardAddressFlags get_address_flags (VObject *vobj);
-static void set_address_flags (VObject *vobj, ECardAddressFlags flags);
-
-typedef void (* ParsePropertyFunc) (ECard *card, VObject *object, char *default_charset);
-
-struct {
-	char *key;
-	ParsePropertyFunc function;
-} attribute_jump_array[] = 
-{
-	{ VCFullNameProp,            parse_full_name },
-	{ "X-EVOLUTION-FILE-AS",     parse_file_as },
-	{ VCNameProp,                parse_name },
-	{ VCBirthDateProp,           parse_bday },
-	{ VCEmailAddressProp,        parse_email },
-	{ VCTelephoneProp,           parse_phone },
-	{ VCAdrProp,                 parse_address },
-	{ VCDeliveryLabelProp,       parse_address_label },
-	{ VCURLProp,                 parse_url },
-	{ VCOrgProp,                 parse_org },
-	{ "X-EVOLUTION-OFFICE",      parse_office },
-	{ VCTitleProp,               parse_title },
-	{ VCBusinessRoleProp,        parse_role },
-	{ "X-EVOLUTION-MANAGER",     parse_manager },
-	{ "X-EVOLUTION-ASSISTANT",   parse_assistant },
-	{ "NICKNAME",                parse_nickname },
-	{ "X-EVOLUTION-SPOUSE",      parse_spouse },
-	{ "X-EVOLUTION-ANNIVERSARY", parse_anniversary },   
-	{ VCMailerProp,              parse_mailer },
-	{ "CALURI",                  parse_caluri },
-	{ "FBURL",                   parse_fburl },
-	{ VCNoteProp,                parse_note },
-	{ XEV_RELATED_CONTACTS,      parse_related_contacts },
-	{ "CATEGORIES",              parse_categories },
-	{ XEV_WANTS_HTML,            parse_wants_html },
-	{ XEV_ARBITRARY,             parse_arbitrary },
-	{ VCUniqueStringProp,        parse_id },
-	{ "X-EVOLUTION-LAST-USE",    parse_last_use },
-	{ "X-EVOLUTION-USE-SCORE",   parse_use_score },
-	{ XEV_LIST,                  parse_list },
-	{ XEV_LIST_SHOW_ADDRESSES,   parse_list_show_addresses },
-	{ VCUniqueStringProp,        parse_id }
-};
-
-/**
- * e_card_get_type:
- * @void: 
- * 
- * Registers the &ECard class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ECard class.
- **/
-GtkType
-e_card_get_type (void)
-{
-	static GtkType card_type = 0;
-
-	if (!card_type) {
-		GtkTypeInfo card_info = {
-			"ECard",
-			sizeof (ECard),
-			sizeof (ECardClass),
-			(GtkClassInitFunc) e_card_class_init,
-			(GtkObjectInitFunc) e_card_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		card_type = gtk_type_unique (gtk_object_get_type (), &card_info);
-	}
-
-	return card_type;
-}
-
-ECard *
-e_card_new_with_default_charset (char *vcard, char *default_charset)
-{
-	ECard *card = E_CARD(gtk_type_new(e_card_get_type()));
-	VObject *vobj = Parse_MIME(vcard, strlen(vcard));
-	while(vobj) {
-		VObject *next;
-		parse(card, vobj, default_charset);
-		next = nextVObjectInList(vobj);
-		cleanVObject(vobj);
-		vobj = next;
-	}
-	if (card->name == NULL)
-		card->name = e_card_name_new();
-	if (card->file_as == NULL)
-		card->file_as = g_strdup("");
-	if (card->fname == NULL)
-		card->fname = g_strdup("");
-	return card;
-}
-
-/**
- * e_card_new:
- * @vcard: a string in vCard format
- *
- * Returns: a new #ECard that wraps the @vcard.
- */
-ECard *
-e_card_new (char *vcard)
-{
-	return e_card_new_with_default_charset (vcard, "UTF-8");
-}
-
-ECard *
-e_card_duplicate(ECard *card)
-{
-	char *vcard = e_card_get_vcard_assume_utf8(card);
-	ECard *new_card = e_card_new(vcard);
-	g_free (vcard);
-	
-	if (card->book) {
-		new_card->book = card->book;
-		gtk_object_ref (GTK_OBJECT (new_card->book));
-	}
-
-	return new_card;
-}
-
-static void
-e_card_get_today (GDate *dt)
-{
-	time_t now;
-	struct tm *now_tm;
-	if (dt == NULL)
-		return;
-	
-	time (&now);
-	now_tm = localtime (&now);
-
-	g_date_set_dmy (dt, now_tm->tm_mday, now_tm->tm_mon + 1, now_tm->tm_year + 1900);
-}
-
-float
-e_card_get_use_score(ECard *card)
-{
-	GDate today, last_use;
-	gint days_since_last_use;
-
-	g_return_val_if_fail (card != NULL && E_IS_CARD (card), 0);
-
-	if (card->last_use == NULL)
-		return 0.0;
-
-	e_card_get_today (&today);
-	g_date_set_dmy (&last_use, card->last_use->day, card->last_use->month, card->last_use->year);
-
-	days_since_last_use = g_date_julian (&today) - g_date_julian (&last_use);
-	
-	/* Apply a seven-day "grace period" to the use score decay. */
-	days_since_last_use -= 7;
-	if (days_since_last_use < 0)
-		days_since_last_use = 0;
-
-	return MAX (card->raw_use_score, 0) * exp (- days_since_last_use / 30.0);
-}
-
-void
-e_card_touch(ECard *card)
-{
-	GDate today;
-	double use_score;
-
-	g_return_if_fail (card != NULL && E_IS_CARD (card));
-
-	e_card_get_today (&today);
-	use_score = e_card_get_use_score (card);
-
-	if (card->last_use == NULL)
-		card->last_use = g_new (ECardDate, 1);
-
-	card->last_use->day   = g_date_day (&today);
-	card->last_use->month = g_date_month (&today);
-	card->last_use->year  = g_date_year (&today);
-
-	card->raw_use_score   = use_score + 1.0;
-}
-
-/**
- * e_card_get_id:
- * @card: an #ECard
- *
- * Returns: a string representing the id of the card, which is unique
- * within its book.
- */
-const char *
-e_card_get_id (ECard *card)
-{
-	g_return_val_if_fail (card && E_IS_CARD (card), NULL);
-
-	return card->id ? card->id : "";
-}
-
-/**
- * e_card_get_id:
- * @card: an #ECard
- * @id: a id in string format
- *
- * Sets the identifier of a card, which should be unique within its
- * book.
- */
-void
-e_card_set_id (ECard *card, const char *id)
-{
-	g_return_if_fail (card && E_IS_CARD (card));
-
-	if ( card->id )
-		g_free(card->id);
-	card->id = g_strdup(id ? id : "");
-}
-
-EBook *
-e_card_get_book (ECard *card)
-{
-	g_return_val_if_fail (card && E_IS_CARD (card), NULL);
-
-	return card->book;
-}
-
-void
-e_card_set_book (ECard *card, EBook *book)
-{
-	g_return_if_fail (card && E_IS_CARD (card));
-	
-	if (card->book)
-		gtk_object_unref (GTK_OBJECT (card->book));
-	card->book = book;
-	if (card->book)
-		gtk_object_ref (GTK_OBJECT (card->book));
-}
-
-gchar *
-e_card_date_to_string (ECardDate *dt)
-{
-	if (dt) 
-		return g_strdup_printf ("%04d-%02d-%02d",
-					CLAMP(dt->year, 1000, 9999),
-					CLAMP(dt->month, 1, 12),
-					CLAMP(dt->day, 1, 31));
-	else
-		return NULL;
-}
-
-static VObject *
-addPropValueUTF8(VObject *o, const char *p, const char *v)
-{
-	VObject *prop = addPropValue (o, p, v);
-	for (; *v; v++) {
-		if ((*v) & 0x80) {
-			addPropValue (prop, "CHARSET", "UTF-8");
-			for (; *v; v++) {
-				if (*v == '\n') {
-					addProp(prop, VCQuotedPrintableProp);
-					return prop;
-				}
-			}
-			return prop;
-		}
-		if (*v == '\n') {
-			addProp(prop, VCQuotedPrintableProp);
-			for (; *v; v++) {
-				if ((*v) & 0x80) {
-					addPropValue (prop, "CHARSET", "UTF-8");
-					return prop;
-				}
-			}
-			return prop;
-		}
-	}
-	return prop;
-}
-
-static VObject *
-addPropValueQP(VObject *o, const char *p, const char *v)
-{
-	VObject *prop = addPropValue (o, p, v);
-	for (; *v; v++) {
-		if (*v == '\n') {
-			addProp(prop, VCQuotedPrintableProp);
-			break;
-		}
-	}
-	return prop;
-}
-
-static void
-addPropValueSets (VObject *o, const char *p, const char *v, gboolean assumeUTF8, gboolean *is_ascii, gboolean *has_return)
-{
-	addPropValue (o, p, v);
-	if (*has_return && (assumeUTF8 || !*is_ascii))
-		return;
-	if (*has_return) {
-		for (; *v; v++) {
-			if (*v & 0x80) {
-				*is_ascii = FALSE;
-				return;
-			}
-		}
-		return;
-	}
-	if (assumeUTF8 || !*is_ascii) {
-		for (; *v; v++) {
-			if (*v == '\n') {
-				*has_return = TRUE;
-				return;
-			}
-		}
-		return;
-	}
-	for (; *v; v++) {
-		if (*v & 0x80) {
-			*is_ascii = FALSE;
-			for (; *v; v++) {
-				if (*v == '\n') {
-					*has_return = TRUE;
-					return;
-				}
-			}
-			return;
-		}
-		if (*v == '\n') {
-			*has_return = TRUE;
-			for (; *v; v++) {
-				if (*v & 0x80) {
-					*is_ascii = FALSE;
-					return;
-				}
-			}
-			return;
-		}
-	}
-	return;
-}
-
-#define ADD_PROP_VALUE(o, p, v)              (assumeUTF8 ? (addPropValueQP ((o), (p), (v))) : addPropValueUTF8 ((o), (p), (v)))
-#define ADD_PROP_VALUE_SET_IS_ASCII(o, p, v) (addPropValueSets ((o), (p), (v), assumeUTF8, &is_ascii, &has_return))
-
-
-static VObject *
-e_card_get_vobject (const ECard *card, gboolean assumeUTF8)
-{
-	VObject *vobj;
-	
-	vobj = newVObject (VCCardProp);
-
-	if (card->file_as && *card->file_as)
-		ADD_PROP_VALUE(vobj, "X-EVOLUTION-FILE-AS", card->file_as);
-	else if (card->file_as)
-		addProp(vobj, "X-EVOLUTION-FILE_AS");
-
-	if (card->fname && *card->fname)
-		ADD_PROP_VALUE(vobj, VCFullNameProp, card->fname);
-	else if (card->fname)
-		addProp(vobj, VCFullNameProp);
-
-	if ( card->name && (card->name->prefix || card->name->given || card->name->additional || card->name->family || card->name->suffix) ) {
-		VObject *nameprop;
-		gboolean is_ascii = TRUE;
-		gboolean has_return = FALSE;
-		nameprop = addProp(vobj, VCNameProp);
-		if ( card->name->prefix )
-			ADD_PROP_VALUE_SET_IS_ASCII(nameprop, VCNamePrefixesProp, card->name->prefix);
-		if ( card->name->given ) 
-			ADD_PROP_VALUE_SET_IS_ASCII(nameprop, VCGivenNameProp, card->name->given);
-		if ( card->name->additional )
-			ADD_PROP_VALUE_SET_IS_ASCII(nameprop, VCAdditionalNamesProp, card->name->additional);
-		if ( card->name->family )
-			ADD_PROP_VALUE_SET_IS_ASCII(nameprop, VCFamilyNameProp, card->name->family);
-		if ( card->name->suffix )
-			ADD_PROP_VALUE_SET_IS_ASCII(nameprop, VCNameSuffixesProp, card->name->suffix);
-		if (has_return)
-			addProp(nameprop, VCQuotedPrintableProp);
-		if (!(is_ascii || assumeUTF8))
-			addPropValue (nameprop, "CHARSET", "UTF-8");
-	}
-	else if (card->name)
-		addProp(vobj, VCNameProp);
-
-
-	if ( card->address ) {
-		EIterator *iterator = e_list_get_iterator(card->address);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *addressprop;
-			ECardDeliveryAddress *address = (ECardDeliveryAddress *) e_iterator_get(iterator);
-			gboolean is_ascii = TRUE;
-			gboolean has_return = FALSE;
-
-			addressprop = addProp(vobj, VCAdrProp);
-			
-			set_address_flags (addressprop, address->flags);
-			if (address->po)
-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCPostalBoxProp, address->po);
-			if (address->ext)
-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCExtAddressProp, address->ext);
-			if (address->street)
-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCStreetAddressProp, address->street);
-			if (address->city)
-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCCityProp, address->city);
-			if (address->region)
-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCRegionProp, address->region);
-			if (address->code)
-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCPostalCodeProp, address->code);
-			if (address->country)
-				ADD_PROP_VALUE_SET_IS_ASCII(addressprop, VCCountryNameProp, address->country);
-
-			if (has_return)
-				addProp(addressprop, VCQuotedPrintableProp);
-			if (!(is_ascii || assumeUTF8))
-				addPropValue (addressprop, "CHARSET", "UTF-8");
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->address_label ) {
-		EIterator *iterator = e_list_get_iterator(card->address_label);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *labelprop;
-			ECardAddrLabel *address_label = (ECardAddrLabel *) e_iterator_get(iterator);
-			if (address_label->data)
-				labelprop = ADD_PROP_VALUE(vobj, VCDeliveryLabelProp, address_label->data);
-			else
-				labelprop = addProp(vobj, VCDeliveryLabelProp);
-			
-			set_address_flags (labelprop, address_label->flags);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->phone ) { 
-		EIterator *iterator = e_list_get_iterator(card->phone);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *phoneprop;
-			ECardPhone *phone = (ECardPhone *) e_iterator_get(iterator);
-			phoneprop = ADD_PROP_VALUE(vobj, VCTelephoneProp, phone->number);
-			
-			set_phone_flags (phoneprop, phone->flags);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->email ) { 
-		EIterator *iterator = e_list_get_iterator(card->email);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *emailprop;
-			emailprop = ADD_PROP_VALUE(vobj, VCEmailAddressProp, (char *) e_iterator_get(iterator));
-			addProp (emailprop, VCInternetProp);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->bday ) {
-		char *value;
-		value = e_card_date_to_string (card->bday);
-		ADD_PROP_VALUE(vobj, VCBirthDateProp, value);
-		g_free(value);
-	}
-
-	if (card->url)
-		ADD_PROP_VALUE(vobj, VCURLProp, card->url);
-
-	if (card->org || card->org_unit) {
-		VObject *orgprop;
-		gboolean is_ascii = TRUE;
-		gboolean has_return = FALSE;
-		orgprop = addProp(vobj, VCOrgProp);
-		
-		if (card->org)
-			ADD_PROP_VALUE_SET_IS_ASCII(orgprop, VCOrgNameProp, card->org);
-		if (card->org_unit)
-			ADD_PROP_VALUE_SET_IS_ASCII(orgprop, VCOrgUnitProp, card->org_unit);
-
-		if (has_return)
-			addProp(orgprop, VCQuotedPrintableProp);
-		if (!(is_ascii || assumeUTF8))
-			addPropValue (orgprop, "CHARSET", "UTF-8");
-	}
-	
-	if (card->office)
-		ADD_PROP_VALUE(vobj, "X-EVOLUTION-OFFICE", card->office);
-
-	if (card->title)
-		ADD_PROP_VALUE(vobj, VCTitleProp, card->title);
-
-	if (card->role)
-		ADD_PROP_VALUE(vobj, VCBusinessRoleProp, card->role);
-	
-	if (card->manager)
-		ADD_PROP_VALUE(vobj, "X-EVOLUTION-MANAGER", card->manager);
-	
-	if (card->assistant)
-		ADD_PROP_VALUE(vobj, "X-EVOLUTION-ASSISTANT", card->assistant);
-	
-	if (card->nickname)
-		ADD_PROP_VALUE(vobj, "NICKNAME", card->nickname);
-
-	if (card->spouse)
-		ADD_PROP_VALUE(vobj, "X-EVOLUTION-SPOUSE", card->spouse);
-
-	if ( card->anniversary ) {
-		char *value;
-		value = e_card_date_to_string (card->anniversary);
-		ADD_PROP_VALUE(vobj, "X-EVOLUTION-ANNIVERSARY", value);
-		g_free(value);
-	}
-
-	if (card->mailer) {
-		ADD_PROP_VALUE(vobj, VCMailerProp, card->mailer);
-	}
-	
-	if (card->caluri)
-		addPropValueQP(vobj, "CALURI", card->caluri);
-
-	if (card->fburl)
-		ADD_PROP_VALUE(vobj, "FBURL", card->fburl);
-	
-	if (card->note) {
-		VObject *noteprop;
-
-		noteprop = ADD_PROP_VALUE(vobj, VCNoteProp, card->note);
-	}
-
-	if (card->last_use) {
-		char *value;
-		value = e_card_date_to_string (card->last_use);
-		ADD_PROP_VALUE (vobj, "X-EVOLUTION-LAST-USE", value);
-		g_free (value);
-	}
-
-	if (card->raw_use_score > 0) {
-		char *value;
-		value = g_strdup_printf ("%f", card->raw_use_score);
-		ADD_PROP_VALUE (vobj, "X-EVOLUTION-USE-SCORE", value);
-		g_free (value);
-	}
-
-	if (card->related_contacts && *card->related_contacts) {
-		ADD_PROP_VALUE(vobj, XEV_RELATED_CONTACTS, card->related_contacts);
-	}
-
-	if (card->categories) {
-		EIterator *iterator;
-		int length = 0;
-		char *string;
-		char *stringptr;
-		for (iterator = e_list_get_iterator(card->categories); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			length += strlen(e_iterator_get(iterator)) + 1;
-		}
-		string = g_new(char, length + 1);
-		stringptr = string;
-		*stringptr = 0;
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			strcpy(stringptr, e_iterator_get(iterator));
-			stringptr += strlen(stringptr);
-			*stringptr = ',';
-			stringptr++;
-			*stringptr = 0;
-		}
-		if (stringptr > string) {
-			stringptr --;
-			*stringptr = 0;
-		}
-		ADD_PROP_VALUE (vobj, "CATEGORIES", string);
-		g_free(string);
-	}
-
-	if (card->wants_html_set) {
-		ADD_PROP_VALUE (vobj, XEV_WANTS_HTML, card->wants_html ? "TRUE" : "FALSE");
-	}
-
-	if (card->list) {
-		ADD_PROP_VALUE (vobj, XEV_LIST, "TRUE");
-		ADD_PROP_VALUE (vobj, XEV_LIST_SHOW_ADDRESSES, card->list_show_addresses ? "TRUE" : "FALSE");
-	}
-
-	if (card->arbitrary) {
-		EIterator *iterator;
-		for (iterator = e_list_get_iterator(card->arbitrary); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);
-			VObject *arb_object;
-			if (arbitrary->value) {
-				arb_object = ADD_PROP_VALUE (vobj, XEV_ARBITRARY, arbitrary->value);
-			} else {
-				arb_object = addProp (vobj, XEV_ARBITRARY);
-			}
-			if (arbitrary->type) {
-				ADD_PROP_VALUE (arb_object, "TYPE", arbitrary->type);
-			}
-			if (arbitrary->key) {
-				addProp (arb_object, arbitrary->key);
-			}
-		}
-	}
-
-	addPropValueQP (vobj, VCUniqueStringProp, (card->id ? card->id : ""));
-
-#if 0	
-	if (crd->photo.prop.used) {
-		vprop = addPropSizedValue (vobj, VCPhotoProp, 
-					  crd->photo.data, crd->photo.size);
-		add_PhotoType (vprop, crd->photo.type);
-		add_CardProperty (vprop, &crd->photo.prop);
-	}
-
-	if (crd->xtension.l) {
-		GList *node;
-		
-		for (node = crd->xtension.l; node; node = node->next) {
-			CardXProperty *xp = (CardXProperty *) node->data;
-			ADD_PROP_VALUE (vobj, xp->name, xp->data);
-			add_CardProperty (vobj, &xp->prop);
-		}
-	}
-	
-	if (crd->timezn.prop.used) {
-		char *str;
-		
-		str = card_timezn_str (crd->timezn);
-		vprop = ADD_PROP_VALUE (vobj, VCTimeZoneProp, str);
-		free (str);
-		add_CardProperty (vprop, &crd->timezn.prop);
-	}
-	
-	if (crd->geopos.prop.used) {
-		char *str;
-		
-		str = card_geopos_str (crd->geopos);
-		vprop = ADD_PROP_VALUE (vobj, VCGeoLocationProp, str);
-		free (str);
-		add_CardProperty (vprop, &crd->geopos.prop);
-	}
-	
-	if (crd->logo.prop.used) {
-		vprop = addPropSizedValue (vobj, VCLogoProp, 
-					  crd->logo.data, crd->logo.size);
-		add_PhotoType (vprop, crd->logo.type);
-		add_CardProperty (vprop, &crd->logo.prop);
-	}
-	
-	if (crd->agent)
-	  addVObjectProp (vobj, card_convert_to_vobject (crd->agent));
-	
-	if (crd->sound.prop.used) {
-		if (crd->sound.type != SOUND_PHONETIC)
-		  vprop = addPropSizedValue (vobj, VCPronunciationProp,
-					    crd->sound.data, crd->sound.size);
-		else
-		  vprop = ADD_PROP_VALUE (vobj, VCPronunciationProp, 
-				       crd->sound.data);
-		
-		add_SoundType (vprop, crd->sound.type);
-		add_CardProperty (vprop, &crd->sound.prop);
-	}
-	
-	if (crd->key.prop.used) {
-		vprop = ADD_PROP_VALUE (vobj, VCPublicKeyProp, crd->key.data);
-		add_KeyType (vprop, crd->key.type);
-		add_CardProperty (vprop, &crd->key.prop);
-	}
-#endif
-	return vobj;
-}
-
-/**
- * e_card_get_vcard:
- * @card: an #ECard
- *
- * Returns: a string in vCard format, which is wrapped by the @card.
- */
-char *
-e_card_get_vcard (ECard *card)
-{
-	VObject *vobj;
-	char *temp, *ret_val;
-
-	vobj = e_card_get_vobject (card, FALSE);
-	temp = writeMemVObject(NULL, NULL, vobj);
-	ret_val = g_strdup(temp);
-	free(temp);
-	cleanVObject(vobj);
-	return ret_val;
-}
-
-char *
-e_card_get_vcard_assume_utf8 (ECard *card)
-{
-	VObject *vobj;
-	char *temp, *ret_val;
-
-	vobj = e_card_get_vobject (card, TRUE);
-	temp = writeMemVObject(NULL, NULL, vobj);
-	ret_val = g_strdup(temp);
-	free(temp);
-	cleanVObject(vobj);
-	return ret_val;
-}
-
-/**
- * e_card_list_get_vcard:
- * @list: a list of #ECards
- *
- * Returns: a string in vCard format.
- */
-char *
-e_card_list_get_vcard (const GList *list)
-{
-	VObject *vobj;
-
-	char *temp, *ret_val;
-
-	vobj = NULL;
-
-	for (; list; list = list->next) {
-		VObject *tempvobj;
-		ECard *card = list->data;
-
-		tempvobj = e_card_get_vobject (card, FALSE);
-		addList (&vobj, tempvobj);
-	}
-	temp = writeMemVObjects(NULL, NULL, vobj);
-	ret_val = g_strdup(temp);
-	free(temp);
-	cleanVObjects(vobj);
-	return ret_val;
-}
-
-static void
-parse_file_as(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( card->file_as )
-		g_free(card->file_as);
-	assign_string(vobj, default_charset, &(card->file_as));
-}
-
-static void
-parse_name(ECard *card, VObject *vobj, char *default_charset)
-{
-	e_card_name_unref(card->name);
-
-	card->name = e_card_name_new();
-
-	card->name->family     = e_v_object_get_child_value (vobj, VCFamilyNameProp,      default_charset);
-	card->name->given      = e_v_object_get_child_value (vobj, VCGivenNameProp,       default_charset);
-	card->name->additional = e_v_object_get_child_value (vobj, VCAdditionalNamesProp, default_charset);
-	card->name->prefix     = e_v_object_get_child_value (vobj, VCNamePrefixesProp,    default_charset);
-	card->name->suffix     = e_v_object_get_child_value (vobj, VCNameSuffixesProp,    default_charset);
-}
-
-static void
-parse_full_name(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( card->fname )
-		g_free(card->fname);
-	assign_string(vobj, default_charset, &(card->fname));
-}
-
-static void
-parse_email(ECard *card, VObject *vobj, char *default_charset)
-{
-	char *next_email;
-	EList *list;
-
-	assign_string(vobj, default_charset, &next_email);
-	gtk_object_get(GTK_OBJECT(card),
-		       "email", &list,
-		       NULL);
-	e_list_append(list, next_email);
-	g_free (next_email);
-}
-
-/* Deal with charset */
-static void
-parse_bday(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if ( card->bday )
-			g_free(card->bday);
-		card->bday = g_new(ECardDate, 1);
-		*(card->bday) = e_card_date_from_string(str);
-		free(str);
-	}
-}
-
-static void
-parse_phone(ECard *card, VObject *vobj, char *default_charset)
-{
-	ECardPhone *next_phone = e_card_phone_new ();
-	EList *list;
-
-	assign_string(vobj, default_charset, &(next_phone->number));
-	next_phone->flags = get_phone_flags(vobj);
-
-	gtk_object_get(GTK_OBJECT(card),
-		       "phone", &list,
-		       NULL);
-	e_list_append(list, next_phone);
-	e_card_phone_unref (next_phone);
-}
-
-static void
-parse_address(ECard *card, VObject *vobj, char *default_charset)
-{
-	ECardDeliveryAddress *next_addr = e_card_delivery_address_new ();
-	EList *list;
-
-	next_addr->flags   = get_address_flags (vobj);
-	next_addr->po      = e_v_object_get_child_value (vobj, VCPostalBoxProp,     default_charset);
-	next_addr->ext     = e_v_object_get_child_value (vobj, VCExtAddressProp,    default_charset);
-	next_addr->street  = e_v_object_get_child_value (vobj, VCStreetAddressProp, default_charset);
-	next_addr->city    = e_v_object_get_child_value (vobj, VCCityProp,          default_charset);
-	next_addr->region  = e_v_object_get_child_value (vobj, VCRegionProp,        default_charset);
-	next_addr->code    = e_v_object_get_child_value (vobj, VCPostalCodeProp,    default_charset);
-	next_addr->country = e_v_object_get_child_value (vobj, VCCountryNameProp,   default_charset);
-
-	gtk_object_get(GTK_OBJECT(card),
-		       "address", &list,
-		       NULL);
-	e_list_append(list, next_addr);
-	e_card_delivery_address_unref (next_addr);
-}
-
-static void
-parse_address_label(ECard *card, VObject *vobj, char *default_charset)
-{
-	ECardAddrLabel *next_addr = e_card_address_label_new ();
-	EList *list;
-
-	next_addr->flags   = get_address_flags (vobj);
-	assign_string(vobj, default_charset, &next_addr->data);
-
-	gtk_object_get(GTK_OBJECT(card),
-		       "address_label", &list,
-		       NULL);
-	e_list_append(list, next_addr);
-	e_card_address_label_unref (next_addr);
-}
-
-static void
-parse_url(ECard *card, VObject *vobj, char *default_charset)
-{
-	if (card->url)
-		g_free(card->url);
-	assign_string(vobj, default_charset, &(card->url));
-}
-
-static void
-parse_org(ECard *card, VObject *vobj, char *default_charset)
-{
-	char *temp;
-	
-	temp = e_v_object_get_child_value(vobj, VCOrgNameProp, default_charset);
-	g_free(card->org);
-	card->org = temp;
-
-	temp = e_v_object_get_child_value(vobj, VCOrgUnitProp, default_charset);
-	g_free(card->org_unit);
-	card->org_unit = temp;
-}
-
-static void
-parse_office(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( card->office )
-		g_free(card->office);
-	assign_string(vobj, default_charset, &(card->office));
-}
-
-static void
-parse_title(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( card->title )
-		g_free(card->title);
-	assign_string(vobj, default_charset, &(card->title));
-}
-
-static void
-parse_role(ECard *card, VObject *vobj, char *default_charset)
-{
-	if (card->role)
-		g_free(card->role);
-	assign_string(vobj, default_charset, &(card->role));
-}
-
-static void
-parse_manager(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( card->manager )
-		g_free(card->manager);
-	assign_string(vobj, default_charset, &(card->manager));
-}
-
-static void
-parse_assistant(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( card->assistant )
-		g_free(card->assistant);
-	assign_string(vobj, default_charset, &(card->assistant));
-}
-
-static void
-parse_nickname(ECard *card, VObject *vobj, char *default_charset)
-{
-	if (card->nickname)
-		g_free(card->nickname);
-	assign_string(vobj, default_charset, &(card->nickname));
-}
-
-static void
-parse_spouse(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( card->spouse )
-		g_free(card->spouse);
-	assign_string(vobj, default_charset, &(card->spouse));
-}
-
-/* Deal with charset */
-static void
-parse_anniversary(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if (card->anniversary)
-			g_free(card->anniversary);
-		card->anniversary = g_new(ECardDate, 1);
-		*(card->anniversary) = e_card_date_from_string(str);
-		free(str);
-	}
-}
-
-static void
-parse_mailer(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( card->mailer )
-		g_free(card->mailer);
-	assign_string(vobj, default_charset, &(card->mailer));
-}
-
-static void
-parse_caluri(ECard *card, VObject *vobj, char *default_charset)
-{
- 	g_free(card->caluri);
- 	assign_string(vobj, default_charset, &(card->caluri));
-}
-
-static void
-parse_fburl(ECard *card, VObject *vobj, char *default_charset)
-{
-	g_free(card->fburl);
-	assign_string(vobj, default_charset, &(card->fburl));
-}
-
-static void
-parse_note(ECard *card, VObject *vobj, char *default_charset)
-{
-	g_free(card->note);
-	assign_string(vobj, default_charset, &(card->note));
-}
-
-static void
-parse_related_contacts(ECard *card, VObject *vobj, char *default_charset)
-{
-	g_free(card->related_contacts);
-	assign_string(vobj, default_charset, &(card->related_contacts));
-}
-
-static void
-add_list_unique(ECard *card, EList *list, char *string)
-{
-	char *temp = e_strdup_strip(string);
-	EIterator *iterator;
-
-	if (!*temp) {
-		g_free(temp);
-		return;
-	}
-	for ( iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		if (!strcmp(e_iterator_get(iterator), temp)) {
-			break;
-		}
-	}
-	if (!e_iterator_is_valid(iterator)) {
-		e_list_append(list, temp);
-	}
-	g_free(temp);
-	gtk_object_unref(GTK_OBJECT(iterator));
-}
-
-static void
-do_parse_categories(ECard *card, char *str)
-{
-	int length = strlen(str);
-	char *copy = g_new(char, length + 1);
-	int i, j;
-	EList *list;
-	gtk_object_get(GTK_OBJECT(card),
-		       "category_list", &list,
-		       NULL);
-	for (i = 0, j = 0; str[i]; i++, j++) {
-		switch (str[i]) {
-		case '\\':
-			i++;
-			if (str[i]) {
-				copy[j] = str[i];
-			} else
-				i--;
-			break;
-		case ',':
-			copy[j] = 0;
-			add_list_unique(card, list, copy);
-			j = -1;
-			break;
-		default:
-			copy[j] = str[i];
-			break;
-		}
-	}
-	copy[j] = 0;
-	add_list_unique(card, list, copy);
-	g_free(copy);
-}
-
-/* Deal with charset */
-static void
-parse_categories(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		do_parse_categories(card, str);
-		free(str);
-	}
-}
-
-/* Deal with charset */
-static void
-parse_wants_html(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if (!strcasecmp(str, "true")) {
-			card->wants_html = TRUE;
-			card->wants_html_set = TRUE;
-		}
-		if (!strcasecmp(str, "false")) {
-			card->wants_html = FALSE;
-			card->wants_html_set = TRUE;
-		}
-		free(str);
-	}
-}
-
-/* Deal with charset */
-static void
-parse_list(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if (!strcasecmp(str, "true")) {
-			card->list = TRUE;
-		}
-		if (!strcasecmp(str, "false")) {
-			card->list = FALSE;
-		}
-		free(str);
-	}
-}
-
-/* Deal with charset */
-static void
-parse_list_show_addresses(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if (!strcasecmp(str, "true")) {
-			card->list_show_addresses = TRUE;
-		}
-		if (!strcasecmp(str, "false")) {
-			card->list_show_addresses = FALSE;
-		}
-		free(str);
-	}
-}
-
-typedef union ValueItem {
-    const char *strs;
-    const wchar_t *ustrs;
-    unsigned int i;
-    unsigned long l;
-    void *any;
-    VObject *vobj;
-} ValueItem;
-
-struct VObject {
-    VObject *next;
-    const char *id;
-    VObject *prop;
-    unsigned short valType;
-    ValueItem val;
-};
-
-static void
-parse_arbitrary(ECard *card, VObject *vobj, char *default_charset)
-{
-	ECardArbitrary *arbitrary = e_card_arbitrary_new();
-	VObjectIterator iterator;
-	EList *list;
-	for ( initPropIterator (&iterator, vobj); moreIteration(&iterator); ) {
-		VObject *temp = nextVObject(&iterator);
-		const char *name = vObjectName(temp);
-		if (name && !strcmp(name, "TYPE")) {
-			g_free(arbitrary->type);
-			assign_string(temp, default_charset, &(arbitrary->type));
-		} else {
-			g_free(arbitrary->key);
-			arbitrary->key = g_strdup(name);
-		}
-	}
-
-	assign_string(vobj, default_charset, &(arbitrary->value));
-	
-	gtk_object_get(GTK_OBJECT(card),
-		       "arbitrary", &list,
-		       NULL);
-	e_list_append(list, arbitrary);
-	e_card_arbitrary_unref(arbitrary);
-}
-
-static void
-parse_id(ECard *card, VObject *vobj, char *default_charset)
-{
-	g_free(card->id);
-	assign_string(vobj, default_charset, &(card->id));
-}
-
-/* Deal with charset */
-static void
-parse_last_use(ECard *card, VObject *vobj, char *default_charset)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if ( card->last_use )
-			g_free(card->last_use);
-		card->last_use = g_new(ECardDate, 1);
-		*(card->last_use) = e_card_date_from_string(str);
-		free(str);
-	}
-}
-
-/* Deal with charset */
-static void
-parse_use_score(ECard *card, VObject *vobj, char *default_charset)
-{
-	card->raw_use_score = 0;
-	
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		card->raw_use_score = MAX(0, atof (str));
-		free (str);
-	}
-}
-
-static void
-parse_attribute(ECard *card, VObject *vobj, char *default_charset)
-{
-	ParsePropertyFunc function = g_hash_table_lookup(E_CARD_CLASS(GTK_OBJECT(card)->klass)->attribute_jump_table, vObjectName(vobj));
-	if ( function )
-		function(card, vobj, default_charset);
-}
-
-static void
-parse(ECard *card, VObject *vobj, char *default_charset)
-{
-	VObjectIterator iterator;
-	initPropIterator(&iterator, vobj);
-	while(moreIteration (&iterator)) {
-		parse_attribute(card, nextVObject(&iterator), default_charset);
-	}
-	if (!card->fname) {
-		card->fname = g_strdup("");
-	}
-	if (!card->name) {
-		card->name = e_card_name_from_string(card->fname);
-	}
-	if (!card->file_as) {
-		ECardName *name = card->name;
-		char *strings[3], **stringptr;
-		char *string;
-		stringptr = strings;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		*stringptr = NULL;
-		string = g_strjoinv(", ", strings);
-		card->file_as = string;
-	}
-}
-
-static void
-e_card_class_init (ECardClass *klass)
-{
-	int i;
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	klass->attribute_jump_table = g_hash_table_new(g_str_hash, g_str_equal);
-
-	for ( i = 0; i < sizeof(attribute_jump_array) / sizeof(attribute_jump_array[0]); i++ ) {
-		g_hash_table_insert(klass->attribute_jump_table, attribute_jump_array[i].key, attribute_jump_array[i].function);
-	}
-
-	gtk_object_add_arg_type ("ECard::file_as",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FILE_AS);
-	gtk_object_add_arg_type ("ECard::full_name",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FULL_NAME);  
-	gtk_object_add_arg_type ("ECard::name",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_NAME);
-	gtk_object_add_arg_type ("ECard::address",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_ADDRESS);
-	gtk_object_add_arg_type ("ECard::address_label",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_ADDRESS_LABEL);
-	gtk_object_add_arg_type ("ECard::phone",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_PHONE);
-	gtk_object_add_arg_type ("ECard::email",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_EMAIL);
-	gtk_object_add_arg_type ("ECard::birth_date",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_BIRTH_DATE);
-	gtk_object_add_arg_type ("ECard::url",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_URL);  
-	gtk_object_add_arg_type ("ECard::org",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ORG);
-	gtk_object_add_arg_type ("ECard::org_unit",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ORG_UNIT);
-	gtk_object_add_arg_type ("ECard::office",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_OFFICE);
-	gtk_object_add_arg_type ("ECard::title",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_TITLE);  
-	gtk_object_add_arg_type ("ECard::role",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ROLE);
-	gtk_object_add_arg_type ("ECard::manager",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_MANAGER);
-	gtk_object_add_arg_type ("ECard::assistant",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ASSISTANT);
-	gtk_object_add_arg_type ("ECard::nickname",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_NICKNAME);
-	gtk_object_add_arg_type ("ECard::spouse",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_SPOUSE);
-	gtk_object_add_arg_type ("ECard::anniversary",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_ANNIVERSARY);
-	gtk_object_add_arg_type ("ECard::mailer",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_MAILER);
-	gtk_object_add_arg_type ("ECard::caluri",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_CALURI);
-	gtk_object_add_arg_type ("ECard::fburl",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FBURL);
-	gtk_object_add_arg_type ("ECard::note",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_NOTE);
-	gtk_object_add_arg_type ("ECard::related_contacts",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_RELATED_CONTACTS);
-	gtk_object_add_arg_type ("ECard::categories",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_CATEGORIES);
-	gtk_object_add_arg_type ("ECard::category_list",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CATEGORY_LIST);
-	gtk_object_add_arg_type ("ECard::wants_html",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_WANTS_HTML);
-	gtk_object_add_arg_type ("ECard::wants_html_set",
-				 GTK_TYPE_BOOL, GTK_ARG_READABLE, ARG_WANTS_HTML);
-	gtk_object_add_arg_type ("ECard::list",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EVOLUTION_LIST);
-	gtk_object_add_arg_type ("ECard::list_show_addresses",
-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_EVOLUTION_LIST_SHOW_ADDRESSES);
-	gtk_object_add_arg_type ("ECard::arbitrary",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_ARBITRARY);
-	gtk_object_add_arg_type ("ECard::id",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ID);
-	gtk_object_add_arg_type ("ECard::last_use",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_LAST_USE);
-	gtk_object_add_arg_type ("ECard::use_score",
-				 GTK_TYPE_FLOAT, GTK_ARG_READWRITE, ARG_USE_SCORE);
-
-
-	object_class->destroy = e_card_destroy;
-	object_class->get_arg = e_card_get_arg;
-	object_class->set_arg = e_card_set_arg;
-}
-
-ECardPhone *
-e_card_phone_new (void)
-{
-	ECardPhone *newphone = g_new(ECardPhone, 1);
-
-	newphone->ref_count = 1;
-	newphone->number = NULL;
-	newphone->flags = 0;
-	
-	return newphone;
-}
-
-void
-e_card_phone_unref (ECardPhone *phone)
-{
-	if (phone) {
-		phone->ref_count --;
-		if (phone->ref_count == 0) {
-			g_free(phone->number);
-			g_free(phone);
-		}
-	}
-}
-
-ECardPhone *
-e_card_phone_ref (const ECardPhone *phone)
-{
-	ECardPhone *phone_mutable = (ECardPhone *) phone;
-	if (phone_mutable)
-		phone_mutable->ref_count ++;
-	return phone_mutable;
-}
-
-ECardPhone *
-e_card_phone_copy (const ECardPhone *phone)
-{
-	if ( phone ) {
-		ECardPhone *phone_copy = e_card_phone_new();
-		phone_copy->number = g_strdup(phone->number);
-		phone_copy->flags  = phone->flags;
-		return phone_copy;
-	} else
-		return NULL;
-}
-
-ECardDeliveryAddress *
-e_card_delivery_address_new (void)
-{
-	ECardDeliveryAddress *newaddr = g_new(ECardDeliveryAddress, 1);
-
-	newaddr->ref_count = 1;
-	newaddr->po      = NULL;
-	newaddr->ext     = NULL;
-	newaddr->street  = NULL;
-	newaddr->city    = NULL;
-	newaddr->region  = NULL;
-	newaddr->code    = NULL;
-	newaddr->country = NULL;
-	newaddr->flags   = 0;
-
-	return newaddr;
-}
-
-void
-e_card_delivery_address_unref (ECardDeliveryAddress *addr)
-{
-	if ( addr ) {
-		addr->ref_count --;
-		if (addr->ref_count == 0) {
-			g_free(addr->po);
-			g_free(addr->ext);
-			g_free(addr->street);
-			g_free(addr->city);
-			g_free(addr->region);
-			g_free(addr->code);
-			g_free(addr->country);
-			g_free(addr);
-		}
-	}
-}
-
-ECardDeliveryAddress *
-e_card_delivery_address_ref (const ECardDeliveryAddress *addr)
-{
-	ECardDeliveryAddress *addr_mutable = (ECardDeliveryAddress *) addr;
-	if (addr_mutable)
-		addr_mutable->ref_count ++;
-	return addr_mutable;
-}
-
-ECardDeliveryAddress *
-e_card_delivery_address_copy (const ECardDeliveryAddress *addr)
-{
-	if ( addr ) {
-		ECardDeliveryAddress *addr_copy = e_card_delivery_address_new ();
-		addr_copy->po      = g_strdup(addr->po     );
-		addr_copy->ext     = g_strdup(addr->ext    );
-		addr_copy->street  = g_strdup(addr->street );
-		addr_copy->city    = g_strdup(addr->city   );
-		addr_copy->region  = g_strdup(addr->region );
-		addr_copy->code    = g_strdup(addr->code   );
-		addr_copy->country = g_strdup(addr->country);
-		addr_copy->flags   = addr->flags;
-		return addr_copy;
-	} else
-		return NULL;
-}
-
-gboolean
-e_card_delivery_address_is_empty (const ECardDeliveryAddress *addr)
-{
-	return (((addr->po      == NULL) || (*addr->po      == 0)) &&
-		((addr->ext     == NULL) || (*addr->ext     == 0)) &&
-		((addr->street  == NULL) || (*addr->street  == 0)) &&
-		((addr->city    == NULL) || (*addr->city    == 0)) &&
-		((addr->region  == NULL) || (*addr->region  == 0)) &&
-		((addr->code    == NULL) || (*addr->code    == 0)) &&
-		((addr->country == NULL) || (*addr->country == 0)));
-}
-
-ECardDeliveryAddress *
-e_card_delivery_address_from_label(const ECardAddrLabel *label)
-{
-	ECardDeliveryAddress *addr = e_card_delivery_address_new ();
-	EAddressWestern *western = e_address_western_parse (label->data);
-	
-	addr->po      = g_strdup (western->po_box     );
-	addr->ext     = g_strdup (western->extended   );
-	addr->street  = g_strdup (western->street     );
-	addr->city    = g_strdup (western->locality   );
-	addr->region  = g_strdup (western->region     );
-	addr->code    = g_strdup (western->postal_code);
-	addr->country = g_strdup (western->country    );
-	addr->flags   = label->flags;
-	
-	e_address_western_free(western);
-	
-	return addr;
-}
-
-char *
-e_card_delivery_address_to_string(const ECardDeliveryAddress *addr)
-{
-	char *strings[5], **stringptr = strings;
-	char *line1, *line22, *line2;
-	char *final;
-	if (addr->po && *addr->po)
-		*(stringptr++) = addr->po;
-	if (addr->street && *addr->street)
-		*(stringptr++) = addr->street;
-	*stringptr = NULL;
-	line1 = g_strjoinv(" ", strings);
-	stringptr = strings;
-	if (addr->region && *addr->region)
-		*(stringptr++) = addr->region;
-	if (addr->code && *addr->code)
-		*(stringptr++) = addr->code;
-	*stringptr = NULL;
-	line22 = g_strjoinv(" ", strings);
-	stringptr = strings;
-	if (addr->city && *addr->city)
-		*(stringptr++) = addr->city;
-	if (line22 && *line22)
-		*(stringptr++) = line22;
-	*stringptr = NULL;
-	line2 = g_strjoinv(", ", strings);
-	stringptr = strings;
-	if (line1 && *line1)
-		*(stringptr++) = line1;
-	if (addr->ext && *addr->ext)
-		*(stringptr++) = addr->ext;
-	if (line2 && *line2)
-		*(stringptr++) = line2;
-	if (addr->country && *addr->country)
-		*(stringptr++) = addr->country;
-	*stringptr = NULL;
-	final = g_strjoinv("\n", strings);
-	g_free(line1);
-	g_free(line22);
-	g_free(line2);
-	return final;
-}
-
-ECardAddrLabel *
-e_card_delivery_address_to_label    (const ECardDeliveryAddress *addr)
-{
-	ECardAddrLabel *label;
-	label = e_card_address_label_new();
-	label->flags = addr->flags;
-	label->data = e_card_delivery_address_to_string(addr);
-
-	return label;
-}
-
-ECardAddrLabel *
-e_card_address_label_new (void)
-{
-	ECardAddrLabel *newaddr = g_new(ECardAddrLabel, 1);
-
-	newaddr->ref_count = 1;
-	newaddr->data = NULL;
-	newaddr->flags = 0;
-	
-	return newaddr;
-}
-
-void
-e_card_address_label_unref (ECardAddrLabel *addr)
-{
-	if (addr) {
-		addr->ref_count --;
-		if (addr->ref_count == 0) {
-			g_free(addr->data);
-			g_free(addr);
-		}
-	}
-}
-
-ECardAddrLabel *
-e_card_address_label_ref (const ECardAddrLabel *addr)
-{
-	ECardAddrLabel *addr_mutable = (ECardAddrLabel *) addr;
-	if (addr_mutable)
-		addr_mutable->ref_count ++;
-	return addr_mutable;
-}
-
-ECardAddrLabel *
-e_card_address_label_copy (const ECardAddrLabel *addr)
-{
-	if ( addr ) {
-		ECardAddrLabel *addr_copy = e_card_address_label_new ();
-		addr_copy->data  = g_strdup(addr->data);
-		addr_copy->flags = addr->flags;
-		return addr_copy;
-	} else
-		return NULL;
-}
-
-ECardName *e_card_name_new(void)
-{
-	ECardName *newname  = g_new(ECardName, 1);
-
-	newname->ref_count  = 1;
-	newname->prefix     = NULL;
-	newname->given      = NULL;
-	newname->additional = NULL;
-	newname->family     = NULL;
-	newname->suffix     = NULL;
-
-	return newname;
-}
-
-void
-e_card_name_unref(ECardName *name)
-{
-	if (name) {
-		name->ref_count --;
-		if (name->ref_count == 0) {
-			g_free (name->prefix);
-			g_free (name->given);
-			g_free (name->additional);
-			g_free (name->family);
-			g_free (name->suffix);
-			g_free (name);
-		}
-	}
-}
-
-ECardName *
-e_card_name_ref(const ECardName *name)
-{
-	ECardName *name_mutable = (ECardName *) name;
-	if (name_mutable)
-		name_mutable->ref_count ++;
-	return name_mutable;
-}
-
-ECardName *
-e_card_name_copy(const ECardName *name)
-{
-	if (name) {
-		ECardName *newname = e_card_name_new ();
-               
-		newname->prefix = g_strdup(name->prefix);
-		newname->given = g_strdup(name->given);
-		newname->additional = g_strdup(name->additional);
-		newname->family = g_strdup(name->family);
-		newname->suffix = g_strdup(name->suffix);
-
-		return newname;
-	} else
-		return NULL;
-}
-
-
-char *
-e_card_name_to_string(const ECardName *name)
-{
-	char *strings[6], **stringptr = strings;
-
-	g_return_val_if_fail (name != NULL, NULL);
-
-	if (name->prefix && *name->prefix)
-		*(stringptr++) = name->prefix;
-	if (name->given && *name->given)
-		*(stringptr++) = name->given;
-	if (name->additional && *name->additional)
-		*(stringptr++) = name->additional;
-	if (name->family && *name->family)
-		*(stringptr++) = name->family;
-	if (name->suffix && *name->suffix)
-		*(stringptr++) = name->suffix;
-	*stringptr = NULL;
-	return g_strjoinv(" ", strings);
-}
-
-ECardName *
-e_card_name_from_string(const char *full_name)
-{
-	ECardName *name = e_card_name_new ();
-	ENameWestern *western = e_name_western_parse (full_name);
-	
-	name->prefix     = g_strdup (western->prefix);
-	name->given      = g_strdup (western->first );
-	name->additional = g_strdup (western->middle);
-	name->family     = g_strdup (western->last  );
-	name->suffix     = g_strdup (western->suffix);
-	
-	e_name_western_free(western);
-	
-	return name;
-}
-
-ECardArbitrary *
-e_card_arbitrary_new(void)
-{
-	ECardArbitrary *arbitrary = g_new(ECardArbitrary, 1);
-	arbitrary->ref_count = 1;
-	arbitrary->key = NULL;
-	arbitrary->type = NULL;
-	arbitrary->value = NULL;
-	return arbitrary;
-}
-
-void
-e_card_arbitrary_unref(ECardArbitrary *arbitrary)
-{
-	if (arbitrary) {
-		arbitrary->ref_count --;
-		if (arbitrary->ref_count == 0) {
-			g_free(arbitrary->key);
-			g_free(arbitrary->type);
-			g_free(arbitrary->value);
-			g_free(arbitrary);
-		}
-	}
-}
-
-ECardArbitrary *
-e_card_arbitrary_copy(const ECardArbitrary *arbitrary)
-{
-	if (arbitrary) {
-		ECardArbitrary *arb_copy = e_card_arbitrary_new ();
-		arb_copy->key = g_strdup(arbitrary->key);
-		arb_copy->type = g_strdup(arbitrary->type);
-		arb_copy->value = g_strdup(arbitrary->value);
-		return arb_copy;
-	} else
-		return NULL;
-}
-
-ECardArbitrary *
-e_card_arbitrary_ref(const ECardArbitrary *arbitrary)
-{
-	ECardArbitrary *arbitrary_mutable = (ECardArbitrary *) arbitrary;
-	if (arbitrary_mutable)
-		arbitrary_mutable->ref_count ++;
-	return arbitrary_mutable;
-}
-
-/* EMail matching */
-static gboolean
-e_card_email_match_single_string (const gchar *a, const gchar *b)
-{
-	const gchar *xa = NULL, *xb = NULL;
-	gboolean match = TRUE;
-
-	for (xa=a; *xa && *xa != '@'; ++xa);
-	for (xb=b; *xb && *xb != '@'; ++xb);
-
-	if (xa-a != xb-b || *xa != *xb || g_strncasecmp (a, b, xa-a))
-		return FALSE;
-
-	if (*xa == '\0')
-		return TRUE;
-	
-	/* Find the end of the string, then walk through backwards comparing.
-	   This is so that we'll match joe@foobar.com and joe@mail.foobar.com.
-	*/
-	while (*xa)
-		++xa;
-	while (*xb)
-		++xb;
-
-	while (match && *xa != '@' && *xb != '@') {
-		match = (tolower (*xa) == tolower (*xb));
-		--xa;
-		--xb;
-	}
-
-	match = match && ((tolower (*xa) == tolower (*xb)) || (*xa == '.') || (*xb == '.'));
-
-	return match;
-}
-
-gboolean
-e_card_email_match_string (const ECard *card, const gchar *str)
-{
-	EIterator *iter;
-	
-	g_return_val_if_fail (card && E_IS_CARD (card), FALSE);
-	g_return_val_if_fail (str != NULL, FALSE);
-
-	iter = e_list_get_iterator (card->email);
-	for (e_iterator_reset (iter); e_iterator_is_valid (iter); e_iterator_next (iter)) {
-		if (e_card_email_match_single_string (e_iterator_get (iter), str))
-			return TRUE;
-	}
-	gtk_object_unref (GTK_OBJECT (iter));
-
-	return FALSE;
-}
-
-gint
-e_card_email_find_number (const ECard *card, const gchar *email)
-{
-	EIterator *iter;
-	gint count = 0;
-
-	g_return_val_if_fail (E_IS_CARD (card), -1);
-	g_return_val_if_fail (email != NULL, -1);
-
-	iter = e_list_get_iterator (card->email);
-	for (e_iterator_reset (iter); e_iterator_is_valid (iter); e_iterator_next (iter)) {
-		if (!g_strcasecmp (e_iterator_get (iter), email))
-			goto finished;
-		++count;
-	}
-	count = -1;
-
- finished:
-	gtk_object_unref (GTK_OBJECT (iter));
-
-	return count;
-}
-
-/*
- * ECard lifecycle management and vCard loading/saving.
- */
-
-static void
-e_card_destroy (GtkObject *object)
-{
-	ECard *card = E_CARD(object);
-	g_free(card->id);
-	if (card->book)
-		gtk_object_unref (GTK_OBJECT (card->book));
-	g_free(card->file_as);
-	g_free(card->fname);
-	e_card_name_unref(card->name);
-	g_free(card->bday);
-
-	g_free(card->url);
-	g_free(card->org);
-	g_free(card->org_unit);
-	g_free(card->office);
-	g_free(card->title);
-	g_free(card->role);
-	g_free(card->manager);
-	g_free(card->assistant);
-	g_free(card->nickname);
-	g_free(card->spouse);
-	g_free(card->anniversary);
-	g_free(card->caluri);
-	g_free(card->fburl);
-	g_free(card->note);
-	g_free(card->related_contacts);
-
-	if (card->categories)
-		gtk_object_unref(GTK_OBJECT(card->categories));
-	if (card->email)
-		gtk_object_unref(GTK_OBJECT(card->email));
-	if (card->phone)
-		gtk_object_unref(GTK_OBJECT(card->phone));
-	if (card->address)
-		gtk_object_unref(GTK_OBJECT(card->address));
-	if (card->address_label)
-		gtk_object_unref(GTK_OBJECT(card->address_label));
-}
-
-
-/* Set_arg handler for the card */
-static void
-e_card_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECard *card;
-	
-	card = E_CARD (object);
-
-	switch (arg_id) {
-	case ARG_FILE_AS:
-		g_free(card->file_as);
-		card->file_as = g_strdup(GTK_VALUE_STRING(*arg));
-		if (card->file_as == NULL)
-			card->file_as = g_strdup("");
-		break;
-
-	case ARG_FULL_NAME:
-		g_free(card->fname);
-		card->fname = g_strdup(GTK_VALUE_STRING(*arg));
-		if (card->fname == NULL)
-			card->fname = g_strdup("");
-
-		e_card_name_unref (card->name);
-		card->name = e_card_name_from_string (card->fname);
-		break;
-	case ARG_NAME:
-		e_card_name_unref (card->name);
-		card->name = e_card_name_ref(GTK_VALUE_POINTER(*arg));
-		if (card->name == NULL)
-			card->name = e_card_name_new();
-		if (card->fname == NULL) {
-			card->fname = e_card_name_to_string(card->name);
-		}
-		if (card->file_as == NULL) {
-			ECardName *name = card->name;
-			char *strings[3], **stringptr;
-			char *string;
-			stringptr = strings;
-			if (name->family && *name->family)
-				*(stringptr++) = name->family;
-			if (name->given && *name->given)
-				*(stringptr++) = name->given;
-			*stringptr = NULL;
-			string = g_strjoinv(", ", strings);
-			card->file_as = string;
-		}
-		break;
-	case ARG_CATEGORIES:
-		if (card->categories)
-			gtk_object_unref(GTK_OBJECT(card->categories));
-		card->categories = NULL;
-		if (GTK_VALUE_STRING(*arg))
-			do_parse_categories(card, GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_CATEGORY_LIST:
-		if (card->categories)
-			gtk_object_unref(GTK_OBJECT(card->categories));
-		card->categories = E_LIST(GTK_VALUE_OBJECT(*arg));
-		if (card->categories)
-			gtk_object_ref(GTK_OBJECT(card->categories));
-		break;
-	case ARG_BIRTH_DATE:
-		g_free(card->bday);
-		if (GTK_VALUE_POINTER (*arg)) {
-			card->bday = g_new (ECardDate, 1);
-			memcpy (card->bday, GTK_VALUE_POINTER (*arg), sizeof (ECardDate));
-		} else {
-			card->bday = NULL;
-		}
-		break;
-	case ARG_URL:
-		g_free(card->url);
-		card->url = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_ORG:
-		g_free(card->org);
-		card->org = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_ORG_UNIT:
-		g_free(card->org_unit);
-		card->org_unit = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_OFFICE:
-		g_free(card->office);
-		card->office = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_TITLE:
-		g_free(card->title);
-		card->title = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_ROLE:
-		g_free(card->role);
-		card->role = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_MANAGER:
-		g_free(card->manager);
-		card->manager = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_ASSISTANT:
-		g_free(card->assistant);
-		card->assistant = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_NICKNAME:
-		g_free(card->nickname);
-		card->nickname = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_SPOUSE:
-		g_free(card->spouse);
-		card->spouse = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_ANNIVERSARY:
-		g_free(card->anniversary);
-		if (GTK_VALUE_POINTER (*arg)) {
-			card->anniversary = g_new (ECardDate, 1);
-			memcpy (card->anniversary, GTK_VALUE_POINTER (*arg), sizeof (ECardDate));
-		} else {
-			card->anniversary = NULL;
-		}
-		break;
-	case ARG_MAILER:
-		g_free(card->mailer);
-		card->mailer = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_CALURI:
-		g_free(card->caluri);
-		card->caluri = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_FBURL:
-		g_free(card->fburl);
-		card->fburl = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_NOTE:
-		g_free (card->note);
-		card->note = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_RELATED_CONTACTS:
-		g_free (card->related_contacts);
-		card->related_contacts = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_WANTS_HTML:
-		card->wants_html = GTK_VALUE_BOOL(*arg);
-		card->wants_html_set = TRUE;
-		break;
-	case ARG_ARBITRARY:
-		if (card->arbitrary)
-			gtk_object_unref(GTK_OBJECT(card->arbitrary));
-		card->arbitrary = E_LIST(GTK_VALUE_OBJECT(*arg));
-		if (card->arbitrary)
-			gtk_object_ref(GTK_OBJECT(card->arbitrary));
-		break;
-	case ARG_ID:
-		g_free(card->id);
-		card->id = g_strdup(GTK_VALUE_STRING(*arg));
-		if (card->id == NULL)
-			card->id = g_strdup ("");
-		break;
-	case ARG_LAST_USE:
-		g_free(card->last_use);
-		if (GTK_VALUE_POINTER (*arg)) {
-			card->last_use = g_new (ECardDate, 1);
-			memcpy (card->last_use, GTK_VALUE_POINTER (*arg), sizeof (ECardDate));
-		} else {
-			card->last_use = NULL;
-		}
-		break;
-	case ARG_USE_SCORE:
-		card->raw_use_score = GTK_VALUE_FLOAT(*arg);
-		break;
-	case ARG_EVOLUTION_LIST:
-		card->list = GTK_VALUE_BOOL(*arg);
-		break;
-	case ARG_EVOLUTION_LIST_SHOW_ADDRESSES:
-		card->list_show_addresses = GTK_VALUE_BOOL(*arg);
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the card */
-static void
-e_card_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECard *card;
-
-	card = E_CARD (object);
-
-	switch (arg_id) {
-	case ARG_FILE_AS:
-		GTK_VALUE_STRING (*arg) = card->file_as;
-		break;
-	case ARG_FULL_NAME:
-		GTK_VALUE_STRING (*arg) = card->fname;
-		break;
-	case ARG_NAME:
-		GTK_VALUE_POINTER(*arg) = card->name;
-		break;
-	case ARG_ADDRESS:
-		if (!card->address)
-			card->address = e_list_new((EListCopyFunc) e_card_delivery_address_ref,
-						   (EListFreeFunc) e_card_delivery_address_unref,
-						   NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->address);
-		break;
-	case ARG_ADDRESS_LABEL:
-		if (!card->address_label)
-			card->address_label = e_list_new((EListCopyFunc) e_card_address_label_ref,
-							 (EListFreeFunc) e_card_address_label_unref,
-							 NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->address_label);
-		break;
-	case ARG_PHONE:
-		if (!card->phone)
-			card->phone = e_list_new((EListCopyFunc) e_card_phone_ref,
-						 (EListFreeFunc) e_card_phone_unref,
-						 NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->phone);
-		break;
-	case ARG_EMAIL:
-		if (!card->email)
-			card->email = e_list_new((EListCopyFunc) g_strdup, 
-						 (EListFreeFunc) g_free,
-						 NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->email);
-		break;
-	case ARG_CATEGORIES:
-		{
-			int i;
-			char ** strs;
-			int length;
-			EIterator *iterator;
-			if (!card->categories)
-				card->categories = e_list_new((EListCopyFunc) g_strdup, 
-							      (EListFreeFunc) g_free,
-							      NULL);
-			length = e_list_length(card->categories);
-			strs = g_new(char *, length + 1);
-			for (iterator = e_list_get_iterator(card->categories), i = 0; e_iterator_is_valid(iterator); e_iterator_next(iterator), i++) {
-				strs[i] = (char *)e_iterator_get(iterator);
-			}
-			strs[i] = 0;
-			GTK_VALUE_STRING(*arg) = g_strjoinv(", ", strs);
-			g_free(strs);
-		}
-		break;
-	case ARG_CATEGORY_LIST:
-		if (!card->categories)
-			card->categories = e_list_new((EListCopyFunc) g_strdup, 
-						      (EListFreeFunc) g_free,
-						      NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->categories);
-		break;
-	case ARG_BIRTH_DATE:
-		GTK_VALUE_POINTER(*arg) = card->bday;
-		break;
-	case ARG_URL:
-		GTK_VALUE_STRING(*arg) = card->url;
-		break;
-	case ARG_ORG:
-		GTK_VALUE_STRING(*arg) = card->org;
-		break;
-	case ARG_ORG_UNIT:
-		GTK_VALUE_STRING(*arg) = card->org_unit;
-		break;
-	case ARG_OFFICE:
-		GTK_VALUE_STRING(*arg) = card->office;
-		break;
-	case ARG_TITLE:
-		GTK_VALUE_STRING(*arg) = card->title;
-		break;
-	case ARG_ROLE:
-		GTK_VALUE_STRING(*arg) = card->role;
-		break;
-	case ARG_MANAGER:
-		GTK_VALUE_STRING(*arg) = card->manager;
-		break;
-	case ARG_ASSISTANT:
-		GTK_VALUE_STRING(*arg) = card->assistant;
-		break;
-	case ARG_NICKNAME:
-		GTK_VALUE_STRING(*arg) = card->nickname;
-		break;
-	case ARG_SPOUSE:
-		GTK_VALUE_STRING(*arg) = card->spouse;
-		break;
-	case ARG_ANNIVERSARY:
-		GTK_VALUE_POINTER(*arg) = card->anniversary;
-		break;
-	case ARG_MAILER:
-		GTK_VALUE_STRING(*arg) = card->mailer;
-		break;
-	case ARG_CALURI:
-		GTK_VALUE_STRING(*arg) = card->caluri;
-		break;
-	case ARG_FBURL:
-		GTK_VALUE_STRING(*arg) = card->fburl;
-		break;
-	case ARG_NOTE:
-		GTK_VALUE_STRING(*arg) = card->note;
-		break;
-	case ARG_RELATED_CONTACTS:
-		GTK_VALUE_STRING(*arg) = card->related_contacts;
-		break;
-	case ARG_WANTS_HTML:
-		GTK_VALUE_BOOL(*arg) = card->wants_html;
-		break;
-	case ARG_WANTS_HTML_SET:
-		GTK_VALUE_BOOL(*arg) = card->wants_html_set;
-		break;
-	case ARG_ARBITRARY:
-		if (!card->arbitrary)
-			card->arbitrary = e_list_new((EListCopyFunc) e_card_arbitrary_ref,
-						     (EListFreeFunc) e_card_arbitrary_unref,
-						     NULL);
-
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->arbitrary);
-		break;
-	case ARG_ID:
-		GTK_VALUE_STRING(*arg) = card->id;
-		break;
-	case ARG_LAST_USE:
-		GTK_VALUE_POINTER(*arg) = card->last_use;
-		break;
-
-	case ARG_USE_SCORE:
-		GTK_VALUE_FLOAT(*arg) = e_card_get_use_score (card);
-		break;
-	case ARG_EVOLUTION_LIST:
-		GTK_VALUE_BOOL(*arg) = card->list;
-		break;
-	case ARG_EVOLUTION_LIST_SHOW_ADDRESSES:
-		GTK_VALUE_BOOL(*arg) = card->list_show_addresses;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-
-/**
- * e_card_init:
- */
-static void
-e_card_init (ECard *card)
-{
-	card->id = g_strdup("");
-	
-	card->file_as = NULL;
-	card->fname = NULL;
-	card->name = NULL;
-	card->bday = NULL;
-	card->email = NULL;
-	card->phone = NULL;
-	card->address = NULL;
-	card->address_label = NULL;
-	card->url = NULL;
-	card->org = NULL;
-	card->org_unit = NULL;
-	card->office = NULL;
-	card->title = NULL;
-	card->role = NULL;
-	card->manager = NULL;
-	card->assistant = NULL;
-	card->nickname = NULL;
-	card->spouse = NULL;
-	card->anniversary = NULL;
-	card->mailer = NULL;
-	card->caluri = NULL;
-	card->fburl = NULL;
-	card->note = NULL;
-	card->related_contacts = NULL;
-	card->categories = NULL;
-	card->wants_html = FALSE;
-	card->wants_html_set = FALSE;
-	card->list = FALSE;
-	card->list_show_addresses = FALSE;
-	card->arbitrary = NULL;
-	card->last_use = NULL;
-	card->raw_use_score = 0;
-#if 0
-
-	c = g_new0 (ECard, 1);
-	
-	c->fname      = 
-	c->mailer     = 
-	c->role       = 
-	c->comment    = 
-	c->categories = 
-	c->uid        = e_card_prop_str_empty ();
-	
-	c->photo.type = PHOTO_JPEG;
-	c->logo.type  = PHOTO_JPEG;
-	c->rev.utc    = -1;
-	c->sound.type = SOUND_PHONETIC;
-	c->key.type   = KEY_PGP;
-
-	c->categories.prop.encod = ENC_QUOTED_PRINTABLE;
-	c->comment.prop.encod    = ENC_QUOTED_PRINTABLE;
-	
-	c->name.prop   = c->photo.prop = c->bday.prop     = c->timezn.prop   = 
-	c->geopos.prop = c->logo.prop  = c->org.prop      = c->rev.prop      =
-	c->sound.prop  = c->key.prop   = c->deladdr.prop  = c->dellabel.prop =
-	c->phone.prop  = c->email.prop = c->xtension.prop = c->prop = e_card_prop_empty ();
-	
-	c->prop.type            = PROP_CARD;
-	c->fname.prop.type      = PROP_FNAME;
-	c->name.prop.type       = PROP_NAME;
-	c->photo.prop.type      = PROP_PHOTO;
-	c->bday.prop.type       = PROP_BDAY;
-	
-	c->deladdr.prop.type    = PROP_DELADDR_LIST;
-	c->dellabel.prop.type   = PROP_DELLABEL_LIST;
-	c->phone.prop.type      = PROP_PHONE_LIST;
-	c->email.prop.type      = PROP_EMAIL_LIST;
-	c->xtension.prop.type   = PROP_XTENSION_LIST;
-	c->mailer.prop.type     = PROP_MAILER;
-	c->timezn.prop.type     = PROP_TIMEZN;
-	c->geopos.prop.type     = PROP_GEOPOS;
-	c->role.prop.type       = PROP_ROLE;
-	c->logo.prop.type       = PROP_LOGO;
-	c->org.prop.type        = PROP_ORG;
-	c->categories.prop.type = PROP_CATEGORIES;
-	c->comment.prop.type    = PROP_COMMENT;
-	c->rev.prop.type        = PROP_REV;
-	c->sound.prop.type      = PROP_SOUND;
-	c->uid.prop.type 	= PROP_UID;
-	c->key.prop.type 	= PROP_KEY;
-	
-	return c;
-#endif
-}
-
-GList *
-e_card_load_cards_from_file_with_default_charset(const char *filename, char *default_charset)
-{
-	VObject *vobj = Parse_MIME_FromFileName((char *) filename);
-	GList *list = NULL;
-	while(vobj) {
-		VObject *next;
-		ECard *card = E_CARD(gtk_type_new(e_card_get_type()));
-		parse(card, vobj, default_charset);
-		next = nextVObjectInList(vobj);
-		cleanVObject(vobj);
-		vobj = next;
-		list = g_list_prepend(list, card);
-	}
-	list = g_list_reverse(list);
-	return list;
-}
-
-GList *
-e_card_load_cards_from_file(const char *filename)
-{
-	return e_card_load_cards_from_file_with_default_charset (filename, "UTF-8");
-}
-
-GList *
-e_card_load_cards_from_string_with_default_charset(const char *str, char *default_charset)
-{
-	VObject *vobj = Parse_MIME(str, strlen (str));
-	GList *list = NULL;
-	while(vobj) {
-		VObject *next;
-		ECard *card = E_CARD(gtk_type_new(e_card_get_type()));
-		parse(card, vobj, default_charset);
-		next = nextVObjectInList(vobj);
-		cleanVObject(vobj);
-		vobj = next;
-		list = g_list_prepend(list, card);
-	}
-	list = g_list_reverse(list);
-	return list;
-}
-
-GList *
-e_card_load_cards_from_string(const char *str)
-{
-	return e_card_load_cards_from_string_with_default_charset (str, "UTF-8");
-}
-
-void
-e_card_free_empty_lists (ECard *card)
-{
-	if (card->address && e_list_length (card->address) == 0) {
-		gtk_object_unref (GTK_OBJECT (card->address));
-		card->address = NULL;
-	}
-
-	if (card->address_label && e_list_length (card->address_label) == 0) {
-		gtk_object_unref (GTK_OBJECT (card->address_label));
-		card->address_label = NULL;
-	}
-
-	if (card->phone && e_list_length (card->phone) == 0) {
-		gtk_object_unref (GTK_OBJECT (card->phone));
-		card->phone = NULL;
-	}
-
-	if (card->email && e_list_length (card->email) == 0) {
-		gtk_object_unref (GTK_OBJECT (card->email));
-		card->email = NULL;
-	}
-
-	if (card->categories && e_list_length (card->categories) == 0) {
-		gtk_object_unref (GTK_OBJECT (card->categories));
-		card->categories = NULL;
-	}
-
-	if (card->arbitrary && e_list_length (card->arbitrary) == 0) {
-		gtk_object_unref (GTK_OBJECT (card->arbitrary));
-		card->arbitrary = NULL;
-	}
-}
-
-static void
-assign_string(VObject *vobj, char *default_charset, char **string)
-{
-	int type = vObjectValueType(vobj);
-	char *str;
-	char *charset = default_charset;
-	gboolean free_charset = FALSE;
-	VObject *charset_obj;
-
-	if ((charset_obj = isAPropertyOf (vobj, "CHARSET"))) {
-		switch (vObjectValueType (charset_obj)) {
-		case VCVT_STRINGZ:
-			charset = (char *) vObjectStringZValue(charset_obj);
-			break;
-		case VCVT_USTRINGZ:
-			charset = fakeCString (vObjectUStringZValue (charset_obj));
-			free_charset = TRUE;
-			break;
-		}
-	}
-
-	switch(type) {
-	case VCVT_STRINGZ:
-		if (strcmp (charset, "UTF-8"))
-			*string = e_utf8_from_charset_string (charset, vObjectStringZValue(vobj));
-		else
-			*string = g_strdup(vObjectStringZValue(vobj));
-		break;
-	case VCVT_USTRINGZ:
-		str = fakeCString (vObjectUStringZValue (vobj));
-		if (strcmp (charset, "UTF-8"))
-			*string = e_utf8_from_charset_string (charset, str);
-		else
-			*string = g_strdup(str);
-		free(str);
-		break;
-	default:
-		*string = g_strdup("");
-		break;
-	}
-
-	if (free_charset) {
-		free (charset);
-	}
-}
-
-#if 0
-static void
-e_card_str_free (CardStrProperty *sp)
-{
-	g_free (sp->str);
-
-	e_card_prop_free (sp->prop);
-}
-
-static void
-e_card_photo_free (CardPhoto *photo)
-{
-	g_free (photo->data);
-
-	e_card_prop_free (photo->prop);
-}
-
-/**
- * e_card_free:
- */
-void
-e_card_free (ECard *card)
-{
-	GList *l;
-
-	g_return_if_fail (card != NULL);
-
-	e_card_name_free (& card->name);
-	e_card_str_free  (& card->fname);
-
-	e_card_photo_free (card->photo);
-
-	e_card_logo_free (card->logo);
-	e_card_org_free (card->org);
-	e_card_key_free (card->key);
-	e_card_sound_free (card->sound);
-
-	e_card_prop_str_free (& card->mailer);
-	e_card_prop_str_free (& card->role);
-	e_card_prop_str_free (& card->categories);
-	e_card_prop_str_free (& card->comment);
-	e_card_prop_str_free (& card->uid);
-
-	/* address is a little more complicated */
-	card_prop_free (card->deladdr.prop);
-	while ((l = card->deladdr.l)) {
-
-		e_card_deladdr_free ((CardDelAddr *) l->data);
-
-		card->deladdr.l = g_list_remove_link (card->deladdr.l, l);
-		g_list_free (l);
-	}
-	
-	g_free (card);
-}
-
-typedef struct
-{
-	char c;
-	int id;
-	
-	GList *sons;
-} tree;
-
-extern CardProperty 
-e_card_prop_empty (void)
-{
-	CardProperty prop;
-	
-	prop.used = FALSE;
-	
-	prop.type = PROP_NONE;
-	prop.encod = ENC_7BIT;
-	prop.value = VAL_INLINE;
-	prop.charset = NULL;
-	prop.lang = NULL;
-	prop.grp = NULL;
-	prop.xtension = NULL;
-	
-	prop.user_data = NULL;
-	
-	return prop;
-}
-
-static CardStrProperty 
-e_card_prop_str_empty (void)
-{
-	CardStrProperty strprop;
-	
-	strprop.prop = card_prop_empty ();
-	strprop.str = NULL;
-	
-	return strprop;
-}
-
-/* Intended to check asserts. */
-extern int card_check_prop (ECardProperty prop)
-{
-	if (((prop.used == FALSE) || (prop.used == TRUE)) &&
-	    ((prop.type >= PROP_NONE) && (prop.type <= PROP_LAST)) &&
-	    ((prop.encod >= ENC_NONE) && (prop.encod <= ENC_LAST)) &&
-	    ((prop.value >= VAL_NONE) && (prop.value <= VAL_LAST)))
-	  return TRUE;
-	    
-	return FALSE;
-}
-
-extern void
-card_prop_free (CardProperty prop)
-{
-	GList *l;
-	
-	g_free (prop.charset);
-	g_free (prop.lang);
-	
-	for (l = prop.xtension; l; l = l->next) {
-		CardXAttribute *xa = (CardXAttribute *) l->data;
-		g_free (xa->name);
-		g_free (xa->data);
-	}
-	
-	g_list_free (l);
-	
-	prop.used = FALSE;
-}
-	
-e_card_deladdr_free (ECardDelAddr *c)
-{
-	card_prop_free (c->prop);
-
-	g_free (p->pobox);
-	g_free (p->ext);
-	g_free (p->street);
-	g_free (p->city);
-	g_free (p->region);
-	g_free (p->code);
-	g_free (p->country);
-}
-
-void 
-card_free (Card *crd)
-{
-}
-
-static tree *
-new_tree (char c, int id)
-{
-	tree *t;
-	
-	t = malloc (sizeof (tree));
-	t->c = c;
-	t->id = id;
-	t->sons = NULL;
-	
-	return t;
-}
-
-static void 
-add_branch (tree *t, char *str, int id)
-{
-	tree *tmp;
-	char *end;
-	
-	end = str + strlen (str) + 1;
-
-	while (str != end) {
-		tmp = new_tree (*str, id);
-		t->sons = g_list_append (t->sons, (gpointer) tmp);
-		t = tmp;
-		
-		str ++;
-	}
-}
-
-static tree *
-add_to_tree (tree *t, struct pair p)
-{
-	GList *node;
-	char *c, *end;
-	tree *tmp;
-	
-	  c = p.str;
-	end = c + strlen (c) + 1;
-	tmp = t;
-	
-	while (c != end) {
-		for (node = tmp->sons; node; node = node->next)
-		  if (((tree *) node->data)->c == *c) {
-			  break;
-		  }
-		
-		if (node) {
-			tmp = (tree *) node->data;
-			tmp->id = 0;
-			c++;
-		}
-		else {
-			add_branch (tmp, c, p.id);
-			break;
-		}
-	}
-	
-	return t;
-}
-		
-static tree *
-create_search_tree (void)
-{
-	tree *t;
-	int i;
-
-	t = new_tree (0, 0);
-	for (i = 0; prop_lookup[i].str; i++)
-	  t = add_to_tree (t, prop_lookup[i]);
-	
-	return t;
-}
-		
-static int 
-card_lookup_name (const char *c)
-{
-	static tree *search_tree = NULL;
-	GList *node;
-	tree *tmp;
-	const char *end;
-	
-	if (!search_tree)
-	  search_tree = create_search_tree ();
-	
-	tmp = search_tree;
-	end = c + strlen (c) + 1;
-	
-	while (tmp->id == 0 && c != end) {
-		for (node = tmp->sons; node; node = node->next)
-		  if (((tree *) node->data)->c == *c) {
-			  break;
-		  }
-	
-		if (node) {
-			tmp = (tree *) node->data;
-			c++;
-		}
-		else
-		  return 0;
-	}
-	
-	return tmp->id;
-}
-
-static enum PhotoType 
-get_photo_type (VObject *o)
-{
-	VObject *vo;
-	int i;
-	
-	for (i = 0; photo_pairs[i].str; i++)
-	  if (has (o, photo_pairs[i].str))
-	    return photo_pairs[i].id;
-
-	g_warning ("? < No PhotoType for Photo property. Falling back to JPEG.");
-	return PHOTO_JPEG;
-}
-
-static CardProperty 
-get_CardProperty (VObject *o)
-{
-	VObjectIterator i;
-	CardProperty prop;
-
-	prop = card_prop_empty ();
-	prop.used = TRUE;
-	
-	initPropIterator (&i, o);
-	while (moreIteration (&i)) {
-		VObject *vo = nextVObject (&i);
-		const char *n = vObjectName (vo);
-		int propid;
-	
-		propid = card_lookup_name (n);
-		
-		switch (propid) {
-			
-		 case PROP_VALUE:
-		
-			if (has (vo, VCContentIDProp))
-			  prop.value = VAL_CID;
-			break;
-			
-		 case PROP_ENCODING:
-			if (has (vo, VCQuotedPrintableProp))
-			  prop.encod = ENC_QUOTED_PRINTABLE;
-			else if (has (vo, VC8bitProp))
-			  prop.encod = ENC_8BIT;
-			else if (has (vo, VCBase64Prop))
-			  prop.encod = ENC_BASE64;
-			break;
-			
-		 case PROP_QUOTED_PRINTABLE:
-			prop.encod = ENC_QUOTED_PRINTABLE;
-			break;
-			
-		 case PROP_8BIT:
-			prop.encod = ENC_8BIT;
-			break;
-			
-		 case PROP_BASE64:
-			prop.encod = ENC_BASE64;
-			break;
-	
-		 case PROP_LANG:
-			if (vObjectValueType (vo)) {
-				prop.lang = 
-				  g_strdup (vObjectStringZValue (vo));
-			} else
-			  g_warning ("? < No value for LANG attribute.");
-			break;
-			
-		 case PROP_CHARSET:
-			if (vObjectValueType (vo)) {
-				prop.charset = 
-				  g_strdup (vObjectStringZValue (vo));
-				g_warning (prop.charset); 
-			} else
-			  g_warning ("? < No value for CHARSET attribute.");
-			break;
-		 default:
-				{
-					CardXAttribute *c;
-
-					c = malloc (sizeof (CardXAttribute));
-					c->name = g_strdup (n);
-					
-					if (vObjectValueType (vo))
-					  c->data = 
-					  g_strdup (vObjectStringZValue (vo));
-					else
-					  c->data = NULL;
-					
-					prop.xtension = 
-					  g_list_append (prop.xtension, c);
-				}
-		}
-	}
-
-	return prop;
-}
-
-static gboolean
-e_card_prop_has (VObject    *o,
-		 const char *id)
-{
-	g_assert (o  != NULL);
-	g_assert (id != NULL);
-
-	if (isAPropertyOf (o, id) == NULL)
-		return FALSE;
-
-	return TRUE;
-}
-
-static const char *
-e_card_prop_get_str (VObject    *o,
-		     const char *id)
-{
-	VObject *strobj;
-
-	g_assert (o  != NULL);
-	g_assert (id != NULL);
-
-	strobj = isAPropertyOf (o, id);
-
-	if (strobj == NULL)
-		return g_strdup ("");
-
-	if (vObjectValueType (strobj) != NULL) {
-		char *str;
-		char *g_str;
-
-		str = fakeCString (vObjectStringZValue (strobj));
-		g_str = g_strdup (str);
-		free (str);
-
-		return g_str;
-	}
-
-	return g_strdup ("");
-}
-
-static ECardName *
-e_card_get_name (VObject *o)
-{
-	CardName *name;
-	VObject *vo;
-	char *the_str;
-
-	name = e_card_name_new ();
-
-	name->family     = e_card_prop_get_substr (o, VCFamilyNameProp);
-	name->given      = e_card_prop_get_substr (o, VCGivenNameProp);
-	name->additional = e_card_prop_get_substr (o, VCAdditionalNamesProp);
-	name->prefix     = e_card_prop_get_substr (o, VCNamePrefixesProp);
-	name->suffix     = e_card_prop_get_substr (o, VCNameSuffixesProp);
-
-	return name;
-}
-
-static CardDelLabel *
-get_CardDelLabel (VObject *o)
-{
-	CardDelLabel *dellabel;
-	char *the_str;
-	
-	dellabel = malloc (sizeof (CardDelLabel));
-	
-	dellabel->type = get_addr_type (o);
-	dellabel->data = g_strdup (str_val (o));
-	
-	free (the_str);
-	return dellabel;
-}
-
-static CardPhone *
-get_CardPhone (VObject *o)
-{
-	CardPhone *ret;
-	char *the_str;
-	
-	ret = malloc (sizeof (CardPhone));
-	ret->type = get_phone_type (o);
-	ret->data = g_strdup (str_val (o));
-	
-	free (the_str);
-
-	return ret;
-}
-
-static CardEMail *
-get_CardEMail (VObject *o)
-{
-	CardEMail *ret;
-	char *the_str; 
-	
-	ret = malloc (sizeof (CardEMail)); 
-	ret->type = get_email_type (o);
-	ret->data = g_strdup (str_val (o));
-	
-	free (the_str);
-	
-	return ret;
-}
-	
-static CardTimeZone 
-strtoCardTimeZone (char *str)
-{
-	char s[3];
-	CardTimeZone tz;
-	
-	if (*str == '-') {
-		tz.sign = -1;
-		str++;
-	} else
-	  tz.sign = 1;
-	
-	tz.hours = 0;
-	tz.mins = 0;
-	
-	s[2] = 0;
-	if (strlen (str) > 2) {
-		s[0] = str[0];
-		s[1] = str[1];
-		tz.hours = atoi (s);
-	} else {
-		g_warning ("? < TimeZone value is too short.");
-		return tz;
-	}
-	
-	str += 2;
-	if (*str == ':')
-	  str++;
-	
-	if (strlen (str) >= 2) {
-		s[0] = str[0];
-		s[1] = str[1];
-		tz.mins = atoi (s);
-	} else {
-		g_warning ("? < TimeZone value is too short.");
-		return tz;
-	}
-	
-	if (strlen (str) > 3)
-		g_warning ("? < TimeZone value is too long.");
-
-	return tz;
-}
-
-static CardGeoPos 
-strtoCardGeoPos (char *str)
-{
-	CardGeoPos gp;
-	char *s;
-	
-	gp.lon = 0;
-	gp.lat = 0;
-	  
-	s = strchr (str, ',');
-	
-	if (! s) {
-		g_warning ("? < Bad format for GeoPos property.");
-		return gp;
-	}
-	
-	*s = 0;
-	s++;
-	
-	gp.lon = atof (str);
-	gp.lat = atof (s);
-	
-	return gp;
-}
-	
-static CardOrg *
-e_card_vobject_to_org (VObject *o)
-{
-	VObject *vo;
-	char *the_str;
-	CardOrg *org;
-
-	org = g_new0 (CardOrg, 1);
-
-	if (has (o, VCOrgNameProp)) {
-		org.name = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnitProp)) {
-		org.unit1 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnit2Prop)) {
-		org.unit2 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnit3Prop)) {
-		org.unit3 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnit4Prop)) {
-		org.unit4 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	
-	return org;
-}
-
-static CardXProperty *
-get_XProp (VObject *o)
-{
-	char *the_str;
-	CardXProperty *ret;
-	
-	ret = malloc (sizeof (CardXProperty)); 
-	ret->name = g_strdup (vObjectName (o));
-	ret->data = g_strdup (str_val (o));
-	free (the_str);
-	
-	return ret;
-}
-
-static CardRev 
-strtoCardRev (char *str)
-{
-	char s[3], *t, *ss;
-	int len, i;
-	CardRev rev;
-	
-	rev.utc = 0;
-	len = strlen (str);
-	
-	if (str[len] == 'Z') {              /* Is it UTC? */
-		rev.utc = 1;
-		str[len] = 0;
-	}
-	  
-	s[2] = 0;
-	t = strchr (str, 'T');
-	if (t) {                            /* Take the Time */
-		*t = 0;
-		t++;
-		if (strlen (t) > 2) {
-			s[0] = t[0];
-			s[1] = t[1];
-			rev.tm.tm_hour = atoi (s);
-		} else {
-			g_warning ("? < Rev value is too short.");
-			return rev;
-		}
-		
-		t += 2;
-		if (*t == ':')             /* Ignore ':' separator */
-		  t++;
-		
-		if (strlen (t) > 2) {
-			s[0] = t[0];
-			s[1] = t[1];
-			rev.tm.tm_min = atoi (s);
-		} else {
-			g_warning ("? < Rev value is too short.");
-			return rev;
-		}
-		
-		t += 2;
-		if (*t == ':')
-		  t++;
-		
-		if (strlen (t) > 2) {
-			s[0] = t[0];
-			s[1] = t[1];
-			rev.tm.tm_sec = atoi (s);
-		} else {
-			g_warning ("? < Rev value is too short.");
-			return rev;
-		}
-
-		if (strlen (str) > 3)
-		  g_warning ("? < Rev value is too long.");
-		
-	} else {
-		g_warning ("? < No time value for Rev property.");
-	}
-
-	/* Now the date (the part before the T) */
-	
-	if (strchr (str, '-')) {                        /* extended iso 8601 */
-		for (ss = strtok (str, "-"), i = 0; ss;
-		     ss = strtok (NULL, "-"), i++)
-		  switch (i) {
-		   case 0:
-			  rev.tm.tm_year = atoi (ss);
-			  break;
-		   case 1:
-			  rev.tm.tm_mon = atoi (ss);
-			  break;
-		   case 2:
-			  rev.tm.tm_mday = atoi (ss);
-			  break;
-		   default:
-			  g_warning ("? < Too many values for Rev property.");
-		  }
-		
-		if (i < 2)
-		  g_warning ("? < Too few values for Rev property.");
-	} else {
-		if (strlen (str) >= 8) {             /* short representation */
-			rev.tm.tm_mday = atoi (str + 6);
-			str[6] = 0;
-			rev.tm.tm_mon = atoi (str + 4);
-			str[4] = 0;
-			rev.tm.tm_year = atoi (str);
-		} else
-		  g_warning ("? < Bad format for Rev property.");
-	}
-	
-	return rev;
-}
-		
-static enum KeyType 
-get_key_type (VObject *o)
-{
-	VObject *vo;
-	int i;
-	
-	for (i = 0; key_pairs[i].str; i++)
-	  if (has (o, key_pairs[i].str))
-	    return key_pairs[i].id;
-
-	g_warning ("? < No KeyType for Key property. Falling back to PGP.");
-	return KEY_PGP;
-}
-
-static CardPhoto 
-get_CardPhoto (VObject *o)
-{
-	VObject *vo;
-	char *the_str;
-	CardPhoto photo;
-
-	photo.type = get_photo_type (o);
-	
-	if (has (o, VCDataSizeProp)) {
-		photo.size = vObjectIntegerValue (vo);
-		photo.data = malloc (photo.size);
-		memcpy (photo.data, vObjectAnyValue (o), photo.size);
-	} else {
-		photo.size = strlen (str_val (o)) + 1;
-		photo.data = g_strdup (the_str);
-		free (the_str);
-	}
-	
-	return photo;
-}
-
-static enum SoundType 
-get_sound_type (VObject *o)
-{
-	VObject *vo;
-	int i;
-	
-	for (i = 0; sound_pairs[i].str; i++)
-	  if (has (o, sound_pairs[i].str))
-	    return sound_pairs[i].id;
-
-	return SOUND_PHONETIC;
-}
-	
-static CardSound 
-get_CardSound (VObject *o)
-{
-	VObject *vo;
-	char *the_str;
-	CardSound sound;
-
-	sound.type = get_sound_type (o);
-	
-	if (has (o, VCDataSizeProp)) {
-		sound.size = vObjectIntegerValue (vo);
-		sound.data = malloc (sound.size);
-		memcpy (sound.data, vObjectAnyValue (o), sound.size);
-	} else {
-		sound.size = strlen (str_val (o));
-		sound.data = g_strdup (the_str);
-		free (the_str);
-	}
-	
-	return sound;
-}
-
-/* Loads our card contents from a VObject */
-static ECard *
-e_card_construct_from_vobject (ECard   *card,
-			       VObject *vcrd)
-{
-	VObjectIterator i;
-	Card *crd;
-	char *the_str;
-
-	initPropIterator (&i, vcrd);
-	crd = card_new ();
-
-	while (moreIteration (&i)) {
-		VObject *o = nextVObject (&i);
-		const char *n = vObjectName (o);
-		int propid;
-		CardProperty *prop = NULL;
-
-		propid = card_lookup_name (n);
-		
-		switch (propid) {
-		case PROP_FNAME:
-			prop = &crd->fname.prop;
-			crd->fname.str = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_NAME:
-			prop = &crd->name.prop;
-			crd->name = e_card_get_name (o);
-			break;
-		 case PROP_PHOTO:
-			prop = &crd->photo.prop;
-			crd->photo = get_CardPhoto (o);
-			break;
-		 case PROP_BDAY:
-			prop = &crd->bday.prop;
-			crd->bday = strtoCardBDay (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_DELADDR:
-				{
-					CardDelAddr *c;
-					c = get_CardDelAddr (o);
-					prop = &c->prop;
-					crd->deladdr.l = g_list_append (crd->deladdr.l, c);
-				}
-			break;
-		 case PROP_DELLABEL:
-				{
-					CardDelLabel *c;
-					c = get_CardDelLabel (o);
-					prop = &c->prop;
-					crd->dellabel.l = g_list_append (crd->dellabel.l, c);
-				}
-			break;
-		 case PROP_PHONE:
-				{
-					CardPhone *c;
-					
-					c = get_CardPhone (o);
-					prop = &c->prop;
-					crd->phone.l = g_list_append (crd->phone.l, c);
-				}
-			break;
-		 case PROP_EMAIL:
-				{
-					CardEMail *c;
-					
-					c = get_CardEMail (o);
-					prop = &c->prop;
-					crd->email.l = g_list_append (crd->email.l, c);
-				}
-			break;
-		 case PROP_MAILER:
-			prop = &crd->mailer.prop;
-			crd->mailer.str = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_TIMEZN:
-			prop = &crd->timezn.prop;
-			crd->timezn = strtoCardTimeZone (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_GEOPOS:
-			prop = &crd->geopos.prop;
-			crd->geopos = strtoCardGeoPos (str_val (o));
-			break;
-		 case PROP_ROLE:
-			prop = &crd->role.prop;
-			crd->role.str = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_LOGO:
-			prop = &crd->logo.prop;
-			crd->logo = get_CardPhoto (o);
-			break;
-		 case PROP_AGENT:
-			crd->agent = card_create_from_vobject (o);
-			break;
-		 case PROP_ORG:
-			prop = &crd->org.prop;
-			crd->org = get_CardOrg (o);
-			break;
-		 case PROP_CATEGORIES:
-			prop = &crd->categories.prop;
-			crd->categories.str = g_strdup (str_val (o));
-			crd->categories.prop.encod = ENC_QUOTED_PRINTABLE;
-			free (the_str);
-			break;
-		 case PROP_COMMENT:
-			prop = &crd->comment.prop;
-			crd->comment.str = g_strdup (str_val (o));
-			crd->comment.prop.encod = ENC_QUOTED_PRINTABLE;
-			free (the_str);
-			break;
-		 case PROP_REV:
-			prop = &crd->rev.prop;
-			crd->rev = strtoCardRev (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_SOUND:
-			prop = &crd->sound.prop;
-			crd->sound = get_CardSound (o);
-			break;
-		 case PROP_VERSION:
-				{
-					char *str;
-					str = str_val (o);
-					if (strcmp (str, "2.1"))
-					  g_warning ("? < Version doesn't match.");
-					free (the_str);
-				}
-			break;
-		 case PROP_KEY:
-			prop = &crd->key.prop;
-			crd->key.type = get_key_type (o);
-			crd->key.data = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 default:
-				{
-					CardXProperty *c;
-				
-					c = get_XProp (o);
-					prop = &c->prop;
-					crd->xtension.l = g_list_append (crd->xtension.l, c);
-				}
-			break;
-		}
-		
-		if (prop) {
-			*prop = get_CardProperty (o);
-			prop->type = propid;
-		}
-	}
-	
-	return crd;
-}
-		
-/* Loads a card from a file */
-GList *
-card_load (GList *crdlist, char *fname)
-{
-	VObject *vobj, *tmp;
-	
-	vobj = Parse_MIME_FromFileName (fname);
-	if (!vobj) {
-		g_warning ("Could not load the cardfile");
-		return NULL;
-	}
-
-	while (vobj) {
-		const char *n = vObjectName (vobj);
-		
-		if (strcmp (n, VCCardProp) == 0) {
-			crdlist = g_list_append (crdlist, (gpointer)
-					    card_create_from_vobject (vobj));
-		}
-		tmp = vobj;
-		vobj = nextVObjectInList (vobj);
-		cleanVObject (tmp);
-	}
-
-	cleanVObject (vobj);
-	cleanStrTbl ();
-	return crdlist;
-}
-
-static VObject *
-add_strProp (VObject *o, const char *id, char *val)
-{
-	VObject *vo = NULL;
-	
-	if (val)
-	  vo = addPropValue (o, id, val);
-
-	return vo;
-}
-
-static VObject *
-add_CardProperty (VObject *o, CardProperty *prop)
-{
-	GList *node;
-	
-	switch (prop->encod) {
-	 case ENC_BASE64:
-		addProp (o, VCBase64Prop);
-		break;
-	 case ENC_QUOTED_PRINTABLE:
-		addProp (o, VCQuotedPrintableProp);
-		break;
-	 case ENC_8BIT:
-		addProp (o, VC8bitProp);
-		break;
-	 case ENC_7BIT:
-		/* Do nothing: 7BIT is the default. Avoids file clutter. */
-		break;
-	 default:
-		g_warning ("? < Card had invalid encoding type.");
-	}
-	
-	switch (prop->value) {
-	 case VAL_CID:
-		addProp (o, VCContentIDProp);
-		break;
-	 case VAL_INLINE:
-		/* Do nothing: INLINE is the default. Avoids file clutter. */
-		break;
-	 default:
-		g_warning ("? < Card had invalid value type.");
-	}
-	
-	for (node = prop->xtension; node; node = node->next) {
-		CardXAttribute *xa = (CardXAttribute *) node->data;
-		if (xa->data)
-		  addPropValue (o, xa->name, xa->data);
-		else
-		  addProp (o, xa->name);
-	}
-
-	add_strProp (o, VCCharSetProp, prop->charset);
-	add_strProp (o, VCLanguageProp, prop->lang);
-	
-	return o;
-}
-
-static VObject *
-add_CardStrProperty (VObject *vobj, const char *id, CardStrProperty *strprop)
-{
-	VObject *vprop;
-	
-	if (strprop->prop.used) {
-		vprop = add_strProp (vobj, id, strprop->str);
-		add_CardProperty (vprop, &strprop->prop);
-	}
-	
-	return vobj;
-}
-
-static VObject *
-add_PhotoType (VObject *o, enum PhotoType photo_type)
-{
-	int i;
-	
-	for (i = 0; photo_pairs[i].str; i++)
-	  if (photo_type == photo_pairs[i].id) {
-		  addProp (o, photo_pairs[i].str);
-		  return o;
-	  }
-
-	g_warning ("? > No PhotoType for Photo property. Falling back to JPEG.");
-	addProp (o, VCJPEGProp);
-	
-	return o;
-}
-
-static VObject *
-add_AddrType (VObject *o, int addr_type)
-{
-	int i;
-	
-	for (i = 0; addr_pairs[i].str; i++)
-	  if (addr_type & addr_pairs[i].id)
-	    addProp (o, addr_pairs[i].str);
-	
-	return o;
-}
-
-static void
-add_strAddrType (GString *string, int addr_type)
-{
-	int i, first = 1;
-	char *str;
-	
-	if (addr_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; addr_pairs[i].str; i++)
-		  if (addr_type & addr_pairs[i].id) {
-			  if (!first)
-			    g_string_append (string, ", ");
-			  first = 0;
-			  str = my_cap (addr_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_PhoneType (VObject *o, int phone_type)
-{
-	int i;
-	
-	for (i = 0; phone_pairs[i].str; i++)
-	  if (phone_type & phone_pairs[i].id)
-	    addProp (o, phone_pairs[i].str);
-	
-	return o;
-}
-
-static void
-add_strPhoneType (GString *string, int phone_type)
-{
-	int i, first = 1;
-	char *str;
-	
-	if (phone_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; phone_pairs[i].str; i++)
-		  if (phone_type & phone_pairs[i].id) {
-			  if (!first)
-			    g_string_append (string, ", ");
-			  first = 0;
-			  str = my_cap (phone_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_EMailType (VObject *o, enum EMailType email_type)
-{
-	int i;
-	
-	for (i = 0; email_pairs[i].str; i++)
-	  if (email_type == email_pairs[i].id) {
-		  addProp (o, email_pairs[i].str);
-		  return o;
-	  }
-
-	g_warning ("? > No EMailType for EMail property. Falling back to INET.");
-	addProp (o, VCInternetProp);
-	
-	return o;
-}
-
-static void
-add_strEMailType (GString *string, int email_type)
-{
-	int i;
-	char *str;
-	
-	if (email_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; email_pairs[i].str; i++)
-		  if (email_type == email_pairs[i].id) {
-			  str = my_cap (email_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-			  break;
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_KeyType (VObject *o, enum KeyType key_type)
-{
-	int i;
-	
-	for (i = 0; key_pairs[i].str; i++)
-	  if (key_type == key_pairs[i].id) {
-		  addProp (o, key_pairs[i].str);
-		  return o;
-	  }
-
-	g_warning ("? > No KeyType for Key property. Falling back to PGP.");
-	addProp (o, VCPGPProp);
-	
-	return o;
-}
-
-static void
-add_strKeyType (GString *string, int key_type)
-{
-	int i;
-	char *str;
-	
-	if (key_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; key_pairs[i].str; i++)
-		  if (key_type == key_pairs[i].id) {
-			  str = my_cap (key_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-			  break;
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_SoundType (VObject *o, enum SoundType sound_type)
-{
-	int i;
-	
-	for (i = 0; sound_pairs[i].str; i++)
-	  if (sound_type == sound_pairs[i].id) {
-		  addProp (o, sound_pairs[i].str);
-		  return o;
-	  }
-
-	return o;
-}
-
-char *card_timezn_str (CardTimeZone timezn)
-{
-	char *str;
-	
-	str = malloc (7);
-	snprintf (str, 7, (timezn.sign == -1)? "-%02d:%02d" : "%02d:%02d",
-		 timezn.hours, timezn.mins);
-	return str;
-}
-
-char *card_geopos_str (CardGeoPos geopos)
-{
-	char *str;
-	
-	str = malloc (15);
-	snprintf (str, 15, "%03.02f,%03.02f", geopos.lon, geopos.lat);
-	return str;
-}
-
-static void add_CardStrProperty_to_string (GString *string, char *prop_name,
-					   CardStrProperty *strprop)
-{
-	if (strprop->prop.used) {
-		if (prop_name)
-		  g_string_append (string, prop_name);
-		
-		g_string_append (string, strprop->str);
-	}
-}
-
-static void add_strProp_to_string (GString *string, char *prop_name, char *val)
-{
-	if (val) {
-		if (prop_name)
-		  g_string_append (string, prop_name);
-		
-		g_string_append (string, val);
-	}
-}
-
-static void addProp_to_string (GString *string, char *prop_name)
-{
-	if (prop_name)
-	  g_string_append (string, prop_name);
-}
-
-char *
-card_to_string (Card *crd)
-{
-	GString *string;
-	char *ret;
-	
-	string = g_string_new ("");
-	
-	add_CardStrProperty_to_string (string, _("Card: "), &crd->fname);
-	if (crd->name.prop.used) {
-		addProp_to_string (string, N_("\nName: "));
-		add_strProp_to_string (string, N_("\n  Prefix:     "), crd->name.prefix);
-		add_strProp_to_string (string, N_("\n  Given:      "), crd->name.given);
-		add_strProp_to_string (string, N_("\n  Additional: "), crd->name.additional);
-		add_strProp_to_string (string, N_("\n  Family:     "), crd->name.family);
-		add_strProp_to_string (string, N_("\n  Suffix:     "), crd->name.suffix);
-		g_string_append_c (string, '\n');
-	}
-	
-/*	if (crd->photo.prop.used) {
-		addPropSizedValue (string, _ ("\nPhoto: "), 
-					  crd->photo.data, crd->photo.size);
-		add_PhotoType (string, crd->photo.type);
-	}*/
-	
-	if (crd->bday.prop.used) {
-		char *date_str;
-		
-		date_str = card_bday_str (crd->bday);
-		add_strProp_to_string (string, N_("\nBirth Date: "), date_str);
-		free (date_str);
-	}
-	
-	if (crd->deladdr.l) {
-		GList *node;
-		
-		for (node = crd->deladdr.l; node; node = node->next) {
-			CardDelAddr *deladdr = (CardDelAddr *) node->data;
-			
-			if (deladdr->prop.used) {
-				addProp_to_string (string, N_("\nAddress:"));
-				add_strAddrType (string, deladdr->type);
-				add_strProp_to_string (string, N_("\n  Postal Box:  "), deladdr->po);
-				add_strProp_to_string (string, N_("\n  Ext:         "), deladdr->ext);
-				add_strProp_to_string (string, N_("\n  Street:      "), deladdr->street);
-				add_strProp_to_string (string, N_("\n  City:        "), deladdr->city);
-				add_strProp_to_string (string, N_("\n  Region:      "), deladdr->region);
-				add_strProp_to_string (string, N_("\n  Postal Code: "), deladdr->code);
-				add_strProp_to_string (string, N_("\n  Country:     "), deladdr->country);
-			}
-		}
-		
-		g_string_append_c (string, '\n');
-	}
-	
-	if (crd->dellabel.l) {
-		GList *node;
-		
-		for (node = crd->dellabel.l; node; node = node->next) {
-			CardDelLabel *dellabel = (CardDelLabel *) node->data;
-			
-			add_strProp_to_string (string, N_("\nDelivery Label: "),
-					    dellabel->data);
-			add_strAddrType (string, dellabel->type);
-		}
-	}
-	
-	if (crd->phone.l) {
-		GList *node;
-		char *sep;
-		
-		if (crd->phone.l->next) {
-			sep = "  ";
-			g_string_append (string, N_("\nTelephones:\n"));
-		} else {
-			sep = " ";
-			g_string_append (string, N_("\nTelephone:"));
-		}
-		
-		for (node = crd->phone.l; node; node = node->next) {
-			CardPhone *phone = (CardPhone *) node->data;
-
-			if (phone->prop.used) {
-				g_string_append (string, sep);
-				g_string_append (string, phone->data);
-				add_strPhoneType (string, phone->type);
-				g_string_append_c (string, '\n');
-			}
-		}
-		
-		if (crd->phone.l->next)
-		  g_string_append_c (string, '\n');
-	}
-
-	if (crd->email.l) {
-		GList *node;
-		char *sep;
-		
-		if (crd->email.l->next) {
-			sep = "  ";
-			g_string_append (string, N_("\nE-mail:\n"));
-		} else {
-			sep = " ";
-			g_string_append (string, N_("\nE-mail:"));
-		}
-		
-		
-		for (node = crd->email.l; node; node = node->next) {
-			CardEMail *email = (CardEMail *) node->data;
-			
-			if (email->prop.used) {
-				g_string_append (string, sep);
-				g_string_append (string, email->data);
-				add_strEMailType (string, email->type);
-				g_string_append_c (string, '\n');
-			}
-		}
-		
-		if (crd->email.l->next)
-		  g_string_append_c (string, '\n');
-	}
-
-	add_CardStrProperty_to_string (string, N_("\nMailer: "), &crd->mailer);
-	
-	if (crd->timezn.prop.used) {
-		char *str;
-		
-		str = card_timezn_str (crd->timezn);
-		add_strProp_to_string (string, N_("\nTime Zone: "), str);
-		free (str);
-	}
-	
-	if (crd->geopos.prop.used) {
-		char *str;
-		
-		str = card_geopos_str (crd->geopos);
-		add_strProp_to_string (string, N_("\nGeo Location: "), str);
-		free (str);
-	}
-	
-        add_CardStrProperty_to_string (string, N_("\nBusiness Role: "), &crd->role);
-	
-/*	if (crd->logo.prop.used) {
-		addPropSizedValue (string, _ ("\nLogo: "), 
-					  crd->logo.data, crd->logo.size);
-		add_PhotoType (string, crd->logo.type);
-	}*/
-	
-/*	if (crd->agent)
-	  addstringectProp (string, card_convert_to_stringect (crd->agent));*/
-	
-	if (crd->org.prop.used) {
-		addProp_to_string (string, N_("\nOrg: "));
-		add_strProp_to_string (string, N_("\n  Name:  "), crd->org.name);
-		add_strProp_to_string (string, N_("\n  Unit:  "), crd->org.unit1);
-		add_strProp_to_string (string, N_("\n  Unit2: "), crd->org.unit2);
-		add_strProp_to_string (string, N_("\n  Unit3: "), crd->org.unit3);
-		add_strProp_to_string (string, N_("\n  Unit4: "), crd->org.unit4);
-		g_string_append_c (string, '\n');
-	}
-	
-        add_CardStrProperty_to_string (string, N_("\nCategories: "), &crd->categories);
-        add_CardStrProperty_to_string (string, N_("\nComment: "), &crd->comment);
-	
-/*	if (crd->sound.prop.used) {
-		if (crd->sound.type != SOUND_PHONETIC)
-		  addPropSizedValue (string, _ ("\nPronunciation: "),
-					    crd->sound.data, crd->sound.size);
-		else
-		  add_strProp_to_string (string, _ ("\nPronunciation: "), 
-				       crd->sound.data);
-		
-		add_SoundType (string, crd->sound.type);
-	}*/
-	
-        add_CardStrProperty_to_string (string, N_("\nUnique String: "), &crd->uid);
-	
-	if (crd->key.prop.used) {
-		add_strProp_to_string (string, N_("\nPublic Key: "), crd->key.data);
-		add_strKeyType (string, crd->key.type);
-	}
-	
-	ret = g_strdup (string->str);
-	g_string_free (string, TRUE);
-	
-	return ret;
-}
-#endif
-
-ECardDate
-e_card_date_from_string (const char *str)
-{
-	ECardDate date;
-	int length;
-
-	date.year = 0;
-	date.month = 0;
-	date.day = 0;
-
-	length = strlen(str);
-	
-	if (length == 10 ) {
-		date.year = str[0] * 1000 + str[1] * 100 + str[2] * 10 + str[3] - '0' * 1111;
-		date.month = str[5] * 10 + str[6] - '0' * 11;
-		date.day = str[8] * 10 + str[9] - '0' * 11;
-	} else if ( length == 8 ) {
-		date.year = str[0] * 1000 + str[1] * 100 + str[2] * 10 + str[3] - '0' * 1111;
-		date.month = str[4] * 10 + str[5] - '0' * 11;
-		date.day = str[6] * 10 + str[7] - '0' * 11;
-	}
-	
-	return date;
-}
-
-char *
-e_v_object_get_child_value(VObject *vobj, char *name, char *default_charset)
-{
-	char *ret_val;
-	VObjectIterator iterator;
-	gboolean free_charset = FALSE;
-	VObject *charset_obj;
-
-	if ((charset_obj = isAPropertyOf (vobj, "CHARSET"))) {
-		switch (vObjectValueType (charset_obj)) {
-		case VCVT_STRINGZ:
-			default_charset = (char *) vObjectStringZValue(charset_obj);
-			break;
-		case VCVT_USTRINGZ:
-			default_charset = fakeCString (vObjectUStringZValue (charset_obj));
-			free_charset = TRUE;
-			break;
-		}
-	}
-
-	initPropIterator(&iterator, vobj);
-	while(moreIteration (&iterator)) {
-		VObject *attribute = nextVObject(&iterator);
-		const char *id = vObjectName(attribute);
-		if ( ! strcmp(id, name) ) {
-			assign_string(attribute, default_charset, &ret_val);
-			return ret_val;
-		}
-	}
-	if (free_charset)
-		free (default_charset);
-
-	return NULL;
-}
-
-static ECardPhoneFlags
-get_phone_flags (VObject *vobj)
-{
-	ECardPhoneFlags ret = 0;
-	int i;
-
-	struct { 
-		char *id;
-		ECardPhoneFlags flag;
-	} phone_pairs[] = {
-		{ VCPreferredProp, E_CARD_PHONE_PREF },
-		{ VCWorkProp,      E_CARD_PHONE_WORK },
-		{ VCHomeProp,      E_CARD_PHONE_HOME },
-		{ VCVoiceProp,     E_CARD_PHONE_VOICE },
-		{ VCFaxProp,       E_CARD_PHONE_FAX },
-		{ VCMessageProp,   E_CARD_PHONE_MSG },
-		{ VCCellularProp,  E_CARD_PHONE_CELL },
-		{ VCPagerProp,     E_CARD_PHONE_PAGER },
-		{ VCBBSProp,       E_CARD_PHONE_BBS },
-		{ VCModemProp,     E_CARD_PHONE_MODEM },
-		{ VCCarProp,       E_CARD_PHONE_CAR },
-		{ VCISDNProp,      E_CARD_PHONE_ISDN },
-		{ VCVideoProp,     E_CARD_PHONE_VIDEO },
-		{ "X-EVOLUTION-ASSISTANT", E_CARD_PHONE_ASSISTANT },
-		{ "X-EVOLUTION-CALLBACK",  E_CARD_PHONE_CALLBACK  },
-		{ "X-EVOLUTION-RADIO",     E_CARD_PHONE_RADIO     },
-		{ "X-EVOLUTION-TELEX",     E_CARD_PHONE_TELEX     },
-		{ "X-EVOLUTION-TTYTDD",    E_CARD_PHONE_TTYTDD    },
-	};
-	
-	for (i = 0; i < sizeof(phone_pairs) / sizeof(phone_pairs[0]); i++) {
-		if (isAPropertyOf (vobj, phone_pairs[i].id)) {
-			ret |= phone_pairs[i].flag;
-		}
-	}
-	
-	return ret;
-}
-
-static void
-set_phone_flags (VObject *vobj, ECardPhoneFlags flags)
-{
-	int i;
-
-	struct { 
-		char *id;
-		ECardPhoneFlags flag;
-	} phone_pairs[] = {
-		{ VCPreferredProp,         E_CARD_PHONE_PREF },
-		{ VCWorkProp,              E_CARD_PHONE_WORK },
-		{ VCHomeProp,              E_CARD_PHONE_HOME },
-		{ VCVoiceProp,             E_CARD_PHONE_VOICE },
-		{ VCFaxProp,               E_CARD_PHONE_FAX },
-		{ VCMessageProp,           E_CARD_PHONE_MSG },
-		{ VCCellularProp,          E_CARD_PHONE_CELL },
-		{ VCPagerProp,             E_CARD_PHONE_PAGER },
-		{ VCBBSProp,               E_CARD_PHONE_BBS },
-		{ VCModemProp,             E_CARD_PHONE_MODEM },
-		{ VCCarProp,               E_CARD_PHONE_CAR },
-		{ VCISDNProp,              E_CARD_PHONE_ISDN },
-		{ VCVideoProp,             E_CARD_PHONE_VIDEO },
-		{ "X-EVOLUTION-ASSISTANT", E_CARD_PHONE_ASSISTANT },
-		{ "X-EVOLUTION-CALLBACK",  E_CARD_PHONE_CALLBACK  },
-		{ "X-EVOLUTION-RADIO",     E_CARD_PHONE_RADIO     },
-		{ "X-EVOLUTION-TELEX",     E_CARD_PHONE_TELEX     },
-		{ "X-EVOLUTION-TTYTDD",    E_CARD_PHONE_TTYTDD    },
-	};
-	
-	for (i = 0; i < sizeof(phone_pairs) / sizeof(phone_pairs[0]); i++) {
-		if (flags & phone_pairs[i].flag) {
-				addProp (vobj, phone_pairs[i].id);
-		}
-	}
-}
-
-static ECardAddressFlags
-get_address_flags (VObject *vobj)
-{
-	ECardAddressFlags ret = 0;
-	int i;
-
-	struct { 
-		char *id;
-		ECardAddressFlags flag;
-	} addr_pairs[] = {
-		{ VCDomesticProp, E_CARD_ADDR_DOM },
-		{ VCInternationalProp, E_CARD_ADDR_INTL },
-		{ VCPostalProp, E_CARD_ADDR_POSTAL },
-		{ VCParcelProp, E_CARD_ADDR_PARCEL },
-		{ VCHomeProp, E_CARD_ADDR_HOME },
-		{ VCWorkProp, E_CARD_ADDR_WORK },
-	};
-	
-	for (i = 0; i < sizeof(addr_pairs) / sizeof(addr_pairs[0]); i++) {
-		if (isAPropertyOf (vobj, addr_pairs[i].id)) {
-			ret |= addr_pairs[i].flag;
-		}
-	}
-	
-	return ret;
-}
-
-static void
-set_address_flags (VObject *vobj, ECardAddressFlags flags)
-{
-	int i;
-
-	struct { 
-		char *id;
-		ECardAddressFlags flag;
-	} addr_pairs[] = {
-		{ VCDomesticProp, E_CARD_ADDR_DOM },
-		{ VCInternationalProp, E_CARD_ADDR_INTL },
-		{ VCPostalProp, E_CARD_ADDR_POSTAL },
-		{ VCParcelProp, E_CARD_ADDR_PARCEL },
-		{ VCHomeProp, E_CARD_ADDR_HOME },
-		{ VCWorkProp, E_CARD_ADDR_WORK },
-	};
-	
-	for (i = 0; i < sizeof(addr_pairs) / sizeof(addr_pairs[0]); i++) {
-		if (flags & addr_pairs[i].flag) {
-			addProp (vobj, addr_pairs[i].id);
-		}
-	}
-}
-
-#include <Evolution-Composer.h>
-
-#define COMPOSER_OAFID "OAFIID:GNOME_Evolution_Mail_Composer"
-
-void
-e_card_list_send (GList *cards, ECardDisposition disposition)
-{
-	BonoboObjectClient *bonobo_server;
-	GNOME_Evolution_Composer composer_server;
-	CORBA_Environment ev;
-
-	if (cards == NULL)
-		return;
-	
-	/* First, I obtain an object reference that represents the Composer. */
-	bonobo_server = bonobo_object_activate (COMPOSER_OAFID, 0);
-
-	g_return_if_fail (bonobo_server != NULL);
-
-	composer_server = bonobo_object_corba_objref (BONOBO_OBJECT (bonobo_server));
-
-	CORBA_exception_init (&ev);
-
-	if (disposition == E_CARD_DISPOSITION_AS_TO) {
-		GNOME_Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;
-		CORBA_char *subject;
-		int to_i, bcc_i;
-		GList *iter;
-		gint to_length = 0, bcc_length = 0;
-
-		/* Figure out how many addresses of each kind we have. */
-		for (iter = cards; iter != NULL; iter = g_list_next (iter)) {
-			ECard *card = E_CARD (iter->data);
-			if (e_card_evolution_list (card)) {
-				gint len = card->email ? e_list_length (card->email) : 0;
-				if (e_card_evolution_list_show_addresses (card))
-					to_length += len;
-				else
-					bcc_length += len;
-			} else {
-				if (card->email != NULL)
-					++to_length;
-			}
-		}
-
-		/* Now I have to make a CORBA sequences that represents a recipient list with
-		   the right number of entries, for the cards. */
-		to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		to_list->_maximum = to_length;
-		to_list->_length = to_length;
-		if (to_length > 0) {
-			to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (to_length);
-		}
-
-		cc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		cc_list->_maximum = cc_list->_length = 0;
-		
-		bcc_list = GNOME_Evolution_Composer_RecipientList__alloc ();
-		bcc_list->_maximum = bcc_length;
-		bcc_list->_length = bcc_length;
-		if (bcc_length > 0) {
-			bcc_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (bcc_length);
-		}
-
-		to_i = 0;
-		bcc_i = 0;
-		while (cards != NULL) {
-			ECard *card = cards->data;
-			EIterator *iterator;
-			gchar *name, *addr;
-			gboolean is_list, is_hidden, free_name_addr;
-			GNOME_Evolution_Composer_Recipient *recipient;
-
-			if (card->email != NULL) {
-
-				is_list = e_card_evolution_list (card);
-				is_hidden = is_list && !e_card_evolution_list_show_addresses (card);
-			
-				for (iterator = e_list_get_iterator (card->email); e_iterator_is_valid (iterator); e_iterator_next (iterator)) {
-					
-					if (is_hidden) {
-						recipient = &(bcc_list->_buffer[bcc_i]);
-						++bcc_i;
-					} else {
-						recipient = &(to_list->_buffer[to_i]);
-						++to_i;
-					}
-					
-					name = "";
-					addr = "";
-					free_name_addr = FALSE;
-					if (e_iterator_is_valid (iterator)) {
-						
-						if (is_list) {
-							/* We need to decode the list entries, which are XMLified EDestinations. */
-							EDestination *dest = e_destination_import (e_iterator_get (iterator));
-							if (dest != NULL) {
-								name = g_strdup (e_destination_get_name (dest));
-								addr = g_strdup (e_destination_get_email (dest));
-								free_name_addr = TRUE;
-								gtk_object_unref (GTK_OBJECT (dest));
-							}
-							
-						} else { /* is just a plain old card */
-							if (card->name)
-								name = e_card_name_to_string (card->name);
-							addr = g_strdup ((char *) e_iterator_get (iterator));
-							free_name_addr = TRUE;
-						}
-					}
-					
-					recipient->name    = CORBA_string_dup (name ? name : "");
-					recipient->address = CORBA_string_dup (addr ? addr : "");
-					
-					if (free_name_addr) {
-						g_free ((gchar *) name);
-						g_free ((gchar *) addr);
-					}
-					
-					/* If this isn't a list, we quit after the first (i.e. the default) address. */
-					if (!is_list)
-						break;
-					
-				}
-				gtk_object_unref (GTK_OBJECT (iterator));
-			}
-
-			cards = g_list_next (cards);
-		}
-
-
-		subject = CORBA_string_dup ("");
-
-		GNOME_Evolution_Composer_setHeaders (composer_server, to_list, cc_list, bcc_list, subject, &ev);
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_printerr ("gui/e-meeting-edit.c: I couldn't set the composer headers via CORBA! Aagh.\n");
-			CORBA_exception_free (&ev);
-			return;
-		}
-
-		CORBA_free (to_list);
-		CORBA_free (cc_list);
-		CORBA_free (bcc_list);
-		CORBA_free (subject);
-	}
-
-	if (disposition == E_CARD_DISPOSITION_AS_ATTACHMENT) {
-		CORBA_char *content_type, *filename, *description;
-		GNOME_Evolution_Composer_AttachmentData *attach_data;
-		CORBA_boolean show_inline;
-		char *tempstr;
-		
-		content_type = CORBA_string_dup ("text/x-vcard");
-		filename = CORBA_string_dup ("");
-
-		if (cards->next) {
-			description = CORBA_string_dup (_("Multiple VCards"));
-		} else {
-			char *file_as;
-
-			gtk_object_get(GTK_OBJECT(cards->data),
-				       "file_as", &file_as,
-				       NULL);
-
-			tempstr = g_strdup_printf (_("VCard for %s"), file_as);
-			description = CORBA_string_dup (tempstr);
-			g_free (tempstr);
-		}
-
-		show_inline = FALSE;
-
-		tempstr = e_card_list_get_vcard (cards);
-		attach_data = GNOME_Evolution_Composer_AttachmentData__alloc();
-		attach_data->_maximum = attach_data->_length = strlen (tempstr);
-		attach_data->_buffer = CORBA_sequence_CORBA_char_allocbuf (attach_data->_length);
-		strcpy (attach_data->_buffer, tempstr);
-		g_free (tempstr);
-
-		GNOME_Evolution_Composer_attachData (composer_server, 
-						     content_type, filename, description,
-						     show_inline, attach_data,
-						     &ev);
-	
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_printerr ("gui/e-meeting-edit.c: I couldn't attach data to the composer via CORBA! Aagh.\n");
-			CORBA_exception_free (&ev);
-			return;
-		}
-	
-		CORBA_free (content_type);
-		CORBA_free (filename);
-		CORBA_free (description);
-		CORBA_free (attach_data);
-	}
-
-	GNOME_Evolution_Composer_show (composer_server, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_printerr ("gui/e-meeting-edit.c: I couldn't show the composer via CORBA! Aagh.\n");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-void
-e_card_send (ECard *card, ECardDisposition disposition)
-{
-	GList *list;
-	list = g_list_prepend (NULL, card);
-	e_card_list_send (list, disposition);
-	g_list_free (list);
-}
-
-gboolean
-e_card_evolution_list (ECard *card)
-{
-	g_return_val_if_fail (card && E_IS_CARD (card), FALSE);
-	return card->list;
-}
-
-gboolean
-e_card_evolution_list_show_addresses (ECard *card)
-{
-	g_return_val_if_fail (card && E_IS_CARD (card), FALSE);
-	return card->list_show_addresses;
-}
-
-typedef struct _CardLoadData CardLoadData;
-struct _CardLoadData {
-	gchar *card_id;
-	ECardCallback cb;
-	gpointer closure;
-};
-
-static void
-get_card_cb (EBook *book, EBookStatus status, ECard *card, gpointer closure)
-{
-	CardLoadData *data = (CardLoadData *) closure;
-
-	if (data->cb != NULL) {
-		if (status == E_BOOK_STATUS_SUCCESS)
-			data->cb (card, data->closure);
-		else
-			data->cb (NULL, data->closure);
-	}
-
-	g_free (data->card_id);
-	g_free (data);
-}
-
-static void
-card_load_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	CardLoadData *data = (CardLoadData *) closure;
-
-	if (status == E_BOOK_STATUS_SUCCESS)
-		e_book_get_card (book, data->card_id, get_card_cb, closure);
-	else {
-		data->cb (NULL, data->closure);
-		g_free (data->card_id);
-		g_free (data);
-	}
-}
-
-void
-e_card_load_uri (const gchar *book_uri, const gchar *uid, ECardCallback cb, gpointer closure)
-{
-	CardLoadData *data;
-	EBook *book;
-	
-	data          = g_new (CardLoadData, 1);
-	data->card_id = g_strdup (uid);
-	data->cb      = cb;
-	data->closure = closure;
-
-	book = e_book_new ();
-	e_book_load_uri (book, book_uri, card_load_cb, data);
-}
diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h
deleted file mode 100644
index 23876bd63a..0000000000
--- a/addressbook/backend/ebook/e-card.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   Arturo Espinosa
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_CARD_H__
-#define __E_CARD_H__
-
-#include <time.h>
-#include <gtk/gtkobject.h>
-#include <stdio.h>
-#include <addressbook/backend/ebook/e-card-types.h>
-#include <e-util/e-list.h>
-
-#define E_TYPE_CARD            (e_card_get_type ())
-#define E_CARD(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD, ECard))
-#define E_CARD_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CARD, ECardClass))
-#define E_IS_CARD(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CARD))
-#define E_IS_CARD_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD))
-
-typedef struct _ECard ECard;
-typedef struct _ECardClass ECardClass;
-
-struct _EBook; /* Forward reference */
-
-struct _ECard {
-	GtkObject object;
-	char *id;
-
-	struct _EBook   *book;          /* The EBook this card is from.     */
-
-	char            *file_as;       /* The File As field.               */
-	char            *fname;         /* The full name.                   */
-	ECardName       *name;          /* The structured name.             */
-	EList           *address;  	/* Delivery addresses (ECardDeliveryAddress *) */
-	EList           *address_label; /* Delivery address labels
-					 * (ECardAddrLabel *)               */
-
-	EList           *phone;         /* Phone numbers (ECardPhone *)     */
-	EList           *email;         /* Email addresses (char *)         */
-	char            *url;	        /* The person's web page.           */
-
-	ECardDate       *bday;	        /* The person's birthday.           */
-
-	char            *note;
-
-
-	char            *org;           /* The person's organization.       */
-	char            *org_unit;      /* The person's organization unit.  */
-	char            *office;        /* The person's office.             */
-	char            *role;          /* The person's role w/in his org   */
-	char            *title;	        /* The person's title w/in his org  */
-
-	char            *manager;
-	char            *assistant;
-
-	char            *nickname;      /* The person's nickname            */
-	
-	char            *spouse;        /* The person's spouse.             */
-	ECardDate       *anniversary;   /* The person's anniversary.        */
-
-	char            *mailer;        /* Mailer                           */
-
-	char            *caluri;        /* Calendar URI                     */
-	char            *fburl;         /* Free Busy URL                    */
-
-	gint             timezone;      /* number of minutes from UTC as an int */
-
-	ECardDate       *last_use;
-	float            raw_use_score;
-
-	char            *related_contacts;  /* EDestinationV (serialized) of related contacts. */
-
-	EList           *categories;    /* Categories.                      */
-
-	EList           *arbitrary;     /* Arbitrary fields.                */
-
-	
-
-	guint32         wants_html : 1;     /* Wants html mail. */
-	guint32         wants_html_set : 1; /* Wants html mail. */
-	guint32		list : 1; /* If the card corresponds to a contact list */
-	guint32		list_show_addresses : 1; /* Whether to show the addresses
-						    in the To: or Bcc: field */
-
-#if 0
-	ECardPhoto      *logo;          /* This person's org's logo.        */
-
-	ECardPhoto      *photo;    	/* A photo of the person.           */
-	
-	ECard           *agent;         /* A person who sereves as this
-					   guy's agent/secretary/etc.       */
-
-	ECardSound      *sound;
-
-	ECardKey        *key;	        /* The person's public key.         */
-	ECardTimeZone   *timezn;        /* The person's time zone.          */
-	ECardGeoPos     *geopos;        /* The person's long/lat.           */
-
-	ECardRev        *rev;	        /* The time this card was last
-					   modified.                        */
-
-	EList        xtension;
-#endif
-};
-
-struct _ECardClass {
-	GtkObjectClass parent_class;
-	GHashTable    *attribute_jump_table;
-};
-
-
-/* Simple functions */
-ECard                *e_card_new                                          (char                       *vcard); /* Assumes utf8 */
-ECard                *e_card_new_with_default_charset                     (char                       *vcard,
-									   char                       *default_charset);
-const char           *e_card_get_id                                       (ECard                      *card);
-void                  e_card_set_id                                       (ECard                      *card,
-									   const char                 *character);
-
-struct _EBook        *e_card_get_book                                     (ECard                      *card);
-void                  e_card_set_book                                     (ECard                      *card,
-									   struct _EBook              *book);
-char                 *e_card_get_vcard                                    (ECard                      *card);
-char                 *e_card_get_vcard_assume_utf8                        (ECard                      *card);
-char                 *e_card_list_get_vcard                               (const GList                *list);
-ECard                *e_card_duplicate                                    (ECard                      *card);
-float                 e_card_get_use_score                                (ECard                      *card);
-void                  e_card_touch                                        (ECard                      *card);
-
-/* Evolution List convenience functions */
-/*   used for encoding uids in email addresses */
-gboolean              e_card_evolution_list                               (ECard                      *card);
-gboolean              e_card_evolution_list_show_addresses                (ECard                      *card);
-
-/* ECardPhone manipulation */
-ECardPhone           *e_card_phone_new                                    (void);
-ECardPhone           *e_card_phone_copy                                   (const ECardPhone           *phone);
-ECardPhone           *e_card_phone_ref                                    (const ECardPhone           *phone);
-void                  e_card_phone_unref                                  (ECardPhone                 *phone);
-
-/* ECardDeliveryAddress manipulation */
-ECardDeliveryAddress *e_card_delivery_address_new                         (void);
-ECardDeliveryAddress *e_card_delivery_address_copy                        (const ECardDeliveryAddress *addr);
-ECardDeliveryAddress *e_card_delivery_address_ref                         (const ECardDeliveryAddress *addr);
-void                  e_card_delivery_address_unref                       (ECardDeliveryAddress       *addr);
-gboolean              e_card_delivery_address_is_empty                    (const ECardDeliveryAddress *addr);
-char                 *e_card_delivery_address_to_string                   (const ECardDeliveryAddress *addr);
-ECardDeliveryAddress *e_card_delivery_address_from_label                  (const ECardAddrLabel       *label);
-ECardAddrLabel       *e_card_delivery_address_to_label                    (const ECardDeliveryAddress *addr);
-
-/* ECardAddrLabel manipulation */
-ECardAddrLabel       *e_card_address_label_new                            (void);
-ECardAddrLabel       *e_card_address_label_copy                           (const ECardAddrLabel       *addr);
-ECardAddrLabel       *e_card_address_label_ref                            (const ECardAddrLabel       *addr);
-void                  e_card_address_label_unref                          (ECardAddrLabel             *addr);
-
-/* ECardName manipulation */
-ECardName            *e_card_name_new                                     (void);
-ECardName            *e_card_name_copy                                    (const ECardName            *name);
-ECardName            *e_card_name_ref                                     (const ECardName            *name);
-void                  e_card_name_unref                                   (ECardName                  *name);
-char                 *e_card_name_to_string                               (const ECardName            *name);
-ECardName            *e_card_name_from_string                             (const char                 *full_name);
-
-/* ECardDate */
-ECardDate             e_card_date_from_string                             (const gchar                *str);
-gchar                *e_card_date_to_string                               (ECardDate                  *dt);
-
-/* ECardArbitrary manipulation */
-ECardArbitrary       *e_card_arbitrary_new                                (void);
-ECardArbitrary       *e_card_arbitrary_copy                               (const ECardArbitrary       *arbitrary);
-ECardArbitrary       *e_card_arbitrary_ref                                (const ECardArbitrary       *arbitrary);
-void                  e_card_arbitrary_unref                              (ECardArbitrary             *arbitrary);
-
-/* ECard email manipulation */
-gboolean              e_card_email_match_string                           (const ECard                *card,
-									   const gchar                *str);
-gint                  e_card_email_find_number                            (const ECard                *card,
-									   const gchar                *email);
-
-/* Specialized functionality */
-GList                *e_card_load_cards_from_file                         (const char                 *filename);
-GList                *e_card_load_cards_from_file_with_default_charset    (const char                 *filename,
-									   char                       *default_charset);
-GList                *e_card_load_cards_from_string                       (const char                 *str);
-GList                *e_card_load_cards_from_string_with_default_charset  (const char                 *str,
-									   char                       *default_charset);
-void                  e_card_free_empty_lists                             (ECard                      *card);
-
-enum _ECardDisposition {
-	E_CARD_DISPOSITION_AS_ATTACHMENT,
-	E_CARD_DISPOSITION_AS_TO,
-};
-typedef enum _ECardDisposition ECardDisposition;
-void                  e_card_send                           (ECard                      *card,
-							     ECardDisposition            disposition);
-void                  e_card_list_send                      (GList                      *cards,
-							     ECardDisposition            disposition);
-
-/* Getting ECards via their URIs */
-typedef void (*ECardCallback) (ECard *card, gpointer closure);
-void                  e_card_load_uri                       (const gchar                *book_uri,
-							     const gchar                *uid,
-							     ECardCallback               cb,
-							     gpointer                    closure);
-
-
-/* Standard Gtk function */
-GtkType               e_card_get_type                       (void);
-
-#endif /* ! __E_CARD_H__ */
diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c
deleted file mode 100644
index b82e616601..0000000000
--- a/addressbook/backend/ebook/e-destination.c
+++ /dev/null
@@ -1,1659 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-destination.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#include <config.h>
-#include "e-destination.h"
-
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include "e-book.h"
-#include "e-book-util.h"
-#include <gal/widgets/e-unicode.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <camel/camel-internet-address.h>
-
-enum {
-	CHANGED,
-	CARDIFIED,
-	LAST_SIGNAL
-};
-
-guint e_destination_signals[LAST_SIGNAL] = { 0 };
-
-struct _EDestinationPrivate {
-
-	gchar *raw;
-
-	gchar *book_uri;
-	gchar *card_uid;
-	ECard *card;
-	gint card_email_num;
-
-	ECard *old_card;
-	gint old_card_email_num;
-	gchar *old_textrep;
-
-	gchar *name;
-	gchar *email;
-	gchar *addr;
-	gchar *textrep;
-
-	GList *list_dests;
-
-	guint html_mail_override : 1;
-	guint wants_html_mail : 1;
-
-	guint show_addresses : 1;
-
-	guint has_been_cardified : 1;
-	guint allow_cardify : 1;
-	guint cannot_cardify : 1;
-	guint pending_cardification;
-
-	guint pending_change : 1;
-
-	EBook *cardify_book;
-
-	gint freeze_count;
-};
-
-static void e_destination_clear_card    (EDestination *);
-static void e_destination_clear_strings (EDestination *);
-
-static GtkObjectClass *parent_class;
-
-static void
-e_destination_destroy (GtkObject *obj)
-{
-	EDestination *dest = E_DESTINATION (obj);
-
-	e_destination_clear (dest);
-
-	if (dest->priv->old_card)
-		gtk_object_unref (GTK_OBJECT (dest->priv->old_card));
-	
-	if (dest->priv->cardify_book)
-		gtk_object_unref (GTK_OBJECT (dest->priv->cardify_book));
-
-	g_free (dest->priv->old_textrep);
-
-	g_free (dest->priv);
-
-	if (parent_class->destroy)
-		parent_class->destroy (obj);
-}
-
-static void
-e_destination_class_init (EDestinationClass *klass)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
-
-	parent_class = GTK_OBJECT_CLASS (gtk_type_class (GTK_TYPE_OBJECT));
-
-	object_class->destroy = e_destination_destroy;
-
-	e_destination_signals[CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EDestinationClass, changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_destination_signals[CARDIFIED] =
-		gtk_signal_new ("cardified",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EDestinationClass, cardified),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_destination_signals, LAST_SIGNAL);
-}
-
-static void
-e_destination_init (EDestination *dest)
-{
-	dest->priv = g_new0 (struct _EDestinationPrivate, 1);
-
-	dest->priv->allow_cardify = TRUE;
-	dest->priv->cannot_cardify = FALSE;
-	dest->priv->pending_cardification = 0;
-}
-
-GtkType
-e_destination_get_type (void)
-{
-	static GtkType dest_type = 0;
-
-	if (!dest_type) {
-		GtkTypeInfo dest_info = {
-			"EDestination",
-			sizeof (EDestination),
-			sizeof (EDestinationClass),
-			(GtkClassInitFunc) e_destination_class_init,
-			(GtkObjectInitFunc) e_destination_init,
-			NULL, NULL, /* reserved */
-			(GtkClassInitFunc) NULL
-		};
-
-		dest_type = gtk_type_unique (gtk_object_get_type (), &dest_info);
-	}
-
-	return dest_type;
-}
-
-EDestination *
-e_destination_new (void)
-{
-	return E_DESTINATION (gtk_type_new (E_TYPE_DESTINATION));
-}
-
-static void
-e_destination_freeze (EDestination *dest)
-{
-	g_return_if_fail (E_IS_DESTINATION (dest));
-	g_return_if_fail (dest->priv->freeze_count >= 0);
-	++dest->priv->freeze_count;
-}
-
-static void
-e_destination_thaw (EDestination *dest)
-{
-	g_return_if_fail (E_IS_DESTINATION (dest));
-	g_return_if_fail (dest->priv->freeze_count > 0);
-	--dest->priv->freeze_count;
-	if (dest->priv->freeze_count == 0 && dest->priv->pending_change)
-		e_destination_changed (dest);
-}
-
-void
-e_destination_changed (EDestination *dest)
-{
-	if (dest->priv->freeze_count == 0) {
-		gtk_signal_emit (GTK_OBJECT (dest), e_destination_signals[CHANGED]);
-		dest->priv->pending_change = FALSE;
-		dest->priv->cannot_cardify = FALSE;
-	
-	} else {
-		dest->priv->pending_change = TRUE;
-	}
-}
-
-EDestination *
-e_destination_copy (const EDestination *dest)
-{
-	EDestination *new_dest;
-	GList *iter;
-
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-
-	new_dest = e_destination_new ();
-
-	new_dest->priv->book_uri           = g_strdup (dest->priv->book_uri);
-	new_dest->priv->card_uid           = g_strdup (dest->priv->card_uid);
-	new_dest->priv->name               = g_strdup (dest->priv->name);
-	new_dest->priv->email              = g_strdup (dest->priv->email);
-	new_dest->priv->addr               = g_strdup (dest->priv->addr);
-	new_dest->priv->card_email_num     = dest->priv->card_email_num;
-	new_dest->priv->old_card_email_num = dest->priv->old_card_email_num;
-	new_dest->priv->old_textrep        = g_strdup (dest->priv->old_textrep);
-
-	new_dest->priv->card     = dest->priv->card;
-	if (new_dest->priv->card)
-		gtk_object_ref (GTK_OBJECT (new_dest->priv->card));
-
-	new_dest->priv->old_card = dest->priv->old_card;
-	if (new_dest->priv->old_card)
-		gtk_object_ref (GTK_OBJECT (new_dest->priv->old_card));
-
-	new_dest->priv->html_mail_override = dest->priv->html_mail_override;
-	new_dest->priv->wants_html_mail    = dest->priv->wants_html_mail;
-
-	for (iter = dest->priv->list_dests; iter != NULL; iter = g_list_next (iter)) {
-		new_dest->priv->list_dests = g_list_append (new_dest->priv->list_dests,
-							    e_destination_copy (E_DESTINATION (iter->data)));
-	}
-
-	return new_dest;
-}
-
-static void
-e_destination_clear_card (EDestination *dest)
-{
-	if (dest->priv->card) {
-		
-		if (dest->priv->old_card)
-			gtk_object_unref (GTK_OBJECT (dest->priv->old_card));
-
-		dest->priv->old_card = dest->priv->card;
-		dest->priv->old_card_email_num = dest->priv->card_email_num;
-
-		g_free (dest->priv->old_textrep);
-		dest->priv->old_textrep = g_strdup (e_destination_get_textrep (dest));
-	}
-
-	g_free (dest->priv->book_uri);
-	dest->priv->book_uri = NULL;
-	g_free (dest->priv->card_uid);
-	dest->priv->card_uid = NULL;
-
-	dest->priv->card = NULL;
-	dest->priv->card_email_num = -1;
-
-	g_list_foreach (dest->priv->list_dests, (GFunc) gtk_object_unref, NULL);
-	g_list_free (dest->priv->list_dests);
-	dest->priv->list_dests = NULL;
-
-	dest->priv->allow_cardify = TRUE;
-	dest->priv->cannot_cardify = FALSE;
-
-	e_destination_cancel_cardify (dest);
-
-	e_destination_changed (dest);
-}
-
-static void
-e_destination_clear_strings (EDestination *dest)
-{
-	g_free (dest->priv->raw);
-	dest->priv->raw = NULL;
-		
-	g_free (dest->priv->name);
-	dest->priv->name = NULL;
-
-	g_free (dest->priv->email);
-	dest->priv->email = NULL;
-
-	g_free (dest->priv->addr);
-	dest->priv->addr = NULL;
-
-	g_free (dest->priv->textrep);
-	dest->priv->textrep = NULL;
-
-	e_destination_changed (dest);
-}
-
-void
-e_destination_clear (EDestination *dest)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-
-	e_destination_freeze (dest);
-
-	e_destination_clear_card (dest);
-	e_destination_clear_strings (dest);
-
-	e_destination_thaw (dest);
-}
-
-static gboolean
-nonempty (const gchar *s)
-{
-	gunichar c;
-	while (*s) {
-		c = g_utf8_get_char (s);
-		if (! g_unichar_isspace (c))
-			return TRUE;
-		s = g_utf8_next_char (s);
-	}
-	return FALSE;
-}
-
-gboolean
-e_destination_is_empty (const EDestination *dest)
-
-{
-	struct _EDestinationPrivate *p;
-	g_return_val_if_fail (E_IS_DESTINATION (dest), TRUE);
-	p = dest->priv;
-	
-	return !(p->card != NULL
-		 || (p->book_uri && *p->book_uri)
-		 || (p->card_uid && *p->card_uid)
-		 || (p->raw && nonempty (p->raw))
-		 || (p->name && nonempty (p->name))
-		 || (p->email && nonempty (p->email))
-		 || (p->addr && nonempty (p->addr))
-		 || (p->list_dests != NULL));
-}
-
-gboolean
-e_destination_is_valid (const EDestination *dest)
-{
-	const gchar *email;
-
-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);
-
-	if (e_destination_from_card (dest))
-		return TRUE;
-
-	email = e_destination_get_email (dest);
-	return email && *email && strchr (email, '@');
-}
-
-gboolean
-e_destination_equal (const EDestination *a, const EDestination *b)
-{
-	const struct _EDestinationPrivate *pa, *pb;
-	const gchar *na, *nb;
-
-	g_return_val_if_fail (E_IS_DESTINATION (a), FALSE);
-	g_return_val_if_fail (E_IS_DESTINATION (b), FALSE);
-
-	if (a == b)
-		return TRUE;
-
-	pa = a->priv;
-	pb = b->priv;
-
-	/* Check equality of cards. */
-	if (pa->card || pb->card) {
-		if (! (pa->card && pb->card))
-			return FALSE;
-
-		if (pa->card == pb->card || !strcmp (e_card_get_id (pa->card), e_card_get_id (pb->card)))
-			return TRUE;
-
-		return FALSE;
-	}
-	
-	/* Just in case name returns NULL */
-	na = e_destination_get_name (a);
-	nb = e_destination_get_name (b);
-	if ((na || nb) && !(na && nb && ! g_utf8_strcasecmp (na, nb)))
-		return FALSE;
-	
-	if (!g_strcasecmp (e_destination_get_email (a), e_destination_get_email (b)))
-		return TRUE;
-	
-	return FALSE;
-}
-
-void
-e_destination_set_card (EDestination *dest, ECard *card, gint email_num)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	g_return_if_fail (card && E_IS_CARD (card));
-
-	if (dest->priv->card != card || dest->priv->card_email_num != email_num) {
-
-		/* We have to freeze/thaw around these operations so that the 'changed'
-		   signals don't cause the EDestination's internal state to be altered
-		   before we can finish setting ->card && ->card_email_num. */
-		e_destination_freeze (dest);
-		e_destination_clear (dest);
-
-		dest->priv->card = card;
-		gtk_object_ref (GTK_OBJECT (dest->priv->card));
-
-		dest->priv->card_email_num = email_num;
-
-		e_destination_changed (dest);
-		e_destination_thaw (dest);
-	}
-}
-
-void
-e_destination_set_book_uri (EDestination *dest, const gchar *uri)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	g_return_if_fail (uri != NULL);
-
-	if (dest->priv->book_uri == NULL
-	    || strcmp (dest->priv->book_uri, uri)) {
-	
-		g_free (dest->priv->book_uri);
-		dest->priv->book_uri = g_strdup (uri);
-
-		/* If we already have a card, remove it unless it's uri matches the one
-		   we just set. */
-		if (dest->priv->card) {
-			EBook *book = e_card_get_book (dest->priv->card);
-			if ((!book) || strcmp (uri, e_book_get_uri (book))) {
-				gtk_object_unref (GTK_OBJECT (dest->priv->card));
-				dest->priv->card = NULL;
-			}
-		}
-
-		e_destination_changed (dest);
-	}
-}
-
-void
-e_destination_set_card_uid (EDestination *dest, const gchar *uid, gint email_num)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	g_return_if_fail (uid != NULL);
-
-	if (dest->priv->card_uid == NULL
-	    || strcmp (dest->priv->card_uid, uid)
-	    || dest->priv->card_email_num != email_num) {
-
-		g_free (dest->priv->card_uid);
-		dest->priv->card_uid = g_strdup (uid);
-		dest->priv->card_email_num = email_num;
-
-		/* If we already have a card, remove it unless it's uri matches the one
-		   we just set. */
-		if (dest->priv->card && strcmp (uid, e_card_get_id (dest->priv->card))) {
-			gtk_object_unref (GTK_OBJECT (dest->priv->card));
-			dest->priv->card = NULL;
-		}
-
-		e_destination_changed (dest);
-	}
-}
-
-void
-e_destination_set_name (EDestination *dest, const gchar *name)
-{
-	gboolean changed = FALSE;
-
-	g_return_if_fail (E_IS_DESTINATION (dest));
-
-	if (name == NULL) {
-		if (dest->priv->name != NULL) {
-			g_free (dest->priv->name);
-			dest->priv->name = NULL;
-			changed = TRUE;
-		}
-	} else if (dest->priv->name == NULL || strcmp (dest->priv->name, name)) {
-		g_free (dest->priv->name);
-		dest->priv->name = g_strdup (name);
-		changed = TRUE;
-	}
-
-	if (changed) {
-		g_free (dest->priv->addr);
-		dest->priv->addr = NULL;
-		g_free (dest->priv->textrep);
-		dest->priv->textrep = NULL;
-		e_destination_changed (dest);
-	}
-}
-
-void
-e_destination_set_email (EDestination *dest, const gchar *email)
-{
-	gboolean changed = FALSE;
-
-	g_return_if_fail (E_IS_DESTINATION (dest));
-
-	if (email == NULL) {
-		if (dest->priv->email != NULL) {
-			g_free (dest->priv->addr);
-			dest->priv->addr = NULL;
-			changed = TRUE;
-		}
-	} else	if (dest->priv->email == NULL || strcmp (dest->priv->email, email)) {
-
-		g_free (dest->priv->email);
-		dest->priv->email = g_strdup (email);
-		changed = TRUE;
-	}
-
-	
-	if (changed) {
-		g_free (dest->priv->addr);
-		dest->priv->addr = NULL;
-		g_free (dest->priv->textrep);
-		dest->priv->textrep = NULL;
-		e_destination_changed (dest);
-	}
-}
-
-void
-e_destination_set_html_mail_pref (EDestination *dest, gboolean x)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	
-	dest->priv->html_mail_override = TRUE;
-	if (dest->priv->wants_html_mail != x) {
-		dest->priv->wants_html_mail = x;
-		e_destination_changed (dest);
-	}
-}
-
-gboolean
-e_destination_contains_card (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), FALSE);
-	return dest->priv->card != NULL;
-}
-
-gboolean
-e_destination_from_card (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), FALSE);
-	return dest->priv->card != NULL || dest->priv->book_uri != NULL || dest->priv->card_uid != NULL;
-}
-
-
-typedef struct _UseCard UseCard;
-struct _UseCard {
-	EDestination *dest;
-	EDestinationCardCallback cb;
-	gpointer closure;
-};
-
-static void
-use_card_cb (ECard *card, gpointer closure)
-{
-	UseCard *uc = (UseCard *) closure;
-
-	if (card != NULL && uc->dest->priv->card == NULL) {
-
-		uc->dest->priv->card = card;
-		gtk_object_ref (GTK_OBJECT (uc->dest->priv->card));
-		e_destination_changed (uc->dest);
-
-	}
-
-	if (uc->cb) {
-		uc->cb (uc->dest, uc->dest->priv->card, uc->closure);
-	}
-
-	/* We held a copy of the destination during the callback. */
-	gtk_object_unref (GTK_OBJECT (uc->dest));
-	g_free (uc);
-}
-
-void
-e_destination_use_card (EDestination *dest, EDestinationCardCallback cb, gpointer closure)
-{
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-
-	if (dest->priv->card != NULL) {
-		if (cb)
-			cb (dest, dest->priv->card, closure);
-	} else if (dest->priv->book_uri != NULL && dest->priv->card_uid != NULL) {
-
-		UseCard *uc = g_new (UseCard, 1);
-		uc->dest = dest;
-		/* Hold a reference to the destination during the callback. */
-		gtk_object_ref (GTK_OBJECT (uc->dest));
-		uc->cb = cb;
-		uc->closure = closure;
-		e_card_load_uri (dest->priv->book_uri, dest->priv->card_uid, use_card_cb, uc);
-	} else {
-		if (cb)
-			cb (dest, NULL, closure);
-	}
-}
-
-ECard *
-e_destination_get_card (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-
-	return dest->priv->card;
-}
-
-const gchar *
-e_destination_get_card_uid (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-	
-	if (dest->priv->card_uid)
-		return dest->priv->card_uid;
-	
-	if (dest->priv->card)
-		return e_card_get_id (dest->priv->card);
-
-	return NULL;
-}
-
-const gchar *
-e_destination_get_book_uri (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-	
-	if (dest->priv->book_uri)
-		return dest->priv->book_uri;
-	
-	if (dest->priv->card) {
-		EBook *book = e_card_get_book (dest->priv->card);
-		if (book) {
-			return e_book_get_uri (book);
-		}
-	}
-
-	return NULL;
-}
-
-gint
-e_destination_get_email_num (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), -1);
-
-	if (dest->priv->card == NULL && (dest->priv->book_uri == NULL || dest->priv->card_uid == NULL))
-		return -1;
-
-	return dest->priv->card_email_num;
-}
-
-const gchar *
-e_destination_get_name (const EDestination *dest)
-{
-	struct _EDestinationPrivate *priv;
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-
-	priv = (struct _EDestinationPrivate *)dest->priv; /* cast out const */
-	
-	if (priv->name == NULL) {
-
-		if (priv->card != NULL) {
-		
-			priv->name = e_card_name_to_string (priv->card->name);
-		
-			if (priv->name == NULL || *priv->name == '\0') {
-				g_free (priv->name);
-				priv->name = g_strdup (priv->card->file_as);
-			}
-
-			if (priv->name == NULL || *priv->name == '\0') {
-				g_free (priv->name);
-				priv->name = g_strdup (e_destination_get_email (dest));
-			}
-
-		} else if (priv->raw != NULL) {
-
-			CamelInternetAddress *addr = camel_internet_address_new ();
-
-			if (camel_address_unformat (CAMEL_ADDRESS (addr), priv->raw)) {
-				const gchar *camel_name = NULL;
-				camel_internet_address_get (addr, 0, &camel_name, NULL);
-				priv->name = g_strdup (camel_name);
-			}
-
-			camel_object_unref (CAMEL_OBJECT (addr));
-		}
-	}
-	
-	return priv->name;
-	
-}
-
-const gchar *
-e_destination_get_email (const EDestination *dest)
-{
-	struct _EDestinationPrivate *priv;
-
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-
-	priv = (struct _EDestinationPrivate *)dest->priv; /* cast out const */
-	
-	if (priv->email == NULL) {
-
-		if (priv->card != NULL) { /* Pull the address out of the card. */
-
-			if (priv->card->email) {
-				EIterator *iter = e_list_get_iterator (priv->card->email);
-				gint n = priv->card_email_num;
-
-				if (n >= 0) {
-					while (n > 0) {
-						e_iterator_next (iter);
-						--n;
-					}
-
-					if (e_iterator_is_valid (iter)) {
-						gconstpointer ptr = e_iterator_get (iter);
-						priv->email = g_strdup ((gchar *) ptr);
-					}
-				}
-
-			} 
-
-		} else if (priv->raw != NULL) {
-
-			CamelInternetAddress *addr = camel_internet_address_new ();
-
-			if (camel_address_unformat (CAMEL_ADDRESS (addr), priv->raw)) {
-				const gchar *camel_email = NULL;
-				camel_internet_address_get (addr, 0, NULL, &camel_email);
-				priv->email = g_strdup (camel_email);
-			}
-			
-			camel_object_unref (CAMEL_OBJECT (addr));
-		} 
-		
-		/* Force e-mail to be non-null... */
-		if (priv->email == NULL) {
-			priv->email = g_strdup ("");
-		}
-	}
-
-	return priv->email;
-}
-
-const gchar *
-e_destination_get_address (const EDestination *dest)
-{
-	struct _EDestinationPrivate *priv;
-	
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-	
-	priv = (struct _EDestinationPrivate *)dest->priv; /* cast out const */
-
-	if (priv->addr == NULL) {
-		CamelInternetAddress *addr = camel_internet_address_new ();
-
-		if (e_destination_is_evolution_list (dest)) {
-			GList *iter = dest->priv->list_dests;
-			
-			while (iter) {
-				EDestination *list_dest = E_DESTINATION (iter->data);
-				if (!e_destination_is_empty (list_dest)) {
-					camel_internet_address_add (addr, 
-								    e_destination_get_name (list_dest),
-								    e_destination_get_email (list_dest));
-				}
-				iter = g_list_next (iter);
-			}
-			
-			priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
-
-		} else if (priv->raw) {
-
-			if (camel_address_unformat (CAMEL_ADDRESS (addr), priv->raw)) {
-				priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
-			}
-
-		} else {
-			
-			camel_internet_address_add (addr,
-						    e_destination_get_name (dest),
-						    e_destination_get_email (dest));
-
-			priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
-		}
-
-		camel_object_unref (CAMEL_OBJECT (addr));
-	}
-
-	return priv->addr;
-}
-
-void
-e_destination_set_raw (EDestination *dest, const gchar *raw)
-{
-	g_return_if_fail (E_IS_DESTINATION (dest));
-	g_return_if_fail (raw != NULL);
-
-	if (dest->priv->raw == NULL || strcmp (dest->priv->raw, raw)) {
-
-		e_destination_freeze (dest);
-
-		e_destination_clear (dest);
-		dest->priv->raw = g_strdup (raw);
-		e_destination_changed (dest);
-
-		e_destination_thaw (dest);
-	}
-}
-
-const gchar *
-e_destination_get_textrep (const EDestination *dest)
-{
-	const gchar *name, *email;
-
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-
-	if (dest->priv->raw)
-		return dest->priv->raw;
-
-	name  = e_destination_get_name (dest);
-	email = e_destination_get_email (dest);
-
-	if (e_destination_from_card (dest) && name != NULL)
-		return name;
-
-	/* Make sure that our address gets quoted properly */
-	if (name && email && dest->priv->textrep == NULL) {
-		CamelInternetAddress *addr = camel_internet_address_new ();
-		camel_internet_address_add (addr, name, email);
-		g_free (dest->priv->textrep);
-		dest->priv->textrep = camel_address_format (CAMEL_ADDRESS (addr));
-		camel_object_unref (CAMEL_OBJECT (addr));
-	}
-
-	if (dest->priv->textrep != NULL)
-		return dest->priv->textrep;
-
-	if (email)
-		return email;
-
-	return "";
-}
-
-gboolean
-e_destination_is_evolution_list (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), FALSE);
-
-	if (dest->priv->list_dests == NULL
-	    && dest->priv->card != NULL
-	    && dest->priv->card->email != NULL
-	    && e_card_evolution_list (dest->priv->card)) {
-
-		EIterator *iter = e_list_get_iterator (dest->priv->card->email);
-		e_iterator_reset (iter);
-		while (e_iterator_is_valid (iter)) {
-			const gchar *dest_xml = (const gchar *) e_iterator_get (iter);
-			EDestination *list_dest = e_destination_import (dest_xml);
-			if (list_dest)
-				dest->priv->list_dests = g_list_append (dest->priv->list_dests, list_dest);
-			e_iterator_next (iter);
-		}
-	}
-
-	return dest->priv->list_dests != NULL;
-}
-
-gboolean
-e_destination_list_show_addresses (const EDestination *dest)
-{
-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);
-
-	if (dest->priv->card != NULL)
-		return e_card_evolution_list_show_addresses (dest->priv->card);
-
-	return dest->priv->show_addresses;
-}
-
-gboolean
-e_destination_get_html_mail_pref (const EDestination *dest)
-{
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), FALSE);
-
-	if (dest->priv->html_mail_override || dest->priv->card == NULL)
-		return dest->priv->wants_html_mail;
-
-	return dest->priv->card->wants_html;
-}
-
-gboolean
-e_destination_allow_cardification (const EDestination *dest)
-{
-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);
-
-	return dest->priv->allow_cardify;
-}
-
-void
-e_destination_set_allow_cardification (EDestination *dest, gboolean x)
-{
-	g_return_if_fail (E_IS_DESTINATION (dest));
-	
-	dest->priv->allow_cardify = x;
-}
-
-static void
-set_cardify_book (EDestination *dest, EBook *book)
-{
-	if (dest->priv->cardify_book && dest->priv->cardify_book != book) {
-		gtk_object_unref (GTK_OBJECT (dest->priv->cardify_book));
-	}
-		
-	dest->priv->cardify_book = book;
-
-	if (book)
-		gtk_object_ref (GTK_OBJECT (book));
-}
-
-static void
-name_and_email_simple_query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)
-{
-	EDestination *dest = E_DESTINATION (closure);
-
-	if (status == E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS && g_list_length ((GList *) cards) == 1) {
-		ECard *card = E_CARD (cards->data);
-		const gchar *email = e_destination_get_email (dest);
-		gint email_num = 0;
-
-		if (e_destination_is_valid (dest) && email && *email) {
-			email_num = e_card_email_find_number (card, e_destination_get_email (dest));
-		}
-
-		if (email_num >= 0) {
-			const char *book_uri;
-
-			book_uri = e_book_get_uri (book);
-
-			dest->priv->has_been_cardified = TRUE;
-			e_destination_set_card (dest, card, email_num);
-			e_destination_set_book_uri (dest, book_uri);
-			gtk_signal_emit (GTK_OBJECT (dest), e_destination_signals[CARDIFIED]);
-		}
-	}
-
-	if (!dest->priv->has_been_cardified) {
-		dest->priv->cannot_cardify = TRUE;
-	}
-
-	gtk_object_unref (GTK_OBJECT (dest)); /* drop the reference held by the query */
-}
-
-
-static void
-nickname_simple_query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)
-{
-	EDestination *dest = E_DESTINATION (closure);
-
-	if (status == E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS) {
-
-		if (g_list_length ((GList *) cards) == 1) {
-			const char *book_uri;
-
-			book_uri = e_book_get_uri (book);
-
-			dest->priv->has_been_cardified = TRUE;
-			e_destination_set_card (dest, E_CARD (cards->data), 0); /* Uses primary e-mail by default. */
-			e_destination_set_book_uri (dest, book_uri);
-			gtk_signal_emit (GTK_OBJECT (dest), e_destination_signals[CARDIFIED]);
-			
-			gtk_object_unref (GTK_OBJECT (dest)); /* drop the reference held by the query */
-			
-		} else {
-		
-			/* We can only end up here if we don't look at all like an e-mail address, so
-			   we do a name-only query on the textrep */
-
-			e_book_name_and_email_query (book,
-						     e_destination_get_textrep (dest),
-						     NULL,
-						     name_and_email_simple_query_cb,
-						     dest);
-		}
-	} else {
-		/* Something went wrong with the query: drop our ref to the destination and return. */
-		gtk_object_unref (GTK_OBJECT (dest));
-	}
-}
-
-static void
-launch_cardify_query (EDestination *dest)
-{
-	if (! e_destination_is_valid (dest)) {
-		
-		/* If it doesn't look like an e-mail address, see if it is a nickname. */
-		e_book_nickname_query (dest->priv->cardify_book,
-				       e_destination_get_textrep (dest),
-				       nickname_simple_query_cb,
-				       dest);
-
-	} else {
-
-		e_book_name_and_email_query (dest->priv->cardify_book,
-					     e_destination_get_name (dest),
-					     e_destination_get_email (dest),
-					     name_and_email_simple_query_cb,
-					     dest);
-	}
-}
-
-static void
-use_local_book_cb (EBook *book, gpointer closure)
-{
-	EDestination *dest = E_DESTINATION (closure);
-	if (dest->priv->cardify_book == NULL) {
-		dest->priv->cardify_book = book;
-		gtk_object_ref (GTK_OBJECT (book));
-	}
-
-	launch_cardify_query (dest);
-}
-
-
-static gboolean
-e_destination_reverting_is_a_good_idea (EDestination *dest)
-{
-	const gchar *textrep;
-	gint len, old_len;
-
-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);
-	if (dest->priv->old_textrep == NULL)
-		return FALSE;
-
-	textrep = e_destination_get_textrep (dest);
-
-	len = g_utf8_strlen (textrep, -1);
-	old_len = g_utf8_strlen (dest->priv->old_textrep, -1);
-
-	if (len <= old_len/2)
-		return FALSE;
-
-	return TRUE;
-}
-
-void
-e_destination_cardify (EDestination *dest, EBook *book)
-{
-	g_return_if_fail (E_IS_DESTINATION (dest));
-	g_return_if_fail (book == NULL || E_IS_BOOK (book));
-
-	if (e_destination_is_evolution_list (dest))
-		return;
-
-	if (e_destination_contains_card (dest))
-		return;
-
-	if (!dest->priv->allow_cardify)
-		return;
-
-	if (dest->priv->cannot_cardify)
-		return;
-
-	e_destination_cancel_cardify (dest);
-
-	/* In some cases, we can revert to the previous card. */
-	if (!e_destination_is_valid (dest)
-	    && e_destination_reverting_is_a_good_idea (dest)
-	    && e_destination_revert (dest)) {
-		return;
-	}
-
-	set_cardify_book (dest, book);
-
-	/* Handle the case of an EDestination containing a card URL */
-	if (e_destination_contains_card (dest)) {
-		e_destination_use_card (dest, NULL, NULL);
-		return;
-	}
-	
-	/* If we have a book ready, proceed.  We hold a reference to ourselves
-	   until our query is complete. */
-	gtk_object_ref (GTK_OBJECT (dest));
-	if (dest->priv->cardify_book != NULL) {
-		launch_cardify_query (dest);
-	} else {
-		e_book_use_local_address_book (use_local_book_cb, dest);
-	}
-}
-
-static gint
-do_cardify_delayed (gpointer ptr)
-{
-	EDestination *dest = E_DESTINATION (ptr);
-	e_destination_cardify (dest, dest->priv->cardify_book);
-	return FALSE;
-}
-
-void
-e_destination_cardify_delayed (EDestination *dest, EBook *book, gint delay)
-{
-	g_return_if_fail (E_IS_DESTINATION (dest));
-	g_return_if_fail (book == NULL || E_IS_BOOK (book));
-
-	if (delay < 0)
-		delay = 500;
-
-	e_destination_cancel_cardify (dest);
-
-	set_cardify_book (dest, book);
-
-	dest->priv->pending_cardification = gtk_timeout_add (delay, do_cardify_delayed, dest);
-}
-
-void
-e_destination_cancel_cardify (EDestination *dest)
-{
-	g_return_if_fail (E_IS_DESTINATION (dest));
-
-	if (dest->priv->pending_cardification) {
-		gtk_timeout_remove (dest->priv->pending_cardification);
-		dest->priv->pending_cardification = 0;
-	}
-}
-
-gboolean
-e_destination_uncardify (EDestination *dest)
-{
-	gchar *email;
-
-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);
-
-	if (! e_destination_contains_card (dest))
-		return FALSE;
-
-	email = g_strdup (e_destination_get_email (dest));
-
-	if (email == NULL)
-		return FALSE;
-
-	e_destination_freeze (dest);
-	e_destination_clear (dest);
-	e_destination_set_raw (dest, email);
-	g_free (email);
-	e_destination_thaw (dest);
-
-	return TRUE;
-}
-
-gboolean
-e_destination_revert (EDestination *dest)
-{
-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);
-
-	if (dest->priv->old_card) {
-		ECard *card;
-		gint card_email_num;
-
-		card = dest->priv->old_card;
-		card_email_num = dest->priv->old_card_email_num;
-
-		dest->priv->old_card = NULL;
-		g_free (dest->priv->old_textrep);
-		dest->priv->old_textrep = NULL;
-
-		e_destination_freeze (dest);
-		e_destination_clear (dest);
-		e_destination_set_card (dest, card, card_email_num);
-		e_destination_thaw (dest);
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-/*
- * Destination import/export
- */
-
-gchar *
-e_destination_get_address_textv (EDestination **destv)
-{
-	gint i, j, len = 0;
-	gchar **strv;
-	gchar *str;
-	
-	g_return_val_if_fail (destv, NULL);
-
-	/* Q: Please tell me this is only for assertion
-           reasons. If this is considered to be ok behavior then you
-           shouldn't use g_return's. Just a reminder ;-) 
-
-	   A: Yes, this is just an assertion.  (Though it does find the
-	   length of the vector in the process...)
-	*/
-	while (destv[len]) {
-		g_return_val_if_fail (E_IS_DESTINATION (destv[len]), NULL);
-		++len;
-	}
-	
-	strv = g_new0 (gchar *, len+1);
-	for (i = 0, j = 0; destv[i]; i++) {
-		if (!e_destination_is_empty (destv[i])) {
-			const gchar *addr = e_destination_get_address (destv[i]);
-			strv[j++] = addr ? (gchar *) addr : "";
-		}
-	}
-	
-	str = g_strjoinv (", ", strv);
-	
-	g_free (strv);
-	
-	return str;
-}
-
-xmlNodePtr
-e_destination_xml_encode (const EDestination *dest)
-{
-	xmlNodePtr dest_node;
-	const gchar *str;
-
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-
-	dest_node = xmlNewNode (NULL, "destination");
-
-	str = e_destination_get_name (dest);
-	if (str)
-		xmlNewTextChild (dest_node, NULL, "name", str);
-
-	if (! e_destination_is_evolution_list (dest)) {
-		str = e_destination_get_email (dest);
-		if (str)
-			xmlNewTextChild (dest_node, NULL, "email", str);
-	} else {
-		GList *iter = dest->priv->list_dests;
-		
-		while (iter) {
-			EDestination *list_dest = E_DESTINATION (iter->data);
-			xmlNodePtr list_node = xmlNewNode (NULL, "list_entry");
-			
-			str = e_destination_get_name (list_dest);
-			if (str)
-				xmlNewTextChild (list_node, NULL, "name", str);
-			
-			str = e_destination_get_email (list_dest);
-			if (str)
-				xmlNewTextChild (list_node, NULL, "email", str);
-
-			xmlAddChild (dest_node, list_node);
-			
-			iter = g_list_next (iter);
-		}
-
-		xmlNewProp (dest_node, "is_list", "yes");
-		xmlNewProp (dest_node, "show_addresses", 
-			    e_destination_list_show_addresses (dest) ? "yes" : "no");
-	}
-
-	str = e_destination_get_book_uri (dest);
-	if (str) {
-		xmlNewTextChild (dest_node, NULL, "book_uri", str);
-	}
-
-	str = e_destination_get_card_uid (dest);
-	if (str) {
-		gchar buf[16];
-		xmlNodePtr uri_node = xmlNewTextChild (dest_node, NULL, "card_uid", str);
-		g_snprintf (buf, 16, "%d", e_destination_get_email_num (dest));
-		xmlNewProp (uri_node, "email_num", buf);
-	}
-
-	xmlNewProp (dest_node, "html_mail", e_destination_get_html_mail_pref (dest) ? "yes" : "no");
-
-	return dest_node;
-}
-
-gboolean
-e_destination_xml_decode (EDestination *dest, xmlNodePtr node)
-{
-	gchar *name = NULL, *email = NULL, *book_uri = NULL, *card_uid = NULL;
-	gint email_num = -1;
-	gboolean html_mail = FALSE;
-	gboolean is_list = FALSE, show_addr = FALSE;
-	gchar *tmp;
-	GList *list_dests = NULL;
-	
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), FALSE);
-	g_return_val_if_fail (node != NULL, FALSE);
-	
-	if (strcmp (node->name, "destination"))
-		return FALSE;
-	
-	tmp = xmlGetProp (node, "html_mail");
-	if (tmp) {
-		html_mail = !strcmp (tmp, "yes");
-		xmlFree (tmp);
-	}
-	
-	tmp = xmlGetProp (node, "is_list");
-	if (tmp) {
-		is_list = !strcmp (tmp, "yes");
-		xmlFree (tmp);
-	}
-	
-	tmp = xmlGetProp (node, "show_addresses");
-	if (tmp) {
-		show_addr = !strcmp (tmp, "yes");
-		xmlFree (tmp);
-	}
-	
-	node = node->xmlChildrenNode;
-	while (node) {
-		if (!strcmp (node->name, "name")) {
-			tmp = xmlNodeGetContent (node);
-			g_free (name);
-			name = g_strdup (tmp);
-			xmlFree (tmp);
-		} else if (!is_list && !strcmp (node->name, "email")) {
-			tmp = xmlNodeGetContent (node);
-			g_free (email);
-			email = g_strdup (tmp);
-			xmlFree (tmp);
-		} else if (is_list && !strcmp (node->name, "list_entry")) {
-			xmlNodePtr subnode = node->xmlChildrenNode;
-			gchar *list_name = NULL, *list_email = NULL;
-			
-			while (subnode) {
-				if (!strcmp (subnode->name, "name")) {
-					tmp = xmlNodeGetContent (subnode);
-					g_free (list_name);
-					list_name = g_strdup (tmp);
-					xmlFree (tmp);
-				} else if (!strcmp (subnode->name, "email")) {
-					tmp = xmlNodeGetContent (subnode);
-					g_free (list_email);
-					list_email = g_strdup (tmp);
-					xmlFree (tmp);
-				}
-				
-				subnode = subnode->next;
-			}
-			
-			if (list_name || list_email) {
-				EDestination *list_dest = e_destination_new ();
-				if (list_name)
-					e_destination_set_name (list_dest, list_name);
-				if (list_email)
-					e_destination_set_email (list_dest, list_email);
-				
-				g_free (list_name);
-				g_free (list_email);
-
-				list_dests = g_list_append (list_dests, list_dest);
-			}
-		} else if (!strcmp (node->name, "book_uri")) {
-			tmp = xmlNodeGetContent (node);
-			g_free (book_uri);
-			book_uri = g_strdup (tmp);
-			xmlFree (tmp);
-		} else if (!strcmp (node->name, "card_uid")) {
-			tmp = xmlNodeGetContent (node);
-			g_free (card_uid);
-			card_uid = g_strdup (tmp);
-			xmlFree (tmp);
-			
-			tmp = xmlGetProp (node, "email_num");
-			email_num = atoi (tmp);
-			xmlFree (tmp);
-		}
-		
-		node = node->next;
-	}
-
-	e_destination_freeze (dest);
-	
-	e_destination_clear (dest);
-	
-	if (name) {
-		e_destination_set_name (dest, name);
-		g_free (name);
-	}
-	if (email) {
-		e_destination_set_email (dest, email);
-		g_free (email);
-	}
-	if (book_uri) {
-		e_destination_set_book_uri (dest, book_uri);
-		g_free (book_uri);
-	}
-	if (card_uid) {
-		e_destination_set_card_uid (dest, card_uid, email_num);
-		g_free (card_uid);
-	}
-	if (list_dests)
-		dest->priv->list_dests = list_dests;
-
-	dest->priv->html_mail_override = TRUE;
-	dest->priv->wants_html_mail = html_mail;
-
-	dest->priv->show_addresses = show_addr;
-
-	e_destination_thaw (dest);
-	
-	return TRUE;
-}
-
-/* FIXME: Make utf-8 safe */
-static gchar *
-null_terminate_and_remove_extra_whitespace (xmlChar *xml_in, gint size)
-{
-	gchar *xml;
-	gchar *r, *w;
-	gboolean skip_white = FALSE;
-
-	if (xml_in == NULL || size <= 0) 
-		return NULL;
-
-	xml = g_strndup (xml_in, size);
-	r = w = xml;
-
-	while (*r) {
-		if (*r == '\n' || *r == '\r') {
-			skip_white = TRUE;
-		} else {
-			gboolean is_space = isspace (*r);
-
-			*w = *r;
-
-			if (! (skip_white && is_space))
-				++w;
-			if (! is_space)
-				skip_white = FALSE;
-		}
-		++r;
-	}
-
-	*w = '\0';
-
-	return xml;
-}
-
-gchar *
-e_destination_export (const EDestination *dest)
-{
-	xmlNodePtr dest_node;
-	xmlDocPtr  dest_doc;
-	xmlChar   *buffer = NULL;
-	gint       size = -1;
-	gchar     *str;
-	
-	g_return_val_if_fail (dest && E_IS_DESTINATION (dest), NULL);
-
-	dest_node = e_destination_xml_encode (dest);
-	if (dest_node == NULL)
-		return NULL;
-
-	dest_doc = xmlNewDoc (XML_DEFAULT_VERSION);
-	xmlDocSetRootElement (dest_doc, dest_node);
-
-	xmlDocDumpMemory (dest_doc, &buffer, &size);
-	xmlFreeDoc (dest_doc);
-
-	str = null_terminate_and_remove_extra_whitespace (buffer, size);
-	xmlFree (buffer);
-
-	return str;
-}
-
-EDestination *
-e_destination_import (const gchar *str)
-{
-	EDestination *dest = NULL;
-	xmlDocPtr dest_doc;
-
-	if (! (str && *str))
-		return NULL;
-
-	dest_doc = xmlParseMemory ((gchar *) str, strlen (str));
-	if (dest_doc && dest_doc->xmlRootNode) {
-		dest = e_destination_new ();
-		if (! e_destination_xml_decode (dest, dest_doc->xmlRootNode)) {
-			gtk_object_unref (GTK_OBJECT (dest));
-			dest = NULL;
-		}
-	}
-	xmlFreeDoc (dest_doc);
-
-	return dest;
-}
-
-gchar *
-e_destination_exportv (EDestination **destv)
-{
-	xmlDocPtr   destv_doc;
-	xmlNodePtr  destv_node;
-	xmlChar    *buffer = NULL;
-	gint        size = -1;
-	gchar      *str;
-	gint        i;
-
-	if (destv == NULL || *destv == NULL)
-		return NULL;
-
-	destv_doc  = xmlNewDoc (XML_DEFAULT_VERSION);
-	destv_node = xmlNewNode (NULL, "destinations");
-	xmlDocSetRootElement (destv_doc, destv_node);
-
-	for (i=0; destv[i]; ++i) {
-		if (! e_destination_is_empty (destv[i])) {
-			xmlNodePtr dest_node = e_destination_xml_encode (destv[i]);
-			if (dest_node)
-				xmlAddChild (destv_node, dest_node);
-		}
-	}
-
-	xmlDocDumpMemory (destv_doc, &buffer, &size);
-	xmlFreeDoc (destv_doc);
-
-	str = null_terminate_and_remove_extra_whitespace (buffer, size);
-	xmlFree (buffer);
-
-	return str;
-}
-
-EDestination **
-e_destination_importv (const gchar *str)
-{
-	GPtrArray *dest_array = NULL;
-	xmlDocPtr destv_doc;
-	xmlNodePtr node;
-	EDestination **destv = NULL;
-	
-	if (!(str && *str))
-		return NULL;
-	
-	destv_doc = xmlParseMemory ((gchar *)str, strlen (str));
-	if (destv_doc == NULL)
-		return NULL;
-
-	node = destv_doc->xmlRootNode;
-	
-	if (strcmp (node->name, "destinations"))
-		goto finished;
-	
-	node = node->xmlChildrenNode;
-	
-	dest_array = g_ptr_array_new ();
-	
-	while (node) {
-		EDestination *dest;
-		
-		dest = e_destination_new ();
-		if (e_destination_xml_decode (dest, node) && !e_destination_is_empty (dest)) {
-			g_ptr_array_add (dest_array, dest);
-		} else {
-			gtk_object_unref (GTK_OBJECT (dest));
-		}
-		
-		node = node->next;
-	}
-	
-	/* we need destv to be NULL terminated */
-	g_ptr_array_add (dest_array, NULL);
-	
-	destv = (EDestination **) dest_array->pdata;
-	g_ptr_array_free (dest_array, FALSE);
-	
- finished:
-	xmlFreeDoc (destv_doc);
-	
-	return destv;
-}
-
-EDestination **
-e_destination_list_to_vector (GList *list)
-{
-	gint N = g_list_length (list);
-	EDestination **destv;
-	gint i = 0;
-
-	if (N == 0)
-		return NULL;
-	
-	destv = g_new (EDestination *, N+1);
-	while (list != NULL) {
-		destv[i] = E_DESTINATION (list->data);
-		list->data = NULL;
-		++i;
-		list = g_list_next (list);
-	}
-	destv[N] = NULL;
-
-	return destv;
-}
-
-void
-e_destination_freev (EDestination **destv)
-{
-	gint i;
-
-	if (destv) {
-		for (i = 0; destv[i] != NULL; ++i) {
-			gtk_object_unref (GTK_OBJECT (destv[i]));
-		}
-		g_free (destv);
-	}
-
-}
-
-static void
-touch_cb (EBook *book, const gchar *addr, ECard *card, gpointer closure)
-{
-	if (book != NULL && card != NULL) {
-		e_card_touch (card);
-		g_message ("Use score for \"%s\" is now %f", addr, e_card_get_use_score (card));
-		e_book_commit_card (book, card, NULL, NULL);
-	}
-}
-
-void
-e_destination_touch (EDestination *dest)
-{
-	const gchar *email;
-
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-
-	email = e_destination_get_email (dest);
-
-	if (email) {
-		e_book_query_address_locally (email, touch_cb, NULL);
-	}
-}
-
-void
-e_destination_touchv (EDestination **destv)
-{
-	gint i;
-
-	g_return_if_fail (destv != NULL);
-
-	for (i = 0; destv[i] != NULL; ++i) {
-		e_destination_touch (destv[i]);
-	}
-}
diff --git a/addressbook/backend/ebook/e-destination.h b/addressbook/backend/ebook/e-destination.h
deleted file mode 100644
index 4beb199503..0000000000
--- a/addressbook/backend/ebook/e-destination.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-destination.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __E_DESTINATION_H__
-#define __E_DESTINATION_H__
-
-#include <gtk/gtkobject.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <gnome-xml/tree.h>
-
-#define E_TYPE_DESTINATION        (e_destination_get_type ())
-#define E_DESTINATION(o)          (GTK_CHECK_CAST ((o), E_TYPE_DESTINATION, EDestination))
-#define E_DESTINATION_CLASS(k)    (GTK_CHECK_CLASS_CAST ((k), E_TYPE_DESTINATION, EDestinationClass))
-#define E_IS_DESTINATION(o)       (GTK_CHECK_TYPE ((o), E_TYPE_DESTINATION))
-#define E_IS_DESTINATION_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TYPE_DESTINATION))
-
-typedef struct _EDestination EDestination;
-typedef struct _EDestinationClass EDestinationClass;
-
-typedef void (*EDestinationCardCallback) (EDestination *dest, ECard *card, gpointer closure);
-
-struct _EDestinationPrivate;
-
-struct _EDestination {
-	GtkObject object;
-
-	struct _EDestinationPrivate *priv;
-};
-
-struct _EDestinationClass {
-	GtkObjectClass parent_class;
-
-	void (*changed) (EDestination *dest);	
-	void (*cardified) (EDestination *dest);
-};
-
-GtkType e_destination_get_type (void);
-
-
-EDestination  *e_destination_new                (void);
-void           e_destination_changed            (EDestination *);
-EDestination  *e_destination_copy               (const EDestination *);
-void           e_destination_clear              (EDestination *);
-
-gboolean       e_destination_is_empty           (const EDestination *);
-gboolean       e_destination_is_valid           (const EDestination *);
-gboolean       e_destination_equal              (const EDestination *a, const EDestination *b);
-
-void           e_destination_set_card           (EDestination *, ECard *card, gint email_num);
-void           e_destination_set_book_uri       (EDestination *, const gchar *uri); 
-void           e_destination_set_card_uid       (EDestination *, const gchar *uid, gint email_num); 
-
-void           e_destination_set_name           (EDestination *, const gchar *name);
-void           e_destination_set_email          (EDestination *, const gchar *email);
-
-void           e_destination_set_html_mail_pref (EDestination *, gboolean);
-
-gboolean       e_destination_contains_card      (const EDestination *);
-gboolean       e_destination_from_card          (const EDestination *);
-
-void           e_destination_use_card           (EDestination *, EDestinationCardCallback cb, gpointer closure);
-
-ECard         *e_destination_get_card           (const EDestination *);
-const gchar   *e_destination_get_book_uri       (const EDestination *);
-const gchar   *e_destination_get_card_uid       (const EDestination *);
-gint           e_destination_get_email_num      (const EDestination *);
-
-const gchar   *e_destination_get_name           (const EDestination *);  /* "Jane Smith" */
-const gchar   *e_destination_get_email          (const EDestination *);  /* "jane@assbarn.com" */
-const gchar   *e_destination_get_address        (const EDestination *);  /* "Jane Smith <jane@assbarn.com>" (or a comma-sep set of such for a list) */
-
-void           e_destination_set_raw            (EDestination *, const gchar *free_form_string);
-const gchar   *e_destination_get_textrep        (const EDestination *);  /* "Jane Smith" or "jane@assbarn.com" */
-
-gboolean       e_destination_is_evolution_list   (const EDestination *);
-gboolean       e_destination_list_show_addresses (const EDestination *);
-
-/* If true, they want HTML mail. */
-gboolean       e_destination_get_html_mail_pref (const EDestination *);
-
-gboolean       e_destination_allow_cardification     (const EDestination *);
-void           e_destination_set_allow_cardification (EDestination *, gboolean);
-void           e_destination_cardify                 (EDestination *, EBook *);
-void           e_destination_cardify_delayed         (EDestination *, EBook *, gint delay); /* delay < 0: "default" */
-void           e_destination_cancel_cardify          (EDestination *);
-gboolean       e_destination_uncardify               (EDestination *);
-
-gboolean       e_destination_revert                  (EDestination *);
-
-gchar         *e_destination_get_address_textv  (EDestination **);
-
-xmlNodePtr     e_destination_xml_encode         (const EDestination *dest);
-gboolean       e_destination_xml_decode         (EDestination *dest, xmlNodePtr node);
-
-gchar         *e_destination_export             (const EDestination *);
-EDestination  *e_destination_import             (const gchar *str);
-
-gchar         *e_destination_exportv            (EDestination **);
-EDestination **e_destination_importv            (const gchar *str);
-
-EDestination **e_destination_list_to_vector     (GList *);
-void           e_destination_freev              (EDestination **);
-
-void           e_destination_touch              (EDestination *);
-void           e_destination_touchv             (EDestination **);
-
-
-#endif /* __E_DESTINATION_H__ */
-
diff --git a/addressbook/backend/ebook/evolution-ldif-importer.c b/addressbook/backend/ebook/evolution-ldif-importer.c
deleted file mode 100644
index 23c6bf8743..0000000000
--- a/addressbook/backend/ebook/evolution-ldif-importer.c
+++ /dev/null
@@ -1,623 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * LDIF importer.  LDIF is the file format of an exported Netscape
- * addressbook.
- *
- * Framework copied from evolution-gnomecard-importer.c
- *
- * Michael M. Morrison (mmorrison@kqcorp.com)
- *
- * Multi-line value support, mailing list support, base64 support, and
- * various fixups: Chris Toshok (toshok@ximian.com)
- */
-
-#include <config.h>
-#include <bonobo.h>
-#include <gnome.h>
-#include <liboaf/liboaf.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include <e-book.h>
-#include <e-card-simple.h>
-#include <e-destination.h>
-
-#include <importer/evolution-importer.h>
-#include <importer/GNOME_Evolution_Importer.h>
-
-#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_LDIF_ImporterFactory"
-
-static BonoboGenericFactory *factory = NULL;
-
-static GHashTable *dn_card_hash;
-
-typedef struct {
-	char *filename;
-	GList *cardlist;
-	GList *iterator;
-	EBook *book;
-	gboolean ready;
-} LDIFImporter;
-
-#define MAX_STRING_LEN 1024
-
-static struct {
-	char *ldif_attribute;
-	ECardSimpleField simple_field;
-#define FLAG_ADDRESS 0x01
-	int flags;
-}
-ldif_fields[] = {
-	{ "cn", E_CARD_SIMPLE_FIELD_FULL_NAME },
-	{ "mail", E_CARD_SIMPLE_FIELD_EMAIL },
-#if 0
-	{ "givenname", E_CARD_SIMPLE_FIELD_GIVEN_NAME },
-#endif
-	{ "sn", E_CARD_SIMPLE_FIELD_FAMILY_NAME },
-	{ "xmozillanickname", E_CARD_SIMPLE_FIELD_NICKNAME },
-	{ "o", E_CARD_SIMPLE_FIELD_ORG },
-	{ "locality", 0, FLAG_ADDRESS},
-	{ "st", 0, FLAG_ADDRESS },
-	{ "streetaddress", 0, FLAG_ADDRESS },
-	{ "title", E_CARD_SIMPLE_FIELD_TITLE },
-	{ "postalcode", 0, FLAG_ADDRESS },
-	{ "countryname", 0, FLAG_ADDRESS },
-	{ "telephonenumber", E_CARD_SIMPLE_FIELD_PHONE_BUSINESS},
-	{ "homephone", E_CARD_SIMPLE_FIELD_PHONE_HOME },
-	{ "facsimiletelephonenumber", E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX },
-	{ "ou", E_CARD_SIMPLE_FIELD_ORG_UNIT },
-	{ "pagerphone", E_CARD_SIMPLE_FIELD_PHONE_PAGER },
-	{ "cellphone", E_CARD_SIMPLE_FIELD_PHONE_MOBILE },
-	{ "homeurl", E_CARD_SIMPLE_FIELD_URL },
-	{ "description", E_CARD_SIMPLE_FIELD_NOTE },
-	{ "xmozillausehtmlmail", E_CARD_SIMPLE_FIELD_WANTS_HTML }
-};
-static int num_ldif_fields = sizeof(ldif_fields) / sizeof (ldif_fields[0]);
-
-static unsigned char base64_rank[256] = {
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255, 62,255,255,255, 63,
-	 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,255,255,255,  0,255,255,
-	255,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
-	 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,255,255,255,255,255,
-	255, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-	 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-	255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-};
-
-/**
- * base64_decode_step: decode a chunk of base64 encoded data
- * @in: input stream
- * @len: max length of data to decode
- * @out: output stream
- * @state: holds the number of bits that are stored in @save
- * @save: leftover bits that have not yet been decoded
- *
- * Decodes a chunk of base64 encoded data
- **/
-static int
-base64_decode_step(unsigned char *in, int len, unsigned char *out, int *state, unsigned int *save)
-{
-	register unsigned char *inptr, *outptr;
-	unsigned char *inend, c;
-	register unsigned int v;
-	int i;
-
-	inend = in+len;
-	outptr = out;
-
-	/* convert 4 base64 bytes to 3 normal bytes */
-	v=*save;
-	i=*state;
-	inptr = in;
-	while (inptr<inend) {
-		c = base64_rank[*inptr++];
-		if (c != 0xff) {
-			v = (v<<6) | c;
-			i++;
-			if (i==4) {
-				*outptr++ = v>>16;
-				*outptr++ = v>>8;
-				*outptr++ = v;
-				i=0;
-			}
-		}
-	}
-
-	*save = v;
-	*state = i;
-
-	/* quick scan back for '=' on the end somewhere */
-	/* fortunately we can drop 1 output char for each trailing = (upto 2) */
-	i=2;
-	while (inptr>in && i) {
-		inptr--;
-		if (base64_rank[*inptr] != 0xff) {
-			if (*inptr == '=')
-				outptr--;
-			i--;
-		}
-	}
-
-	/* if i!= 0 then there is a truncation error! */
-	return outptr-out;
-}
-
-static int
-base64_decode_simple (char *data, int len)
-{
-	int state = 0;
-	unsigned int save = 0;
-
-	return base64_decode_step ((unsigned char *)data, len,
-				   (unsigned char *)data, &state, &save);
-}
-
-static void
-getValue( char * dest, char **src )
-{
-	char *d = dest;
-	char *s = *src;
-
- copy_line:
-	while( *s != 0 && *s != '\n' && *s != '\r' )
-		*dest++ = *s++;
-
-	if (*s == '\r') s++;
-	if (*s == '\n')	s++;
-
-	/* check for continuation here */
-	if (*s == ' ') {
-		s++;
-		goto copy_line;
-	}
-
-	*dest = 0;
-
-	if (*d == ':') {
-		int new_len;
-		/* it's base64 encoded */
-		memmove (d, d + 2, strlen (d) - 2);
-		new_len = base64_decode_simple (d, strlen (d));
-		*(d + new_len) = 0;
-	}
-
-	*src = s;
-}
-
-static gboolean
-parseLine( ECardSimple *simple, ECardDeliveryAddress *address, char **buf )
-{
-	char *ptr;
-	char *colon, *value;
-	gboolean field_handled;
-	char ldif_value[MAX_STRING_LEN];
-
-	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++;
-
-		getValue( ldif_value, &value );
-
-		field_handled = FALSE;
-		for (i = 0; i < num_ldif_fields; i ++) {
-			if (!g_strcasecmp (ptr, ldif_fields[i].ldif_attribute)) {
-				if (ldif_fields[i].flags & FLAG_ADDRESS) {
-					if (!g_strcasecmp (ptr, "locality"))
-						address->city = g_strdup (ldif_value);
-					else if (!g_strcasecmp (ptr, "countryname"))
-						address->country = g_strdup (ldif_value);
-					else if (!g_strcasecmp (ptr, "postalcode"))
-						address->code = g_strdup (ldif_value);
-					else if (!g_strcasecmp (ptr, "st"))
-						address->region = g_strdup (ldif_value);
-					else if (!g_strcasecmp (ptr, "streetaddress"))
-						address->street = g_strdup (ldif_value);
-				}
-				else {
-					e_card_simple_set (simple, ldif_fields[i].simple_field, ldif_value);
-					printf ("set %s to %s\n", ptr, ldif_value);
-				}
-				field_handled = TRUE;
-				break;
-			}
-		}
-
-		/* handle objectclass/dn/member out here */
-		if (!field_handled) {
-			if (!g_strcasecmp (ptr, "dn"))
-				g_hash_table_insert (dn_card_hash, g_strdup(ldif_value), simple->card);
-			else if (!g_strcasecmp (ptr, "objectclass") && !g_strcasecmp (ldif_value, "groupofnames")) {
-				e_card_simple_set (simple, E_CARD_SIMPLE_FIELD_IS_LIST, "true");
-			}
-			else if (!g_strcasecmp (ptr, "member")) {
-				EList *email;
-				gtk_object_get (GTK_OBJECT (simple->card),
-						"email", &email,
-						NULL);
-				e_list_append (email, ldif_value);
-			}
-		}
-
-		/* put the colon back the way it was, just for kicks */
-		*colon = ':';
-	}
-	else {
-		g_warning ("unrecognized entry %s", ptr);
-		return FALSE;
-	}
-
-	*buf = value;
-
-	return TRUE;
-}
-
-static ECard *
-getNextLDIFEntry( FILE *f )
-{
-	ECard *card;
-	ECardAddrLabel *label;
-	ECardSimple *simple;
-	ECardDeliveryAddress *address;
-	GString *str;
-	char line[1024];
-	char *buf;
-
-	str = g_string_new ("");
-	/* read from the file until we get to a blank line (or eof) */
-	while (!feof (f)) {
-		if (!fgets (line, sizeof(line), f))
-			break;
-		if (line[0] == '\n')
-			break;
-		str = g_string_append (str, line);
-	}
-
-	if (strlen (str->str) == 0) {
-		g_string_free (str, TRUE);
-		return NULL;
-	}
-
-	/* now parse that entry */
-	card = e_card_new ("");
-	simple = e_card_simple_new (card);
-	address = e_card_delivery_address_new ();
-
-	buf = str->str;
-	while (buf) {
-		if (!parseLine (simple, address, &buf)) {
-			/* parsing error */
-			gtk_object_unref (GTK_OBJECT (simple));
-			e_card_delivery_address_unref (address);
-			return NULL;
-		}
-	}
-
-
-	/* fill in the address */
-	address->flags = E_CARD_ADDR_HOME;
-
-	label = e_card_delivery_address_to_label (address);
-	e_card_delivery_address_unref (address);
-
-	e_card_simple_set_address (simple, E_CARD_SIMPLE_ADDRESS_ID_HOME, label);
-
-	e_card_address_label_unref (label);
-
-	e_card_simple_sync_card (simple);
-
-	g_string_free (str, TRUE);
-
-	return card;
-}
-
-static void
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	ECard *card = E_CARD(closure);
-	char *vcard;
-
-	e_card_set_id (card, id);
-
-	vcard = e_card_get_vcard(card);	
-
-	g_print ("Saved card: %s\n", vcard);
-	g_free(vcard);
-}
-
-static void
-resolve_list_card (LDIFImporter *gci, ECard *card)
-{
-	EList *email;
-	EIterator *email_iter;
-	char *full_name;
-
-	if (!e_card_evolution_list (card))
-		return;
-
-	gtk_object_get (GTK_OBJECT (card),
-			"email", &email,
-			"full_name", &full_name,
-			NULL);
-
-	/* set file_as to full_name so we don't later try and figure
-           out a first/last name for the list. */
-	if (full_name)
-		gtk_object_set (GTK_OBJECT (card),
-				"file_as", full_name,
-				NULL);
-
-	email_iter = e_list_get_iterator (email);
-	while (e_iterator_is_valid (email_iter)) {
-		const char *dn = e_iterator_get (email_iter);
-		ECard *dn_card = g_hash_table_lookup (dn_card_hash, dn);
-
-		/* break list chains here, since we don't support them just yet */
-		if (dn_card && !e_card_evolution_list (dn_card)) {
-			EDestination *dest = e_destination_new ();
-			gchar *dest_xml;
-			e_destination_set_card (dest, dn_card, 0);  /* Hard-wired for default e-mail, since netscape only exports 1 email address */
-			dest_xml = e_destination_export (dest);
-			gtk_object_unref (GTK_OBJECT (dest));
-			if (dest_xml) {
-				e_iterator_set (email_iter, dest_xml);
-				g_free (dest_xml);
-				e_iterator_next (email_iter);
-			}
-			else {
-				e_iterator_delete (email_iter);
-			}
-		}
-		else {
-			e_iterator_delete (email_iter);
-		}
-	}
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	LDIFImporter *gci = (LDIFImporter *) closure;
-	GList * list = NULL;
-	GList * list_list = NULL;
-	FILE * file;
-	ECard *card;
-
-	if(!( file = fopen( gci->filename, "r" ) )) {
-		g_warning("!!!Can't open .ldif file");
-		return;
-	}
-
-	dn_card_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	while ((card = getNextLDIFEntry (file))) {
-
-		if (e_card_evolution_list (card))
-			list_list = g_list_append (list_list, card);
-		else
-			list = g_list_append (list, card);
-	}
-
-	fclose( file );
-
-	list = g_list_reverse( list );
-	list_list = g_list_reverse (list_list);
-	list = g_list_concat (list, list_list);
-
-	gci->cardlist = list;
-	gci->ready = TRUE;
-}
-
-static void
-ebook_create (LDIFImporter *gci)
-{
-	gchar *path, *uri;
-	
-	gci->book = e_book_new ();
-
-	if (!gci->book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return;
-	}
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	if (! e_book_load_uri (gci->book, uri, book_open_cb, gci)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-}
-
-/* EvolutionImporter methods */
-static void
-process_item_fn (EvolutionImporter *importer,
-		 CORBA_Object listener,
-		 void *closure,
-		 CORBA_Environment *ev)
-{
-	LDIFImporter *gci = (LDIFImporter *) closure;
-	ECard *card;
-
-	if (gci->iterator == NULL)
-		gci->iterator = gci->cardlist;
-
-	if (gci->ready == FALSE) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_NOT_READY,
-							       gci->iterator ? TRUE : FALSE, 
-							       ev);
-		return;
-	}
-	
-	if (gci->iterator == NULL) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_UNSUPPORTED_OPERATION,
-							       FALSE, ev);
-		return;
-	}
-
-	card = gci->iterator->data;
-	if (e_card_evolution_list (card))
-		resolve_list_card (gci, card);
-	e_book_add_card (gci->book, card, add_card_cb, card);
-
-	gci->iterator = gci->iterator->next;
-
-	GNOME_Evolution_ImporterListener_notifyResult (listener,
-						       GNOME_Evolution_ImporterListener_OK,
-						       gci->iterator ? TRUE : FALSE, 
-						       ev);
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error notifying listeners.");
-	}
-	
-	return;
-}
-
-static char *supported_extensions[2] = {
-	".ldif", NULL
-};
-
-static gboolean
-support_format_fn (EvolutionImporter *importer,
-		   const char *filename,
-		   void *closure)
-{
-	char *ext;
-	int i;
-
-	ext = strrchr (filename, '.');
-	if (ext == NULL) {
-		return FALSE;
-	}
-
-	for (i = 0; supported_extensions[i] != NULL; i++) {
-		if (strcmp (supported_extensions[i], ext) == 0)
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void
-importer_destroy_cb (GtkObject *object,
-		     LDIFImporter *gci)
-{
-	gtk_main_quit ();
-}
-
-static gboolean
-load_file_fn (EvolutionImporter *importer,
-	      const char *filename,
-	      const char *folderpath,
-	      void *closure)
-{
-	LDIFImporter *gci;
-
-	gci = (LDIFImporter *) closure;
-	gci->filename = g_strdup (filename);
-	gci->cardlist = NULL;
-	gci->iterator = NULL;
-	gci->ready = FALSE;
-	ebook_create (gci);
-
-	return TRUE;
-}
-					   
-static BonoboObject *
-factory_fn (BonoboGenericFactory *_factory,
-	    void *closure)
-{
-	EvolutionImporter *importer;
-	LDIFImporter *gci;
-
-	gci = g_new (LDIFImporter, 1);
-	importer = evolution_importer_new (support_format_fn, load_file_fn, 
-					   process_item_fn, NULL, gci);
-	
-	gtk_signal_connect (GTK_OBJECT (importer), "destroy",
-			    GTK_SIGNAL_FUNC (importer_destroy_cb), gci);
-	
-	return BONOBO_OBJECT (importer);
-}
-
-static void
-importer_init (void)
-{
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_IID, 
-					      factory_fn, NULL);
-
-	if (factory == NULL) {
-		g_error ("Unable to create factory");
-	}
-
-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));
-}
-
-int
-main (int argc,
-      char **argv)
-{
-	CORBA_ORB orb;
-	
-	gnome_init_with_popt_table ("Evolution-LDIF-Importer",
-				    "0.0", argc, argv, oaf_popt_options, 0,
-				    NULL);
-	orb = oaf_init (argc, argv);
-	if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {
-		g_error ("Could not initialize Bonobo.");
-	}
-
-	importer_init ();
-	bonobo_main ();
-
-	return 0;
-}
-
-
diff --git a/addressbook/backend/ebook/evolution-vcard-importer.c b/addressbook/backend/ebook/evolution-vcard-importer.c
deleted file mode 100644
index e32593b4fb..0000000000
--- a/addressbook/backend/ebook/evolution-vcard-importer.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <stdio.h>
-
-#include <liboaf/liboaf.h>
-#include <bonobo/bonobo-context.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-main.h>
-
-#include <e-book.h>
-
-#include <importer/evolution-importer.h>
-#include <importer/GNOME_Evolution_Importer.h>
-
-#include <e-util/e-path.h>
-
-#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory"
-
-static BonoboGenericFactory *factory = NULL;
-
-typedef struct {
-	char *filename;
-	char *folderpath;
-	GList *cardlist;
-	GList *iterator;
-	EBook *book;
-	gboolean ready;
-} VCardImporter;
-
-static void
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	ECard *card = E_CARD(closure);
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	VCardImporter *gci = (VCardImporter *) closure;
-
-	gci->cardlist = e_card_load_cards_from_file_with_default_charset(gci->filename, "ISO-8859-1");
-	gci->ready = TRUE;
-}
-
-static void
-ebook_create (VCardImporter *gci)
-{
-	gchar *path, *uri;
-	gchar *epath;
-	
-	gci->book = e_book_new ();
-
-	if (!gci->book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return;
-	}
-
-	path = g_concat_dir_and_file (g_get_home_dir (), "evolution/local");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	epath = e_path_to_physical (uri, gci->folderpath);
-	g_free (uri);
-	uri = g_strdup_printf ("%s/addressbook.db", epath);
-	g_free (epath);
-
-	if (! e_book_load_uri (gci->book, uri, book_open_cb, gci)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-}
-
-/* EvolutionImporter methods */
-static void
-process_item_fn (EvolutionImporter *importer,
-		 CORBA_Object listener,
-		 void *closure,
-		 CORBA_Environment *ev)
-{
-	VCardImporter *gci = (VCardImporter *) closure;
-	ECard *card;
-
-	if (gci->iterator == NULL)
-		gci->iterator = gci->cardlist;
-	
-	if (gci->ready == FALSE) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_NOT_READY,
-							       gci->iterator ? TRUE : FALSE, 
-							       ev);
-		return;
-	}
-	
-	if (gci->iterator == NULL) {
-		GNOME_Evolution_ImporterListener_notifyResult (listener,
-							       GNOME_Evolution_ImporterListener_UNSUPPORTED_OPERATION,
-							       FALSE, ev);
-		return;
-	}
-	
-	card = gci->iterator->data;
-	e_book_add_card (gci->book, card, add_card_cb, card);
-	
-	gci->iterator = gci->iterator->next;
-	
-	GNOME_Evolution_ImporterListener_notifyResult (listener,
-						       GNOME_Evolution_ImporterListener_OK,
-						       gci->iterator ? TRUE : FALSE, 
-						       ev);
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("Error notifying listeners.");
-	}
-	
-	return;
-}
-
-static char *supported_extensions[3] = {
-	".vcf",
-	".gcrd",
-	NULL
-};
-
-/* Actually check the contents of this file */
-static gboolean
-check_file_is_vcard (const char *filename)
-{
-	FILE *handle;
-	char line[4096];
-	gboolean result;
-
-	handle = fopen (filename, "r");
-	if (handle == NULL) {
-		g_print ("\n");
-		return FALSE;
-	}
-		
-	fgets (line, 4096, handle);
-	if (line == NULL) {
-		fclose (handle);
-		g_print ("\n");
-		return FALSE;
-	}
-
-	if (strncmp (line, "BEGIN:VCARD", 11) == 0) {
-		result = TRUE;
-	} else {
-		result = FALSE;
-	}
-
-	fclose (handle);
-	return result;
-}
-
-static gboolean
-support_format_fn (EvolutionImporter *importer,
-		   const char *filename,
-		   void *closure)
-{
-	char *ext;
-	int i;
-
-	ext = strrchr (filename, '.');
-	if (ext == NULL) {
-		return check_file_is_vcard (filename);
-	}
-	for (i = 0; supported_extensions[i] != NULL; i++) {
-		if (strcmp (supported_extensions[i], ext) == 0)
-			return check_file_is_vcard (filename);
-	}
-
-	return FALSE;
-}
-
-static void
-importer_destroy_cb (GtkObject *object,
-		     VCardImporter *gci)
-{
-	gtk_main_quit ();
-}
-
-static gboolean
-load_file_fn (EvolutionImporter *importer,
-	      const char *filename,
-	      const char *folderpath,
-	      void *closure)
-{
-	VCardImporter *gci;
-
-	if (check_file_is_vcard (filename) == FALSE) {
-		return FALSE;
-	}
-
-	gci = (VCardImporter *) closure;
-	gci->filename = g_strdup (filename);
-	gci->folderpath = g_strdup (folderpath);
-	gci->cardlist = NULL;
-	gci->iterator = NULL;
-	gci->ready = FALSE;
-	ebook_create (gci);
-
-	return TRUE;
-}
-					   
-static BonoboObject *
-factory_fn (BonoboGenericFactory *_factory,
-	    void *closure)
-{
-	EvolutionImporter *importer;
-	VCardImporter *gci;
-
-	gci = g_new (VCardImporter, 1);
-	importer = evolution_importer_new (support_format_fn, load_file_fn, 
-					   process_item_fn, NULL, gci);
-	
-	gtk_signal_connect (GTK_OBJECT (importer), "destroy",
-			    GTK_SIGNAL_FUNC (importer_destroy_cb), gci);
-	
-	return BONOBO_OBJECT (importer);
-}
-
-static void
-importer_init (void)
-{
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_IID, 
-					      factory_fn, NULL);
-
-	if (factory == NULL) {
-		g_error ("Unable to create factory");
-	}
-
-	bonobo_running_context_auto_exit_unref (BONOBO_OBJECT (factory));
-}
-
-int
-main (int argc,
-      char **argv)
-{
-	CORBA_ORB orb;
-	
-	gnome_init_with_popt_table ("Evolution-VCard-Importer",
-				    PACKAGE, argc, argv, oaf_popt_options, 0,
-				    NULL);
-	orb = oaf_init (argc, argv);
-	if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {
-		g_error ("Could not initialize Bonobo.");
-	}
-
-	importer_init ();
-	bonobo_main ();
-
-	return 0;
-}
-
-
diff --git a/addressbook/backend/ebook/load-gnomecard-addressbook.c b/addressbook/backend/ebook/load-gnomecard-addressbook.c
deleted file mode 100644
index 6f592a4664..0000000000
--- a/addressbook/backend/ebook/load-gnomecard-addressbook.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <stdio.h>
-#include <glib.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-init.h>
-#include <bonobo/bonobo-main.h>
-#include <liboaf/liboaf.h>
-
-#include "e-book.h"
-
-static CORBA_Environment ev;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-static void
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	ECard *card = E_CARD(closure);
-	char *vcard = e_card_get_vcard_assume_utf8(card);
-	g_print ("Saved card: %s\n", vcard);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	GList *list = e_card_load_cards_from_file_with_default_charset("gnomecard.vcf", "ISO-8859-1");
-	GList *iterator;
-	for (iterator = list; iterator; iterator = g_list_next(iterator)) {
-		ECard *card = iterator->data;
-		e_book_add_card(book, card, add_card_cb, card);
-	}
-	g_list_free(list);
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	gchar *path, *uri;
-	
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return FALSE;
-	}
-	
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	if (! e_book_load_uri (book, uri, book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-
-
-	return FALSE;
-}
-
-int
-main (int argc, char **argv)
-{
-
-	CORBA_exception_init (&ev);
-
-	gnome_init_with_popt_table("blah", "0.0", argc, argv, NULL, 0, NULL);
-	oaf_init (argc, argv);
-	init_bonobo (argc, argv);
-
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-	
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/load-pine-addressbook.c b/addressbook/backend/ebook/load-pine-addressbook.c
deleted file mode 100644
index c1d58a88bf..0000000000
--- a/addressbook/backend/ebook/load-pine-addressbook.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <glib.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-init.h>
-#include <bonobo/bonobo-main.h>
-#include <liboaf/liboaf.h>
-
-#include "e-book.h"
-
-static CORBA_Environment ev;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-static void
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	ECard *card = E_CARD(closure);
-	char *vcard = e_card_get_vcard_assume_utf8(card);
-	g_print ("Saved card: %s\n", vcard);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-parse_line (EBook *book, char *line)
-{
-	char **strings;
-	ECardName *name;
-	ECard *card;
-	EList *list;
-
-	card = e_card_new("");
-	strings = g_strsplit(line, "\t", 3);
-	if (strings[0] && strings[1] && strings[2]) {
-		name = e_card_name_from_string(strings[1]);
-		gtk_object_set(GTK_OBJECT(card),
-			       "nickname", strings[0],
-			       "full_name", strings[1],
-			       "name", name,
-			       NULL);
-		gtk_object_get(GTK_OBJECT(card),
-			       "email", &list,
-			       NULL);
-		e_list_append(list, strings[2]);
-		e_book_add_card(book, card, add_card_cb, card);
-	}
-	g_strfreev(strings);
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	FILE *fp = fopen (".addressbook", "r");
-	char line[2 * 1024];
-	int which = 0;
-	char *lastline = NULL;
-
-	if (!fp) {
-		g_warning ("Can't find .addressbook");
-		return;
-	}
-
-	while(fgets(line + which * 1024, 1024, fp)) {
-		int length;
-		char *thisline = line + which * 1024;
-		length = strlen(thisline);
-		if (thisline[length - 1] == '\n')
-			line[--length] = 0;
-		if (lastline && *thisline && isspace(*thisline)) {
-			char *temp;
-			while(*thisline && isspace(*thisline))
-				thisline ++;
-			temp = lastline;
-			lastline = g_strdup_printf("%s%s", lastline, thisline);
-			g_free(temp);
-			continue;
-		}
-		if (lastline) {
-			parse_line (book, lastline);
-			g_free(lastline);
-		}
-		lastline = g_strdup(thisline);
-	}
-
-	if (lastline) {
-		parse_line (book, lastline);
-		g_free(lastline);
-	}
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	gchar *path, *uri;
-	
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return FALSE;
-	}
-	
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	if (! e_book_load_uri (book, uri, book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-
-
-	return FALSE;
-}
-
-#if 0
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-#endif
-
-int
-main (int argc, char **argv)
-{
-
-	CORBA_exception_init (&ev);
-
-	gnome_init_with_popt_table("blah", "0.0", argc, argv, NULL, 0, NULL);
-	oaf_init (argc, argv);
-	init_bonobo (argc, argv);
-
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-	
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/test-card.c b/addressbook/backend/ebook/test-card.c
deleted file mode 100644
index dd591d6c51..0000000000
--- a/addressbook/backend/ebook/test-card.c
+++ /dev/null
@@ -1,196 +0,0 @@
-#include <string.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnomeui/gnome-init.h>
-#include "e-card.h"
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"ORG:Ximian, Inc.
-"             \
-"TITLE:Head Geek
-"                  \
-"ROLE:Programmer/Executive
-"        \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@ximian.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
-
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-
-
-
-int
-main (int argc, char **argv)
-{
-	char  *cardstr;
-	ECard *card;
-
-	/* Fields */
-	char *fname;
-	char *org;
-	char *org_unit;
-        char *title;
-	char *role;
-	char *nickname;
-	char *fburl;
-	ECardName *name;
-	EList *address;
-	EList *phone;
-	EList *email;
-	EIterator *iterator;
-	ECardDate *bday;
-
-	gnome_init ("TestCard", "0.0", argc, argv);
-
-	cardstr = NULL;
-	if (argc == 2)
-		cardstr = read_file (argv [1]);
-
-	if (cardstr == NULL)
-		cardstr = TEST_VCARD;
-#if 0
-	{
-	  int i;
-	  for ( i = 0; i < 100000; i++ ) {
-	    card = e_card_new (cardstr);
-	  
-	    gtk_object_unref (GTK_OBJECT (card));
-	  }
-	}
-#endif
-	card = e_card_new_with_default_charset (cardstr, "ISO-8859-1");
-	gtk_object_get(GTK_OBJECT(card),
-		       "full_name",  &fname,
-		       "name",       &name,
-		       "address",    &address,
-		       "phone",      &phone,
-		       "email",      &email,
-		       "org",        &org,
-		       "org_unit",   &org_unit,
-		       "title",      &title,
-		       "role",       &role,
-		       "nickname",   &nickname,
-		       "fburl",      &fburl,
-		       "birth_date", &bday,
-		       NULL);
-	if ( fname ) {
-	  printf("Name : %s\n", fname);
-	  g_free(fname);
-	}
-	if ( name ) {
-	  printf("Full Name:\n");
-	  if ( name->prefix )
-	    printf("  prefix     : %s\n", name->prefix);
-	  if ( name->given )
-	    printf("  given      : %s\n", name->given);
-	  if ( name->additional )
-	    printf("  additional : %s\n", name->additional);
-	  if ( name->family )
-	    printf("  family     : %s\n", name->family);
-	  if ( name->suffix )
-	    printf("  suffix     : %s\n", name->suffix);
-	}
-	if ( org ) {
-	  printf("Company : %s\n", org);
-        }
-	if ( org_unit ) {
-	  printf("Department : %s\n", org_unit);
-        }
-	if ( title ) {
-	  printf("Title : %s\n", title);
-        }
-	if ( role ) {
-	  printf("Profession : %s\n", role);
-        }
-	if ( nickname ) {
-	  printf("Nickname : %s\n", nickname);
-        }
-	if ( fburl ) {
-	  printf("Free Busy URL : %s\n", fburl);
-        }
-	if ( bday ) {
-	  printf("BDay : %4d-%02d-%02d\n", bday->year, bday->month, bday->day);
-	}
-	if ( email ) {
-	  iterator = e_list_get_iterator(address);
-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-	    printf("Email : %s\n", (char *) e_iterator_get(iterator));
-	  }
-	  gtk_object_unref(GTK_OBJECT(iterator));
-	}
-	if ( phone ) {
-	  iterator = e_list_get_iterator(address);
-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-	    ECardPhone *e_card_phone = (ECardPhone *) e_iterator_get(iterator);
-	    printf("Phone ; %d : %s\n", e_card_phone->flags, e_card_phone->number);
-	  }
-	  gtk_object_unref(GTK_OBJECT(iterator));
-	}
-	if ( address ) {
-	  iterator = e_list_get_iterator(address);
-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-	    ECardDeliveryAddress *del_address = (ECardDeliveryAddress *) e_iterator_get(iterator);
-	    printf("Address ; %d:\n", del_address->flags);
-	    if ( del_address->po )
-	      printf("  Po      : %s\n", del_address->po);
-	    if ( del_address->ext )
-	      printf("  Ext     : %s\n", del_address->ext);
-	    if ( del_address->street )
-	      printf("  Street  : %s\n", del_address->street);
-	    if ( del_address->city )
-	      printf("  City    : %s\n", del_address->city);
-	    if ( del_address->region )
-	      printf("  Region  : %s\n", del_address->region);
-	    if ( del_address->code )
-	      printf("  Code    : %s\n", del_address->code);
-	    if ( del_address->country )
-	      printf("  Country : %s\n", del_address->country);
-	  }
-	  gtk_object_unref(GTK_OBJECT(iterator));
-	}
-	printf("%s", e_card_get_vcard_assume_utf8(card));
-	gtk_object_unref (GTK_OBJECT (card));
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/test-client-list.c b/addressbook/backend/ebook/test-client-list.c
deleted file mode 100644
index 8a38ccf4e1..0000000000
--- a/addressbook/backend/ebook/test-client-list.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-
-#include <glib.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-init.h>
-#include <liboaf/liboaf.h>
-#include <bonobo/bonobo-main.h>
-
-#include "e-book.h"
-
-CORBA_Environment ev;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	gnome_init ("blah", "0.0", argc, argv);
-	oaf_init (argc, argv);
-
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-static void
-get_cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure)
-{
-	long length = e_card_cursor_get_length(cursor);
-	long i;
-	
-	printf ("Length: %d\n", (int) length);
-	for ( i = 0; i < length; i++ ) {
-		ECard *card = e_card_cursor_get_nth(cursor, i);
-		char *vcard = e_card_get_vcard_assume_utf8(card);
-		printf("[%s]\n", vcard);
-		g_free(vcard);
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	printf ("Book opened.\n");
-	e_book_get_cursor(book, "", get_cursor_cb, NULL);
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	
-	book = e_book_new ();
-
-	if (! e_book_load_uri (book, "file:/tmp/test.db", book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-
-
-	return FALSE;
-}
-
-int
-main (int argc, char **argv)
-{
-
-	CORBA_exception_init (&ev);
-	init_bonobo (argc, argv);
-
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/test-client.c b/addressbook/backend/ebook/test-client.c
deleted file mode 100644
index 44b20ebdde..0000000000
--- a/addressbook/backend/ebook/test-client.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <glib.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-init.h>
-#include <bonobo/bonobo-main.h>
-#include <liboaf/liboaf.h>
-
-#include "e-book.h"
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@ximian.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"END:VCARD
-"                        \
-"
-"
-
-static CORBA_Environment ev;
-static char *cardstr;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-static void
-get_cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure)
-{
-	long length = e_card_cursor_get_length(cursor);
-	long i;
-
-	/* we just added a card, so the length should be >1 */
-	printf ("\n%s: %s(): Number of cards is %ld\n",
-		__FILE__, __FUNCTION__, length);
-	if (length < 1)
-		printf ("*** Why isn't this above zero?? ***\n\n");
-	
-	for ( i = 0; i < length; i++ ) {
-		ECard *card = e_card_cursor_get_nth(cursor, i);
-		char *vcard = e_card_get_vcard_assume_utf8(card);
-		printf("Get all cards callback: [%s]\n", vcard);
-		g_free(vcard);
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-}
-
-static void
-get_card_cb (EBook *book, EBookStatus status, ECard *card, gpointer closure)
-{
-	char *vcard;
-
-	vcard = e_card_get_vcard_assume_utf8(card);
-	printf ("Card added: [%s]\n", vcard);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(card));
-
-	printf ("Getting cards..\n");
-	e_book_get_cursor(book, "", get_cursor_cb, NULL);
-	printf ("Done getting all cards.\n");	
-}
-
-static void
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	GTimer *timer;
-
-	printf ("Status: %d\n", status);
-
-	printf ("Id: %s\n", id);
-
-	timer = g_timer_new ();
-	g_timer_start (timer);
-	e_book_get_card (book, id, get_card_cb, closure);
-	g_timer_stop (timer);
-	printf ("%g\n", g_timer_elapsed (timer, NULL));
-}
-
-static void
-get_fields_cb (EBook *book, EBookStatus status, EList *fields, gpointer closure)
-{
-	if (fields) {
-		EIterator *iter = e_list_get_iterator (fields);
-
-		printf ("Supported fields:\n");
-
-		for (; e_iterator_is_valid (iter); e_iterator_next (iter)) {
-			printf (" %s\n", (char*)e_iterator_get (iter));
-		}
-
-		gtk_object_unref(GTK_OBJECT(fields));
-	}
-	else {
-		printf ("No supported fields?\n");
-	}
-
-	e_book_add_vcard(book, cardstr, add_card_cb, NULL);
-}
-
-
-static void
-auth_user_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	printf ("user authenticated\n");
-	e_book_get_supported_fields (book, get_fields_cb, closure);
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	e_book_authenticate_user (book, "username", "password", auth_user_cb, NULL);
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return FALSE;
-	}
-	
-
-	if (! e_book_load_uri (book, "file:/tmp/test.db", book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-
-
-	return FALSE;
-}
-
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-
-
-int
-main (int argc, char **argv)
-{
-
-	CORBA_exception_init (&ev);
-
-	gnome_init_with_popt_table ("blah", "0.0", argc, argv, NULL, 0, NULL);
-	oaf_init (argc, argv);
-	init_bonobo (argc, argv);
-
-	cardstr = NULL;
-	if (argc == 2)
-		cardstr = read_file (argv [1]);
-
-	if (cardstr == NULL)
-		cardstr = TEST_VCARD;
-
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-	
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/backend/idl/.cvsignore b/addressbook/backend/idl/.cvsignore
deleted file mode 100644
index 09980ae6ba..0000000000
--- a/addressbook/backend/idl/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/backend/idl/Makefile.am b/addressbook/backend/idl/Makefile.am
deleted file mode 100644
index db61d2c30c..0000000000
--- a/addressbook/backend/idl/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-idldir = $(datadir)/idl
-
-idl_DATA =			\
-	addressbook.idl
-
-EXTRA_DIST = $(idl_DATA)
diff --git a/addressbook/backend/idl/addressbook.idl b/addressbook/backend/idl/addressbook.idl
deleted file mode 100644
index 342482d573..0000000000
--- a/addressbook/backend/idl/addressbook.idl
+++ /dev/null
@@ -1,160 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-module Addressbook {
-	typedef string CardId;
-	typedef string VCard;
-	typedef sequence<VCard> VCardList;
-	typedef sequence<string> stringlist;
-
-	interface CardCursor : Bonobo::Unknown {
-		long   count  ();
-		string getNth (in long n);
-	};
-
-	/* 
-	 * A book view is a live view of a book.  It's either a view
-	 * of all the cards in the book or a view of a query.  When
-	 * created, it will get a series of signal_card_added calls
-	 * for all objects in the initial set.  After that, it will
-	 * get added, removed, or changed signals whenever the book
-	 * changes (if it affects the set of viewed cards.)
-	 */
-	interface BookViewListener : Bonobo::Unknown {
-		void notifyCardAdded        (in VCardList cards);
-		void notifyCardRemoved      (in CardId id);
-		void notifyCardChanged      (in VCardList cards);
-		void notifySequenceComplete ();
-		void notifyStatusMessage    (in string message);
-	};
-	
-	interface BookView : Bonobo::Unknown {
-	};
-
-	interface Book : Bonobo::Unknown {
-		/*
-		 * Fetching cards in the addresbook.
-		 */
-		void getVCard (in CardId id);
-
-		void authenticateUser (in string user, in string passwd);
-
-		/*
-		 * Adding and deleting cards in the book.
-		 */
-		void addCard    (in VCard vcard);
-		void removeCard (in CardId Id);
-	        
-		/*
-		 * Modifying cards in the addressbook.
-		 */
-		void modifyCard (in VCard vcard);
-		
-		/*
-		 * This function returns a cursor to the book
-		 * listener.  This is for people who want a snapshot
-		 * of the addressbook.  The syntax for the query
-		 * string is not yet defined.
-		 */
-		void getCursor (in string query);
-		
-		/*
-		 * These two functions return a book view to the book
-		 * listener.  This is for people who want a live view
-		 * of the addressbook.
-		 */
-		void getBookView (in BookViewListener listener, in string query);
-
-		void getChanges  (in BookViewListener listener, in string change_id);
-
-		void checkConnection ();
-
-		void getSupportedFields ();
-
-		string getStaticCapabilities ();
-
-		string getName ();
-	};
-
-	interface BookListener : Bonobo::Unknown {
-
-		enum CallStatus {
-			Success,
-			RepositoryOffline,
-			PermissionDenied,
-			CardNotFound,
-			CardIdAlreadyExists,
-			ProtocolNotSupported,
-			AuthenticationFailed,
-			AuthenticationRequired,
-			UnsupportedField,
-			OtherError
-		};
-
-		void notifyCardCreated  (in CallStatus status, in CardId Id);
-
-		void notifyCardRemoved  (in CallStatus status);
-
-		void notifyCardModified (in CallStatus status);
-		
-		void notifyOpenBookProgress (in string status_message, in short percent);
-
-		void notifyBookOpened       (in CallStatus status, in Book book);
-
-		void notifyCardRequested    (in CallStatus status, in VCard card);
-
-		void notifyCursorRequested  (in CallStatus status, in CardCursor cursor);
-
-		void notifyViewRequested    (in CallStatus status, in BookView view);
-
-		void notifyChangesRequested (in CallStatus status, in BookView view);
-
-		void notifyAuthenticationResult (in CallStatus status);
-
-		void notifySupportedFields (in CallStatus status, in stringlist fields);
-
-		/**
-		 * notifyConnectionStatus:
-		 *
-		 * Used to report changes in the connection to the
-		 * contact repository.  This is often a response to a
-		 * call to check_connection() on the Book, but wombat
-		 * is free to report the connection status without
-		 * being asked.
-		 */
-		void notifyConnectionStatus (in boolean connected);
-
-		/**
-		 * notifyWritable:
-		 *
-		 * Used to report whether or not a backend can write
-		 * to a given addressbook.  All books default to
-		 * read-only, so unless you receive a notification
-		 * saying otherwise, treat the book as read-only.  It
-		 * is presumed that this notification will be sent
-		 * early (just after a connection is opened, usually),
-		 * but it may also be sent later, if/when the backend
-		 * notices a change.
-		 */
-		void notifyWritable (in boolean writable);
-	};
-
-	interface BookFactory : Bonobo::Unknown {
-		exception ProtocolNotSupported {};
-
-		void openBook (in string uri, in BookListener listener)
-			raises (ProtocolNotSupported);
-	};
-};
-};
-};
diff --git a/addressbook/backend/pas/.cvsignore b/addressbook/backend/pas/.cvsignore
deleted file mode 100644
index 071cef99ae..0000000000
--- a/addressbook/backend/pas/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-addressbook-stubs.c
-addressbook-skels.c
-addressbook-common.c
-addressbook.h
-*.lo
-*.la
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
deleted file mode 100644
index ea150597c9..0000000000
--- a/addressbook/backend/pas/Makefile.am
+++ /dev/null
@@ -1,63 +0,0 @@
-CORBA_SOURCE =						\
-	addressbook.h					\
-	addressbook-common.c				\
-	addressbook-stubs.c				\
-	addressbook-skels.c
-
-idls =							\
-	$(srcdir)/../idl/addressbook.idl
-
-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
-
-$(CORBA_SOURCE): $(idls)
-	$(ORBIT_IDL) -I $(srcdir) $(srcdir)/../idl/addressbook.idl $(idl_flags)
-
-INCLUDES =						\
-	$(DB3_CFLAGS)					\
-	$(LDAP_CFLAGS)					\
-        -DGNOMELOCALEDIR=\""$(localedir)"\"		\
-	-DG_LOG_DOMAIN=\"wombat-pas\"			\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-        $(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-LDAP_SCHEMA =						\
-	evolutionperson.schema
-
-LDAP_BACKEND_FILES = pas-backend-ldap.c pas-backend-ldap.h
-
-if ENABLE_LDAP
-LDAP_BACKEND = $(LDAP_BACKEND_FILES)
-else
-LDAP_BACKEND = 
-endif
-
-noinst_LIBRARIES = libpas.a
-
-libpas_a_SOURCES =					\
-	$(CORBA_SOURCE)					\
-	pas-book-factory.c				\
-	pas-book-factory.h				\
-	pas-book-view.c					\
-	pas-book-view.h					\
-	pas-book.c					\
-	pas-book.h					\
-	pas-backend-card-sexp.c				\
-	pas-backend-card-sexp.h				\
-	pas-backend-file.c				\
-	pas-backend-file.h				\
-	$(LDAP_BACKEND)					\
-	pas-backend.c					\
-	pas-backend.h					\
-	pas-card-cursor.c				\
-	pas-card-cursor.h
-
-BUILT_SOURCES = $(CORBA_SOURCE)
-CLEANFILES = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-
-EXTRA_DIST = $(LDAP_BACKEND_FILES) $(LDAP_SCHEMA)
diff --git a/addressbook/backend/pas/TODO b/addressbook/backend/pas/TODO
deleted file mode 100644
index 0c77c1b200..0000000000
--- a/addressbook/backend/pas/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* Implement pas_book_factory_activate
-* Authentication
-\ No newline at end of file
diff --git a/addressbook/backend/pas/evolutionperson.schema b/addressbook/backend/pas/evolutionperson.schema
deleted file mode 100644
index f0f3a394df..0000000000
--- a/addressbook/backend/pas/evolutionperson.schema
+++ /dev/null
@@ -1,206 +0,0 @@
-#
-# Depends upon
-#   Definition of an X.500 Attribute Type and an Object Class to Hold
-#   Uniform Resource Identifiers (URIs) [RFC2079]
-#	(core.schema)
-#   
-#   A Summary of the X.500(96) User Schema for use with LDAPv3 [RFC2256]
-#	(core.schema)
-#
-#   The COSINE and Internet X.500 Schema [RFC1274] (cosine.schema)
-#
-#   The Internet Organizational Person Schema (inetorgperson)
-#
-# OIDs are broken up into the following:
-#   1.3.6.1.4.1.8506.1.?
-#                     .1  Syntaxes
-#                     .2  Attributes
-#                     .3  Objectclasses
-   
-# primaryPhone
-attributetype ( 1.3.6.1.4.1.8506.1.2.1
-	NAME 'primaryPhone'
-	DESC 'preferred phone number used to contact a person'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-	SINGLE-VALUE )
-
-# carPhone
-attributetype ( 1.3.6.1.4.1.8506.1.2.2
-	NAME 'carPhone'
-	DESC 'car phone telephone number of the person'
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-	SINGLE-VALUE )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.3
-	NAME ( 'homeFacsimileTelephoneNumber' 'homeFax' )
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.22 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.4
-	NAME 'otherPhone'
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.5
-	NAME 'businessRole'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.6
-	NAME 'managerName'
-	SUP name )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.7
-	NAME 'assistantName'
-	SUP name )
-
-# spouseName
-# single valued (/me smirks)
-attributetype ( 1.3.6.1.4.1.8506.1.2.8
-	NAME 'spouseName'
-	SUP name
-	SINGLE-VALUE )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.9
-	NAME 'otherPostalAddress'
-	EQUALITY caseIgnoreListMatch
-	SUBSTR caseIgnoreListSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.10
-	NAME ( 'mailer' 'mua' )
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32} )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.11
-	NAME ( 'birthDate' 'dob' )
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.12
-	NAME 'anniversary'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.13
-	NAME 'note'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.14
-	NAME 'evolutionArbitrary'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{4096} )
-	)
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.15
-	NAME 'fileAs'
-	SUP name )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.16
-	NAME 'assistantPhone'
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.17
-	NAME 'companyPhone'
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.18
-	NAME 'callbackPhone'
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.19
-	NAME ( 'otherFacsimileTelephoneNumber' 'otherFax' )
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.20
-	NAME 'radio'
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.21
-	NAME 'telex'
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.22
-	NAME 'tty'
-	EQUALITY telephoneNumberMatch
-	SUBSTR telephoneNumberSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.23
-	NAME 'categories'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{4096} )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.24
-	NAME 'contact'
-        EQUALITY distinguishedNameMatch
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.25
-	NAME 'listName'
-	SUP name
-	SINGLE-VALUE )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.26
-	NAME 'calendarURI'
-        EQUALITY caseExactIA5Match
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-	SINGLE-VALUE )
-
-attributetype ( 1.3.6.1.4.1.8506.1.2.27
-	NAME 'freeBusyURI'
-        EQUALITY caseExactIA5Match
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-	SINGLE-VALUE )
-
-# evolutionPerson
-objectclass	( 1.3.6.1.4.1.8506.1.3.1
-    NAME 'evolutionPerson'
-	DESC 'Objectclass geared to Evolution Usage'
-    SUP inetOrgPerson
-    STRUCTURAL
-	MAY (
-	        fileAs $ primaryPhone $ carPhone $ homeFacsimileTelephoneNumber $ 
-		otherPhone $ businessRole $ managerName $ assistantName $ assistantPhone $
-		otherPostalAddress $ mailer $ birthDate $ anniversary $ spouseName $
-		note $ companyPhone $ callbackPhone $ otherFacsimileTelephoneNumber $
-		radio $ telex $ tty $ categories $ calendarURI $ freeBusyURI )
-	)
-
-# evolutionPersonList
-objectclass	( 1.3.6.1.4.1.8506.1.3.2
-    NAME 'evolutionPersonList'
-	DESC 'Objectclass geared to Evolution Contact Lists'
-    SUP top
-    STRUCTURAL
-	MUST (
-		listName )
-	MAY (
-		mail $ contact )
-	)
diff --git a/addressbook/backend/pas/pas-backend-card-sexp.c b/addressbook/backend/pas/pas-backend-card-sexp.c
deleted file mode 100644
index a1b1fb6d35..0000000000
--- a/addressbook/backend/pas/pas-backend-card-sexp.c
+++ /dev/null
@@ -1,401 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include "pas-backend-card-sexp.h"
-
-#include <string.h>
-#include <e-util/e-sexp.h>
-#include <ebook/e-card-simple.h>
-#include <gal/widgets/e-unicode.h>
-
-static GtkObjectClass *parent_class;
-
-typedef struct _SearchContext SearchContext;
-
-struct _PASBackendCardSExpPrivate {
-	ESExp *search_sexp;
-	SearchContext *search_context;
-};
-
-struct _SearchContext {
-	ECardSimple *card;
-};
-
-static gboolean
-compare_email (ECardSimple *card, const char *str,
-	       char *(*compare)(const char*, const char*))
-{
-	int i;
-
-	for (i = E_CARD_SIMPLE_EMAIL_ID_EMAIL; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-		const char *email = e_card_simple_get_email (card, i);
-
-		if (email && compare(email, str))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-compare_phone (ECardSimple *card, const char *str,
-	       char *(*compare)(const char*, const char*))
-{
-	int i;
-
-	for (i = E_CARD_SIMPLE_PHONE_ID_ASSISTANT; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-		const ECardPhone *phone = e_card_simple_get_phone (card, i);
-
-		if (phone && compare(phone->number, str))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-compare_address (ECardSimple *card, const char *str,
-		 char *(*compare)(const char*, const char*))
-{
-	g_warning("address searching not implemented\n");
-	return FALSE;
-}
-
-static gboolean
-compare_category (ECardSimple *card, const char *str,
-		  char *(*compare)(const char*, const char*))
-{
-	EList *categories;
-	EIterator *iterator;
-	ECard *ecard;
-	gboolean ret_val = FALSE;
-
-	gtk_object_get (GTK_OBJECT (card),
-			"card", &ecard,
-			NULL);
-	gtk_object_get (GTK_OBJECT (ecard),
-			"category_list", &categories,
-			NULL);
-
-	for (iterator = e_list_get_iterator(categories); e_iterator_is_valid (iterator); e_iterator_next (iterator)) {
-		const char *category = e_iterator_get (iterator);
-
-		if (compare(category, str)) {
-			ret_val = TRUE;
-			break;
-		}
-	}
-
-	gtk_object_unref (GTK_OBJECT (iterator));
-	e_card_free_empty_lists (ecard);
-	return ret_val;
-}
-
-static struct prop_info {
-	ECardSimpleField field_id;
-	const char *query_prop;
-	const char *ecard_prop;
-#define PROP_TYPE_NORMAL   0x01
-#define PROP_TYPE_LIST     0x02
-#define PROP_TYPE_LISTITEM 0x03
-#define PROP_TYPE_ID 0x04
-	int prop_type;
-	gboolean (*list_compare)(ECardSimple *ecard, const char *str,
-				 char *(*compare)(const char*, const char*));
-
-} prop_info_table[] = {
-#define NORMAL_PROP(f,q,e) {f, q, e, PROP_TYPE_NORMAL, NULL}
-#define ID_PROP {0, "id", NULL, PROP_TYPE_ID, NULL}
-#define LIST_PROP(q,e,c) {0, q, e, PROP_TYPE_LIST, c}
-
-	/* query prop,  ecard prop,   type,              list compare function */
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_FILE_AS, "file_as", "file_as" ),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_FULL_NAME, "full_name",  "full_name" ),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_URL, "url", "url" ),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_MAILER, "mailer", "mailer"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ORG, "org", "org"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ORG_UNIT, "org_unit", "org_unit"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_OFFICE, "office", "office"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_TITLE, "title", "title"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ROLE, "role", "role"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_MANAGER, "manager", "manager"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ASSISTANT, "assistant", "assistant"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_NICKNAME, "nickname", "nickname"),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_SPOUSE, "spouse", "spouse" ),
-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_NOTE, "note", "note"),
-	ID_PROP,
-	LIST_PROP ( "email", "email", compare_email ),
-	LIST_PROP ( "phone", "phone", compare_phone ),
-	LIST_PROP ( "address", "address", compare_address ),
-	LIST_PROP ( "category", "category", compare_category ),
-};
-static int num_prop_infos = sizeof(prop_info_table) / sizeof(prop_info_table[0]);
-
-static ESExpResult *
-entry_compare(SearchContext *ctx, struct _ESExp *f,
-	      int argc, struct _ESExpResult **argv,
-	      char *(*compare)(const char*, const char*))
-{
-	ESExpResult *r;
-	int truth = FALSE;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname;
-		struct prop_info *info = NULL;
-		int i;
-		gboolean any_field;
-
-		propname = argv[0]->value.string;
-
-		any_field = !strcmp(propname, "x-evolution-any-field");
-		for (i = 0; i < num_prop_infos; i ++) {
-			if (any_field
-			    || !strcmp (prop_info_table[i].query_prop, propname)) {
-				info = &prop_info_table[i];
-				
-				if (info->prop_type == PROP_TYPE_NORMAL) {
-					char *prop = NULL;
-					/* searches where the query's property
-					   maps directly to an ecard property */
-					
-					prop = e_card_simple_get (ctx->card, info->field_id);
-
-					if (prop && compare(prop, argv[1]->value.string)) {
-						truth = TRUE;
-					}
-					if ((!prop) && compare("", argv[1]->value.string)) {
-						truth = TRUE;
-					}
-					g_free (prop);
-				} else if (info->prop_type == PROP_TYPE_LIST) {
-				/* the special searches that match any of the list elements */
-					truth = info->list_compare (ctx->card, argv[1]->value.string, compare);
-				} else if (info->prop_type == PROP_TYPE_ID) {
-					const char *prop = NULL;
-					/* searches where the query's property
-					   maps directly to an ecard property */
-					
-					prop = e_card_get_id (ctx->card->card);
-
-					if (prop && compare(prop, argv[1]->value.string)) {
-						truth = TRUE;
-					}
-					if ((!prop) && compare("", argv[1]->value.string)) {
-						truth = TRUE;
-					}
-				}
-
-				/* if we're looking at all fields and find a match,
-				   or if we're just looking at this one field,
-				   break. */
-				if ((any_field && truth)
-				    || !any_field)
-					break;
-			}
-		}
-		
-	}
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = truth;
-
-	return r;
-}
-
-static ESExpResult *
-func_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	SearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, (char *(*)(const char*, const char*)) e_utf8_strstrcase);
-}
-
-static char *
-is_helper (const char *s1, const char *s2)
-{
-	if (!strcmp(s1, s2))
-		return (char*)s1;
-	else
-		return NULL;
-}
-
-static ESExpResult *
-func_is(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	SearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, is_helper);
-}
-
-static char *
-endswith_helper (const char *s1, const char *s2)
-{
-	char *p;
-	if ((p = strstr(s1, s2))
-	    && (strlen(p) == strlen(s2)))
-		return p;
-	else
-		return NULL;
-}
-
-static ESExpResult *
-func_endswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	SearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, endswith_helper);
-}
-
-static char *
-beginswith_helper (const char *s1, const char *s2)
-{
-	char *p;
-	if ((p = strstr(s1, s2))
-	    && (p == s1))
-		return p;
-	else
-		return NULL;
-}
-
-static ESExpResult *
-func_beginswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	SearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, beginswith_helper);
-}
-
-/* 'builtin' functions */
-static struct {
-	char *name;
-	ESExpFunc *func;
-	int type;		/* set to 1 if a function can perform shortcut evaluation, or
-				   doesn't execute everything, 0 otherwise */
-} symbols[] = {
-	{ "contains", func_contains, 0 },
-	{ "is", func_is, 0 },
-	{ "beginswith", func_beginswith, 0 },
-	{ "endswith", func_endswith, 0 },
-};
-
-gboolean
-pas_backend_card_sexp_match_vcard (PASBackendCardSExp *sexp, const char *vcard)
-{
-	ECard *card;
-	ESExpResult *r;
-	gboolean retval;
-
-	card = e_card_new ((char*)vcard);
-	sexp->priv->search_context->card = e_card_simple_new (card);
-	gtk_object_unref(GTK_OBJECT(card));
-
-	/* if it's not a valid vcard why is it in our db? :) */
-	if (!sexp->priv->search_context->card)
-		return FALSE;
-
-	r = e_sexp_eval(sexp->priv->search_sexp);
-
-	retval = (r && r->type == ESEXP_RES_BOOL && r->value.bool);
-
-	gtk_object_unref(GTK_OBJECT(sexp->priv->search_context->card));
-
-	e_sexp_result_free(sexp->priv->search_sexp, r);
-
-	return retval;
-}
-
-
-
-/**
- * pas_backend_card_sexp_new:
- */
-PASBackendCardSExp *
-pas_backend_card_sexp_new (const char *text)
-{
-	PASBackendCardSExp *sexp = gtk_type_new (pas_backend_card_sexp_get_type ());
-	int esexp_error;
-	int i;
-
-	sexp->priv->search_sexp = e_sexp_new();
-
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction(sexp->priv->search_sexp, 0, symbols[i].name,
-					     (ESExpIFunc *)symbols[i].func, sexp->priv->search_context);
-		} else {
-			e_sexp_add_function(sexp->priv->search_sexp, 0, symbols[i].name,
-					    symbols[i].func, sexp->priv->search_context);
-		}
-	}
-
-	e_sexp_input_text(sexp->priv->search_sexp, text, strlen(text));
-	esexp_error = e_sexp_parse(sexp->priv->search_sexp);
-
-	if (esexp_error == -1) {
-		gtk_object_unref (GTK_OBJECT (sexp));
-		sexp = NULL;
-	}
-
-	return sexp;
-}
-
-static void
-pas_backend_card_sexp_destroy (GtkObject *object)
-{
-	PASBackendCardSExp *sexp = PAS_BACKEND_CARD_SEXP (object);
-	e_sexp_unref(sexp->priv->search_sexp);
-
-	g_free (sexp->priv->search_context);
-	g_free (sexp->priv);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);	
-}
-
-static void
-pas_backend_card_sexp_class_init (PASBackendCardSExpClass *klass)
-{
-	GtkObjectClass  *object_class = (GtkObjectClass *) klass;
-
-	parent_class = gtk_type_class (gtk_object_get_type ());
-
-	/* Set the virtual methods. */
-
-	object_class->destroy = pas_backend_card_sexp_destroy;
-}
-
-static void
-pas_backend_card_sexp_init (PASBackendCardSExp *sexp)
-{
-	PASBackendCardSExpPrivate *priv;
-
-	priv             = g_new0 (PASBackendCardSExpPrivate, 1);
-
-	sexp->priv = priv;
-	priv->search_context = g_new (SearchContext, 1);
-}
-
-/**
- * pas_backend_card_sexp_get_type:
- */
-GtkType
-pas_backend_card_sexp_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBackendCardSExp",
-			sizeof (PASBackendCardSExp),
-			sizeof (PASBackendCardSExpClass),
-			(GtkClassInitFunc)  pas_backend_card_sexp_class_init,
-			(GtkObjectInitFunc) pas_backend_card_sexp_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/pas/pas-backend-card-sexp.h b/addressbook/backend/pas/pas-backend-card-sexp.h
deleted file mode 100644
index e1cb75c77d..0000000000
--- a/addressbook/backend/pas/pas-backend-card-sexp.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#ifndef __PAS_BACKEND_CARD_SEXP_H__
-#define __PAS_BACKEND_CARD_SEXP_H__
-
-#include <gtk/gtk.h>
-
-typedef struct _PASBackendCardSExpPrivate PASBackendCardSExpPrivate;
-
-typedef struct {
-	GtkObject parent_object;
-	PASBackendCardSExpPrivate *priv;
-} PASBackendCardSExp;
-
-typedef struct {
-	GtkObjectClass parent_class;
-} PASBackendCardSExpClass;
-
-PASBackendCardSExp *pas_backend_card_sexp_new      (const char *text);
-GtkType             pas_backend_card_sexp_get_type (void);
-
-gboolean            pas_backend_card_sexp_match_vcard (PASBackendCardSExp *sexp, const char *vcard);
-
-#define PAS_BACKEND_CARD_SEXP_TYPE        (pas_backend_card_sexp_get_type ())
-#define PAS_BACKEND_CARD_SEXP(o)          (GTK_CHECK_CAST ((o), PAS_BACKEND_CARD_SEXP_TYPE, PASBackendCardSExp))
-#define PAS_BACKEND_CARD_SEXP_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BACKEND_TYPE, PASBackendCardSExpClass))
-#define PAS_IS_BACKEND_CARD_SEXP(o)       (GTK_CHECK_TYPE ((o), PAS_BACKEND_CARD_SEXP_TYPE))
-#define PAS_IS_BACKEND_CARD_SEXP_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BACKEND_CARD_SEXP_TYPE))
-
-#endif /* __PAS_BACKEND_CARD_SEXP_H__ */
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
deleted file mode 100644
index 56c8d545cc..0000000000
--- a/addressbook/backend/pas/pas-backend-file.c
+++ /dev/null
@@ -1,1537 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#include "config.h"  
-#include "pas-backend-file.h"
-
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-#include <db.h>
-
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-
-#include <e-util/e-db3-utils.h>
-
-#if DB_VERSION_MAJOR != 3 || \
-    DB_VERSION_MINOR != 1 || \
-    DB_VERSION_PATCH != 17
-#error Including wrong DB3.  Need libdb 3.1.17.
-#endif
-
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-util.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
-
-#include <ebook/e-card-simple.h>
-#include <e-util/e-dbhash.h>
-#include <e-util/e-db3-utils.h>
-#include "pas-book.h"
-#include "pas-card-cursor.h"
-#include "pas-backend-card-sexp.h"
-
-#define PAS_BACKEND_FILE_VERSION_NAME "PAS-DB-VERSION"
-#define PAS_BACKEND_FILE_VERSION "0.2"
-
-#define PAS_ID_PREFIX "pas-id-"
-
-static PASBackendClass *pas_backend_file_parent_class;
-typedef struct _PASBackendFileCursorPrivate PASBackendFileCursorPrivate;
-typedef struct _PASBackendFileBookView PASBackendFileBookView;
-typedef struct _PASBackendFileSearchContext PASBackendFileSearchContext;
-typedef struct _PasBackendFileChangeContext PASBackendFileChangeContext;
-
-struct _PASBackendFilePrivate {
-	GList    *clients;
-	gboolean  loaded;
-	char     *uri;
-	DB       *file_db;
-	EList    *book_views;
-	gboolean  writable;
-};
-
-struct _PASBackendFileCursorPrivate {
-	PASBackend *backend;
-	PASBook    *book;
-
-	GList      *elements;
-	guint32    num_elements;
-};
-
-struct _PASBackendFileBookView {
-	PASBookView                 *book_view;
-	gchar                       *search;
-	PASBackendCardSExp          *card_sexp;
-	gchar                       *change_id;
-	PASBackendFileChangeContext *change_context;
-};
-
-struct _PasBackendFileChangeContext {
-	DB *db;
-
-	GList *add_cards;
-	GList *add_ids;
-	GList *mod_cards;
-	GList *mod_ids;
-	GList *del_ids;
-};
-
-static PASBackendFileBookView *
-pas_backend_file_book_view_copy(const PASBackendFileBookView *book_view, void *closure)
-{
-	PASBackendFileBookView *new_book_view;
-	new_book_view = g_new (PASBackendFileBookView, 1);
-	new_book_view->book_view = book_view->book_view;
-
-	new_book_view->search = g_strdup(book_view->search);
-	new_book_view->card_sexp = book_view->card_sexp;
-	if (new_book_view->card_sexp)
-		gtk_object_ref(GTK_OBJECT(new_book_view->card_sexp));
-	
-	new_book_view->change_id = g_strdup(book_view->change_id);
-	if (book_view->change_context) {
-		new_book_view->change_context = g_new(PASBackendFileChangeContext, 1);
-		new_book_view->change_context->db = book_view->change_context->db;
-		new_book_view->change_context->add_cards = book_view->change_context->add_cards;
-		new_book_view->change_context->add_ids = book_view->change_context->add_ids;
-		new_book_view->change_context->mod_cards = book_view->change_context->mod_cards;
-		new_book_view->change_context->mod_ids = book_view->change_context->mod_ids;
-		new_book_view->change_context->del_ids = book_view->change_context->del_ids;
-	} else
-		new_book_view->change_context = NULL;
-	
-	return new_book_view;
-}
-
-static void
-pas_backend_file_book_view_free(PASBackendFileBookView *book_view, void *closure)
-{
-	g_free(book_view->search);
-	if (book_view->card_sexp)
-		gtk_object_unref (GTK_OBJECT(book_view->card_sexp));
-
-	g_free(book_view->change_id);
-	if (book_view->change_context) {
-		g_list_foreach (book_view->change_context->add_cards, (GFunc)g_free, NULL);
-		g_list_foreach (book_view->change_context->add_ids, (GFunc)g_free, NULL);
-		g_list_foreach (book_view->change_context->mod_cards, (GFunc)g_free, NULL);
-		g_list_foreach (book_view->change_context->mod_ids, (GFunc)g_free, NULL);
-		g_list_foreach (book_view->change_context->del_ids, (GFunc)g_free, NULL);
-		g_list_free (book_view->change_context->add_cards);
-		g_list_free (book_view->change_context->add_ids);
-		g_list_free (book_view->change_context->mod_cards);
-		g_list_free (book_view->change_context->mod_ids);
-		g_list_free (book_view->change_context->del_ids);
-	}
-	g_free(book_view->change_context);
-
-	g_free(book_view);
-}
-
-static long
-get_length(PASCardCursor *cursor, gpointer data)
-{
-	PASBackendFileCursorPrivate *cursor_data = (PASBackendFileCursorPrivate *) data;
-
-	return cursor_data->num_elements;
-}
-
-static char *
-get_nth(PASCardCursor *cursor, long n, gpointer data)
-{
-	PASBackendFileCursorPrivate *cursor_data = (PASBackendFileCursorPrivate *) data;
-	GList *nth_item = g_list_nth(cursor_data->elements, n);
-
-	return g_strdup((char*)nth_item->data);
-}
-
-static void
-cursor_destroy(GtkObject *object, gpointer data)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_Addressbook_Book corba_book;
-	PASBackendFileCursorPrivate *cursor_data = (PASBackendFileCursorPrivate *) data;
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(cursor_data->book));
-
-	CORBA_exception_init(&ev);
-
-	GNOME_Evolution_Addressbook_Book_unref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("cursor_destroy: Exception unreffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-
-	g_list_foreach(cursor_data->elements, (GFunc)g_free, NULL);
-	g_list_free (cursor_data->elements);
-
-	g_free(cursor_data);
-}
-
-static void
-view_destroy(GtkObject *object, gpointer data)
-{
-	PASBook           *book = (PASBook *)data;
-	PASBackendFile    *bf;
-	EIterator         *iterator;
-	gboolean success = FALSE;
-
-	bf = PAS_BACKEND_FILE(pas_book_get_backend(book));
-	for (iterator = e_list_get_iterator(bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const PASBackendFileBookView *view = e_iterator_get(iterator);
-		if (view->book_view == PAS_BOOK_VIEW(object)) {
-			e_iterator_delete(iterator);
-			success = TRUE;
-			break;
-		}
-	}
-	if (!success)
-		g_warning ("Failed to remove from book_views list");
-	gtk_object_unref(GTK_OBJECT(iterator));
-
-	bonobo_object_unref(BONOBO_OBJECT(book));
-}
-
-static void
-string_to_dbt(const char *str, DBT *dbt)
-{
-	memset (dbt, 0, sizeof (*dbt));
-	dbt->data = (void*)str;
-	dbt->size = strlen (str) + 1;
-}
-
-static char *
-pas_backend_file_create_unique_id (char *vcard)
-{
-	/* use a 32 counter and the 32 bit timestamp to make an id.
-	   it's doubtful 2^32 id's will be created in a second, so we
-	   should be okay. */
-	static guint c = 0;
-	return g_strdup_printf (PAS_ID_PREFIX "%08lX%08X", time(NULL), c++);
-}
-
-static gboolean
-vcard_matches_search (const PASBackendFileBookView *view, char *vcard_string)
-{
-	/* If this is not a search context view, it doesn't match be default */
-	if (view->card_sexp == NULL)
-		return FALSE;
-
-	return pas_backend_card_sexp_match_vcard (view->card_sexp, vcard_string);
-}
-
-static void
-pas_backend_file_search (PASBackendFile  	      *bf,
-			 PASBook         	      *book,
-			 const PASBackendFileBookView *cnstview)
-{
-	int     db_error = 0;
-	GList   *cards = NULL;
-	gint    card_count = 0, card_threshold = 20, card_threshold_max = 1000;
-	DB      *db = bf->priv->file_db;
-	DBC     *dbc;
-	DBT     id_dbt, vcard_dbt;
-	int     file_version_name_len;
-	PASBackendFileBookView *view = (PASBackendFileBookView *)cnstview;
-	gboolean search_needed;
-
-	if (!bf->priv->loaded)
-		return;
-
-	search_needed = TRUE;
-
-	if ( ! strcmp (view->search, "(contains \"x-evolution-any-field\" \"\")"))
-		search_needed = FALSE;
-
-	if (search_needed)
-		pas_book_view_notify_status_message (view->book_view, _("Searching..."));
-	else
-		pas_book_view_notify_status_message (view->book_view, _("Loading..."));
-
-	if (view->card_sexp)
-		gtk_object_unref (GTK_OBJECT(view->card_sexp));
-
-	view->card_sexp = pas_backend_card_sexp_new (view->search);
-	
-	if (!view->card_sexp) {
-		/* need a different error message here. */
-		pas_book_view_notify_status_message (view->book_view, _("Error in search expression."));
-		pas_book_view_notify_complete (view->book_view);
-		return;
-	}
-
-	file_version_name_len = strlen (PAS_BACKEND_FILE_VERSION_NAME);
-
-	db_error = db->cursor (db, NULL, &dbc, 0);
-
-	memset (&id_dbt, 0, sizeof (id_dbt));
-	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
-
-	if (db_error != 0) {
-		g_warning ("pas_backend_file_search: error building list\n");
-	} else {
-		db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_FIRST);
-
-		while (db_error == 0) {
-
-			/* don't include the version in the list of cards */
-			if (id_dbt.size != file_version_name_len+1
-			    || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {
-				char *vcard_string = vcard_dbt.data;
-
-				/* check if the vcard matches the search sexp */
-				if ((!search_needed) || vcard_matches_search (view, vcard_string)) {
-					cards = g_list_prepend (cards, g_strdup (vcard_string));
-				}
-
-				card_count ++;
-
-				/* If we've accumulated a number of checks, pass them off to the client. */
-				if (card_count >= card_threshold) {
-					cards = g_list_reverse (cards);
-					pas_book_view_notify_add (view->book_view, cards);
-					/* Clean up the handed-off data. */
-					g_list_foreach (cards, (GFunc)g_free, NULL);
-					g_list_free (cards);
-					cards = NULL;
-					card_count = 0;
-
-					/* Yeah, this scheme is overly complicated.  But I like it. */
-					if (card_threshold < card_threshold_max) {
-						card_threshold = MIN (2*card_threshold, card_threshold_max);
-					}
-				}
-			}
-
-			db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_NEXT);
-		}
-		dbc->c_close (dbc);
-
-		if (db_error != DB_NOTFOUND) {
-			g_warning ("pas_backend_file_search: error building list\n");
-		}
-	}
-
-	if (card_count)
-		pas_book_view_notify_add (view->book_view, cards);
-
-	pas_book_view_notify_complete (view->book_view);
-
-	/*
-	** It's fine to do this now since the data has been handed off.
-	*/
-	g_list_foreach (cards, (GFunc)g_free, NULL);
-	g_list_free (cards);
-}
-
-static void
-pas_backend_file_changes_foreach_key (const char *key, gpointer user_data)
-{
-	PASBackendFileChangeContext *ctx = user_data;
-	DB      *db = ctx->db;
-	DBT     id_dbt, vcard_dbt;
-	int     db_error = 0;
-	
-	string_to_dbt (key, &id_dbt);
-	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
-	db_error = db->get (db, NULL, &id_dbt, &vcard_dbt, 0);
-	
-	if (db_error != 0) {
-		char *id = id_dbt.data;
-		
-		ctx->del_ids = g_list_append (ctx->del_ids, g_strdup (id));
-	}
-}
-
-static void
-pas_backend_file_changes (PASBackendFile  	      *bf,
-			  PASBook         	      *book,
-			  const PASBackendFileBookView *cnstview)
-{
-	int     db_error = 0;
-	DBT     id_dbt, vcard_dbt;
-	char    *filename;
-	EDbHash *ehash;
-	GList *i, *v;
-	DB      *db = bf->priv->file_db;
-	DBC *dbc;
-	PASBackendFileBookView *view = (PASBackendFileBookView *)cnstview;
-	PASBackendFileChangeContext *ctx = cnstview->change_context;
-
-	memset (&id_dbt, 0, sizeof (id_dbt));
-	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
-
-	if (!bf->priv->loaded)
-		return;
-
-	/* Find the changed ids - FIX ME, path should not be hard coded */
-	filename = g_strdup_printf ("%s/evolution/local/Contacts/%s.db", g_get_home_dir (), view->change_id);
-	ehash = e_dbhash_new (filename);
-	g_free (filename);
-	
-	db_error = db->cursor (db, NULL, &dbc, 0);
-
-	if (db_error != 0) {
-		g_warning ("pas_backend_file_changes: error building list\n");
-	} else {
-		db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_FIRST);
-
-		while (db_error == 0) {
-
-			/* don't include the version in the list of cards */
-			if (id_dbt.size != strlen(PAS_BACKEND_FILE_VERSION_NAME) + 1
-			    || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {
-				ECard *card;
-				char *id = id_dbt.data;
-				char *vcard_string;
-				
-				/* Remove fields the user can't change
-				 * and can change without the rest of the
-				 * card changing 
-				 */
-				card = e_card_new (vcard_dbt.data);
-				gtk_object_set (GTK_OBJECT (card), "last_use", NULL, "use_score", 0.0, NULL);
-				vcard_string = e_card_get_vcard_assume_utf8 (card);
-				gtk_object_unref (GTK_OBJECT (card));
-				
-				/* check what type of change has occurred, if any */
-				switch (e_dbhash_compare (ehash, id, vcard_string)) {
-				case E_DBHASH_STATUS_SAME:
-					break;
-				case E_DBHASH_STATUS_NOT_FOUND:
-					ctx->add_cards = g_list_append (ctx->add_cards, 
-									g_strdup(vcard_string));
-					ctx->add_ids = g_list_append (ctx->add_ids, g_strdup(id));
-					break;
-				case E_DBHASH_STATUS_DIFFERENT:
-					ctx->mod_cards = g_list_append (ctx->mod_cards, 
-									g_strdup(vcard_string));
-					ctx->mod_ids = g_list_append (ctx->mod_ids, g_strdup(id));
-					break;
-				}
-			}
-
-			db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_NEXT);
-		}
-		dbc->c_close (dbc);
-	}
-
-   	e_dbhash_foreach_key (ehash, (EDbHashFunc)pas_backend_file_changes_foreach_key, view->change_context);
-
-	/* Send the changes */
-	if (db_error != DB_NOTFOUND) {
-		g_warning ("pas_backend_file_changes: error building list\n");
-	} else {
-  		if (ctx->add_cards != NULL)
-  			pas_book_view_notify_add (view->book_view, ctx->add_cards);
-		
-		if (ctx->mod_cards != NULL)
-			pas_book_view_notify_change (view->book_view, ctx->mod_cards);
-
-		for (v = ctx->del_ids; v != NULL; v = v->next){
-			char *id = v->data;
-			pas_book_view_notify_remove (view->book_view, id);
-		}
-		
-		pas_book_view_notify_complete (view->book_view);
-	}
-
-	/* Update the hash */
-	for (i = ctx->add_ids, v = ctx->add_cards; i != NULL; i = i->next, v = v->next){
-		char *id = i->data;
-		char *vcard = v->data;
-
-		e_dbhash_add (ehash, id, vcard);
-		g_free (i->data);
-		g_free (v->data);		
-	}	
-	for (i = ctx->mod_ids, v = ctx->mod_cards; i != NULL; i = i->next, v = v->next){
-		char *id = i->data;
-		char *vcard = v->data;
-
-		e_dbhash_add (ehash, id, vcard);
-		g_free (i->data);
-		g_free (v->data);		
-	}	
-	for (i = ctx->del_ids; i != NULL; i = i->next){
-		char *id = i->data;
-
-		e_dbhash_remove (ehash, id);
-		g_free (i->data);
-	}
-
-	e_dbhash_write (ehash);
-  	e_dbhash_destroy (ehash);
-}
-
-static char *
-do_create(PASBackend *backend,
-	  char       *vcard_req,
-	  char      **vcard_ptr)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	DB             *db = bf->priv->file_db;
-	DBT            id_dbt, vcard_dbt;
-	int            db_error;
-	char           *id;
-	ECard          *card;
-	char           *vcard;
-	char           *ret_val;
-
-	id = pas_backend_file_create_unique_id (vcard_req);
-
-	string_to_dbt (id, &id_dbt);
-	
-	card = e_card_new(vcard_req);
-	e_card_set_id(card, id);
-	vcard = e_card_get_vcard_assume_utf8(card);
-
-	string_to_dbt (vcard, &vcard_dbt);
-
-	db_error = db->put (db, NULL, &id_dbt, &vcard_dbt, 0);
-
-	if (0 == db_error) {
-		db_error = db->sync (db, 0);
-		if (db_error != 0)
-			g_warning ("db->sync failed.\n");
-		ret_val = id;
-
-	}
-	else {
-		g_free (id);
-		ret_val = NULL;
-	}
-
-	gtk_object_unref(GTK_OBJECT(card));
-	card = NULL;
-
-	if (vcard_ptr && ret_val)
-		*vcard_ptr = vcard;
-	else
-		g_free (vcard);
-
-	return ret_val;
-}
-
-static void
-pas_backend_file_process_create_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	char *id;
-	char *vcard;
-	EIterator *iterator;
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-
-	id = do_create(backend, req->vcard, &vcard);
-	if (id) {
-		for (iterator = e_list_get_iterator(bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const PASBackendFileBookView *view = e_iterator_get(iterator);
-			if (vcard_matches_search (view, vcard)) {
-				bonobo_object_ref (BONOBO_OBJECT (view->book_view));
-				pas_book_view_notify_add_1 (view->book_view, vcard);
-				pas_book_view_notify_complete (view->book_view);
-				bonobo_object_unref (BONOBO_OBJECT (view->book_view));
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-		
-		pas_book_respond_create (
-			book,
-			GNOME_Evolution_Addressbook_BookListener_Success,
-			id);
-		g_free(vcard);
-		g_free(id);
-	}
-	else {
-		/* XXX need a different call status for this case, i
-                   think */
-		pas_book_respond_create (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound,
-				 "");
-	}
-
-	g_free(req->vcard);
-}
-
-static void
-pas_backend_file_process_remove_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	DB             *db = bf->priv->file_db;
-	DBT            id_dbt, vcard_dbt;
-	int            db_error;
-	EIterator     *iterator;
-	char          *vcard_string;
-	const char    *id;
-
-	id = req->id;
-	string_to_dbt (id, &id_dbt);
-	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
-
-	db_error = db->get (db, NULL, &id_dbt, &vcard_dbt, 0);
-	if (0 != db_error) {
-		pas_book_respond_remove (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
-		g_free (req->id);
-		return;
-	}
-	
-	db_error = db->del (db, NULL, &id_dbt, 0);
-	if (0 != db_error) {
-		pas_book_respond_remove (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
-		g_free (req->id);
-		return;
-	}
-
-	db_error = db->sync (db, 0);
-	if (db_error != 0)
-		g_warning ("db->sync failed.\n");
-
-
-	vcard_string = vcard_dbt.data;
-	for (iterator = e_list_get_iterator (bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const PASBackendFileBookView *view = e_iterator_get(iterator);
-		if (vcard_matches_search (view, vcard_string)) {
-			bonobo_object_ref (BONOBO_OBJECT (view->book_view));
-			pas_book_view_notify_remove (view->book_view, req->id);
-			pas_book_view_notify_complete (view->book_view);
-			bonobo_object_unref (BONOBO_OBJECT (view->book_view));
-		}
-	}
-	gtk_object_unref(GTK_OBJECT(iterator));
-	
-	pas_book_respond_remove (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_Success);
-	
-	g_free (req->id);
-}
-
-static void
-pas_backend_file_process_modify_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	DB             *db = bf->priv->file_db;
-	DBT            id_dbt, vcard_dbt;
-	int            db_error;
-	EIterator     *iterator;
-	ECard         *card;
-	const char    *id, *lookup_id;
-	char          *old_vcard_string;
-
-	/* create a new ecard from the request data */
-	card = e_card_new(req->vcard);
-	id = e_card_get_id(card);
-
-	/* This is disgusting, but for a time cards were added with
-           ID's that are no longer used (they contained both the uri
-           and the id.) If we recognize it as a uri (file:///...) trim
-           off everything before the last '/', and use that as the
-           id.*/
-	if (!strncmp (id, "file:///", strlen ("file:///"))) {
-		lookup_id = strrchr (id, '/') + 1;
-	}
-	else
-		lookup_id = id;
-
-	string_to_dbt (lookup_id, &id_dbt);	
-	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
-
-	/* get the old ecard - the one that's presently in the db */
-	db_error = db->get (db, NULL, &id_dbt, &vcard_dbt, 0);
-	if (0 != db_error) {
-		pas_book_respond_modify (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
-		g_free (req->id);
-		return;
-	}
-	old_vcard_string = g_strdup(vcard_dbt.data);
-
-	string_to_dbt (req->vcard, &vcard_dbt);	
-
-	db_error = db->put (db, NULL, &id_dbt, &vcard_dbt, 0);
-
-	if (0 == db_error) {
-		db_error = db->sync (db, 0);
-		if (db_error != 0)
-			g_warning ("db->sync failed.\n");
-
-		for (iterator = e_list_get_iterator(bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			CORBA_Environment ev;
-			const PASBackendFileBookView *view = e_iterator_get(iterator);
-			gboolean old_match, new_match;
-
-			CORBA_exception_init(&ev);
-
-			bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
-
-			old_match = vcard_matches_search (view, old_vcard_string);
-			new_match = vcard_matches_search (view, req->vcard);
-			if (old_match && new_match)
-				pas_book_view_notify_change_1 (view->book_view, req->vcard);
-			else if (new_match)
-				pas_book_view_notify_add_1 (view->book_view, req->vcard);
-			else /* if (old_match) */
-				pas_book_view_notify_remove (view->book_view, id);
-			pas_book_view_notify_complete (view->book_view);
-
-			bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		pas_book_respond_modify (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_Success);
-	}
-	else {
-		pas_book_respond_modify (
-				 book,
-				 GNOME_Evolution_Addressbook_BookListener_CardNotFound);
-	}
-
-	g_free(old_vcard_string);
-
-	gtk_object_unref(GTK_OBJECT(card));
-	g_free (req->vcard);
-}
-
-static void
-pas_backend_file_build_cards_list(PASBackend *backend,
-				      PASBackendFileCursorPrivate *cursor_data,
-				      char *search)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	DB             *db = bf->priv->file_db;
-	DBC            *dbc;
-	int            db_error;
-	DBT  id_dbt, vcard_dbt;
-	PASBackendCardSExp *card_sexp = NULL;
-	gboolean search_needed;
-	
-	cursor_data->elements = NULL;
-
-	search_needed = TRUE;
-
-	if (!strcmp (search, "(contains \"x-evolution-any-field\" \"\")"))
-		search_needed = FALSE;
-
-	card_sexp = pas_backend_card_sexp_new (search);
-	
-	if (!card_sexp)
-		g_warning ("pas_backend_file_build_all_cards_list: error building list\n");
-
-	db_error = db->cursor (db, NULL, &dbc, 0);
-
-	if (db_error != 0) {
-		g_warning ("pas_backend_file_build_all_cards_list: error building list\n");
-	}
-
-	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
-	memset (&id_dbt, 0, sizeof (id_dbt));
-	db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_FIRST);
-
-	while (db_error == 0) {
-
-		/* don't include the version in the list of cards */
-		if (id_dbt.size != strlen(PAS_BACKEND_FILE_VERSION_NAME) + 1
-		    || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {
-
-			if ((!search_needed) || (card_sexp != NULL && pas_backend_card_sexp_match_vcard  (card_sexp, vcard_dbt.data))) {
-				cursor_data->elements = g_list_prepend (cursor_data->elements, g_strdup (vcard_dbt.data));
-			}
-		}
-
-		db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_NEXT);
-
-	}
-
-	if (db_error != DB_NOTFOUND) {
-		g_warning ("pas_backend_file_build_all_cards_list: error building list\n");
-	}
-	else {
-		cursor_data->num_elements = g_list_length (cursor_data->elements);
-		cursor_data->elements = g_list_reverse (cursor_data->elements);
-	}
-}
-
-static void
-pas_backend_file_process_get_vcard (PASBackend *backend,
-				    PASBook    *book,
-				    PASRequest *req)
-{
-	PASBackendFile *bf;
-	DB             *db;
-	DBT             id_dbt, vcard_dbt;
-	int             db_error = 0;
-	char           *card;
-	GNOME_Evolution_Addressbook_BookListener_CallStatus status;	
-
-	bf = PAS_BACKEND_FILE (pas_book_get_backend (book));
-	db = bf->priv->file_db;
-
-	string_to_dbt (req->id, &id_dbt);
-	memset (&vcard_dbt, 0, sizeof (vcard_dbt));
-
-	db_error = db->get (db, NULL, &id_dbt, &vcard_dbt, 0);
-
-	if (db_error == 0) {
-		card = vcard_dbt.data;
-		status = GNOME_Evolution_Addressbook_BookListener_Success;
-	} else {
-		card = NULL;
-		status = GNOME_Evolution_Addressbook_BookListener_CardNotFound;
-	}
-
-	pas_book_respond_get_vcard (book,
-				    status,
-				    card);
-}
-
-static void
-pas_backend_file_process_get_cursor (PASBackend *backend,
-				     PASBook    *book,
-				     PASRequest *req)
-{
-	/*
-	  PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	  DB             *db = bf->priv->file_db;
-	  DBT            id_dbt, vcard_dbt;
-	*/
-	CORBA_Environment ev;
-	int            db_error = 0;
-	PASBackendFileCursorPrivate *cursor_data;
-	PASCardCursor *cursor;
-	GNOME_Evolution_Addressbook_Book corba_book;
-
-	cursor_data = g_new(PASBackendFileCursorPrivate, 1);
-	cursor_data->backend = backend;
-	cursor_data->book = book;
-
-	pas_backend_file_build_cards_list(backend, cursor_data, req->search);
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("pas_backend_file_process_get_cursor: Exception reffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-	
-	cursor = pas_card_cursor_new(get_length,
-				     get_nth,
-				     cursor_data);
-
-	gtk_signal_connect(GTK_OBJECT(cursor), "destroy",
-			   GTK_SIGNAL_FUNC(cursor_destroy), cursor_data);
-	
-	pas_book_respond_get_cursor (
-		book,
-		(db_error == 0 
-		 ? GNOME_Evolution_Addressbook_BookListener_Success 
-		 : GNOME_Evolution_Addressbook_BookListener_CardNotFound),
-		cursor);
-}
-
-static void
-pas_backend_file_process_get_book_view (PASBackend *backend,
-					PASBook    *book,
-					PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	CORBA_Environment ev;
-	PASBookView       *book_view;
-	PASBackendFileBookView view;
-	EIterator *iterator;
-
-	g_return_if_fail (req->listener != NULL);
-	
-	bonobo_object_ref(BONOBO_OBJECT(book));
-
-	book_view = pas_book_view_new (req->listener);
-
-	gtk_signal_connect(GTK_OBJECT(book_view), "destroy",
-			   GTK_SIGNAL_FUNC(view_destroy), book);
-
-	view.book_view = book_view;
-	view.search = req->search;
-	view.card_sexp = NULL;
-	view.change_id = NULL;
-	view.change_context = NULL;	
-
-	e_list_append(bf->priv->book_views, &view);
-
-	pas_book_respond_get_book_view (book,
-		   (book_view != NULL
-		    ? GNOME_Evolution_Addressbook_BookListener_Success 
-		    : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */),
-		   book_view);
-
-	iterator = e_list_get_iterator(bf->priv->book_views);
-	e_iterator_last(iterator);
-	pas_backend_file_search (bf, book, e_iterator_get(iterator));
-	gtk_object_unref(GTK_OBJECT(iterator));
-
-	g_free(req->search);
-	CORBA_exception_init(&ev);
-
-	bonobo_object_unref (BONOBO_OBJECT (book_view));
-	bonobo_object_release_unref (req->listener, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("pas_backend_file_process_get_book_view: Exception unreffing "
-			  "listener.\n");
-	}
-
-	CORBA_exception_free(&ev);
-}
-
-static void
-pas_backend_file_process_get_changes (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	CORBA_Environment ev;
-	PASBookView       *book_view;
-	PASBackendFileBookView view;
-	PASBackendFileChangeContext ctx;
-	EIterator *iterator;
-
-	g_return_if_fail (req->listener != NULL);
-
-	bonobo_object_ref(BONOBO_OBJECT(book));
-
-	book_view = pas_book_view_new (req->listener);
-
-	gtk_signal_connect(GTK_OBJECT(book_view), "destroy",
-			   GTK_SIGNAL_FUNC(view_destroy), book);
-
-	pas_book_respond_get_changes (book,
-		   (book_view != NULL
-		    ? GNOME_Evolution_Addressbook_BookListener_Success 
-		    : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */),
-		   book_view);
-
-	view.book_view = book_view;
-	view.change_id = req->change_id;
-	view.change_context = &ctx;
-	ctx.db = bf->priv->file_db;
-	ctx.add_cards = NULL;
-	ctx.add_ids = NULL;
-	ctx.mod_cards = NULL;
-	ctx.mod_ids = NULL;
-	ctx.del_ids = NULL;
-	view.search = NULL;
-	view.card_sexp = NULL;
-	
-	e_list_append(bf->priv->book_views, &view);
-
-	iterator = e_list_get_iterator(bf->priv->book_views);
-	e_iterator_last(iterator);
-	pas_backend_file_changes (bf, book, e_iterator_get(iterator));
-	gtk_object_unref(GTK_OBJECT(iterator));
-
-	g_free(req->search);
-	CORBA_exception_init(&ev);
-	bonobo_object_release_unref (req->listener, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("pas_backend_file_process_get_changed: Exception unreffing "
-			  "listener.\n");
-	}
-
-	CORBA_exception_free(&ev);
-}
-
-static void
-pas_backend_file_process_check_connection (PASBackend *backend,
-					   PASBook    *book,
-					   PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-
-	pas_book_report_connection (book, bf->priv->file_db != NULL);
-}
-
-static char *
-pas_backend_file_extract_path_from_uri (const char *uri)
-{
-	g_assert (strncasecmp (uri, "file:", 5) == 0);
-
-	return g_strdup (uri + 5);
-}
-
-static void
-pas_backend_file_process_authenticate_user (PASBackend *backend,
-					    PASBook    *book,
-					    PASRequest *req)
-{
-	pas_book_respond_authenticate_user (book,
-					    GNOME_Evolution_Addressbook_BookListener_Success);
-}
-
-static void
-pas_backend_file_process_get_supported_fields (PASBackend *backend,
-					       PASBook    *book,
-					       PASRequest *req)
-{
-	EList *fields = e_list_new ((EListCopyFunc)g_strdup, (EListFreeFunc)g_free, NULL);
-	ECardSimple *simple;
-	ECard *card;
-	int i;
-
-	/* we support everything, so instantiate an e-card, and loop
-           through all fields, adding their ecard_fields. */
-
-	card = e_card_new ("");
-	simple = e_card_simple_new (card);
-
-	for (i = 0; i < E_CARD_SIMPLE_FIELD_LAST; i ++)
-		e_list_append (fields, e_card_simple_get_ecard_field (simple, i));
-
-	gtk_object_unref (GTK_OBJECT (card));
-	gtk_object_unref (GTK_OBJECT (simple));
-
-	pas_book_respond_get_supported_fields (book,
-					       GNOME_Evolution_Addressbook_BookListener_Success,
-					       fields);
-}
-
-static void
-pas_backend_file_process_client_requests (PASBook *book)
-{
-	PASBackend *backend;
-	PASRequest *req;
-
-	backend = pas_book_get_backend (book);
-
-	req = pas_book_pop_request (book);
-	if (req == NULL)
-		return;
-
-	switch (req->op) {
-	case CreateCard:
-		pas_backend_file_process_create_card (backend, book, req);
-		break;
-
-	case RemoveCard:
-		pas_backend_file_process_remove_card (backend, book, req);
-		break;
-
-	case ModifyCard:
-		pas_backend_file_process_modify_card (backend, book, req);
-		break;
-
-	case CheckConnection:
-		pas_backend_file_process_check_connection (backend, book, req);
-		break;
-
-	case GetVCard:
-		pas_backend_file_process_get_vcard (backend, book, req);
-		break;
-		
-	case GetCursor:
-		pas_backend_file_process_get_cursor (backend, book, req);
-		break;
-		
-	case GetBookView:
-		pas_backend_file_process_get_book_view (backend, book, req);
-		break;
-
-	case GetChanges:
-		pas_backend_file_process_get_changes (backend, book, req);
-		break;
-
-	case AuthenticateUser:
-		pas_backend_file_process_authenticate_user (backend, book, req);
-		break;
-
-	case GetSupportedFields:
-		pas_backend_file_process_get_supported_fields (backend, book, req);
-		break;
-	}
-
-	g_free (req);
-}
-
-static void
-pas_backend_file_book_destroy_cb (PASBook *book, gpointer data)
-{
-	PASBackendFile *backend;
-
-	backend = PAS_BACKEND_FILE (data);
-
-	pas_backend_remove_client (PAS_BACKEND (backend), book);
-}
-
-/*
-** versions:
-**
-** 0.0 just a list of cards
-**
-** 0.1 same as 0.0, but with the version tag
-**
-** 0.2 not a real format upgrade, just a hack to fix broken ids caused
-**     by a bug in early betas, but we only need to convert them if
-**     the previous version is 0.1, since the bug existed after 0.1
-**     came about.
-*/
-static gboolean
-pas_backend_file_upgrade_db (PASBackendFile *bf, char *old_version)
-{
-	DB  *db = bf->priv->file_db;
-	int db_error;
-	DBT version_name_dbt, version_dbt;
-	
-	if (strcmp (old_version, "0.0")
-	    && strcmp (old_version, "0.1")) {
-		g_warning ("unsupported version '%s' found in PAS backend file\n",
-			   old_version);
-		return FALSE;
-	}
-
-	if (!strcmp (old_version, "0.1")) {
-		/* we just loop through all the cards in the db,
-                   giving them valid ids if they don't have them */
-		DBT  id_dbt, vcard_dbt;
-		DBC *dbc;
-		int  card_failed = 0;
-
-		db_error = db->cursor (db, NULL, &dbc, 0);
-		if (db_error != 0) {
-			g_warning ("unable to get cursor");
-			return FALSE;
-		}
-
-		memset (&id_dbt, 0, sizeof (id_dbt));
-		memset (&vcard_dbt, 0, sizeof (vcard_dbt));
-
-		db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_FIRST);
-
-		while (db_error == 0) {
-			if (id_dbt.size != strlen(PAS_BACKEND_FILE_VERSION_NAME) + 1
-			    || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {
-				ECard *card;
-
-				card = e_card_new (vcard_dbt.data);
-
-				/* the cards we're looking for are
-				   created with a normal id dbt, but
-				   with the id field in the vcard set
-				   to something that doesn't match.
-				   so, we need to modify the card to
-				   have the same id as the the dbt. */
-				if (strcmp (id_dbt.data, e_card_get_id (card))) {
-					char *vcard;
-
-					e_card_set_id (card, id_dbt.data);
-
-					vcard = e_card_get_vcard (card);
-					string_to_dbt (vcard, &vcard_dbt);
-
-					db_error = db->put (db, NULL,
-							    &id_dbt, &vcard_dbt, 0);
-
-					g_free (vcard);
-
-					if (db_error != 0)
-						card_failed++;
-				}
-
-				gtk_object_unref (GTK_OBJECT(card));
-			}
-
-			db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_NEXT);
-		}
-
-		if (card_failed) {
-			g_warning ("failed to update %d cards\n", card_failed);
-			return FALSE;
-		}
-	}
-
-	string_to_dbt (PAS_BACKEND_FILE_VERSION_NAME, &version_name_dbt);
-	string_to_dbt (PAS_BACKEND_FILE_VERSION, &version_dbt);
-
-	db_error = db->put (db, NULL, &version_name_dbt, &version_dbt, 0);
-	if (db_error == 0)
-		return TRUE;
-	else
-		return FALSE;
-}
-
-static gboolean
-pas_backend_file_maybe_upgrade_db (PASBackendFile *bf)
-{
-	DB   *db = bf->priv->file_db;
-	DBT  version_name_dbt, version_dbt;
-	int  db_error;
-	char *version;
-	gboolean ret_val = TRUE;
-
-	string_to_dbt (PAS_BACKEND_FILE_VERSION_NAME, &version_name_dbt);
-	memset (&version_dbt, 0, sizeof (version_dbt));
-
-	db_error = db->get (db, NULL, &version_name_dbt, &version_dbt, 0);
-	if (db_error == 0) {
-		/* success */
-		version = g_strdup (version_dbt.data);
-	}
-	else {
-		/* key was not in file */
-		version = g_strdup ("0.0");
-	}
-
-	if (strcmp (version, PAS_BACKEND_FILE_VERSION))
-		ret_val = pas_backend_file_upgrade_db (bf, version);
-
-	g_free (version);
-
-	return ret_val;
-}
-
-
-#define INITIAL_VCARD "BEGIN:VCARD\n\
-X-EVOLUTION-FILE-AS:Ximian, Inc.\n\
-LABEL;WORK;QUOTED-PRINTABLE:401 Park Drive  3 West=0ABoston, MA 02215=0AUSA\n\
-TEL;WORK;VOICE:(617) 236-0442\n\
-TEL;WORK;FAX:(617) 236-8630\n\
-EMAIL;INTERNET:hello@ximian.com\n\
-URL:www.ximian.com/\n\
-ORG:Ximian, Inc.;\n\
-NOTE:Welcome to the Ximian Addressbook.\n\
-END:VCARD"
-
-static gboolean
-pas_backend_file_load_uri (PASBackend             *backend,
-			   const char             *uri)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	char           *filename;
-	gboolean        writable = FALSE;
-	int             db_error;
-	DB *db;
-	int major, minor, patch;
-
-	g_assert (bf->priv->loaded == FALSE);
-
-	db_version (&major, &minor, &patch);
-
-	if (major != 3 ||
-	    minor != 1 ||
-	    patch != 17) {
-		g_warning ("Wrong version of libdb.");
-		return FALSE;
-	}
-
-	filename = pas_backend_file_extract_path_from_uri (uri);
-
-	db_error = e_db3_utils_maybe_recover (filename);
-	if (db_error != 0)
-		return FALSE;
-
-	db_error = db_create (&db, NULL, 0);
-	if (db_error != 0)
-		return FALSE;
-
-	db_error = db->open (db, filename, NULL, DB_HASH, 0, 0666);
-
-	if (db_error == DB_OLD_VERSION) {
-		db_error = e_db3_utils_upgrade_format (filename);
-
-		if (db_error != 0)
-			return FALSE;
-
-		db_error = db->open (db, filename, NULL, DB_HASH, 0, 0666);
-	}
-
-	bf->priv->file_db = db;
-
-	if (db_error == 0) {
-		writable = TRUE;
-	} else {
-		db_error = db->open (db, filename, NULL, DB_HASH, DB_RDONLY, 0666);
-
-		if (db_error != 0) {
-			db_error = db->open (db, filename, NULL, DB_HASH, DB_CREATE, 0666);
-
-			if (db_error == 0) {
-				char *create_initial_file;
-				char *dir;
-
-				dir = g_dirname(filename);
-				create_initial_file = g_concat_dir_and_file(dir, "create-initial");
-
-				if (g_file_exists(create_initial_file)) {
-					char *id;
-					id = do_create(backend, INITIAL_VCARD, NULL);
-					g_free (id);
-				}
-
-				g_free(create_initial_file);
-				g_free(dir);
-
-				writable = TRUE;
-			}
-		}
-	}
-
-	g_free (filename);
-
-
-	if (db_error != 0) {
-		bf->priv->file_db = NULL;
-		return FALSE;
-	}
-
-	bf->priv->writable = writable;
-
-	if (pas_backend_file_maybe_upgrade_db (bf))
-		bf->priv->loaded = TRUE;
-	else {
-		db->close (db, 0);
-		bf->priv->file_db = NULL;
-		bf->priv->writable = FALSE;
-		return FALSE;
-	}
-
-	g_free(bf->priv->uri);
-	bf->priv->uri = g_strdup (uri);
-
-	return TRUE;
-}
-
-/* Get_uri handler for the addressbook file backend */
-static const char *
-pas_backend_file_get_uri (PASBackend *backend)
-{
-	PASBackendFile *bf;
-
-	bf = PAS_BACKEND_FILE (backend);
-
-	g_return_val_if_fail (bf->priv->loaded, NULL);
-	g_assert (bf->priv->uri != NULL);
-
-	return bf->priv->uri;
-}
-
-static gboolean
-pas_backend_file_add_client (PASBackend             *backend,
-			     GNOME_Evolution_Addressbook_BookListener  listener)
-{
-	PASBackendFile *bf;
-	PASBook        *book;
-
-	g_assert (backend != NULL);
-	g_assert (PAS_IS_BACKEND_FILE (backend));
-
-	bf = PAS_BACKEND_FILE (backend);
-
-	book = pas_book_new (backend, listener);
-
-	if (!book) {
-		if (!bf->priv->clients)
-			pas_backend_last_client_gone (backend);
-
-		return FALSE;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (book), "destroy",
-			    pas_backend_file_book_destroy_cb, backend);
-
-	gtk_signal_connect (GTK_OBJECT (book), "requests_queued",
-		    pas_backend_file_process_client_requests, NULL);
-
-	bf->priv->clients = g_list_prepend (
-		bf->priv->clients, book);
-
-	if (bf->priv->loaded) {
-		pas_book_respond_open (
-			book, GNOME_Evolution_Addressbook_BookListener_Success);
-		if (bf->priv->writable)
-			pas_book_report_writable (book, bf->priv->writable);
-	} else {
-		pas_book_respond_open (
-		       book, GNOME_Evolution_Addressbook_BookListener_OtherError);
-	}
-
-	bonobo_object_unref (BONOBO_OBJECT (book));
-	
-	return TRUE;
-}
-
-static void
-pas_backend_file_remove_client (PASBackend             *backend,
-				PASBook                *book)
-{
-	PASBackendFile *bf;
-	GList *l;
-	PASBook *lbook;
-
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (PAS_IS_BACKEND_FILE (backend));
-	g_return_if_fail (book != NULL);
-	g_return_if_fail (PAS_IS_BOOK (book));
-
-	bf = PAS_BACKEND_FILE (backend);
-
-	/* Find the book in the list of clients */
-
-	for (l = bf->priv->clients; l; l = l->next) {
-		lbook = PAS_BOOK (l->data);
-
-		if (lbook == book)
-			break;
-	}
-
-	g_assert (l != NULL);
-
-	/* Disconnect */
-
-	bf->priv->clients = g_list_remove_link (bf->priv->clients, l);
-	g_list_free_1 (l);
-
-	/* When all clients go away, notify the parent factory about it so that
-	 * it may decide whether to kill the backend or not.
-	 */
-	if (!bf->priv->clients)
-		pas_backend_last_client_gone (backend);
-}
-
-static char *
-pas_backend_file_get_static_capabilities (PASBackend             *backend)
-{
-	return g_strdup("local");
-}
-
-static gboolean
-pas_backend_file_construct (PASBackendFile *backend)
-{
-	g_assert (backend != NULL);
-	g_assert (PAS_IS_BACKEND_FILE (backend));
-
-	if (! pas_backend_construct (PAS_BACKEND (backend)))
-		return FALSE;
-
-	return TRUE;
-}
-
-/**
- * pas_backend_file_new:
- */
-PASBackend *
-pas_backend_file_new (void)
-{
-	PASBackendFile *backend;
-
-	backend = gtk_type_new (pas_backend_file_get_type ());
-
-	if (! pas_backend_file_construct (backend)) {
-		gtk_object_unref (GTK_OBJECT (backend));
-
-		return NULL;
-	}
-
-	return PAS_BACKEND (backend);
-}
-
-static void
-pas_backend_file_destroy (GtkObject *object)
-{
-	PASBackendFile *bf;
-
-	bf = PAS_BACKEND_FILE (object);
-
-	gtk_object_unref(GTK_OBJECT(bf->priv->book_views));
-	g_free (bf->priv->uri);
-
-	GTK_OBJECT_CLASS (pas_backend_file_parent_class)->destroy (object);	
-}
-
-static void
-pas_backend_file_class_init (PASBackendFileClass *klass)
-{
-	GtkObjectClass  *object_class = (GtkObjectClass *) klass;
-	PASBackendClass *parent_class;
-
-	pas_backend_file_parent_class = gtk_type_class (pas_backend_get_type ());
-
-	parent_class = PAS_BACKEND_CLASS (klass);
-
-	/* Set the virtual methods. */
-	parent_class->load_uri                = pas_backend_file_load_uri;
-	parent_class->get_uri                 = pas_backend_file_get_uri;
-	parent_class->add_client              = pas_backend_file_add_client;
-	parent_class->remove_client           = pas_backend_file_remove_client;
-	parent_class->get_static_capabilities = pas_backend_file_get_static_capabilities;
-
-	object_class->destroy = pas_backend_file_destroy;
-}
-
-static void
-pas_backend_file_init (PASBackendFile *backend)
-{
-	PASBackendFilePrivate *priv;
-
-	priv             = g_new0 (PASBackendFilePrivate, 1);
-	priv->loaded     = FALSE;
-	priv->clients    = NULL;
-	priv->book_views = e_list_new((EListCopyFunc) pas_backend_file_book_view_copy, (EListFreeFunc) pas_backend_file_book_view_free, NULL);
-	priv->uri        = NULL;
-	priv->writable   = FALSE;
-
-	backend->priv = priv;
-}
-
-/**
- * pas_backend_file_get_type:
- */
-GtkType
-pas_backend_file_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBackendFile",
-			sizeof (PASBackendFile),
-			sizeof (PASBackendFileClass),
-			(GtkClassInitFunc)  pas_backend_file_class_init,
-			(GtkObjectInitFunc) pas_backend_file_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (pas_backend_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/pas/pas-backend-file.h b/addressbook/backend/pas/pas-backend-file.h
deleted file mode 100644
index 6c29c8b7a2..0000000000
--- a/addressbook/backend/pas/pas-backend-file.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2000, Ximian, Inc.
- */
-
-#ifndef __PAS_BACKEND_FILE_H__
-#define __PAS_BACKEND_FILE_H__
-
-#include <libgnome/gnome-defs.h>
-#include "pas-backend.h"
-
-typedef struct _PASBackendFilePrivate PASBackendFilePrivate;
-
-typedef struct {
-	PASBackend             parent_object;
-	PASBackendFilePrivate *priv;
-} PASBackendFile;
-
-typedef struct {
-	PASBackendClass parent_class;
-} PASBackendFileClass;
-
-PASBackend *pas_backend_file_new      (void);
-GtkType     pas_backend_file_get_type (void);
-
-#define PAS_BACKEND_FILE_TYPE        (pas_backend_file_get_type ())
-#define PAS_BACKEND_FILE(o)          (GTK_CHECK_CAST ((o), PAS_BACKEND_FILE_TYPE, PASBackendFile))
-#define PAS_BACKEND_FILE_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BACKEND_TYPE, PASBackendFileClass))
-#define PAS_IS_BACKEND_FILE(o)       (GTK_CHECK_TYPE ((o), PAS_BACKEND_FILE_TYPE))
-#define PAS_IS_BACKEND_FILE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BACKEND_FILE_TYPE))
-
-#endif /* ! __PAS_BACKEND_FILE_H__ */
-
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
deleted file mode 100644
index 1432133fd3..0000000000
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ /dev/null
@@ -1,2777 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Author:
- *   Chris Toshok (toshok@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#define DEBUG
-
-#include "config.h"  
-#include <fcntl.h>
-#include <time.h>
-#include <lber.h>
-#include <gtk/gtksignal.h>
-
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-
-#ifdef DEBUG
-#define LDAP_DEBUG
-#define LDAP_DEBUG_ADD
-#endif
-#include <ldap.h>
-#ifdef DEBUG
-#undef LDAP_DEBUG
-#endif
-
-#if LDAP_VENDOR_VERSION > 20000
-#define OPENLDAP2
-#else
-#define OPENLDAP1
-#endif
-
-#ifdef OPENLDAP2
-#include "ldap_schema.h"
-#endif
-
-#include <e-util/e-sexp.h>
-#include <ebook/e-card-simple.h>
-
-#include "pas-backend-ldap.h"
-#include "pas-backend-card-sexp.h"
-#include "pas-book.h"
-#include "pas-card-cursor.h"
-
-
-#define LDAP_MAX_SEARCH_RESPONSES 100
-
-/* the objectClasses we need */
-#define TOP                  "top"
-#define PERSON               "person"
-#define ORGANIZATIONALPERSON "organizationalPerson"
-#define INETORGPERSON        "inetOrgPerson"
-#define EVOLUTIONPERSON      "evolutionPerson"
-
-static gchar *query_prop_to_ldap(gchar *query_prop);
-
-static PASBackendClass *pas_backend_ldap_parent_class;
-typedef struct _PASBackendLDAPCursorPrivate PASBackendLDAPCursorPrivate;
-typedef struct _PASBackendLDAPBookView PASBackendLDAPBookView;
-typedef struct LDAPOp LDAPOp;
-
-struct _PASBackendLDAPPrivate {
-	char     *uri;
-	gboolean connected;
-	GList    *clients;
-	gchar    *ldap_host;
-	gchar    *ldap_rootdn;
-	int      ldap_port;
-	int      ldap_scope;
-	GList    *book_views;
-
-	LDAP     *ldap;
-
-	EList    *supported_fields;
-
-	/* whether or not there's support for the objectclass we need
-           to store all our additional fields */
-	gboolean evolutionPersonSupported;
-	gboolean evolutionPersonChecked;
-
-	gboolean writable;
-
-	/* whether or not there's a request in process on our LDAP* */
-	LDAPOp *current_op;
-	GList *pending_ops;
-	int op_idle;
-};
-
-struct _PASBackendLDAPCursorPrivate {
-	PASBackend *backend;
-	PASBook    *book;
-
-	GList      *elements;
-	long       num_elements;
-};
-
-struct _PASBackendLDAPBookView {
-	PASBookView           *book_view;
-	PASBackendLDAPPrivate *blpriv;
-	gchar                 *search;
-	PASBackendCardSExp    *card_sexp;
-	int                   search_idle;
-	int                   search_msgid;
-	LDAPOp                *search_op;
-};
-
-typedef gboolean (*LDAPOpHandler)(PASBackend *backend, LDAPOp *op);
-typedef void (*LDAPOpDtor)(PASBackend *backend, LDAPOp *op);
-
-struct LDAPOp {
-	LDAPOpHandler handler;
-	LDAPOpDtor    dtor;
-	PASBackend    *backend;
-	PASBook       *book;
-	PASBookView   *view;
-};
-
-static void     ldap_op_init (LDAPOp *op, PASBackend *backend, PASBook *book, PASBookView *view, LDAPOpHandler handler, LDAPOpDtor dtor);
-static void     ldap_op_process_current (PASBackend *backend);
-static void     ldap_op_process (LDAPOp *op);
-static void     ldap_op_restart (LDAPOp *op);
-static gboolean ldap_op_process_on_idle (PASBackend *backend);
-static void     ldap_op_finished (LDAPOp *op);
-
-static ECardSimple *build_card_from_entry (LDAP *ldap, LDAPMessage *e, GList **existing_objectclasses);
-
-static void email_populate (ECardSimple *card, char **values);
-struct berval** email_ber (ECardSimple *card);
-static gboolean email_compare (ECardSimple *ecard1, ECardSimple *ecard2);
-
-static void homephone_populate (ECardSimple *card, char **values);
-struct berval** homephone_ber (ECardSimple *card);
-static gboolean homephone_compare (ECardSimple *ecard1, ECardSimple *ecard2);
-
-static void business_populate (ECardSimple *card, char **values);
-struct berval** business_ber (ECardSimple *card);
-static gboolean business_compare (ECardSimple *ecard1, ECardSimple *ecard2);
-
-static void anniversary_populate (ECardSimple *card, char **values);
-struct berval** anniversary_ber (ECardSimple *card);
-static gboolean anniversary_compare (ECardSimple *ecard1, ECardSimple *ecard2);
-
-static void birthday_populate (ECardSimple *card, char **values);
-struct berval** birthday_ber (ECardSimple *card);
-static gboolean birthday_compare (ECardSimple *ecard1, ECardSimple *ecard2);
-
-struct prop_info {
-	ECardSimpleField field_id;
-	char *query_prop;
-	char *ldap_attr;
-#define PROP_TYPE_STRING   0x01
-#define PROP_TYPE_COMPLEX     0x02
-#define PROP_DN            0x04
-#define PROP_EVOLVE        0x08
-	int prop_type;
-
-	/* the remaining items are only used for the TYPE_COMPLEX props */
-
-	/* used when reading from the ldap server populates ECard with the values in **values. */
-	void (*populate_ecard_func)(ECardSimple *card, char **values);
-	/* used when writing to an ldap server.  returns a NULL terminated array of berval*'s */
-	struct berval** (*ber_func)(ECardSimple *card);
-	/* used to compare list attributes */
-	gboolean (*compare_func)(ECardSimple *card1, ECardSimple *card2);
-
-} prop_info[] = {
-
-#define COMPLEX_PROP(fid,q,a,ctor,ber,cmp) {fid, q, a, PROP_TYPE_COMPLEX, ctor, ber, cmp}
-#define E_COMPLEX_PROP(fid,q,a,ctor,ber,cmp) {fid, q, a, PROP_TYPE_COMPLEX | PROP_EVOLVE, ctor, ber, cmp}
-#define STRING_PROP(fid,q,a) {fid, q, a, PROP_TYPE_STRING}
-#define E_STRING_PROP(fid,q,a) {fid, q, a, PROP_TYPE_STRING | PROP_EVOLVE}
-
-
-	/* name fields */
-	STRING_PROP (E_CARD_SIMPLE_FIELD_FULL_NAME,   "full_name", "cn" ),
-	STRING_PROP (E_CARD_SIMPLE_FIELD_FAMILY_NAME, "family_name", "sn" ),
-
-	/* email addresses */
-	COMPLEX_PROP   (E_CARD_SIMPLE_FIELD_EMAIL, "email", "mail", email_populate, email_ber, email_compare),
-
-	/* phone numbers */
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,      "primary_phone", "primaryPhone"),
-	COMPLEX_PROP     (E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,     "business_phone", "telephoneNumber", business_populate, business_ber, business_compare),
-	COMPLEX_PROP     (E_CARD_SIMPLE_FIELD_PHONE_HOME,         "home_phone", "homePhone", homephone_populate, homephone_ber, homephone_compare),
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_PHONE_MOBILE,       "mobile_phone", "mobile"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_CAR,          "car_phone", "carPhone"),
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX, "business_fax", "facsimileTelephoneNumber"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,     "home_fax", "homeFacsimileTelephoneNumber"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_OTHER,        "other_phone", "otherPhone"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_OTHER,        "other_fax", "otherFacsimileTelephoneNumber"), 
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_PHONE_ISDN,         "isdn", "internationaliSDNNumber"), 
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_PHONE_PAGER,        "pager", "pager"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_RADIO,        "radio", "radio"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_TELEX,        "telex", "telex"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_ASSISTANT,    "assistant_phone", "assistantPhone"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_COMPANY,      "company_phone", "companyPhone"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_CALLBACK,     "callback_phone", "callbackPhone"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_PHONE_TTYTTD,       "tty", "tty"),
-
-	/* org information */
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_ORG,       "org",       "o"),
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_ORG_UNIT,  "org_unit",  "ou"),
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_OFFICE,    "office",    "roomNumber"),
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_TITLE,     "title",     "title"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_ROLE,      "role",      "businessRole"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_MANAGER,   "manager",   "managerName"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_ASSISTANT, "assistant", "assistantName"), 
-
-	/* addresses */
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS, "business_address", "postalAddress"),
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_ADDRESS_HOME,     "home_address",     "homePostalAddress"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,    "other_address",    "otherPostalAddress"),
-
-	/* misc fields */
-	STRING_PROP (E_CARD_SIMPLE_FIELD_URL,           "url", "labeledURI"),
-	/* map nickname to displayName */
-	STRING_PROP   (E_CARD_SIMPLE_FIELD_NICKNAME,    "nickname",  "displayName"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_SPOUSE,      "spouse", "spouseName"), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_NOTE,        "note", "note"), 
-	E_COMPLEX_PROP (E_CARD_SIMPLE_FIELD_ANNIVERSARY, "anniversary", "anniversary", anniversary_populate, anniversary_ber, anniversary_compare), 
-	E_COMPLEX_PROP (E_CARD_SIMPLE_FIELD_BIRTH_DATE,  "birth_date", "birthDate", birthday_populate, birthday_ber, birthday_compare), 
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_MAILER,      "mailer", "mailer"), 
-
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_FILE_AS,     "file_as", "fileAs"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_CATEGORIES,  "categories", "categories"),
-
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_CALURI,      "caluri", "calendarURI"),
-	E_STRING_PROP (E_CARD_SIMPLE_FIELD_FBURL,       "fburl", "freeBusyURI")
-
-/*  	E_CARD_SIMPLE_FIELD_NAME_OR_ORG, */
-
-
-#undef E_STRING_PROP
-#undef STRING_PROP
-#undef E_COMPLEX_PROP
-#undef COMPLEX_PROP
-};
-
-static int num_prop_infos = sizeof(prop_info) / sizeof(prop_info[0]);
-
-static void
-view_destroy(GtkObject *object, gpointer data)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_Addressbook_Book    corba_book;
-	PASBook           *book = (PASBook *)data;
-	PASBackendLDAP    *bl;
-	GList             *list;
-
-	bl = PAS_BACKEND_LDAP(pas_book_get_backend(book));
-	for (list = bl->priv->book_views; list; list = g_list_next(list)) {
-		PASBackendLDAPBookView *view = list->data;
-		if (view->book_view == PAS_BOOK_VIEW(object)) {
-			if (view->search_idle != 0) {
-				/* we have a search running on the
-				   ldap connection.  remove the idle
-				   handler and anbandon the msg id */
-				g_source_remove(view->search_idle);
-				if (view->search_msgid != -1)
-					ldap_abandon (bl->priv->ldap, view->search_msgid);
-
-				/* if the search op is the current op,
-				   finish it. else, remove it from the
-				   list and nuke it ourselves. */
-				if (view->search_op == bl->priv->current_op)
-					ldap_op_finished (view->search_op);
-				else {
-					bl->priv->pending_ops = g_list_remove (bl->priv->pending_ops,
-									       view->search_op);
-					view->search_op->dtor (view->search_op->backend,
-							       view->search_op);
-				}
-			}
-			g_free (view->search);
-			gtk_object_unref (GTK_OBJECT (view->card_sexp));
-			g_free (view);
-			bl->priv->book_views = g_list_remove_link(bl->priv->book_views, list);
-			g_list_free_1(list);
-			break;
-		}
-	}
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	GNOME_Evolution_Addressbook_Book_unref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("view_destroy: Exception unreffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-}
-
-static void
-add_to_supported_fields (PASBackendLDAP *bl, char **attrs, GHashTable *attr_hash)
-{
-	int i;
-	for (i = 0; attrs[i]; i ++) {
-		char *query_prop = g_hash_table_lookup (attr_hash, attrs[i]);
-
-		if (query_prop) {
-			e_list_append (bl->priv->supported_fields, query_prop);
-
-			/* handle the list attributes here */
-			if (!strcmp (query_prop, "email")) {
-				e_list_append (bl->priv->supported_fields, "email_2");
-				e_list_append (bl->priv->supported_fields, "email_3");
-			}
-			else if (!strcmp (query_prop, "business_phone")) {
-				e_list_append (bl->priv->supported_fields, "business_phone_2");
-			}
-			else if (!strcmp (query_prop, "home_phone")) {
-				e_list_append (bl->priv->supported_fields, "home_phone_2");
-			}
-		}
-	}
-}
-
-static void
-add_oc_attributes_to_supported_fields (PASBackendLDAP *bl, LDAPObjectClass *oc)
-{
-	int i;
-	GHashTable *attr_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	for (i = 0; i < num_prop_infos; i ++)
-		g_hash_table_insert (attr_hash, prop_info[i].ldap_attr, prop_info[i].query_prop);
-
-	if (oc->oc_at_oids_must)
-		add_to_supported_fields (bl, oc->oc_at_oids_must, attr_hash);
-
-	if (oc->oc_at_oids_may)
-		add_to_supported_fields (bl, oc->oc_at_oids_may, attr_hash);
-
-	g_hash_table_destroy (attr_hash);
-}
-
-static void
-check_schema_support (PASBackendLDAP *bl)
-{
-	char *attrs[2];
-	LDAPMessage *resp;
-	LDAP *ldap = bl->priv->ldap;
-
-	bl->priv->evolutionPersonChecked = TRUE;
-
-	attrs[0] = "objectClasses";
-	attrs[1] = NULL;
-
-	if (ldap_search_ext_s (ldap, "cn=Subschema", LDAP_SCOPE_BASE,
-			       "(objectClass=subschema)", attrs, 0,
-			       NULL, NULL, NULL, 0, &resp) == LDAP_SUCCESS) {
-		char **values;
-
-		values = ldap_get_values (ldap, resp, "objectClasses");
-
-		if (values) {
-			int i;
-			for (i = 0; values[i]; i ++) {
-				int j;
-				int code;
-				const char *err;
-				LDAPObjectClass *oc = ldap_str2objectclass (values[i], &code, &err, 0);
-
-				if (!oc)
-					continue;
-
-				for (j = 0; oc->oc_names[j]; j++)
-					if (!g_strcasecmp (oc->oc_names[j], EVOLUTIONPERSON)) {
-						g_print ("support found on ldap server for objectclass evolutionPerson\n");
-						bl->priv->evolutionPersonSupported = TRUE;
-
-						add_oc_attributes_to_supported_fields (bl, oc);
-					}
-					else if (!g_strcasecmp (oc->oc_names[j], INETORGPERSON)
-						 || !g_strcasecmp (oc->oc_names[j], ORGANIZATIONALPERSON)
-						 || !g_strcasecmp (oc->oc_names[j], PERSON)) {
-						add_oc_attributes_to_supported_fields (bl, oc);
-					}
-
-				ldap_objectclass_free (oc);
-			}
-		}
-	}
-}
-
-static void
-pas_backend_ldap_connect (PASBackendLDAP *bl)
-{
-	PASBackendLDAPPrivate *blpriv = bl->priv;
-
-	/* close connection first if it's open first */
-	if (blpriv->ldap)
-		ldap_unbind (blpriv->ldap);
-
-	blpriv->ldap = ldap_init (blpriv->ldap_host, blpriv->ldap_port);
-#ifdef DEBUG
-	{
-		int debug_level = ~0;
-		ldap_set_option (blpriv->ldap, LDAP_OPT_DEBUG_LEVEL, &debug_level);
-	}
-#endif
-
-	if (NULL != blpriv->ldap) {
-		ldap_simple_bind_s(blpriv->ldap,
-				   NULL /*binddn*/, NULL /*passwd*/);
-		blpriv->connected = TRUE;
-
-		/* check to see if evolutionPerson is supported, if we can (me
-		   might not be able to if we can't authenticate.  if we
-		   can't, try again in auth_user.) */
-		check_schema_support (bl);
-	}
-	else {
-		g_warning ("pas_backend_ldap_connect failed for "
-			   "'ldap://%s:%d/%s'\n",
-			   blpriv->ldap_host,
-			   blpriv->ldap_port,
-			   blpriv->ldap_rootdn ? blpriv->ldap_rootdn : "");
-		blpriv->connected = FALSE;
-	}
-
-}
-
-static ECardSimple *
-search_for_dn_with_objectclasses (PASBackendLDAP *bl, const char *dn, GList **existing_objectclasses)
-{
-	LDAP *ldap = bl->priv->ldap;
-	LDAPMessage    *res, *e;
-	ECardSimple *result = NULL;
-
-	if (ldap_search_s (ldap,
-			   dn,
-			   LDAP_SCOPE_BASE,
-			   "(objectclass=*)",
-			   NULL, 0, &res) == LDAP_SUCCESS) {
-		e = ldap_first_entry (ldap, res);
-		while (NULL != e) {
-			if (!strcmp (ldap_get_dn (ldap, e), dn)) {
-				printf ("found it\n");
-				result = build_card_from_entry (ldap, e, existing_objectclasses);
-				break;
-			}
-			e = ldap_next_entry (ldap, e);
-		}
-
-		ldap_msgfree(res);
-	}
-
-	return result;
-}
-
-static ECardSimple *
-search_for_dn (PASBackendLDAP *bl, const char *dn)
-{
-	return search_for_dn_with_objectclasses (bl, dn, NULL);
-}
-
-static void
-ldap_op_init (LDAPOp *op, PASBackend *backend,
-	      PASBook *book, PASBookView *view,
-	      LDAPOpHandler handler, LDAPOpDtor dtor)
-{
-	op->backend = backend;
-	op->book = book;
-	op->view = view;
-	op->handler = handler;
-	op->dtor = dtor;
-}
-
-static void
-ldap_op_process_current (PASBackend *backend)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	LDAPOp *op = bl->priv->current_op;
-
-	if (!bl->priv->connected) {
-		if (op->view)
-			pas_book_view_notify_status_message (op->view, _("Connecting to LDAP server..."));
-		pas_backend_ldap_connect(bl);
-	}
-
-	if (bl->priv->connected) {
-		if (op->handler (backend, op))
-			ldap_op_finished (op);
-	}
-	else {
-		if (op->view) {
-			pas_book_view_notify_status_message (op->view, _("Unable to connect to LDAP server."));
-			pas_book_view_notify_complete (op->view);
-		}
-
-		ldap_op_finished (op);
-	}
-}
-
-static void
-ldap_op_process (LDAPOp *op)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op->backend);
-
-	if (bl->priv->current_op) {
-		/* operation in progress.  queue this op for later and return. */
-		if (op->view)
-			pas_book_view_notify_status_message (op->view, _("Waiting for connection to LDAP server..."));
-		bl->priv->pending_ops = g_list_append (bl->priv->pending_ops, op);
-	}
-	else {
-		/* nothing going on, do this op now */
-		bl->priv->current_op = op;
-		ldap_op_process_current (op->backend);
-	}
-}
-
-static gboolean
-ldap_op_process_on_idle (PASBackend *backend)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	bl->priv->op_idle = 0;
-
-	ldap_op_process_current (backend);
-
-	return FALSE;
-}
-
-static void
-ldap_op_restart (LDAPOp *op)
-{
-	PASBackend *backend = op->backend;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	g_return_if_fail (op == bl->priv->current_op);
-
-	bl->priv->op_idle = g_idle_add((GSourceFunc)ldap_op_process_on_idle, backend);
-}
-
-static void
-ldap_op_finished (LDAPOp *op)
-{
-	PASBackend *backend = op->backend;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	g_return_if_fail (op == bl->priv->current_op);
-
-	op->dtor (backend, op);
-
-	if (bl->priv->pending_ops) {
-		bl->priv->current_op = bl->priv->pending_ops->data;
-		bl->priv->pending_ops = g_list_remove_link (bl->priv->pending_ops, bl->priv->pending_ops);
-
-		bl->priv->op_idle = g_idle_add((GSourceFunc)ldap_op_process_on_idle, backend);
-	}
-	else {
-		bl->priv->current_op = NULL;
-	}
-}
-
-static int
-ldap_error_to_response (int ldap_error)
-{
-	if (ldap_error == LDAP_SUCCESS)
-		return GNOME_Evolution_Addressbook_BookListener_Success;
-	else if (LDAP_NAME_ERROR (ldap_error))
-		return GNOME_Evolution_Addressbook_BookListener_CardNotFound;
-	else if (ldap_error == LDAP_INSUFFICIENT_ACCESS)
-		return GNOME_Evolution_Addressbook_BookListener_PermissionDenied;
-	else if (ldap_error == LDAP_SERVER_DOWN)
-		return GNOME_Evolution_Addressbook_BookListener_RepositoryOffline;
-	else if (ldap_error == LDAP_ALREADY_EXISTS)
-		return GNOME_Evolution_Addressbook_BookListener_CardIdAlreadyExists;
-	else
-		return GNOME_Evolution_Addressbook_BookListener_OtherError;
-}
-
-
-static char *
-create_dn_from_ecard (ECardSimple *card, const char *root_dn)
-{
-	char *cn, *cn_part = NULL;
-	char *dn;
-	gboolean need_comma = FALSE;
-
-	cn = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_FULL_NAME);
-	if (cn) {
-		cn_part = g_strdup_printf ("cn=%s%s", cn, need_comma ? "," : "");
-	}
-	else {
-		cn_part = g_strdup ("");
-	}
-
-	dn = g_strdup_printf ("%s%s%s", cn_part,
-			      (root_dn && strlen(root_dn)) ? "," : "",
-			      (root_dn && strlen(root_dn)) ? root_dn: "");
-
-	g_free (cn_part);
-
-	g_print ("generated dn: %s\n", dn);
-
-	return dn;
-}
-
-static void
-free_mods (GPtrArray *mods)
-{
-	int i = 0;
-	LDAPMod *mod;
-
-	while ((mod = g_ptr_array_index (mods, i++))) {
-		int j;
-		g_free (mod->mod_type);
-
-		if (mod->mod_op & LDAP_MOD_BVALUES) {
-			for (j = 0; mod->mod_bvalues[j]; j++) {
-				g_free (mod->mod_bvalues[j]->bv_val);
-				g_free (mod->mod_bvalues[j]);
-			}
-		}
-		else {
-			for (j = 0; mod->mod_values[j]; j++)
-				g_free (mod->mod_values[j]);
-		}
-		g_free (mod);
-	}
-
-	g_ptr_array_free (mods, TRUE);
-}
-
-static GPtrArray*
-build_mods_from_ecards (PASBackendLDAP *bl, ECardSimple *current, ECardSimple *new, gboolean *new_dn_needed)
-{
-	gboolean adding = (current == NULL);
-	GPtrArray *result = g_ptr_array_new();
-	int i;
-
-	if (new_dn_needed)
-		*new_dn_needed = FALSE;
-
-	/* we walk down the list of properties we can deal with (that
-	 big table at the top of the file) */
-
-	for (i = 0; i < num_prop_infos; i ++) {
-		gboolean include;
-		gboolean new_prop_present = FALSE;
-		gboolean current_prop_present = FALSE;
-		struct berval** new_prop_bers = NULL;
-		char *new_prop = NULL;
-		char *current_prop = NULL;
-
-		/* XXX if it's an evolutionPerson prop and the ldap
-                   server doesn't support that objectclass, skip it. */
-		if (prop_info[i].prop_type & PROP_EVOLVE && !bl->priv->evolutionPersonSupported)
-			continue;
-
-		/* get the value for the new card, and compare it to
-                   the value in the current card to see if we should
-                   update it -- if adding is TRUE, short circuit the
-                   check. */
-		if (prop_info[i].prop_type & PROP_TYPE_STRING) {
-			new_prop = e_card_simple_get (new, prop_info[i].field_id);
-			new_prop_present = (new_prop != NULL);
-		}
-		else {
-			new_prop_bers = prop_info[i].ber_func (new);
-			new_prop_present = (new_prop_bers != NULL);
-		}
-
-		/* need to set INCLUDE to true if the field needs to
-                   show up in the ldap modify request */
-		if (adding) {
-			/* if we're creating a new card, include it if the
-                           field is there at all */
-			if (prop_info[i].prop_type & PROP_TYPE_STRING)
-				include = (new_prop_present && *new_prop); /* empty strings cause problems */
-			else
-				include = new_prop_present;
-		}
-		else {
-			/* if we're modifying an existing card,
-                           include it if the current field value is
-                           different than the new one, if it didn't
-                           exist previously, or if it's been
-                           removed. */
-			if (prop_info[i].prop_type & PROP_TYPE_STRING) {
-				current_prop = e_card_simple_get (current, prop_info[i].field_id);
-				current_prop_present = (current_prop != NULL);
-
-				if (new_prop && current_prop)
-					include = *new_prop && strcmp (new_prop, current_prop);
-				else
-					include = (!!new_prop != !!current_prop);
-			}
-			else {
-				int j;
-				struct berval **current_prop_bers = prop_info[i].ber_func (current);
-
-				current_prop_present = (current_prop_bers != NULL);
-
-				/* free up the current_prop_bers */
-				if (current_prop_bers) {
-					for (j = 0; current_prop_bers[j]; j++) {
-						g_free (current_prop_bers[j]->bv_val);
-						g_free (current_prop_bers[j]);
-					}
-					g_free (current_prop_bers);
-				}
-
-				include = !prop_info[i].compare_func (new, current);
-			}
-		}
-
-		if (include) {
-			LDAPMod *mod = g_new (LDAPMod, 1);
-
-			/* the included attribute has changed - we
-                           need to update the dn if it's one of the
-                           attributes we compute the dn from. */
-			if (new_dn_needed)
-				*new_dn_needed |= prop_info[i].prop_type & PROP_DN;
-
-			if (adding) {
-				mod->mod_op = LDAP_MOD_ADD;
-			}
-			else {
-				if (!new_prop_present)
-					mod->mod_op = LDAP_MOD_DELETE;
-				else if (!current_prop_present)
-					mod->mod_op = LDAP_MOD_ADD;
-				else
-					mod->mod_op = LDAP_MOD_REPLACE;
-			}
-			
-			mod->mod_type = g_strdup (prop_info[i].ldap_attr);
-
-			if (prop_info[i].prop_type & PROP_TYPE_STRING) {
-				mod->mod_values = g_new (char*, 2);
-				mod->mod_values[0] = new_prop;
-				mod->mod_values[1] = NULL;
-			}
-			else { /* PROP_TYPE_COMPLEX */
-				mod->mod_op |= LDAP_MOD_BVALUES;
-				mod->mod_bvalues = new_prop_bers;
-			}
-
-			g_ptr_array_add (result, mod);
-		}
-		
-	}
-
-	/* NULL terminate the list of modifications */
-	g_ptr_array_add (result, NULL);
-
-	return result;
-}
-
-static void
-add_objectclass_mod (PASBackendLDAP *bl, GPtrArray *mod_array, GList *existing_objectclasses)
-{
-	LDAPMod *objectclass_mod;
-
-	if (existing_objectclasses) {
-		int i = 0;
-
-		objectclass_mod = g_new (LDAPMod, 1);
-		objectclass_mod->mod_op = LDAP_MOD_ADD;
-		objectclass_mod->mod_type = g_strdup ("objectClass");
-		objectclass_mod->mod_values = g_new (char*, bl->priv->evolutionPersonSupported ? 6 : 5);
-
-		/* yes, this is a linear search for each of our
-                   objectclasses, but really, how many objectclasses
-                   are there going to be in any sane ldap entry? */
-#define FIND_INSERT(oc) \
-	if (!g_list_find_custom (existing_objectclasses, (oc), (GCompareFunc)g_strcasecmp)) \
-	         objectclass_mod->mod_values[i++] = g_strdup ((oc));
-
-		FIND_INSERT (TOP);
-		FIND_INSERT (PERSON);
-		FIND_INSERT (ORGANIZATIONALPERSON);
-		FIND_INSERT (INETORGPERSON);
-		if (bl->priv->evolutionPersonSupported)
-			FIND_INSERT (EVOLUTIONPERSON);
-		objectclass_mod->mod_values[i] = NULL;
-
-		if (i) {
-			g_ptr_array_add (mod_array, objectclass_mod);
-		}
-		else {
-			g_free (objectclass_mod->mod_type);
-			g_free (objectclass_mod->mod_values);
-			g_free (objectclass_mod);
-		}
-	}
-	else {
-		objectclass_mod = g_new (LDAPMod, 1);
-		objectclass_mod->mod_op = LDAP_MOD_ADD;
-		objectclass_mod->mod_type = g_strdup ("objectClass");
-		objectclass_mod->mod_values = g_new (char*, bl->priv->evolutionPersonSupported ? 6 : 5);
-		objectclass_mod->mod_values[0] = g_strdup (TOP);
-		objectclass_mod->mod_values[1] = g_strdup (PERSON);
-		objectclass_mod->mod_values[2] = g_strdup (ORGANIZATIONALPERSON);
-		objectclass_mod->mod_values[3] = g_strdup (INETORGPERSON);
-		if (bl->priv->evolutionPersonSupported) {
-			objectclass_mod->mod_values[4] = g_strdup (EVOLUTIONPERSON);
-			objectclass_mod->mod_values[5] = NULL;
-		}
-		else {
-			objectclass_mod->mod_values[4] = NULL;
-		}
-		g_ptr_array_add (mod_array, objectclass_mod);
-	}
-}
-
-typedef struct {
-	LDAPOp op;
-	char *vcard;
-} LDAPCreateOp;
-
-static gboolean
-create_card_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPCreateOp *create_op = (LDAPCreateOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	ECard *new_ecard;
-	ECardSimple *new_card;
-	char *dn;
-	int response;
-	int            ldap_error;
-	GPtrArray *mod_array;
-	LDAPMod **ldap_mods;
-	LDAP *ldap;
-
-	printf ("vcard = %s\n", create_op->vcard);
-
-	new_ecard = e_card_new (create_op->vcard);
-	new_card = e_card_simple_new (new_ecard);
-
-	dn = create_dn_from_ecard (new_card, bl->priv->ldap_rootdn);
-	e_card_simple_set_id (new_card, dn); /* for the notification code below */
-
-	ldap = bl->priv->ldap;
-
-	/* build our mods */
-	mod_array = build_mods_from_ecards (bl, NULL, new_card, NULL);
-
-#if 0
-	if (!mod_array) {
-		/* there's an illegal field in there.  report
-                   UnsupportedAttribute back */
-		g_free (dn);
-
-		gtk_object_unref (GTK_OBJECT(new_card));
-
-		pas_book_respond_create (create_op->op.book,
-					 GNOME_Evolution_Addressbook_BookListener_UnsupportedField,
-					 dn);
-
-		return TRUE;
-	}
-#endif
-
-	/* remove the NULL at the end */
-	g_ptr_array_remove (mod_array, NULL);
-
-	/* add our objectclass(es) */
-	add_objectclass_mod (bl, mod_array, NULL);
-
-	/* then put the NULL back */
-	g_ptr_array_add (mod_array, NULL);
-
-#ifdef LDAP_DEBUG_ADD
-	{
-		int i;
-		printf ("Sending the following to the server as ADD\n");
-
-		for (i = 0; g_ptr_array_index(mod_array, i); i ++) {
-			LDAPMod *mod = g_ptr_array_index(mod_array, i);
-			if (mod->mod_op & LDAP_MOD_DELETE)
-				printf ("del ");
-			else if (mod->mod_op & LDAP_MOD_REPLACE)
-				printf ("rep ");
-			else
-				printf ("add ");
-			if (mod->mod_op & LDAP_MOD_BVALUES)
-				printf ("ber ");
-			else
-				printf ("    ");
-
-			printf (" %s:\n", mod->mod_type);
-
-			if (mod->mod_op & LDAP_MOD_BVALUES) {
-				int j;
-				for (j = 0; mod->mod_bvalues[j] && mod->mod_bvalues[j]->bv_val; j++)
-					printf ("\t\t'%s'\n", mod->mod_bvalues[j]->bv_val);
-			}
-			else {
-				int j;
-
-				for (j = 0; mod->mod_values[j]; j++)
-					printf ("\t\t'%s'\n", mod->mod_values[j]);
-			}
-		}
-	}
-#endif
-
-	ldap_mods = (LDAPMod**)mod_array->pdata;
-
-	if (op->view)
-		pas_book_view_notify_status_message (op->view, _("Adding card to LDAP server..."));
-
-	/* actually perform the ldap add */
-	ldap_error = ldap_add_s (ldap, dn, ldap_mods);
-
-	if (ldap_error == LDAP_SUCCESS) {
-		/* the card was created, let's let the views know about it */
-		GList *l;
-		for (l = bl->priv->book_views; l; l = l->next) {
-			CORBA_Environment ev;
-			gboolean match;
-			PASBackendLDAPBookView *view = l->data; 
-					
-			CORBA_exception_init(&ev);
-
-			bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
-
-			match = pas_backend_card_sexp_match_vcard (view->card_sexp,
-								   e_card_simple_get_vcard_assume_utf8 (new_card));
-			if (match)
-				pas_book_view_notify_add_1 (view->book_view, e_card_simple_get_vcard_assume_utf8 (new_card));
-			pas_book_view_notify_complete (view->book_view);
-
-			bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
-		}
-	}
-	else {
-		ldap_perror (ldap, "ldap_add_s");
-	}
-
-	if (op->view)
-		pas_book_view_notify_complete (op->view);
-
-	/* and clean up */
-	free_mods (mod_array);
-	g_free (dn);
-
-	gtk_object_unref (GTK_OBJECT(new_card));
-
-	/* and lastly respond */
-	response = ldap_error_to_response (ldap_error);
-	pas_book_respond_create (create_op->op.book,
-				 response,
-				 dn);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-create_card_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPCreateOp *create_op = (LDAPCreateOp*)op;
-
-	if (op->view)
-		bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(op->view)), NULL);
-
-	g_free (create_op->vcard);
-	g_free (create_op);
-}
-
-static void
-pas_backend_ldap_process_create_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	LDAPCreateOp *create_op = g_new (LDAPCreateOp, 1);
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	PASBookView *book_view = NULL;
-
-	if (bl->priv->book_views) {
-		PASBackendLDAPBookView *v = bl->priv->book_views->data;
-		book_view = v->book_view;
-		bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(book_view)), NULL);
-	}
-
-	ldap_op_init ((LDAPOp*)create_op, backend, book,
-		      book_view,
-		      create_card_handler, create_card_dtor);
-
-	create_op->vcard = req->vcard;
-
-	ldap_op_process ((LDAPOp*)create_op);
-}
-
-
-typedef struct {
-	LDAPOp op;
-	char *id;
-} LDAPRemoveOp;
-
-static gboolean
-remove_card_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPRemoveOp *remove_op = (LDAPRemoveOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	int response;
-	int ldap_error;
-	ECardSimple *simple;
-
-	if (op->view)
-		pas_book_view_notify_status_message (op->view, _("Removing card from LDAP server..."));
-
-	simple = search_for_dn (bl, remove_op->id);
-
-	if (simple) {
-		ldap_error = ldap_delete_s (bl->priv->ldap, remove_op->id);
-
-		if (ldap_error == LDAP_SUCCESS) {
-			/* the card was removed, let's let the views know about it */
-			GList *l;
-			for (l = bl->priv->book_views; l; l = l->next) {
-				CORBA_Environment ev;
-				gboolean match;
-				PASBackendLDAPBookView *view = l->data; 
-					
-				CORBA_exception_init(&ev);
-
-				bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
-
-				match = pas_backend_card_sexp_match_vcard (view->card_sexp,
-									   e_card_simple_get_vcard_assume_utf8 (simple));
-				if (match)
-					pas_book_view_notify_remove (view->book_view, remove_op->id);
-				pas_book_view_notify_complete (view->book_view);
-
-				bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
-			}
-		}
-		else {
-			ldap_perror (bl->priv->ldap, "ldap_delete_s");
-		}
-
-		response = ldap_error_to_response (ldap_error);
-	}
-	else
-		response = GNOME_Evolution_Addressbook_BookListener_CardNotFound;
-
-	pas_book_respond_remove (remove_op->op.book,
-				 response);
-
-	if (op->view)
-		pas_book_view_notify_complete (op->view);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-remove_card_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPRemoveOp *remove_op = (LDAPRemoveOp*)op;
-
-	if (op->view)
-		bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(op->view)), NULL);
-
-	g_free (remove_op->id);
-	g_free (remove_op);
-}
-
-static void
-pas_backend_ldap_process_remove_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	LDAPRemoveOp *remove_op = g_new (LDAPRemoveOp, 1);
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	PASBookView *book_view = NULL;
-
-	if (bl->priv->book_views) {
-		PASBackendLDAPBookView *v = bl->priv->book_views->data;
-		book_view = v->book_view;
-		bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(book_view)), NULL);
-	}
-
-	ldap_op_init ((LDAPOp*)remove_op, backend, book,
-		      book_view,
-		      remove_card_handler, remove_card_dtor);
-
-	remove_op->id = req->id;
-
-	ldap_op_process ((LDAPOp*)remove_op);
-}
-
-
-typedef struct {
-	LDAPOp op;
-	char *vcard;
-} LDAPModifyOp;
-
-static gboolean
-modify_card_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPModifyOp *modify_op = (LDAPModifyOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	ECard *new_ecard;
-	const char *id;
-	int response;
-	int            ldap_error = LDAP_SUCCESS;
-	GPtrArray *mod_array;
-	LDAPMod **ldap_mods;
-	LDAP *ldap;
-	ECardSimple *current_card;
-	GList *existing_objectclasses = NULL;
-
-	new_ecard = e_card_new (modify_op->vcard);
-	id = e_card_get_id(new_ecard);
-
-	ldap = bl->priv->ldap;
-
-	if (op->view)
-		pas_book_view_notify_status_message (op->view, _("Modifying card from LDAP server..."));
-
-	current_card = search_for_dn_with_objectclasses (bl, id, &existing_objectclasses);
-
-	if (current_card) {
-		ECardSimple *new_card = e_card_simple_new (new_ecard);
-		gboolean need_new_dn;
-
-		/* build our mods */
-		mod_array = build_mods_from_ecards (bl, current_card, new_card, &need_new_dn);
-		if (mod_array->len > 0) {
-
-			/* remove the NULL at the end */
-			g_ptr_array_remove (mod_array, NULL);
-
-			/* add our objectclass(es), making sure
-                           evolutionPerson is there if it's supported */
-			add_objectclass_mod (bl, mod_array, existing_objectclasses);
-
-			/* then put the NULL back */
-			g_ptr_array_add (mod_array, NULL);
-
-			ldap_mods = (LDAPMod**)mod_array->pdata;
-
-			/* actually perform the ldap modify */
-			ldap_error = ldap_modify_ext_s (ldap, id, ldap_mods, NULL, NULL);
-			if (ldap_error == LDAP_SUCCESS) {
-
-				/* the card was modified, let's let the views know about it */
-				GList *l;
-				for (l = bl->priv->book_views; l; l = l->next) {
-					CORBA_Environment ev;
-					gboolean old_match, new_match;
-					PASBackendLDAPBookView *view = l->data; 
-					
-					CORBA_exception_init(&ev);
-
-					bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
-
-					old_match = pas_backend_card_sexp_match_vcard (view->card_sexp,
-										       e_card_simple_get_vcard_assume_utf8 (current_card));
-					new_match = pas_backend_card_sexp_match_vcard (view->card_sexp,
-										       modify_op->vcard);
-					if (old_match && new_match)
-						pas_book_view_notify_change_1 (view->book_view, modify_op->vcard);
-					else if (new_match)
-						pas_book_view_notify_add_1 (view->book_view, modify_op->vcard);
-					else /* if (old_match) */
-						pas_book_view_notify_remove (view->book_view, e_card_simple_get_id (new_card));
-					pas_book_view_notify_complete (view->book_view);
-
-					bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev);
-				}
-			}
-			else {
-				ldap_perror (ldap, "ldap_modify_s");
-			}
-		}
-		else {
-			g_print ("modify list empty.  no modification sent\n");
-		}
-
-		/* and clean up */
-		free_mods (mod_array);
-		g_list_foreach (existing_objectclasses, (GFunc)g_free, NULL);
-		g_list_free (existing_objectclasses);
-		gtk_object_unref (GTK_OBJECT(new_card));
-		gtk_object_unref (GTK_OBJECT(current_card));
-	}
-	else {
-		g_print ("didn't find original card\n");
-	}
-
-	response = ldap_error_to_response (ldap_error);
-	pas_book_respond_modify (modify_op->op.book,
-				 response);
-
-	if (op->view)
-		pas_book_view_notify_complete (op->view);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-modify_card_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPModifyOp *modify_op = (LDAPModifyOp*)op;
-
-	if (op->view)
-		bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(op->view)), NULL);
-
-	g_free (modify_op->vcard);
-	g_free (modify_op);
-}
-
-static void
-pas_backend_ldap_process_modify_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	LDAPModifyOp *modify_op = g_new (LDAPModifyOp, 1);
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	PASBookView *book_view = NULL;
-
-	if (bl->priv->book_views) {
-		PASBackendLDAPBookView *v = bl->priv->book_views->data;
-		book_view = v->book_view;
-		bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(book_view)), NULL);
-	}
-
-	ldap_op_init ((LDAPOp*)modify_op, backend, book,
-		      book_view,
-		      modify_card_handler, modify_card_dtor);
-
-	modify_op->vcard = req->vcard;
-
-	ldap_op_process ((LDAPOp*)modify_op);
-}
-
-
-static void
-pas_backend_ldap_process_get_vcard (PASBackend *backend,
-				    PASBook *book,
-				    PASRequest *req)
-{
-	PASBackendLDAP *bl;
-	ECardSimple *simple;
-
-	bl = PAS_BACKEND_LDAP (pas_book_get_backend (book));
-
-	simple = search_for_dn (bl, req->id);
-
-	if (simple) {
-		pas_book_respond_get_vcard (book,
-					    GNOME_Evolution_Addressbook_BookListener_Success,
-					    e_card_simple_get_vcard_assume_utf8 (simple));
-		gtk_object_unref (GTK_OBJECT (simple));
-	}
-	else {
-		pas_book_respond_get_vcard (book,
-					    GNOME_Evolution_Addressbook_BookListener_CardNotFound,
-					    "");
-	}
-}
-
-
-typedef struct {
-	LDAPOp op;
-	PASBook *book;
-} LDAPGetCursorOp;
-
-static long
-get_length(PASCardCursor *cursor, gpointer data)
-{
-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;
-
-	return cursor_data->num_elements;
-}
-
-static char *
-get_nth(PASCardCursor *cursor, long n, gpointer data)
-{
-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;
-
-	g_return_val_if_fail (n < cursor_data->num_elements, NULL);
-
-	return (char*)g_list_nth (cursor_data->elements, n);
-}
-
-static void
-cursor_destroy(GtkObject *object, gpointer data)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_Addressbook_Book corba_book;
-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(cursor_data->book));
-
-	CORBA_exception_init(&ev);
-
-	GNOME_Evolution_Addressbook_Book_unref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("cursor_destroy: Exception unreffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-
-	/* free the ldap specific cursor information */
-	g_list_foreach (cursor_data->elements, (GFunc)g_free, NULL);
-	g_list_free (cursor_data->elements);
-
-	g_free(cursor_data);
-}
-
-static void
-pas_backend_ldap_build_all_cards_list(PASBackend *backend,
-				      PASBackendLDAPCursorPrivate *cursor_data)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	LDAP           *ldap = bl->priv->ldap;
-	int            ldap_error;
-	LDAPMessage    *res, *e;
-
-	if ((ldap_error = ldap_search_s (ldap,
-					 bl->priv->ldap_rootdn,
-					 bl->priv->ldap_scope,
-					 "(objectclass=*)",
-					 NULL, 0, &res)) != LDAP_SUCCESS) {
-		g_warning ("ldap error '%s' in "
-			   "pas_backend_ldap_build_all_cards_list\n",
-			   ldap_err2string(ldap_error));
-	}
-
-	cursor_data->elements = NULL;
-
-	cursor_data->num_elements = ldap_count_entries (ldap, res);
-
-	e = ldap_first_entry(ldap, res);
-
-	while (NULL != e) {
-
-		/* for now just make a list of the dn's */
-#if 0
-		for ( a = ldap_first_attribute( ldap, e, &ber ); a != NULL;
-		      a = ldap_next_attribute( ldap, e, ber ) ) {
-		}
-#else
-		cursor_data->elements = g_list_prepend(cursor_data->elements,
-						       g_strdup(ldap_get_dn(ldap, e)));
-#endif
-
-		e = ldap_next_entry(ldap, e);
-	}
-
-	ldap_msgfree(res);
-}
-
-
-static gboolean
-get_cursor_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPGetCursorOp *cursor_op = (LDAPGetCursorOp*)op;
-	CORBA_Environment ev;
-	int            ldap_error = 0;
-	PASCardCursor *cursor;
-	GNOME_Evolution_Addressbook_Book corba_book;
-	PASBackendLDAPCursorPrivate *cursor_data;
-	PASBook *book = cursor_op->book;
-
-	cursor_data = g_new(PASBackendLDAPCursorPrivate, 1);
-	cursor_data->backend = backend;
-	cursor_data->book = book;
-
-	pas_backend_ldap_build_all_cards_list(backend, cursor_data);
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	GNOME_Evolution_Addressbook_Book_ref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("pas_backend_file_process_get_cursor: Exception reffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-	
-	cursor = pas_card_cursor_new(get_length,
-				     get_nth,
-				     cursor_data);
-
-	gtk_signal_connect(GTK_OBJECT(cursor), "destroy",
-			   GTK_SIGNAL_FUNC(cursor_destroy), cursor_data);
-	
-	pas_book_respond_get_cursor (book,
-				     ldap_error_to_response (ldap_error),
-				     cursor);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-get_cursor_dtor (PASBackend *backend, LDAPOp *op)
-{
-	g_free (op);
-}
-
-static void
-pas_backend_ldap_process_get_cursor (PASBackend *backend,
-				     PASBook    *book,
-				     PASRequest *req)
-{
-	LDAPGetCursorOp *op = g_new (LDAPGetCursorOp, 1);
-
-	ldap_op_init ((LDAPOp*)op, backend, book, NULL, get_cursor_handler, get_cursor_dtor);
-
-	ldap_op_process ((LDAPOp*)op);
-}
-
-
-/* List property functions */
-static void
-email_populate(ECardSimple *card, char **values)
-{
-	int i;
-
-	for (i = 0; values[i] && i < 3; i ++) {
-		e_card_simple_set_email (card, i, values[i]);
-	}
-}
-
-struct berval**
-email_ber(ECardSimple *card)
-{
-	struct berval** result;
-	const char *emails[3];
-	int i, j, num;
-
-	num = 0;
-	for (i = 0; i < 3; i ++) {
-		emails[i] = e_card_simple_get_email (card, E_CARD_SIMPLE_EMAIL_ID_EMAIL + i);
-		if (emails[i])
-			num++;
-	}
-
-	if (num == 0)
-		return NULL;
-
-	result = g_new (struct berval*, num + 1);
-
-	for (i = 0; i < num; i ++)
-		result[i] = g_new (struct berval, 1);
-
-	j = 0;
-	for (i = 0; i < 3; i ++) {
-		if (emails[i]) {
-			result[j]->bv_val = g_strdup (emails[i]);
-			result[j++]->bv_len = strlen (emails[i]);
-		}
-	}
-
-	result[num] = NULL;
-
-	return result;
-}
-
-static gboolean
-email_compare (ECardSimple *ecard1, ECardSimple *ecard2)
-{
-	const char *email1, *email2;
-	int i;
-
-	for (i = 0; i < 3; i ++) {
-		gboolean equal;
-		email1 = e_card_simple_get_email (ecard1, E_CARD_SIMPLE_EMAIL_ID_EMAIL + i);
-		email2 = e_card_simple_get_email (ecard2, E_CARD_SIMPLE_EMAIL_ID_EMAIL + i);
-
-		if (email1 && email2)
-			equal = !strcmp (email1, email2);
-		else
-			equal = (!!email1 == !!email2);
-
-		if (!equal)
-			return equal;
-	}
-
-	return TRUE;
-}
-
-static void
-homephone_populate(ECardSimple *card, char **values)
-{
-	if (values[0])
-		e_card_simple_set (card, E_CARD_SIMPLE_FIELD_PHONE_HOME, values[0]);
-	if (values[1])
-		e_card_simple_set (card, E_CARD_SIMPLE_FIELD_PHONE_HOME_2, values[1]);
-}
-
-struct berval**
-homephone_ber(ECardSimple *card)
-{
-	struct berval** result;
-	const char *homephones[3];
-	int i, j, num;
-
-	num = 0;
-	if ((homephones[0] = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_PHONE_HOME)))
-		num++;
-	if ((homephones[1] = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_PHONE_HOME_2)))
-		num++;
-
-	if (num == 0)
-		return NULL;
-
-	result = g_new (struct berval*, num + 1);
-
-	for (i = 0; i < num; i ++)
-		result[i] = g_new (struct berval, 1);
-
-	j = 0;
-	for (i = 0; i < 2; i ++) {
-		if (homephones[i]) {
-			result[j]->bv_val = g_strdup (homephones[i]);
-			result[j++]->bv_len = strlen (homephones[i]);
-		}
-	}
-
-	result[num] = NULL;
-
-	return result;
-}
-
-static gboolean
-homephone_compare (ECardSimple *ecard1, ECardSimple *ecard2)
-{
-	int phone_ids[2] = { E_CARD_SIMPLE_FIELD_PHONE_HOME, E_CARD_SIMPLE_FIELD_PHONE_HOME_2 };
-	const char *phone1, *phone2;
-	int i;
-
-	for (i = 0; i < 2; i ++) {
-		gboolean equal;
-		phone1 = e_card_simple_get (ecard1, phone_ids[i]);
-		phone2 = e_card_simple_get (ecard2, phone_ids[i]);
-
-		if (phone1 && phone2)
-			equal = !strcmp (phone1, phone2);
-		else
-			equal = (!!phone1 == !!phone2);
-
-		if (!equal)
-			return equal;
-	}
-
-	return TRUE;
-}
-
-static void
-business_populate(ECardSimple *card, char **values)
-{
-	if (values[0])
-		e_card_simple_set (card, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS, values[0]);
-	if (values[1])
-		e_card_simple_set (card, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2, values[1]);
-}
-
-struct berval**
-business_ber(ECardSimple *card)
-{
-	struct berval** result;
-	const char *business_phones[3];
-	int i, j, num;
-
-	num = 0;
-	if ((business_phones[0] = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS)))
-		num++;
-	if ((business_phones[1] = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2)))
-		num++;
-
-	if (num == 0)
-		return NULL;
-
-	result = g_new (struct berval*, num + 1);
-
-	for (i = 0; i < num; i ++)
-		result[i] = g_new (struct berval, 1);
-
-	j = 0;
-	for (i = 0; i < 2; i ++) {
-		if (business_phones[i]) {
-			result[j]->bv_val = g_strdup (business_phones[i]);
-			result[j++]->bv_len = strlen (business_phones[i]);
-		}
-	}
-
-	result[num] = NULL;
-
-	return result;
-}
-
-static gboolean
-business_compare (ECardSimple *ecard1, ECardSimple *ecard2)
-{
-	int phone_ids[2] = { E_CARD_SIMPLE_FIELD_PHONE_BUSINESS, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2 };
-	const char *phone1, *phone2;
-	int i;
-
-	for (i = 0; i < 2; i ++) {
-		gboolean equal;
-		phone1 = e_card_simple_get (ecard1, phone_ids[i]);
-		phone2 = e_card_simple_get (ecard2, phone_ids[i]);
-
-		if (phone1 && phone2)
-			equal = !strcmp (phone1, phone2);
-		else
-			equal = (!!phone1 == !!phone2);
-
-		if (!equal)
-			return equal;
-	}
-
-	return TRUE;
-}
-
-static void
-anniversary_populate (ECardSimple *card, char **values)
-{
-	if (values[0]) {
-		ECardDate dt = e_card_date_from_string (values[0]);
-		gtk_object_set (GTK_OBJECT (card->card),
-				"anniversary", &dt,
-				NULL);
-	}
-}
-
-struct berval**
-anniversary_ber (ECardSimple *card)
-{
-	ECardDate *dt;
-	struct berval** result = NULL;
-
-	gtk_object_get (GTK_OBJECT (card->card),
-			"anniversary", &dt,
-			NULL);
-
-	if (dt) {
-		char *anniversary;
-
-		anniversary = e_card_date_to_string (dt);
-
-		result = g_new (struct berval*, 2);
-		result[0] = g_new (struct berval, 1);
-		result[0]->bv_val = anniversary;
-		result[0]->bv_len = strlen (anniversary);
-
-		result[1] = NULL;
-	}
-
-	return result;
-}
-
-static gboolean
-anniversary_compare (ECardSimple *ecard1, ECardSimple *ecard2)
-{
-	ECardDate *dt;
-	char *date1 = NULL, *date2 = NULL;
-	gboolean equal;
-
-	gtk_object_get (GTK_OBJECT (ecard1->card),
-			"anniversary", &dt,
-			NULL);
-	if (dt)
-		date1 = e_card_date_to_string (dt);
-
-	gtk_object_get (GTK_OBJECT (ecard2->card),
-			"anniversary", &dt,
-			NULL);
-	if (dt)
-		date2 = e_card_date_to_string (dt);
-
-	if (date1 && date2)
-		equal = !strcmp (date1, date2);
-	else
-		equal = (!!date1 == !!date2);
-
-	g_free (date1);
-	g_free (date2);
-
-	return equal;
-}
-
-static void
-birthday_populate (ECardSimple *card, char **values)
-{
-	if (values[0]) {
-		ECardDate dt = e_card_date_from_string (values[0]);
-		gtk_object_set (GTK_OBJECT (card->card),
-				"birth_date", &dt,
-				NULL);
-	}
-}
-
-struct berval**
-birthday_ber (ECardSimple *card)
-{
-	ECardDate *dt;
-	struct berval** result = NULL;
-
-	gtk_object_get (GTK_OBJECT (card->card),
-			"birth_date", &dt,
-			NULL);
-
-	if (dt) {
-		char *birthday;
-
-		birthday = e_card_date_to_string (dt);
-
-		result = g_new (struct berval*, 2);
-		result[0] = g_new (struct berval, 1);
-		result[0]->bv_val = birthday;
-		result[0]->bv_len = strlen (birthday);
-
-		result[1] = NULL;
-	}
-
-	return result;
-}
-
-static gboolean
-birthday_compare (ECardSimple *ecard1, ECardSimple *ecard2)
-{
-	ECardDate *dt;
-	char *date1 = NULL, *date2 = NULL;
-	gboolean equal;
-
-	gtk_object_get (GTK_OBJECT (ecard1->card),
-			"birth_date", &dt,
-			NULL);
-	if (dt)
-		date1 = e_card_date_to_string (dt);
-
-	gtk_object_get (GTK_OBJECT (ecard2->card),
-			"birth_date", &dt,
-			NULL);
-	if (dt)
-		date2 = e_card_date_to_string (dt);
-
-	if (date1 && date2)
-		equal = !strcmp (date1, date2);
-	else
-		equal = (!!date1 == !!date2);
-
-	g_free (date1);
-	g_free (date2);
-
-	return equal;
-}
-
-#define IS_RFC2254_CHAR(c) ((c) == '*' || (c) =='\\' || (c) == '(' || (c) == ')' || (c) == '\0')
-static char hex[] = "0123456789abcdef";
-static char *
-rfc2254_escape(char *str)
-{
-	int i;
-	int len = strlen(str);
-	int newlen = 0;
-
-	for (i = 0; i < len; i ++) {
-		if (IS_RFC2254_CHAR(str[i]))
-			newlen += 3;
-		else
-			newlen ++;
-	}
-
-	if (len == newlen) {
-		return g_strdup (str);
-	}
-	else {
-		char *newstr = g_malloc0 (newlen + 1);
-		int j = 0;
-		for (i = 0; i < len; i ++) {
-			if (IS_RFC2254_CHAR(str[i])) {
-				newstr[j++] = '\\';
-				newstr[j++] = hex[(str[i]&0xf0) >> 4];
-				newstr[j++] = hex[str[i]&0x0f];
-			}
-			else {
-				newstr[j++] = str[i];
-			}
-		}
-		return newstr;
-	}
-		
-}
-
-static ESExpResult *
-func_and(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	char ** strings;
-
-	if (argc > 0) {
-		int i;
-
-		strings = g_new0(char*, argc+3);
-		strings[0] = g_strdup ("(&");
-		strings[argc+3 - 2] = g_strdup (")");
-		
-		for (i = 0; i < argc; i ++) {
-			GList *list_head = *list;
-			if (!list_head)
-				break;
-			strings[argc - i] = list_head->data;
-			*list = g_list_remove_link(list_head, list_head);
-			g_list_free_1(list_head);
-		}
-
-		*list = g_list_prepend(*list, g_strjoinv(" ", strings));
-
-		for (i = 0 ; i < argc + 2; i ++)
-			g_free (strings[i]);
-
-		g_free (strings);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_or(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	char ** strings;
-
-	if (argc > 0) {
-		int i;
-
-		strings = g_new0(char*, argc+3);
-		strings[0] = g_strdup ("(|");
-		strings[argc+3 - 2] = g_strdup (")");
-
-		for (i = 0; i < argc; i ++) {
-			GList *list_head = *list;
-			if (!list_head)
-				break;
-			strings[argc - i] = list_head->data;
-			*list = g_list_remove_link(list_head, list_head);
-			g_list_free_1(list_head);
-		}
-
-		*list = g_list_prepend(*list, g_strjoinv(" ", strings));
-
-		for (i = 0 ; i < argc + 2; i ++)
-			g_free (strings[i]);
-
-		g_free (strings);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_not(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	/* just replace the head of the list with the NOT of it. */
-	if (argc > 0) {
-		char *term = (*list)->data;
-		(*list)->data = g_strdup_printf("(!%s)", term);
-		g_free (term);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = rfc2254_escape(argv[1]->value.string);
-		gboolean one_star = FALSE;
-
-		if (strlen(str) == 0)
-			one_star = TRUE;
-
-		if (!strcmp (propname, "x-evolution-any-field")) {
-			int i;
-			int query_length;
-			char *big_query;
-			char *match_str;
-
-			match_str = g_strdup_printf("=*%s%s)",
-						    str, one_star ? "" : "*");
-
-			query_length = 3; /* strlen ("(|") + strlen (")") */
-
-			for (i = 0; i < num_prop_infos; i ++) {
-				query_length += 1 /* strlen ("(") */ + strlen(prop_info[i].ldap_attr) + strlen (match_str);
-			}
-
-			big_query = g_malloc0(query_length + 1);
-			strcat (big_query, "(|");
-			for (i = 0; i < num_prop_infos; i ++) {
-				strcat (big_query, "(");
-				strcat (big_query, prop_info[i].ldap_attr);
-				strcat (big_query, match_str);
-			}
-			strcat (big_query, ")");
-
-			*list = g_list_prepend(*list, big_query);
-
-			g_free (match_str);
-		}
-		else {
-			char *ldap_attr = query_prop_to_ldap(propname);
-
-			if (ldap_attr)
-				*list = g_list_prepend(*list,
-						       g_strdup_printf("(%s=*%s%s)",
-								       ldap_attr,
-								       str,
-								       one_star ? "" : "*"));
-		}
-
-		g_free (str);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_is(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = rfc2254_escape(argv[1]->value.string);
-		char *ldap_attr = query_prop_to_ldap(propname);
-
-		if (ldap_attr)
-			*list = g_list_prepend(*list,
-					       g_strdup_printf("(%s=%s)",
-							       ldap_attr, str));
-		else {
-			g_warning ("unknown query property\n");
-			/* we want something that'll always be false */
-			*list = g_list_prepend(*list,
-					       g_strdup("objectClass=MyBarnIsBiggerThanYourBarn"));
-		}
-
-		g_free (str);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_beginswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = rfc2254_escape(argv[1]->value.string);
-		char *ldap_attr = query_prop_to_ldap(propname);
-		gboolean one_star = FALSE;
-
-		if (strlen(str) == 0)
-			one_star = TRUE;
-
-		if (ldap_attr)
-			*list = g_list_prepend(*list,
-					       g_strdup_printf("(%s=%s*)",
-							       ldap_attr,
-							       str));
-		g_free (str);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_endswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = rfc2254_escape(argv[1]->value.string);
-		char *ldap_attr = query_prop_to_ldap(propname);
-		gboolean one_star = FALSE;
-
-		if (strlen(str) == 0)
-			one_star = TRUE;
-
-		if (ldap_attr)
-			*list = g_list_prepend(*list,
-					       g_strdup_printf("(%s=*%s)",
-							       ldap_attr,
-							       str));
-		g_free (str);
-	}
-
-	r = e_sexp_result_new(f, ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-/* 'builtin' functions */
-static struct {
-	char *name;
-	ESExpFunc *func;
-	int type;		/* set to 1 if a function can perform shortcut evaluation, or
-				   doesn't execute everything, 0 otherwise */
-} symbols[] = {
-	{ "and", func_and, 0 },
-	{ "or", func_or, 0 },
-	{ "not", func_not, 0 },
-	{ "contains", func_contains, 0 },
-	{ "is", func_is, 0 },
-	{ "beginswith", func_beginswith, 0 },
-	{ "endswith", func_endswith, 0 },
-};
-
-static gchar *
-pas_backend_ldap_build_query (gchar *query)
-{
-	ESExp *sexp;
-	ESExpResult *r;
-	gchar *retval;
-	GList *list = NULL;
-	int i;
-
-	sexp = e_sexp_new();
-
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction(sexp, 0, symbols[i].name,
-					     (ESExpIFunc *)symbols[i].func, &list);
-		} else {
-			e_sexp_add_function(sexp, 0, symbols[i].name,
-					    symbols[i].func, &list);
-		}
-	}
-
-	e_sexp_input_text(sexp, query, strlen(query));
-	e_sexp_parse(sexp);
-
-	r = e_sexp_eval(sexp);
-
-	e_sexp_result_free(sexp, r);
-	e_sexp_unref (sexp);
-
-	if (list) {
-		if (list->next) {
-			g_warning ("conversion to ldap query string failed");
-			retval = NULL;
-			g_list_foreach (list, (GFunc)g_free, NULL);
-		}
-		else {
-			retval = list->data;
-		}
-	}
-	else {
-		g_warning ("conversion to ldap query string failed");
-		retval = NULL;
-	}
-
-	g_list_free (list);
-	return retval;
-}
-
-static gchar *
-query_prop_to_ldap(gchar *query_prop)
-{
-	int i;
-
-	for (i = 0; i < num_prop_infos; i ++)
-		if (!strcmp (query_prop, prop_info[i].query_prop))
-			return prop_info[i].ldap_attr;
-
-	return NULL;
-}
-
-
-typedef struct {
-	LDAPOp op;
-	char *ldap_query;
-	PASBackendLDAP *bl;
-	PASBackendLDAPBookView *view;
-} LDAPSearchOp;
-
-static ECardSimple *
-build_card_from_entry (LDAP *ldap, LDAPMessage *e, GList **existing_objectclasses)
-{
-	ECard *ecard = E_CARD(gtk_type_new(e_card_get_type()));
-	ECardSimple *card = e_card_simple_new (ecard);
-	char *dn = ldap_get_dn(ldap, e);
-	char *attr;
-	BerElement *ber = NULL;
-
-	g_print ("build_card_from_entry, dn = %s\n", dn);
-	e_card_simple_set_id (card, dn);
-
-	for (attr = ldap_first_attribute (ldap, e, &ber); attr;
-	     attr = ldap_next_attribute (ldap, e, ber)) {
-		int i;
-		struct prop_info *info = NULL;
-		char **values;
-
-		if (existing_objectclasses && !strcasecmp (attr, "objectclass")) {
-			values = ldap_get_values (ldap, e, attr);
-			for (i = 0; values[i]; i ++)
-				*existing_objectclasses = g_list_append (*existing_objectclasses, g_strdup (values[i]));
-
-			ldap_value_free (values);
-		}
-		else {
-			for (i = 0; i < num_prop_infos; i ++)
-				if (!g_strcasecmp (attr, prop_info[i].ldap_attr))
-					info = &prop_info[i];
-
-			if (info) {
-				values = ldap_get_values (ldap, e, attr);
-
-				if (values) {
-					if (info->prop_type & PROP_TYPE_STRING) {
-						/* if it's a normal property just set the string */
-						e_card_simple_set (card, info->field_id, values[0]);
-
-					}
-					else if (info->prop_type & PROP_TYPE_COMPLEX) {
-						/* if it's a list call the ecard-populate function,
-						   which calls gtk_object_set to set the property */
-						info->populate_ecard_func(card,
-									  values);
-					}
-
-					ldap_value_free (values);
-				}
-			}
-		}
-	}
-
-#ifndef OPENLDAP2
-	/* if ldap->ld_errno == LDAP_DECODING_ERROR there was an
-	   error decoding an attribute, and we shouldn't free ber,
-	   since the ldap library already did it. */
-	if (ldap->ld_errno != LDAP_DECODING_ERROR && ber)
-		ber_free (ber, 0);
-#endif
-
-	e_card_simple_sync_card (card);
-
-	return card;
-}
-
-static gboolean
-poll_ldap (LDAPSearchOp *op)
-{
-	PASBackendLDAPBookView *view = op->view;
-	PASBackendLDAP *bl = op->bl;
-	LDAP           *ldap = bl->priv->ldap;
-	int            rc;
-	LDAPMessage    *res, *e;
-	GList   *cards = NULL;
-	static int received = 0;
-
-	pas_book_view_notify_status_message (view->book_view, _("Receiving LDAP search results..."));
-
-	rc = ldap_result (ldap, view->search_msgid, 0, NULL, &res);
-	
-	if (rc == -1 && received == 0) {
-		pas_book_view_notify_status_message (view->book_view, _("Restarting search."));
-		/* connection went down and we never got any. */
-		bl->priv->connected = FALSE;
-
-		/* this will reopen the connection */
-		ldap_op_restart ((LDAPOp*)op);
-		return FALSE;
-	}
-
-	if (rc != LDAP_RES_SEARCH_ENTRY) {
-		view->search_idle = 0;
-		pas_book_view_notify_complete (view->book_view);
-		ldap_op_finished ((LDAPOp*)op);
-		received = 0;
-		return FALSE;
-	}
-
-	received = 1;
-		
-	e = ldap_first_entry(ldap, res);
-
-	while (NULL != e) {
-		ECardSimple *card = build_card_from_entry (ldap, e, NULL);
-
-		cards = g_list_append (cards, e_card_simple_get_vcard_assume_utf8 (card));
-
-		gtk_object_unref (GTK_OBJECT(card));
-
-		e = ldap_next_entry(ldap, e);
-	}
-
-	if (cards) {
-		pas_book_view_notify_add (view->book_view, cards);
-			
-		g_list_foreach (cards, (GFunc)g_free, NULL);
-		g_list_free (cards);
-		cards = NULL;
-	}
-
-	ldap_msgfree(res);
-
-	return TRUE;
-}
-
-static gboolean
-ldap_search_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPSearchOp *search_op = (LDAPSearchOp*) op;
-
-	if (op->view)
-		pas_book_view_notify_status_message (op->view, _("Searching..."));
-
-	/* it might not be NULL if we've been restarted */
-	if (search_op->ldap_query == NULL)
-		search_op->ldap_query = pas_backend_ldap_build_query(search_op->view->search);
-
-	if (search_op->ldap_query != NULL) {
-		PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-		PASBackendLDAPBookView *view = search_op->view;
-		LDAP *ldap = bl->priv->ldap;
-		int ldap_err;
-
-		ldap_err = ldap_search_ext (ldap, bl->priv->ldap_rootdn,
-					    bl->priv->ldap_scope,
-					    search_op->ldap_query,
-					    NULL, 0,
-					    NULL, /* XXX */
-					    NULL, /* XXX */
-					    NULL,
-					    LDAP_MAX_SEARCH_RESPONSES, &view->search_msgid);
-
-		if (ldap_err != LDAP_SUCCESS) {
-			pas_book_view_notify_status_message (view->book_view, ldap_err2string(ldap_err));
-			return TRUE; /* act synchronous in this case */
-		}
-
-		if (view->search_msgid == -1) {
-			pas_book_view_notify_status_message (view->book_view, ldap_err2string(ldap_err));
-			return TRUE; /* act synchronous in this case */
-		}
-		else {
-			view->search_idle = g_idle_add((GSourceFunc)poll_ldap, search_op);
-		}
-
-		/* we're async */
-		return FALSE;
-	}
-	else {
-		/* error doing the conversion to an ldap query, let's
-                   end this now by acting like we're synchronous. */
-		g_warning ("LDAP problem converting search query %s\n", search_op->view->search);
-		return TRUE;
-	}
-}
-
-static void
-ldap_search_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPSearchOp *search_op = (LDAPSearchOp*) op;
-
-	if (op->view)
-		bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(op->view)), NULL);
-
-	g_free (search_op->ldap_query);
-	g_free (search_op);
-}
-
-static void
-pas_backend_ldap_search (PASBackendLDAP  	*bl,
-			 PASBook         	*book,
-			 PASBackendLDAPBookView *view)
-{
-	LDAPSearchOp *op = g_new (LDAPSearchOp, 1);
-
-	bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), NULL);
-	ldap_op_init ((LDAPOp*)op, PAS_BACKEND(bl), book, view->book_view, ldap_search_handler, ldap_search_dtor);
-
-	op->ldap_query = NULL;
-	op->view = view;
-	op->bl = bl;
-
-	/* keep track of the search op so we can delete it from the
-           list if the view is destroyed */
-	view->search_op = (LDAPOp*)op;
-
-	ldap_op_process ((LDAPOp*)op);
-}
-
-static void
-pas_backend_ldap_process_get_book_view (PASBackend *backend,
-					PASBook    *book,
-					PASRequest *req)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	CORBA_Environment ev;
-	PASBookView       *book_view;
-	PASBackendLDAPBookView *view;
-
-	g_return_if_fail (req->listener != NULL);
-
-	book_view = pas_book_view_new (req->listener);
-
-	bonobo_object_ref(BONOBO_OBJECT(book));
-	gtk_signal_connect(GTK_OBJECT(book_view), "destroy",
-			   GTK_SIGNAL_FUNC(view_destroy), book);
-
-	view = g_new0(PASBackendLDAPBookView, 1);
-	view->book_view = book_view;
-	view->search = g_strdup(req->search);
-	view->card_sexp = pas_backend_card_sexp_new (view->search);
-	view->blpriv = bl->priv;
-
-	bl->priv->book_views = g_list_prepend(bl->priv->book_views, view);
-
-	pas_book_respond_get_book_view (book,
-		(book_view != NULL
-		 ? GNOME_Evolution_Addressbook_BookListener_Success 
-		 : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */),
-		book_view);
-
-	pas_backend_ldap_search (bl, book, view);
-
-	g_free (req->search);
-	CORBA_exception_init(&ev);
-
-	bonobo_object_unref (BONOBO_OBJECT (book_view));
-	bonobo_object_release_unref(req->listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("pas_backend_file_process_get_book_view: Exception reffing "
-			  "corba book.\n");
-	}
-	CORBA_exception_free(&ev);
-
-}
-
-static void
-pas_backend_ldap_process_check_connection (PASBackend *backend,
-					   PASBook    *book,
-					   PASRequest *req)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	pas_book_report_connection (book, bl->priv->connected);
-}
-
-static void
-pas_backend_ldap_process_authenticate_user (PASBackend *backend,
-					    PASBook    *book,
-					    PASRequest *req)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	int ldap_error;
-	char *query;
-	LDAPMessage    *res, *e;
-
-	query = g_strdup_printf ("(mail=%s)", req->user);
-
-	ldap_error = ldap_search_s (bl->priv->ldap,
-				    bl->priv->ldap_rootdn,
-				    bl->priv->ldap_scope,
-				    query,
-				    NULL, 0, &res);
-
-	if (ldap_error == LDAP_SUCCESS) {
-		char *dn;
-
-		e = ldap_first_entry (bl->priv->ldap, res);
-		dn = ldap_get_dn (bl->priv->ldap, e);
-
-		printf ("authenticating as %s\n", dn);
-
-		ldap_error = ldap_simple_bind_s(bl->priv->ldap,
-						dn,
-						req->passwd);
-
-		pas_book_respond_authenticate_user (book,
-						    ldap_error_to_response (ldap_error));
-
-		bl->priv->writable = (ldap_error == LDAP_SUCCESS);
-
-		if (!bl->priv->evolutionPersonChecked)
-			check_schema_support (bl);
-
-		ldap_msgfree (res);
-	}
-	else {
-		pas_book_respond_authenticate_user (book, GNOME_Evolution_Addressbook_BookListener_PermissionDenied);
-	}
-
-	pas_book_report_writable (book, bl->priv->writable);
-
-	g_free (query);
-}
-
-static void
-pas_backend_ldap_process_get_supported_fields (PASBackend *backend,
-					       PASBook    *book,
-					       PASRequest *req)
-
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	pas_book_respond_get_supported_fields (book,
-					       GNOME_Evolution_Addressbook_BookListener_Success,
-					       bl->priv->supported_fields);
-}
-
-static void
-pas_backend_ldap_process_client_requests (PASBook *book)
-{
-	PASBackend *backend;
-	PASRequest *req;
-
-	backend = pas_book_get_backend (book);
-
-	req = pas_book_pop_request (book);
-	if (req == NULL)
-		return;
-
-	switch (req->op) {
-	case CreateCard:
-		pas_backend_ldap_process_create_card (backend, book, req);
-		break;
-
-	case RemoveCard:
-		pas_backend_ldap_process_remove_card (backend, book, req);
-		break;
-
-	case ModifyCard:
-		pas_backend_ldap_process_modify_card (backend, book, req);
-		break;
-
-	case CheckConnection:
-		pas_backend_ldap_process_check_connection (backend, book, req);
-		break;
-
-	case GetVCard:
-		pas_backend_ldap_process_get_vcard (backend, book, req);
-		break;
-
-	case GetCursor:
-		pas_backend_ldap_process_get_cursor (backend, book, req);
-		break;
-
-	case GetBookView:
-		pas_backend_ldap_process_get_book_view (backend, book, req);
-		break;
-
-	case GetChanges:
-		/* FIXME: Code this. */
-		break;
-
-	case AuthenticateUser:
-		pas_backend_ldap_process_authenticate_user (backend, book, req);
-		break;
-
-	case GetSupportedFields:
-		pas_backend_ldap_process_get_supported_fields (backend, book, req);
-		break;
-	}
-
-	g_free (req);
-}
-
-static void
-pas_backend_ldap_book_destroy_cb (PASBook *book, gpointer data)
-{
-	PASBackendLDAP *backend;
-
-	backend = PAS_BACKEND_LDAP (data);
-
-	pas_backend_remove_client (PAS_BACKEND (backend), book);
-}
-
-static gboolean
-pas_backend_ldap_load_uri (PASBackend             *backend,
-			   const char             *uri)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	LDAPURLDesc    *lud;
-	int ldap_error;
-
-	g_assert (bl->priv->connected == FALSE);
-
-	ldap_error = ldap_url_parse ((char*)uri, &lud);
-	if (ldap_error == LDAP_SUCCESS) {
-		g_free(bl->priv->uri);
-		bl->priv->uri = g_strdup (uri);
-		bl->priv->ldap_host = g_strdup(lud->lud_host);
-		bl->priv->ldap_port = lud->lud_port;
-		/* if a port wasn't specified, default to LDAP_PORT */
-		if (bl->priv->ldap_port == 0)
-			bl->priv->ldap_port = LDAP_PORT;
-		bl->priv->ldap_rootdn = g_strdup(lud->lud_dn);
-		bl->priv->ldap_scope = lud->lud_scope;
-
-		ldap_free_urldesc(lud);
-
-		pas_backend_ldap_connect (bl);
-		if (bl->priv->ldap == NULL)
-			return FALSE;
-		else
-			return TRUE;
-	} else
-		return FALSE;
-}
-
-/* Get_uri handler for the addressbook LDAP backend */
-static const char *
-pas_backend_ldap_get_uri (PASBackend *backend)
-{
-	PASBackendLDAP *bl;
-
-	bl = PAS_BACKEND_LDAP (backend);
-	return bl->priv->uri;
-}
-
-static gboolean
-pas_backend_ldap_add_client (PASBackend             *backend,
-			     GNOME_Evolution_Addressbook_BookListener  listener)
-{
-	PASBackendLDAP *bl;
-	PASBook        *book;
-
-	g_assert (backend != NULL);
-	g_assert (PAS_IS_BACKEND_LDAP (backend));
-
-	bl = PAS_BACKEND_LDAP (backend);
-
-	book = pas_book_new (backend, listener);
-
-	if (!book) {
-		if (!bl->priv->clients)
-			pas_backend_last_client_gone (backend);
-
-		return FALSE;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (book), "destroy",
-		    pas_backend_ldap_book_destroy_cb, backend);
-
-	gtk_signal_connect (GTK_OBJECT (book), "requests_queued",
-		    pas_backend_ldap_process_client_requests, NULL);
-
-	bl->priv->clients = g_list_prepend (
-		bl->priv->clients, book);
-
-	if (bl->priv->connected) {
-		pas_book_respond_open (
-			book, GNOME_Evolution_Addressbook_BookListener_Success);
-	} else {
-		pas_book_respond_open (
-			book, GNOME_Evolution_Addressbook_BookListener_OtherError);
-	}
-
-	pas_book_report_writable (book, bl->priv->writable);
-
-	bonobo_object_unref (BONOBO_OBJECT (book));
-	
-	return TRUE;
-}
-
-static void
-pas_backend_ldap_remove_client (PASBackend             *backend,
-				PASBook                *book)
-{
-	PASBackendLDAP *bl;
-	GList *l;
-	PASBook *lbook;
-
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (PAS_IS_BACKEND_LDAP (backend));
-	g_return_if_fail (book != NULL);
-	g_return_if_fail (PAS_IS_BOOK (book));
-
-	bl = PAS_BACKEND_LDAP (backend);
-
-	/* Find the book in the list of clients */
-
-	for (l = bl->priv->clients; l; l = l->next) {
-		lbook = PAS_BOOK (l->data);
-
-		if (lbook == book)
-			break;
-	}
-
-	g_assert (l != NULL);
-
-	/* Disconnect */
-
-	bl->priv->clients = g_list_remove_link (bl->priv->clients, l);
-	g_list_free_1 (l);
-
-	/* When all clients go away, notify the parent factory about it so that
-	 * it may decide whether to kill the backend or not.
-	 */
-	if (!bl->priv->clients)
-		pas_backend_last_client_gone (backend);
-}
-
-static char *
-pas_backend_ldap_get_static_capabilites (PASBackend *backend)
-{
-	return g_strdup("net");
-}
-
-static gboolean
-pas_backend_ldap_construct (PASBackendLDAP *backend)
-{
-	g_assert (backend != NULL);
-	g_assert (PAS_IS_BACKEND_LDAP (backend));
-
-	if (! pas_backend_construct (PAS_BACKEND (backend)))
-		return FALSE;
-
-	return TRUE;
-}
-
-/**
- * pas_backend_ldap_new:
- */
-PASBackend *
-pas_backend_ldap_new (void)
-{
-	PASBackendLDAP *backend;
-
-	backend = gtk_type_new (pas_backend_ldap_get_type ());
-
-	if (! pas_backend_ldap_construct (backend)) {
-		gtk_object_unref (GTK_OBJECT (backend));
-
-		return NULL;
-	}
-
-	return PAS_BACKEND (backend);
-}
-
-static void
-call_dtor (LDAPOp *op, gpointer data)
-{
-	op->dtor (op->backend, op);
-}
-
-static void
-pas_backend_ldap_destroy (GtkObject *object)
-{
-	PASBackendLDAP *bl;
-
-	bl = PAS_BACKEND_LDAP (object);
-
-	g_list_foreach (bl->priv->pending_ops, (GFunc)call_dtor, NULL);
-	g_list_free (bl->priv->pending_ops);
-
-	if (bl->priv->supported_fields)
-		gtk_object_unref (GTK_OBJECT (bl->priv->supported_fields));
-
-	g_free (bl->priv->uri);
-
-	GTK_OBJECT_CLASS (pas_backend_ldap_parent_class)->destroy (object);	
-}
-
-static void
-pas_backend_ldap_class_init (PASBackendLDAPClass *klass)
-{
-	GtkObjectClass  *object_class = (GtkObjectClass *) klass;
-	PASBackendClass *parent_class;
-
-	pas_backend_ldap_parent_class = gtk_type_class (pas_backend_get_type ());
-
-	parent_class = PAS_BACKEND_CLASS (klass);
-
-	/* Set the virtual methods. */
-	parent_class->load_uri                = pas_backend_ldap_load_uri;
-	parent_class->get_uri                 = pas_backend_ldap_get_uri;
-	parent_class->add_client              = pas_backend_ldap_add_client;
-	parent_class->remove_client           = pas_backend_ldap_remove_client;
-	parent_class->get_static_capabilities = pas_backend_ldap_get_static_capabilites;
-
-	object_class->destroy = pas_backend_ldap_destroy;
-}
-
-static void
-pas_backend_ldap_init (PASBackendLDAP *backend)
-{
-	PASBackendLDAPPrivate *priv;
-
-	priv                   = g_new0 (PASBackendLDAPPrivate, 1);
-
-	priv->supported_fields = e_list_new ((EListCopyFunc)g_strdup, (EListFreeFunc)g_free, NULL);
-
-	backend->priv = priv;
-}
-
-/**
- * pas_backend_ldap_get_type:
- */
-GtkType
-pas_backend_ldap_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBackendLDAP",
-			sizeof (PASBackendLDAP),
-			sizeof (PASBackendLDAPClass),
-			(GtkClassInitFunc)  pas_backend_ldap_class_init,
-			(GtkObjectInitFunc) pas_backend_ldap_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (pas_backend_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/pas/pas-backend-ldap.h b/addressbook/backend/pas/pas-backend-ldap.h
deleted file mode 100644
index 9f32c58bbf..0000000000
--- a/addressbook/backend/pas/pas-backend-ldap.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2000, Ximian, Inc.
- */
-
-#ifndef __PAS_BACKEND_LDAP_H__
-#define __PAS_BACKEND_LDAP_H__
-
-#include <libgnome/gnome-defs.h>
-#include "pas-backend.h"
-
-typedef struct _PASBackendLDAPPrivate PASBackendLDAPPrivate;
-
-typedef struct {
-	PASBackend             parent_object;
-	PASBackendLDAPPrivate *priv;
-} PASBackendLDAP;
-
-typedef struct {
-	PASBackendClass parent_class;
-} PASBackendLDAPClass;
-
-PASBackend *pas_backend_ldap_new      (void);
-GtkType     pas_backend_ldap_get_type (void);
-
-#define PAS_BACKEND_LDAP_TYPE        (pas_backend_ldap_get_type ())
-#define PAS_BACKEND_LDAP(o)          (GTK_CHECK_CAST ((o), PAS_BACKEND_LDAP_TYPE, PASBackendLDAP))
-#define PAS_BACKEND_LDAP_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BACKEND_TYPE, PASBackendLDAPClass))
-#define PAS_IS_BACKEND_LDAP(o)       (GTK_CHECK_TYPE ((o), PAS_BACKEND_LDAP_TYPE))
-#define PAS_IS_BACKEND_LDAP_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BACKEND_LDAP_TYPE))
-
-#endif /* ! __PAS_BACKEND_LDAP_H__ */
-
diff --git a/addressbook/backend/pas/pas-backend.c b/addressbook/backend/pas/pas-backend.c
deleted file mode 100644
index 593ed624d2..0000000000
--- a/addressbook/backend/pas/pas-backend.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtksignal.h>
-#include "pas-backend.h"
-
-#define CLASS(o) PAS_BACKEND_CLASS (GTK_OBJECT (o)->klass)
-
-/* Signal IDs */
-enum {
-	LAST_CLIENT_GONE,
-	LAST_SIGNAL
-};
-
-static guint pas_backend_signals[LAST_SIGNAL];
-
-
-gboolean
-pas_backend_construct (PASBackend *backend)
-{
-	return TRUE;
-}
-
-gboolean
-pas_backend_load_uri (PASBackend             *backend,
-		      const char             *uri)
-{
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (PAS_IS_BACKEND (backend), FALSE);
-	g_return_val_if_fail (uri != NULL, FALSE);
-
-	g_assert (CLASS (backend)->load_uri != NULL);
-
-	return (* CLASS (backend)->load_uri) (backend, uri);
-}
-
-/**
- * pas_backend_get_uri:
- * @backend: An addressbook backend.
- * 
- * Queries the URI that an addressbook backend is serving.
- * 
- * Return value: URI for the backend.
- **/
-const char *
-pas_backend_get_uri (PASBackend *backend)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (PAS_IS_BACKEND (backend), NULL);
-
-	g_assert (CLASS (backend)->get_uri != NULL);
-
-	return (* CLASS (backend)->get_uri) (backend);
-}
-
-/**
- * pas_backend_add_client:
- * @backend: An addressbook backend.
- * @listener: Listener for notification to the client.
- *
- * Adds a client to an addressbook backend.
- *
- * Return value: TRUE on success, FALSE on failure to add the client.
- */
-gboolean
-pas_backend_add_client (PASBackend             *backend,
-			GNOME_Evolution_Addressbook_BookListener  listener)
-{
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (PAS_IS_BACKEND (backend), FALSE);
-	g_return_val_if_fail (listener != CORBA_OBJECT_NIL, FALSE);
-
-	g_assert (CLASS (backend)->add_client != NULL);
-
-	return CLASS (backend)->add_client (backend, listener);
-}
-
-void
-pas_backend_remove_client (PASBackend *backend,
-			   PASBook    *book)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (PAS_IS_BACKEND (backend));
-	g_return_if_fail (book    != NULL);
-	g_return_if_fail (PAS_IS_BOOK (book));
-	
-	g_assert (CLASS (backend)->remove_client != NULL);
-
-	CLASS (backend)->remove_client (backend, book);
-}
-
-char *
-pas_backend_get_static_capabilities (PASBackend *backend)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (PAS_IS_BACKEND (backend), NULL);
-	
-	g_assert (CLASS (backend)->get_static_capabilities != NULL);
-
-	return CLASS (backend)->get_static_capabilities (backend);
-}
-
-/**
- * pas_backend_last_client_gone:
- * @backend: An addressbook backend.
- * 
- * Emits the "last_client_gone" signal for the specified backend.  Should
- * only be called from backend implementations if the backend really does
- * not have any more clients.
- **/
-void
-pas_backend_last_client_gone (PASBackend *backend)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (PAS_IS_BACKEND (backend));
-
-	gtk_signal_emit (GTK_OBJECT (backend), pas_backend_signals[LAST_CLIENT_GONE]);	
-}
-
-static void
-pas_backend_init (PASBackend *backend)
-{
-}
-
-static void
-pas_backend_class_init (PASBackendClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) klass;
-
-	pas_backend_signals[LAST_CLIENT_GONE] =
-		gtk_signal_new ("last_client_gone",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (PASBackendClass, last_client_gone),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, pas_backend_signals, LAST_SIGNAL);
-
-	klass->add_client = NULL;
-	klass->remove_client = NULL;
-	klass->get_static_capabilities = NULL;
-}
-
-/**
- * pas_backend_get_type:
- */
-GtkType
-pas_backend_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBackend",
-			sizeof (PASBackend),
-			sizeof (PASBackendClass),
-			(GtkClassInitFunc)  pas_backend_class_init,
-			(GtkObjectInitFunc) pas_backend_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/pas/pas-backend.h b/addressbook/backend/pas/pas-backend.h
deleted file mode 100644
index bd9a12c2a0..0000000000
--- a/addressbook/backend/pas/pas-backend.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * An abstract class which defines the API to a given backend.
- * There will be one PASBackend object for every URI which is loaded.
- *
- * Two people will call into the PASBackend API:
- *
- * 1. The PASBookFactory, when it has been asked to load a book.
- *    It will create a new PASBackend if one is not already running
- *    for the requested URI.  It will call pas_backend_add_client to
- *    add a new client to an existing PASBackend server.
- *
- * 2. A PASBook, when a client has requested an operation on the
- *    GNOME_Evolution_Addressbook_Book interface.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#ifndef __PAS_BACKEND_H__
-#define __PAS_BACKEND_H__
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkobject.h>
-#include <pas/addressbook.h>
-
-typedef struct _PASBackend        PASBackend;
-typedef struct _PASBackendPrivate PASBackendPrivate;
-
-#include <pas/pas-book.h>
-
-struct _PASBackend {
-	GtkObject parent_object;
-	PASBackendPrivate *priv;
-};
-
-typedef struct {
-	GtkObjectClass parent_class;
-
-	/* Virtual methods */
-	gboolean (*load_uri) (PASBackend *backend, const char *uri);
-	const char *(* get_uri) (PASBackend *backend);
-	gboolean (*add_client) (PASBackend *backend, GNOME_Evolution_Addressbook_BookListener listener);
-	void (*remove_client) (PASBackend *backend, PASBook *book);
-        char *(*get_static_capabilities) (PASBackend *backend);
-
-	/* Notification signals */
-	void (* last_client_gone) (PASBackend *backend);
-} PASBackendClass;
-
-typedef PASBackend * (*PASBackendFactoryFn) (void);
-
-gboolean    pas_backend_construct                (PASBackend             *backend);
-gboolean    pas_backend_load_uri                 (PASBackend             *backend,
-						  const char             *uri);
-const char *pas_backend_get_uri                  (PASBackend             *backend);
-
-gboolean    pas_backend_add_client               (PASBackend             *backend,
-						  GNOME_Evolution_Addressbook_BookListener  listener);
-void        pas_backend_remove_client            (PASBackend             *backend,
-						  PASBook                *book);
-char       *pas_backend_get_static_capabilities  (PASBackend             *backend);
-
-void        pas_backend_last_client_gone         (PASBackend             *backend);
-
-GtkType     pas_backend_get_type                 (void);
-
-#define PAS_BACKEND_TYPE        (pas_backend_get_type ())
-#define PAS_BACKEND(o)          (GTK_CHECK_CAST ((o), PAS_BACKEND_TYPE, PASBackend))
-#define PAS_BACKEND_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BACKEND_TYPE, PASBackendClass))
-#define PAS_IS_BACKEND(o)       (GTK_CHECK_TYPE ((o), PAS_BACKEND_TYPE))
-#define PAS_IS_BACKEND_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BACKEND_TYPE))
-
-#endif /* ! __PAS_BACKEND_H__ */
-
diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c
deleted file mode 100644
index 76e73ceca0..0000000000
--- a/addressbook/backend/pas/pas-book-factory.c
+++ /dev/null
@@ -1,647 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#include <config.h>
-#include <ctype.h>
-
-#include <gtk/gtksignal.h>
-#include <liboaf/liboaf.h>
-#include "addressbook.h"
-#include "pas-book-factory.h"
-
-#define DEFAULT_PAS_BOOK_FACTORY_OAF_ID "OAFIID:GNOME_Evolution_Wombat_ServerFactory"
-
-static BonoboObjectClass          *pas_book_factory_parent_class;
-POA_GNOME_Evolution_Addressbook_BookFactory__vepv   pas_book_factory_vepv;
-
-typedef struct {
-	char                              *uri;
-	GNOME_Evolution_Addressbook_BookListener             listener;
-} PASBookFactoryQueuedRequest;
-
-struct _PASBookFactoryPrivate {
-	gint        idle_id;
-	GHashTable *backends;
-	GHashTable *active_server_map;
-	GList      *queued_requests;
-
-	/* OAFIID of the factory */
-	char *iid;
-
-	/* Whether the factory has been registered with OAF yet */
-	guint       registered : 1;
-};
-
-/* Signal IDs */
-enum {
-	LAST_BOOK_GONE,
-	LAST_SIGNAL
-};
-
-static guint factory_signals[LAST_SIGNAL];
-
-static char *
-pas_book_factory_canonicalize_uri (const char *uri)
-{
-	/* FIXME: What do I do here? */
-
-	return g_strdup (uri);
-}
-
-static char *
-pas_book_factory_extract_proto_from_uri (const char *uri)
-{
-	char *proto;
-	char *p;
-
-	p = strchr (uri, ':');
-
-	if (p == NULL)
-		return NULL;
-
-	proto = g_malloc0 (p - uri + 1);
-
-	strncpy (proto, uri, p - uri);
-
-	return proto;
-}
-
-/**
- * pas_book_factory_register_backend:
- * @factory:
- * @proto:
- * @backend:
- */
-void
-pas_book_factory_register_backend (PASBookFactory      *factory,
-				   const char          *proto,
-				   PASBackendFactoryFn  backend)
-{
-	g_return_if_fail (factory != NULL);
-	g_return_if_fail (PAS_IS_BOOK_FACTORY (factory));
-	g_return_if_fail (proto != NULL);
-	g_return_if_fail (backend != NULL);
-
-	if (g_hash_table_lookup (factory->priv->backends, proto) != NULL) {
-		g_warning ("pas_book_factory_register_backend: "
-			   "Proto \"%s\" already registered!\n", proto);
-	}
-
-	g_hash_table_insert (factory->priv->backends,
-			     g_strdup (proto), backend);
-}
-
-/**
- * pas_book_factory_get_n_backends:
- * @factory: An addressbook factory.
- * 
- * Queries the number of running addressbook backends in an addressbook factory.
- * 
- * Return value: Number of running backends.
- **/
-int
-pas_book_factory_get_n_backends (PASBookFactory *factory)
-{
-	g_return_val_if_fail (factory != NULL, -1);
-	g_return_val_if_fail (PAS_IS_BOOK_FACTORY (factory), -1);
-
-	return g_hash_table_size (factory->priv->active_server_map);
-}
-
-static void
-dump_active_server_map_entry (gpointer key, gpointer value, gpointer data)
-{
-	char *uri;
-	PASBackend *backend;
-
-	uri = key;
-	backend = PAS_BACKEND (value);
-
-	g_message ("  %s: %p", uri, backend);
-}
-
-void
-pas_book_factory_dump_active_backends (PASBookFactory *factory)
-{
-	g_message ("Active PAS backends");
-
-	g_hash_table_foreach (factory->priv->active_server_map,
-			      dump_active_server_map_entry,
-			      NULL);
-
-}
-
-/* Callback used when a backend loses its last connected client */
-static void
-backend_last_client_gone_cb (PASBackend *backend, gpointer data)
-{
-	PASBookFactory *factory;
-	const char *uri;
-	gpointer orig_key;
-	gboolean result;
-	char *orig_uri;
-
-	factory = PAS_BOOK_FACTORY (data);
-
-	/* Remove the backend from the active server map */
-
-	uri = pas_backend_get_uri (backend);
-	g_assert (uri != NULL);
-
-	result = g_hash_table_lookup_extended (factory->priv->active_server_map, uri,
-					       &orig_key, NULL);
-	g_assert (result != FALSE);
-
-	orig_uri = orig_key;
-
-	g_hash_table_remove (factory->priv->active_server_map, orig_uri);
-	g_free (orig_uri);
-
-	gtk_object_unref (GTK_OBJECT (backend));
-
-	/* Notify upstream if there are no more backends */
-
-	if (g_hash_table_size (factory->priv->active_server_map) == 0)
-		gtk_signal_emit (GTK_OBJECT (factory), factory_signals[LAST_BOOK_GONE]);
-}
-
-static PASBackendFactoryFn
-pas_book_factory_lookup_backend_factory (PASBookFactory *factory,
-					 const char     *uri)
-{
-	PASBackendFactoryFn  backend_fn;
-	char                *proto;
-	char                *canonical_uri;
-
-	g_assert (factory != NULL);
-	g_assert (PAS_IS_BOOK_FACTORY (factory));
-	g_assert (uri != NULL);
-
-	canonical_uri = pas_book_factory_canonicalize_uri (uri);
-	if (canonical_uri == NULL)
-		return NULL;
-
-	proto = pas_book_factory_extract_proto_from_uri (canonical_uri);
-	if (proto == NULL) {
-		g_free (canonical_uri);
-		return NULL;
-	}
-
-	backend_fn = g_hash_table_lookup (factory->priv->backends, proto);
-
-	g_free (proto); 
-	g_free (canonical_uri);
-
-	return backend_fn;
-}
-
-static PASBackend *
-pas_book_factory_launch_backend (PASBookFactory              *factory,
-				 GNOME_Evolution_Addressbook_BookListener       listener,
-				 const char                  *uri)
-{
-	PASBackendFactoryFn  backend_factory;
-	PASBackend          *backend;
-
-	backend_factory = pas_book_factory_lookup_backend_factory (
-		factory, uri);
-
-	if (!backend_factory) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
-			listener,
-			GNOME_Evolution_Addressbook_BookListener_ProtocolNotSupported,
-			CORBA_OBJECT_NIL,
-			&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("pas_book_factory_launch_backend(): could not notify "
-				   "the listener");
-
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	backend = (* backend_factory) ();
-	if (!backend) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
-			listener,
-			GNOME_Evolution_Addressbook_BookListener_OtherError,
-			CORBA_OBJECT_NIL,
-			&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("pas_book_factory_launch_backend(): could not notify "
-				   "the listener");
-
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	g_hash_table_insert (factory->priv->active_server_map,
-			     g_strdup (uri),
-			     backend);
-
-	gtk_signal_connect (GTK_OBJECT (backend), "last_client_gone",
-			    backend_last_client_gone_cb,
-			    factory);
-
-	return backend;
-}
-
-static void
-pas_book_factory_process_request (PASBookFactory              *factory,
-				  PASBookFactoryQueuedRequest *request)
-{
-	PASBackend *backend;
-	char *uri;
-	GNOME_Evolution_Addressbook_BookListener listener;
-	CORBA_Environment ev;
-
-	uri = request->uri;
-	listener = request->listener;
-	g_free (request);
-
-	/* Look up the backend and create one if needed */
-
-	backend = g_hash_table_lookup (factory->priv->active_server_map, uri);
-
-	if (!backend) {
-		backend = pas_book_factory_launch_backend (factory, listener, uri);
-		if (!backend)
-			goto out;
-
-		if (!pas_backend_load_uri (backend, uri))
-			goto out;
-
-		pas_backend_add_client (backend, listener);
-
-		goto out;
-	}
-
-	pas_backend_add_client (backend, listener);
-
- out:
-	g_free (uri);
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("pas_book_factory_process_request(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-}
-
-static gboolean
-pas_book_factory_process_queue (PASBookFactory *factory)
-{
-	/* Process pending Book-creation requests. */
-	if (factory->priv->queued_requests != NULL) {
-		PASBookFactoryQueuedRequest  *request;
-		GList *l;
-
-		l = factory->priv->queued_requests;
-		request = l->data;
-
-		pas_book_factory_process_request (factory, request);
-
-		factory->priv->queued_requests = g_list_remove_link (
-			factory->priv->queued_requests, l);
-		g_list_free_1 (l);
-	}
-
-	if (factory->priv->queued_requests == NULL) {
-
-		factory->priv->idle_id = 0;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-pas_book_factory_queue_request (PASBookFactory               *factory,
-				const char                   *uri,
-				const GNOME_Evolution_Addressbook_BookListener  listener)
-{
-	PASBookFactoryQueuedRequest *request;
-	GNOME_Evolution_Addressbook_BookListener       listener_copy;
-	CORBA_Environment            ev;
-
-	CORBA_exception_init (&ev);
-
-	listener_copy = CORBA_Object_duplicate (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("PASBookFactory: Could not duplicate BookListener!\n");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-
-	request           = g_new0 (PASBookFactoryQueuedRequest, 1);
-	request->listener = listener_copy;
-	request->uri      = g_strdup (uri);
-
-	factory->priv->queued_requests =
-		g_list_prepend (factory->priv->queued_requests, request);
-
-	if (! factory->priv->idle_id) {
-		factory->priv->idle_id =
-			g_idle_add ((GSourceFunc) pas_book_factory_process_queue, factory);
-	}
-}
-
-
-static void
-impl_GNOME_Evolution_Addressbook_BookFactory_openBook (PortableServer_Servant        servant,
-				      const CORBA_char             *uri,
-				      const GNOME_Evolution_Addressbook_BookListener  listener,
-				      CORBA_Environment            *ev)
-{
-	PASBookFactory      *factory =
-		PAS_BOOK_FACTORY (bonobo_object_from_servant (servant));
-	PASBackendFactoryFn  backend_factory;
-
-	backend_factory = pas_book_factory_lookup_backend_factory (factory, uri);
-
-	if (backend_factory == NULL) {
-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
-			listener,
-			GNOME_Evolution_Addressbook_BookListener_ProtocolNotSupported,
-			CORBA_OBJECT_NIL,
-			ev);
-
-		return;
-	}
-
-	pas_book_factory_queue_request (factory, uri, listener);
-}
-
-static gboolean
-pas_book_factory_construct (PASBookFactory *factory)
-{
-	POA_GNOME_Evolution_Addressbook_BookFactory  *servant;
-	CORBA_Environment           ev;
-	CORBA_Object                obj;
-
-	g_assert (factory != NULL);
-	g_assert (PAS_IS_BOOK_FACTORY (factory));
-
-	servant = (POA_GNOME_Evolution_Addressbook_BookFactory *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &pas_book_factory_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Addressbook_BookFactory__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (factory), servant);
-	if (obj == CORBA_OBJECT_NIL) {
-		g_free (servant);
-
-		return FALSE;
-	}
-
-	bonobo_object_construct (BONOBO_OBJECT (factory), obj);
-
-	return TRUE;
-}
-
-/**
- * pas_book_factory_new:
- */
-PASBookFactory *
-pas_book_factory_new (void)
-{
-	PASBookFactory *factory;
-
-	factory = gtk_type_new (pas_book_factory_get_type ());
-
-	if (! pas_book_factory_construct (factory)) {
-		g_warning ("pas_book_factory_new: Could not construct PASBookFactory!\n");
-		gtk_object_unref (GTK_OBJECT (factory));
-
-		return NULL;
-	}
-
-	return factory;
-}
-
-/**
- * pas_book_factory_activate:
- */
-gboolean
-pas_book_factory_activate (PASBookFactory *factory, const char *iid)
-{
-	PASBookFactoryPrivate *priv;
-	CORBA_Object obj;
-	OAF_RegistrationResult result;
-	char *tmp_iid;
-
-	g_return_val_if_fail (factory != NULL, FALSE);
-	g_return_val_if_fail (PAS_IS_BOOK_FACTORY (factory), FALSE);
-
-	priv = factory->priv;
-
-	g_return_val_if_fail (!priv->registered, FALSE);
-
-	/* if iid is NULL, use the default factory OAFIID */
-	if (iid)
-		tmp_iid = g_strdup (iid);
-	else
-		tmp_iid = g_strdup (DEFAULT_PAS_BOOK_FACTORY_OAF_ID);
-
-	obj = bonobo_object_corba_objref (BONOBO_OBJECT (factory));
-
-	result = oaf_active_server_register (tmp_iid, obj);
-
-	switch (result) {
-	case OAF_REG_SUCCESS:
-		priv->registered = TRUE;
-		priv->iid = tmp_iid;
-		return TRUE;
-	case OAF_REG_NOT_LISTED:
-		g_message ("Error registering the PAS factory: not listed");
-		break;
-	case OAF_REG_ALREADY_ACTIVE:
-		g_message ("Error registering the PAS factory: already active");
-		break;
-	case OAF_REG_ERROR:
-	default:
-		g_message ("Error registering the PAS factory: generic error");
-		break;
-	}
-
-	g_free (tmp_iid);
-	return FALSE;
-}
-
-static void
-pas_book_factory_init (PASBookFactory *factory)
-{
-	factory->priv = g_new0 (PASBookFactoryPrivate, 1);
-
-	factory->priv->active_server_map = g_hash_table_new (g_str_hash, g_str_equal);
-	factory->priv->backends          = g_hash_table_new (g_str_hash, g_str_equal);
-	factory->priv->queued_requests   = NULL;
-	factory->priv->registered        = FALSE;
-}
-
-static void
-free_active_server_map_entry (gpointer key, gpointer value, gpointer data)
-{
-	char *uri;
-	PASBackend *backend;
-
-	uri = key;
-	g_free (uri);
-
-	backend = PAS_BACKEND (value);
-	gtk_object_unref (GTK_OBJECT (backend));
-}
-
-static void
-remove_backends_entry (gpointer key, gpointer value, gpointer data)
-{
-	char *uri;
-
-	uri = key;
-	g_free (uri);
-}
-
-static void
-pas_book_factory_destroy (GtkObject *object)
-{
-	PASBookFactory *factory = PAS_BOOK_FACTORY (object);
-	GList          *l;
-
-	for (l = factory->priv->queued_requests; l != NULL; l = l->next) {
-		PASBookFactoryQueuedRequest *request = l->data;
-		CORBA_Environment ev;
-
-		g_free (request->uri);
-
-		CORBA_exception_init (&ev);
-		CORBA_Object_release (request->listener, &ev);
-		CORBA_exception_free (&ev);
-
-		g_free (request);
-	}
-	g_list_free (factory->priv->queued_requests);
-	factory->priv->queued_requests = NULL;
-
-	g_hash_table_foreach (factory->priv->active_server_map,
-			      free_active_server_map_entry,
-			      NULL);
-	g_hash_table_destroy (factory->priv->active_server_map);
-	factory->priv->active_server_map = NULL;
-
-	g_hash_table_foreach (factory->priv->backends,
-			      remove_backends_entry,
-			      NULL);
-	g_hash_table_destroy (factory->priv->backends);
-	factory->priv->backends = NULL;
-
-	if (factory->priv->registered) {
-		CORBA_Object obj;
-
-		obj = bonobo_object_corba_objref (BONOBO_OBJECT (factory));
-		oaf_active_server_unregister (factory->priv->iid, obj);
-		factory->priv->registered = FALSE;
-	}
-
-	g_free (factory->priv->iid);
-	
-	g_free (factory->priv);
-
-	GTK_OBJECT_CLASS (pas_book_factory_parent_class)->destroy (object);
-}
-
-static POA_GNOME_Evolution_Addressbook_BookFactory__epv *
-pas_book_factory_get_epv (void)
-{
-	POA_GNOME_Evolution_Addressbook_BookFactory__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookFactory__epv, 1);
-
-	epv->openBook = impl_GNOME_Evolution_Addressbook_BookFactory_openBook;
-
-	return epv;
-	
-}
-
-static void
-pas_book_factory_corba_class_init (void)
-{
-	pas_book_factory_vepv.Bonobo_Unknown_epv         = bonobo_object_get_epv ();
-	pas_book_factory_vepv.GNOME_Evolution_Addressbook_BookFactory_epv = pas_book_factory_get_epv ();
-}
-
-static void
-pas_book_factory_class_init (PASBookFactoryClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	pas_book_factory_parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	factory_signals[LAST_BOOK_GONE] =
-		gtk_signal_new ("last_book_gone",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (PASBookFactoryClass, last_book_gone),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, factory_signals, LAST_SIGNAL);
-
-	object_class->destroy = pas_book_factory_destroy;
-
-	pas_book_factory_corba_class_init ();
-}
-
-/**
- * pas_book_factory_get_type:
- */
-GtkType
-pas_book_factory_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBookFactory",
-			sizeof (PASBookFactory),
-			sizeof (PASBookFactoryClass),
-			(GtkClassInitFunc)  pas_book_factory_class_init,
-			(GtkObjectInitFunc) pas_book_factory_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/backend/pas/pas-book-factory.h b/addressbook/backend/pas/pas-book-factory.h
deleted file mode 100644
index 1936701296..0000000000
--- a/addressbook/backend/pas/pas-book-factory.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2000, Ximian, Inc.
- */
-
-#include <bonobo/bonobo-object.h>
-#include <libgnome/gnome-defs.h>
-
-#include <pas/pas-backend.h>
-
-#ifndef __PAS_BOOK_FACTORY_H__
-#define __PAS_BOOK_FACTORY_H__
-
-BEGIN_GNOME_DECLS
-
-typedef struct _PASBookFactoryPrivate PASBookFactoryPrivate;
-
-typedef struct {
-	BonoboObject            parent_object;
-	PASBookFactoryPrivate *priv;
-} PASBookFactory;
-
-typedef struct {
-	BonoboObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* last_book_gone) (PASBookFactory *factory);
-} PASBookFactoryClass;
-
-PASBookFactory *pas_book_factory_new              (void);
-
-void            pas_book_factory_register_backend (PASBookFactory               *factory,
-						   const char                   *proto,
-						   PASBackendFactoryFn           backend_factory);
-
-int             pas_book_factory_get_n_backends   (PASBookFactory               *factory);
-
-void            pas_book_factory_dump_active_backends (PASBookFactory *factory);
-
-gboolean        pas_book_factory_activate         (PASBookFactory               *factory, const char *iid);
-
-GtkType         pas_book_factory_get_type (void);
-
-#define PAS_BOOK_FACTORY_TYPE        (pas_book_factory_get_type ())
-#define PAS_BOOK_FACTORY(o)          (GTK_CHECK_CAST ((o), PAS_BOOK_FACTORY_TYPE, PASBookFactory))
-#define PAS_BOOK_FACTORY_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_FACTORY_TYPE, PASBookFactoryClass))
-#define PAS_IS_BOOK_FACTORY(o)       (GTK_CHECK_TYPE ((o), PAS_BOOK_FACTORY_TYPE))
-#define PAS_IS_BOOK_FACTORY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_FACTORY_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __PAS_BOOK_FACTORY_H__ */
diff --git a/addressbook/backend/pas/pas-book-view.c b/addressbook/backend/pas/pas-book-view.c
deleted file mode 100644
index b5266a6b35..0000000000
--- a/addressbook/backend/pas/pas-book-view.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * pas-book-view.c
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#include <config.h>
-#include <glib.h>
-#include "pas-book-view.h"
-
-static BonoboObjectClass *pas_book_view_parent_class;
-POA_GNOME_Evolution_Addressbook_BookView__vepv pas_book_view_vepv;
-
-struct _PASBookViewPrivate {
-	GNOME_Evolution_Addressbook_BookViewListener  listener;
-};
-
-/**
- * pas_book_view_notify_change:
- */
-void
-pas_book_view_notify_change (PASBookView                *book_view,
-			     const GList                *cards)
-{
-	CORBA_Environment ev;
-	gint i, length;
-	CORBA_sequence_GNOME_Evolution_Addressbook_VCard card_sequence;
-
-	length = g_list_length((GList *) cards);
-
-	card_sequence._buffer = CORBA_sequence_GNOME_Evolution_Addressbook_VCard_allocbuf(length);
-	card_sequence._maximum = length;
-	card_sequence._length = length;
-
-	for ( i = 0; cards; cards = g_list_next(cards), i++ ) {
-		card_sequence._buffer[i] = CORBA_string_dup((char *) cards->data);
-	}
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookViewListener_notifyCardChanged (
-		book_view->priv->listener, &card_sequence, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_view_notify_change: Exception signaling BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	CORBA_free(card_sequence._buffer);
-}
-
-void
-pas_book_view_notify_change_1 (PASBookView *book_view,
-			       const char  *card)
-{
-	GList *list = g_list_append(NULL, (char *) card);
-	pas_book_view_notify_change(book_view, list);
-	g_list_free(list);
-}
-
-/**
- * pas_book_view_notify_remove:
- */
-void
-pas_book_view_notify_remove (PASBookView                *book_view,
-			     const char                 *id)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookViewListener_notifyCardRemoved (
-		book_view->priv->listener, (GNOME_Evolution_Addressbook_CardId) id, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_view_notify_remove: Exception signaling BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_view_notify_add:
- */
-void
-pas_book_view_notify_add (PASBookView                *book_view,
-			  const GList                *cards)
-{
-	CORBA_Environment ev;
-	gint i, length;
-	CORBA_sequence_GNOME_Evolution_Addressbook_VCard card_sequence;
-
-	length = g_list_length((GList *)cards);
-
-	card_sequence._buffer = CORBA_sequence_GNOME_Evolution_Addressbook_VCard_allocbuf(length);
-	card_sequence._maximum = length;
-	card_sequence._length = length;
-
-	for ( i = 0; cards; cards = g_list_next(cards), i++ ) {
-		card_sequence._buffer[i] = CORBA_string_dup((char *) cards->data);
-	}
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookViewListener_notifyCardAdded (
-		book_view->priv->listener, &card_sequence, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_view_notify_add: Exception signaling BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	CORBA_free(card_sequence._buffer);
-}
-
-void
-pas_book_view_notify_add_1 (PASBookView *book_view,
-			    const char  *card)
-{
-	GList *list = g_list_append(NULL, (char *) card);
-	pas_book_view_notify_add(book_view, list);
-	g_list_free(list);
-}
-
-void
-pas_book_view_notify_complete (PASBookView *book_view)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookViewListener_notifySequenceComplete (
-		book_view->priv->listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_view_notify_complete: Exception signaling BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-void
-pas_book_view_notify_status_message (PASBookView *book_view,
-				     const char  *message)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookViewListener_notifyStatusMessage (
-		book_view->priv->listener, message, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_view_notify_status_message: Exception signaling BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-static gboolean
-pas_book_view_construct (PASBookView                *book_view,
-			 GNOME_Evolution_Addressbook_BookViewListener  listener)
-{
-	POA_GNOME_Evolution_Addressbook_BookView *servant;
-	CORBA_Environment   ev;
-	CORBA_Object        obj;
-
-	g_assert (book_view      != NULL);
-	g_assert (PAS_IS_BOOK_VIEW (book_view));
-	g_assert (listener  != CORBA_OBJECT_NIL);
-
-	servant = (POA_GNOME_Evolution_Addressbook_BookView *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &pas_book_view_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Addressbook_BookView__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	bonobo_object_dup_ref (listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("Unable to duplicate & ref listener object in pas-book-view.c\n");
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (book_view), servant);
-	if (obj == CORBA_OBJECT_NIL) {
-		g_free (servant);
-
-		return FALSE;
-	}
-
-	bonobo_object_construct (BONOBO_OBJECT (book_view), obj);
-
-	book_view->priv->listener  = listener;
-
-	return TRUE;
-}
-
-/**
- * pas_book_view_new:
- */
-PASBookView *
-pas_book_view_new (GNOME_Evolution_Addressbook_BookViewListener  listener)
-{
-	PASBookView *book_view;
-
-	g_return_val_if_fail (listener  != CORBA_OBJECT_NIL, NULL);
-
-	book_view = gtk_type_new (pas_book_view_get_type ());
-
-	if (! pas_book_view_construct (book_view, listener)) {
-		gtk_object_unref (GTK_OBJECT (book_view));
-
-		return NULL;
-	}
-
-	return book_view;
-}
-
-static void
-pas_book_view_destroy (GtkObject *object)
-{
-	PASBookView *book_view = PAS_BOOK_VIEW (object);
-	CORBA_Environment   ev;
-
-	CORBA_exception_init (&ev);
-	bonobo_object_release_unref (book_view->priv->listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		CORBA_exception_free (&ev);
-
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	g_free (book_view->priv);
-
-	GTK_OBJECT_CLASS (pas_book_view_parent_class)->destroy (object);	
-}
-
-static POA_GNOME_Evolution_Addressbook_BookView__epv *
-pas_book_view_get_epv (void)
-{
-	POA_GNOME_Evolution_Addressbook_BookView__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_BookView__epv, 1);
-
-	return epv;
-	
-}
-
-static void
-pas_book_view_corba_class_init (void)
-{
-	pas_book_view_vepv.Bonobo_Unknown_epv     = bonobo_object_get_epv ();
-	pas_book_view_vepv.GNOME_Evolution_Addressbook_BookView_epv = pas_book_view_get_epv ();
-}
-
-static void
-pas_book_view_class_init (PASBookViewClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	pas_book_view_parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	object_class->destroy = pas_book_view_destroy;
-
-	pas_book_view_corba_class_init ();
-}
-
-static void
-pas_book_view_init (PASBookView *book_view)
-{
-	book_view->priv           = g_new0 (PASBookViewPrivate, 1);
-	book_view->priv->listener = CORBA_OBJECT_NIL;
-}
-
-/**
- * pas_book_view_get_type:
- */
-GtkType
-pas_book_view_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBookView",
-			sizeof (PASBookView),
-			sizeof (PASBookViewClass),
-			(GtkClassInitFunc)  pas_book_view_class_init,
-			(GtkObjectInitFunc) pas_book_view_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
-
diff --git a/addressbook/backend/pas/pas-book-view.h b/addressbook/backend/pas/pas-book-view.h
deleted file mode 100644
index 26bf360f17..0000000000
--- a/addressbook/backend/pas/pas-book-view.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * A wrapper object which exports the GNOME_Evolution_Addressbook_Book CORBA interface
- * and which maintains a request queue.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#ifndef __PAS_BOOK_VIEW_H__
-#define __PAS_BOOK_VIEW_H__
-
-#include <bonobo/bonobo-object.h>
-#include <libgnome/gnome-defs.h>
-#include <pas/addressbook.h>
-
-typedef struct _PASBookView        PASBookView;
-typedef struct _PASBookViewClass   PASBookViewClass;
-typedef struct _PASBookViewPrivate PASBookViewPrivate;
-
-struct _PASBookView {
-	BonoboObject     parent_object;
-	PASBookViewPrivate *priv;
-};
-
-struct _PASBookViewClass {
-	BonoboObjectClass parent_class;
-};
-PASBookView *pas_book_view_new                    (GNOME_Evolution_Addressbook_BookViewListener  listener);
-
-void         pas_book_view_notify_change          (PASBookView                *book_view,
-						   const GList                *cards);
-void         pas_book_view_notify_change_1        (PASBookView                *book_view,
-						   const char                 *card);
-void         pas_book_view_notify_remove          (PASBookView                *book_view,
-						   const char                 *id);
-void         pas_book_view_notify_add             (PASBookView                *book_view,
-						   const GList                *cards);
-void         pas_book_view_notify_add_1           (PASBookView                *book_view,
-						   const char                 *card);
-void         pas_book_view_notify_complete        (PASBookView                *book_view);
-void         pas_book_view_notify_status_message  (PASBookView                *book_view,
-						   const char                 *message);
-
-GtkType      pas_book_view_get_type               (void);
-
-#define PAS_BOOK_VIEW_TYPE        (pas_book_view_get_type ())
-#define PAS_BOOK_VIEW(o)          (GTK_CHECK_CAST ((o), PAS_BOOK_VIEW_TYPE, PASBookView))
-#define PAS_BOOK_VIEW_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_VIEW_FACTORY_TYPE, PASBookViewClass))
-#define PAS_IS_BOOK_VIEW(o)       (GTK_CHECK_TYPE ((o), PAS_BOOK_VIEW_TYPE))
-#define PAS_IS_BOOK_VIEW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_VIEW_TYPE))
-
-#endif /* ! __PAS_BOOK_VIEW_H__ */
diff --git a/addressbook/backend/pas/pas-book.c b/addressbook/backend/pas/pas-book.c
deleted file mode 100644
index d51d182dad..0000000000
--- a/addressbook/backend/pas/pas-book.c
+++ /dev/null
@@ -1,893 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * pas-book.c
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-util/e-list.h"
-#include "pas-book.h"
-
-static BonoboObjectClass *pas_book_parent_class;
-POA_GNOME_Evolution_Addressbook_Book__vepv pas_book_vepv;
-
-enum {
-	REQUESTS_QUEUED,
-	LAST_SIGNAL
-};
-
-static guint pas_book_signals [LAST_SIGNAL];
-
-struct _PASBookPrivate {
-	PASBackend             *backend;
-	GNOME_Evolution_Addressbook_BookListener  listener;
-
-	GList                  *request_queue;
-	gint                    timeout_id;
-	
-	guint                   timeout_lock : 1;
-};
-
-static gboolean
-pas_book_check_queue (PASBook *book)
-{
-	if (book->priv->timeout_lock)
-		return TRUE;
-
-	book->priv->timeout_lock = TRUE;
-
-	if (book->priv->request_queue != NULL) {
-		gtk_signal_emit (GTK_OBJECT (book),
-				 pas_book_signals [REQUESTS_QUEUED]);
-	}
-
-	if (book->priv->request_queue == NULL) {
-		book->priv->timeout_id = 0;
-		book->priv->timeout_lock = FALSE;
-		bonobo_object_unref (BONOBO_OBJECT (book));
-		return FALSE;
-	}
-
-	book->priv->timeout_lock = FALSE;
-
-	return TRUE;
-}
-
-static void
-pas_book_queue_request (PASBook *book, PASRequest *req)
-{
-	book->priv->request_queue =
-		g_list_append (book->priv->request_queue, req);
-
-	if (book->priv->timeout_id == 0) {
-		bonobo_object_ref (BONOBO_OBJECT (book));
-		book->priv->timeout_id = g_timeout_add (20, (GSourceFunc) pas_book_check_queue, book);
-	}
-}
-
-static void
-pas_book_queue_create_card (PASBook *book, const char *vcard)
-{
-	PASRequest *req;
-
-	req        = g_new0 (PASRequest, 1);
-	req->op    = CreateCard;
-	req->vcard = g_strdup (vcard);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_remove_card (PASBook *book, const char *id)
-{
-	PASRequest *req;
-
-	req     = g_new0 (PASRequest, 1);
-	req->op = RemoveCard;
-	req->id = g_strdup (id);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_modify_card (PASBook *book, const char *vcard)
-{
-	PASRequest *req;
-
-	req        = g_new0 (PASRequest, 1);
-	req->op    = ModifyCard;
-	req->vcard = g_strdup (vcard);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_get_cursor (PASBook *book, const char *search)
-{
-	PASRequest *req;
-
-	req         = g_new0 (PASRequest, 1);
-	req->op     = GetCursor;
-	req->search = g_strdup(search);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_get_vcard (PASBook *book, const char *id)
-{
-	PASRequest *req;
-
-	req     = g_new0 (PASRequest, 1);
-	req->op = GetVCard;
-	req->id = g_strdup(id);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_authenticate_user (PASBook *book,
-				  const char *user, const char *passwd)
-{
-	PASRequest *req;
-
-	req         = g_new0 (PASRequest, 1);
-	req->op     = AuthenticateUser;
-	req->user   = g_strdup(user);
-	req->passwd = g_strdup(passwd);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_get_supported_fields (PASBook *book)
-{
-	PASRequest *req;
-
-	req     = g_new0 (PASRequest, 1);
-	req->op = GetSupportedFields;
-
-	pas_book_queue_request (book, req);
-}
-
-
-static void
-pas_book_queue_get_book_view (PASBook *book, const GNOME_Evolution_Addressbook_BookViewListener listener, const char *search)
-{
-	PASRequest *req;
-	CORBA_Environment ev;
-
-	req           = g_new0 (PASRequest, 1);
-	req->op       = GetBookView;
-	req->search   = g_strdup(search);
-	
-	CORBA_exception_init (&ev);
-
-	req->listener = bonobo_object_dup_ref(listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_queue_get_book_view: Exception "
-			   "duplicating BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_get_changes (PASBook *book, const GNOME_Evolution_Addressbook_BookViewListener listener, const char *change_id)
-{
-	PASRequest *req;
-	CORBA_Environment ev;
-
-	req           = g_new0 (PASRequest, 1);
-	req->op       = GetChanges;
-	req->change_id= g_strdup(change_id);
-	
-	CORBA_exception_init (&ev);
-
-	req->listener = bonobo_object_dup_ref(listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_queue_get_changes: Exception "
-			   "duplicating BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_check_connection (PASBook *book)
-{
-	PASRequest *req;
-
-	req        = g_new0 (PASRequest, 1);
-	req->op    = CheckConnection;
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_getVCard (PortableServer_Servant servant,
-						const GNOME_Evolution_Addressbook_CardId id,
-						CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_get_vcard (book, id);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_authenticateUser (PortableServer_Servant servant,
-							const char* user,
-							const char* passwd,
-							CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_authenticate_user (book, user, passwd);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_addCard (PortableServer_Servant servant,
-				 const GNOME_Evolution_Addressbook_VCard vcard,
-				 CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_create_card (book, (const char *) vcard);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_removeCard (PortableServer_Servant servant,
-				 const GNOME_Evolution_Addressbook_CardId id,
-				 CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_remove_card (book, (const char *) id);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_modifyCard (PortableServer_Servant servant,
-				 const GNOME_Evolution_Addressbook_VCard vcard,
-				 CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_modify_card (book, (const char *) vcard);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_getCursor (PortableServer_Servant servant,
-				const CORBA_char *search,
-				CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_get_cursor (book, search);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_getBookView (PortableServer_Servant servant,
-				   const GNOME_Evolution_Addressbook_BookViewListener listener,
-				   const CORBA_char *search,
-				   CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_get_book_view (book, listener, search);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_getChanges (PortableServer_Servant servant,
-				 const GNOME_Evolution_Addressbook_BookViewListener listener,
-				 const CORBA_char *change_id,
-				 CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_get_changes (book, listener, change_id);
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_checkConnection (PortableServer_Servant servant,
-				      CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_check_connection (book);
-}
-
-static char *
-impl_GNOME_Evolution_Addressbook_Book_getStaticCapabilities (PortableServer_Servant servant,
-					     CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-	char *temp;
-	char *ret_val;
-
-	temp = pas_backend_get_static_capabilities (book->priv->backend);
-	ret_val = CORBA_string_dup(temp);
-	g_free(temp);
-	return ret_val;
-}
-
-static void
-impl_GNOME_Evolution_Addressbook_Book_getSupportedFields (PortableServer_Servant servant,
-							  CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_get_supported_fields (book);
-}
-
-/**
- * pas_book_get_backend:
- */
-PASBackend *
-pas_book_get_backend (PASBook *book)
-{
-	g_return_val_if_fail (book != NULL,       NULL);
-	g_return_val_if_fail (PAS_IS_BOOK (book), NULL);
-
-	return book->priv->backend;
-}
-
-/**
- * pas_book_get_listener:
- */
-GNOME_Evolution_Addressbook_BookListener
-pas_book_get_listener (PASBook *book)
-{
-	g_return_val_if_fail (book != NULL,       CORBA_OBJECT_NIL);
-	g_return_val_if_fail (PAS_IS_BOOK (book), CORBA_OBJECT_NIL);
-
-	return book->priv->listener;
-}
-
-/**
- * pas_book_check_pending
- */
-gint
-pas_book_check_pending (PASBook *book)
-{
-	g_return_val_if_fail (book != NULL,       -1);
-	g_return_val_if_fail (PAS_IS_BOOK (book), -1);
-
-	return g_list_length (book->priv->request_queue);
-}
-
-/**
- * pas_book_pop_request:
- */
-PASRequest *
-pas_book_pop_request (PASBook *book)
-{
-	GList      *popped;
-	PASRequest *req;
-
-	g_return_val_if_fail (book != NULL,       NULL);
-	g_return_val_if_fail (PAS_IS_BOOK (book), NULL);
-
-	if (book->priv->request_queue == NULL)
-		return NULL;
-
-	req = book->priv->request_queue->data;
-
-	popped = book->priv->request_queue;
-	book->priv->request_queue =
-		g_list_remove_link (book->priv->request_queue, popped);
-
-	g_list_free_1 (popped);
-
-	return req;
-}
-
-/**
- * pas_book_respond_open:
- */
-void
-pas_book_respond_open (PASBook                           *book,
-		       GNOME_Evolution_Addressbook_BookListener_CallStatus  status)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	if (status == GNOME_Evolution_Addressbook_BookListener_Success) {
-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
-			book->priv->listener, status,
-			bonobo_object_corba_objref (BONOBO_OBJECT (book)),
-			&ev);
-	} else {
-		GNOME_Evolution_Addressbook_BookListener_notifyBookOpened (
-			book->priv->listener, status,
-			CORBA_OBJECT_NIL, &ev);
-	}
-	
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_open: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_create:
- */
-void
-pas_book_respond_create (PASBook                           *book,
-			 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-			 const char                        *id)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyCardCreated (
-		book->priv->listener, status, (char *)id, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_create: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_remove:
- */
-void
-pas_book_respond_remove (PASBook                           *book,
-			 GNOME_Evolution_Addressbook_BookListener_CallStatus  status)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyCardRemoved (
-		book->priv->listener, status, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_remove: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_modify:
- */
-void
-pas_book_respond_modify (PASBook                           *book,
-			 GNOME_Evolution_Addressbook_BookListener_CallStatus  status)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyCardModified (
-		book->priv->listener, status, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_modify: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_authenticate_user:
- */
-void
-pas_book_respond_authenticate_user (PASBook                           *book,
-				    GNOME_Evolution_Addressbook_BookListener_CallStatus  status)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyAuthenticationResult (
-		book->priv->listener, status, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_authenticate_user: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-void
-pas_book_respond_get_supported_fields (PASBook *book,
-				       GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-				       EList   *fields)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_Addressbook_stringlist stringlist;
-	int num_fields;
-	EIterator *iter;
-	int i;
-
-	CORBA_exception_init (&ev);
-
-	num_fields = e_list_length (fields);
-
-	stringlist._buffer = CORBA_sequence_CORBA_string_allocbuf (num_fields);
-	stringlist._maximum = num_fields;
-	stringlist._length = num_fields;
-
-	iter = e_list_get_iterator (fields);
-
-	for (i = 0; e_iterator_is_valid (iter); e_iterator_next (iter), i ++) {
-		stringlist._buffer[i] = CORBA_string_dup (e_iterator_get(iter));
-	}
-
-	gtk_object_unref (GTK_OBJECT (fields));
-
-	GNOME_Evolution_Addressbook_BookListener_notifySupportedFields (
-			book->priv->listener, status,
-			&stringlist,
-			&ev);
-
-	CORBA_exception_free (&ev);
-
-	CORBA_free(stringlist._buffer);
-}
-
-/**
- * pas_book_respond_get_cursor:
- */
-void
-pas_book_respond_get_cursor (PASBook                           *book,
-			     GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-			     PASCardCursor                     *cursor)
-{
-	CORBA_Environment ev;
-	CORBA_Object      object;
-
-	CORBA_exception_init (&ev);
-	
-	object = bonobo_object_corba_objref(BONOBO_OBJECT(cursor));
-
-	GNOME_Evolution_Addressbook_BookListener_notifyCursorRequested (
-		book->priv->listener, status, object, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_get_cursor: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_get_book_view:
- */
-void
-pas_book_respond_get_book_view (PASBook                           *book,
-				GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-				PASBookView                       *book_view)
-{
-	CORBA_Environment ev;
-	CORBA_Object      object;
-
-	CORBA_exception_init (&ev);
-	
-	object = bonobo_object_corba_objref(BONOBO_OBJECT(book_view));
-
-	GNOME_Evolution_Addressbook_BookListener_notifyViewRequested (
-		book->priv->listener, status, object, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_get_book_view: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_get_changes:
- */
-void
-pas_book_respond_get_vcard (PASBook                           *book,
-			    GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-			    char                              *vcard)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyCardRequested (
-		book->priv->listener, status, vcard, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_get_card: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_respond_get_changes:
- */
-void
-pas_book_respond_get_changes (PASBook                           *book,
-			      GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-			      PASBookView                       *book_view)
-{
-	CORBA_Environment ev;
-	CORBA_Object      object;
-
-	CORBA_exception_init (&ev);
-	
-	object = bonobo_object_corba_objref(BONOBO_OBJECT(book_view));
-
-	GNOME_Evolution_Addressbook_BookListener_notifyChangesRequested (
-		book->priv->listener, status, object, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_respond_get_changes: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_report_connection:
- */
-void
-pas_book_report_connection (PASBook  *book,
-			    gboolean  connected)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyConnectionStatus (
-		book->priv->listener, (CORBA_boolean) connected, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_report_connection: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * pas_book_report_writable:
- */
-void
-pas_book_report_writable (PASBook                           *book,
-			  gboolean                           writable)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	GNOME_Evolution_Addressbook_BookListener_notifyWritable (
-		book->priv->listener, (CORBA_boolean) writable, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_report_writable: Exception "
-			   "responding to BookListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-static gboolean
-pas_book_construct (PASBook                *book,
-		    PASBackend             *backend,
-		    GNOME_Evolution_Addressbook_BookListener  listener)
-{
-	POA_GNOME_Evolution_Addressbook_Book *servant;
-	CORBA_Environment   ev;
-	CORBA_Object        obj;
-
-	g_assert (book      != NULL);
-	g_assert (PAS_IS_BOOK (book));
-	g_assert (listener  != CORBA_OBJECT_NIL);
-
-	servant = (POA_GNOME_Evolution_Addressbook_Book *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &pas_book_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Addressbook_Book__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (book), servant);
-	if (obj == CORBA_OBJECT_NIL) {
-		g_free (servant);
-
-		return FALSE;
-	}
-
-	bonobo_object_construct (BONOBO_OBJECT (book), obj);
-
-	CORBA_exception_init (&ev);
-	book->priv->listener = CORBA_Object_duplicate (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("pas_book_construct(): could not duplicate the listener");
-
-	CORBA_exception_free (&ev);
-
-	book->priv->listener  = listener;
-	book->priv->backend   = backend;
-
-	return TRUE;
-}
-
-/**
- * pas_book_new:
- */
-PASBook *
-pas_book_new (PASBackend             *backend,
-	      GNOME_Evolution_Addressbook_BookListener  listener)
-{
-	PASBook *book;
-
-	g_return_val_if_fail (listener  != CORBA_OBJECT_NIL, NULL);
-
-	book = gtk_type_new (pas_book_get_type ());
-
-	if (! pas_book_construct (book, backend, listener)) {
-		gtk_object_unref (GTK_OBJECT (book));
-
-		return NULL;
-	}
-
-	return book;
-}
-
-static void
-pas_book_destroy (GtkObject *object)
-{
-	PASBook *book = PAS_BOOK (object);
-	GList   *l;
-	CORBA_Environment ev;
-
-	for (l = book->priv->request_queue; l != NULL; l = l->next) {
-		PASRequest *req = l->data;
-
-		g_free (req->id);
-		g_free (req->vcard);
-		g_free (req);
-	}
-	g_list_free (book->priv->request_queue);
-
-	/* We should never ever have timeout_id == 0 when we get destroyed, unless there
-	   is some sort of reference counting bug.  Still, we do this to try to avoid
-	   horrible crashes in those situations. */
-	if (book->priv->timeout_id) {
-		g_warning ("PASBook destroyed with non-zero timeout_id.  This shouldn't happen.");
-		g_source_remove (book->priv->timeout_id);
-		book->priv->timeout_id = 0;
-	}
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (book->priv->listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("pas_book_construct(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-
-	g_free (book->priv);
-	book->priv = NULL;
-
-	GTK_OBJECT_CLASS (pas_book_parent_class)->destroy (object);	
-}
-
-static POA_GNOME_Evolution_Addressbook_Book__epv *
-pas_book_get_epv (void)
-{
-	POA_GNOME_Evolution_Addressbook_Book__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_Book__epv, 1);
-
-	epv->getVCard              = impl_GNOME_Evolution_Addressbook_Book_getVCard;
-	epv->authenticateUser      = impl_GNOME_Evolution_Addressbook_Book_authenticateUser;
-	epv->addCard               = impl_GNOME_Evolution_Addressbook_Book_addCard;
-	epv->removeCard            = impl_GNOME_Evolution_Addressbook_Book_removeCard;
-	epv->modifyCard            = impl_GNOME_Evolution_Addressbook_Book_modifyCard;
-	epv->checkConnection       = impl_GNOME_Evolution_Addressbook_Book_checkConnection;
-	epv->getStaticCapabilities = impl_GNOME_Evolution_Addressbook_Book_getStaticCapabilities;
-	epv->getSupportedFields    = impl_GNOME_Evolution_Addressbook_Book_getSupportedFields;
-	epv->getCursor             = impl_GNOME_Evolution_Addressbook_Book_getCursor;
-	epv->getBookView           = impl_GNOME_Evolution_Addressbook_Book_getBookView;
-	epv->getChanges            = impl_GNOME_Evolution_Addressbook_Book_getChanges;
-
-	return epv;
-	
-}
-
-static void
-pas_book_corba_class_init (void)
-{
-	pas_book_vepv.Bonobo_Unknown_epv  = bonobo_object_get_epv ();
-	pas_book_vepv.GNOME_Evolution_Addressbook_Book_epv = pas_book_get_epv ();
-}
-
-static void
-pas_book_class_init (PASBookClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	pas_book_parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	pas_book_signals [REQUESTS_QUEUED] =
-		gtk_signal_new ("requests_queued",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (PASBookClass, requests_queued),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, pas_book_signals, LAST_SIGNAL);
-
-	object_class->destroy = pas_book_destroy;
-
-	pas_book_corba_class_init ();
-}
-
-static void
-pas_book_init (PASBook *book)
-{
-	book->priv                = g_new0 (PASBookPrivate, 1);
-	book->priv->timeout_id    = 0;
-	book->priv->request_queue = NULL;
-	book->priv->timeout_id    = 0;
-	book->priv->timeout_lock  = FALSE;
-}
-
-/**
- * pas_book_get_type:
- */
-GtkType
-pas_book_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBook",
-			sizeof (PASBook),
-			sizeof (PASBookClass),
-			(GtkClassInitFunc)  pas_book_class_init,
-			(GtkObjectInitFunc) pas_book_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
-
diff --git a/addressbook/backend/pas/pas-book.h b/addressbook/backend/pas/pas-book.h
deleted file mode 100644
index 6f5832d914..0000000000
--- a/addressbook/backend/pas/pas-book.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * A wrapper object which exports the GNOME_Evolution_Addressbook_Book CORBA interface
- * and which maintains a request queue.
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#ifndef __PAS_BOOK_H__
-#define __PAS_BOOK_H__
-
-#include <bonobo/bonobo-object.h>
-#include <libgnome/gnome-defs.h>
-#include <pas/addressbook.h>
-#include <pas/pas-book-view.h>
-#include "e-util/e-list.h"
-
-typedef struct _PASBook        PASBook;
-typedef struct _PASBookPrivate PASBookPrivate;
-
-#include <pas/pas-backend.h>
-#include <pas/pas-card-cursor.h>
-
-typedef enum {
-	CreateCard,
-	RemoveCard,
-	ModifyCard,
-	GetVCard,
-	GetCursor,
-	GetBookView,
-	GetChanges,
-	CheckConnection,
-	AuthenticateUser,
-	GetSupportedFields
-} PASOperation;
-
-typedef struct {
-	PASOperation               op;
-	char                      *id;
-	char                      *vcard;
-	char                      *search;
-	char                      *change_id;
-	char                      *user;
-        char                      *passwd;
-	GNOME_Evolution_Addressbook_BookViewListener listener;
-	GNOME_Evolution_Addressbook_stringlist fields;
-} PASRequest;
-
-struct _PASBook {
-	BonoboObject     parent_object;
-	PASBookPrivate *priv;
-};
-
-typedef struct {
-	BonoboObjectClass parent_class;
-
-	/* Signals */
-	void (*requests_queued) (void);
-} PASBookClass;
-
-typedef gboolean (*PASBookCanWriteFn)     (PASBook *book);
-typedef gboolean (*PASBookCanWriteCardFn) (PASBook *book, const char *id);
-
-PASBook                *pas_book_new                    (PASBackend                        *backend,
-							 GNOME_Evolution_Addressbook_BookListener             listener);
-PASBackend             *pas_book_get_backend            (PASBook                           *book);
-GNOME_Evolution_Addressbook_BookListener  pas_book_get_listener           (PASBook                           *book);
-int                     pas_book_check_pending          (PASBook                           *book);
-PASRequest             *pas_book_pop_request            (PASBook                           *book);
-void                    pas_book_respond_open           (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status);
-void                    pas_book_respond_create         (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-							 const char                        *id);
-void                    pas_book_respond_remove         (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status);
-void                    pas_book_respond_modify         (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status);
-void                    pas_book_respond_authenticate_user (PASBook                           *book,
-							    GNOME_Evolution_Addressbook_BookListener_CallStatus  status);
-void                    pas_book_respond_get_supported_fields (PASBook *book,
-							       GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-							       EList   *fields);
-
-void                    pas_book_respond_get_cursor     (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-							 PASCardCursor                     *cursor);
-void                    pas_book_respond_get_book_view  (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-							 PASBookView                       *book_view);
-void                    pas_book_respond_get_vcard      (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-							 char                              *vcard);
-void                    pas_book_respond_get_changes    (PASBook                           *book,
-							 GNOME_Evolution_Addressbook_BookListener_CallStatus  status,
-							 PASBookView                       *book_view);
-void                    pas_book_report_connection      (PASBook                           *book,
-							 gboolean                           connected);
-
-void                    pas_book_report_writable        (PASBook                           *book,
-							 gboolean                           writable);
-
-GtkType                 pas_book_get_type               (void);
-
-#define PAS_BOOK_TYPE        (pas_book_get_type ())
-#define PAS_BOOK(o)          (GTK_CHECK_CAST ((o), PAS_BOOK_TYPE, PASBook))
-#define PAS_BOOK_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_FACTORY_TYPE, PASBookClass))
-#define PAS_IS_BOOK(o)       (GTK_CHECK_TYPE ((o), PAS_BOOK_TYPE))
-#define PAS_IS_BOOK_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_TYPE))
-
-#endif /* ! __PAS_BOOK_H__ */
diff --git a/addressbook/backend/pas/pas-card-cursor.c b/addressbook/backend/pas/pas-card-cursor.c
deleted file mode 100644
index 572f63f46e..0000000000
--- a/addressbook/backend/pas/pas-card-cursor.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * pas-card-cursor.c: Implements card cursors.
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com.
- */
-
-#include <config.h>
-#include "addressbook.h"
-#include "pas-card-cursor.h"
-
-struct _PASCardCursorPrivate {
-	long     (*get_length) (PASCardCursor *cursor, gpointer data);
-	char *   (*get_nth)    (PASCardCursor *cursor, long n, gpointer data);
-	gpointer   data;
-};
-
-/*
- * A pointer to our parent object class
- */
-static BonoboObjectClass *parent_class;
-
-/*
- * The VEPV for the CardCursor object
- */
-static POA_GNOME_Evolution_Addressbook_CardCursor__vepv cursor_vepv;
-
-/*
- * Implemented GtkObject::destroy
- */
-static void
-pas_card_cursor_destroy (GtkObject *object)
-{
-	PASCardCursor *cursor = PAS_CARD_CURSOR (object);
-
-	if ( cursor->priv )
-		g_free ( cursor->priv );
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-/*
- * CORBA Demo::Echo::echo method implementation
- */
-static CORBA_long
-impl_pas_card_cursor_get_length (PortableServer_Servant  servant,
-			       CORBA_Environment      *ev)
-{
-	PASCardCursor *cursor = PAS_CARD_CURSOR (bonobo_object_from_servant (servant));
-	if ( cursor->priv->get_length )
-		return cursor->priv->get_length( cursor, cursor->priv->data );
-	else
-		return 0;
-}
-
-/*
- * CORBA Demo::Echo::echo method implementation
- */
-static char *
-impl_pas_card_cursor_get_nth (PortableServer_Servant  servant,
-			    const CORBA_long        n,
-			    CORBA_Environment      *ev)
-{
-	PASCardCursor *cursor = PAS_CARD_CURSOR (bonobo_object_from_servant (servant));
-	if ( cursor->priv->get_nth ) {
-		char *vcard = cursor->priv->get_nth( cursor, n, cursor->priv->data );
-		char *retval = CORBA_string_dup (vcard);
-		g_free (vcard);
-		return retval;
-	} else
-		return CORBA_string_dup ("");
-}
-
-/*
- * If you want users to derive classes from your implementation
- * you need to support this method.
- */
-POA_GNOME_Evolution_Addressbook_CardCursor__epv *
-pas_card_cursor_get_epv (void)
-{
-	POA_GNOME_Evolution_Addressbook_CardCursor__epv *epv;
-
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_CardCursor__epv, 1);
-
-	/*
-	 * This is the method invoked by CORBA
-	 */
-	epv->count  = impl_pas_card_cursor_get_length;
-	epv->getNth = impl_pas_card_cursor_get_nth;
-
-	return epv;
-}
-
-static void
-init_pas_card_cursor_corba_class (void)
-{
-	cursor_vepv.Bonobo_Unknown_epv       = bonobo_object_get_epv ();
-	cursor_vepv.GNOME_Evolution_Addressbook_CardCursor_epv = pas_card_cursor_get_epv ();
-}
-
-static void
-pas_card_cursor_class_init (PASCardCursorClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	object_class->destroy = pas_card_cursor_destroy;
-
-	init_pas_card_cursor_corba_class ();
-}
-
-static void
-pas_card_cursor_init (PASCardCursor *cursor)
-{
-	cursor->priv = g_new(PASCardCursorPrivate, 1);
-	cursor->priv->get_length = NULL;
-	cursor->priv->get_nth = NULL;
-	cursor->priv->data = NULL;
-}
-
-GtkType
-pas_card_cursor_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"PASCardCursor",
-			sizeof (PASCardCursor),
-			sizeof (PASCardCursorClass),
-			(GtkClassInitFunc) pas_card_cursor_class_init,
-			(GtkObjectInitFunc) pas_card_cursor_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
-
-PASCardCursor *
-pas_card_cursor_construct (PASCardCursor           *cursor,
-			   GNOME_Evolution_Addressbook_CardCursor     corba_cursor,
-			   PASCardCursorLengthFunc  get_length,
-			   PASCardCursorNthFunc     get_nth,
-			   gpointer data)
-{
-	g_return_val_if_fail (cursor != NULL, NULL);
-	g_return_val_if_fail (PAS_IS_CARD_CURSOR (cursor), NULL);
-	g_return_val_if_fail (corba_cursor != CORBA_OBJECT_NIL, NULL);
-
-	/*
-	 * Call parent constructor
-	 */
-	if (!bonobo_object_construct (BONOBO_OBJECT (cursor), (CORBA_Object) corba_cursor))
-		return NULL;
-
-	/*
-	 * Initialize cursor
-	 */
-	cursor->priv->get_length = get_length;
-	cursor->priv->get_nth = get_nth;
-	cursor->priv->data = data;
-	
-	/*
-	 * Success: return the GtkType we were given
-	 */
-	return cursor;
-}
-
-/*
- * This routine creates the ORBit CORBA server and initializes the
- * CORBA side of things
- */
-static GNOME_Evolution_Addressbook_CardCursor
-create_cursor (BonoboObject *cursor)
-{
-	POA_GNOME_Evolution_Addressbook_CardCursor *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_GNOME_Evolution_Addressbook_CardCursor *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &cursor_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_GNOME_Evolution_Addressbook_CardCursor__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION){
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	/*
-	 * Activates the CORBA object.
-	 */
-	return (GNOME_Evolution_Addressbook_CardCursor) bonobo_object_activate_servant (cursor, servant);
-}
-
-PASCardCursor *
-pas_card_cursor_new (PASCardCursorLengthFunc  get_length,
-		     PASCardCursorNthFunc     get_nth,
-		     gpointer data)
-{
-	PASCardCursor *cursor;
-	GNOME_Evolution_Addressbook_CardCursor corba_cursor;
-
-	cursor = gtk_type_new (pas_card_cursor_get_type ());
-	corba_cursor = create_cursor (BONOBO_OBJECT (cursor));
-
-	if (corba_cursor == CORBA_OBJECT_NIL){
-		gtk_object_unref (GTK_OBJECT (cursor));
-		return NULL;
-	}
-	
-	return pas_card_cursor_construct (cursor,
-					  corba_cursor,
-					  get_length,
-					  get_nth,
-					  data);
-}
diff --git a/addressbook/backend/pas/pas-card-cursor.h b/addressbook/backend/pas/pas-card-cursor.h
deleted file mode 100644
index 70ecb5e718..0000000000
--- a/addressbook/backend/pas/pas-card-cursor.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Nat Friedman (nat@ximian.com)
- *
- * Copyright 2000, Ximian, Inc.
- */
-
-#ifndef __PAS_CARD_CURSOR_H__
-#define __PAS_CARD_CURSOR_H__
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-#include <pas/addressbook.h>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _PASCardCursor        PASCardCursor;
-typedef struct _PASCardCursorPrivate PASCardCursorPrivate;
-typedef struct _PASCardCursorClass   PASCardCursorClass;
-
-typedef long (*PASCardCursorLengthFunc) (PASCardCursor *cursor, gpointer data);
-typedef char * (*PASCardCursorNthFunc) (PASCardCursor *cursor, long n, gpointer data);
-
-struct _PASCardCursor {
-	BonoboObject     parent;
-	PASCardCursorPrivate *priv;
-};
-
-struct _PASCardCursorClass {
-	BonoboObjectClass parent;
-};
-
-/* Creating a new addressbook. */
-PASCardCursor *pas_card_cursor_new       (PASCardCursorLengthFunc  get_length,
-				          PASCardCursorNthFunc     get_nth,
-					  gpointer data);
-PASCardCursor *pas_card_cursor_construct (PASCardCursor           *cursor,
-					  GNOME_Evolution_Addressbook_CardCursor     corba_cursor,
-					  PASCardCursorLengthFunc  get_length,
-					  PASCardCursorNthFunc     get_nth,
-					  gpointer data);
-
-GtkType        pas_card_cursor_get_type  (void);
-POA_GNOME_Evolution_Addressbook_CardCursor__epv *
-               pas_card_cursor_get_epv   (void);
-
-/* Fetching cards. */
-#define PAS_CARD_CURSOR_TYPE        (pas_card_cursor_get_type ())
-#define PAS_CARD_CURSOR(o)          (GTK_CHECK_CAST ((o), PAS_CARD_CURSOR_TYPE, PASCardCursor))
-#define PAS_CARD_CURSOR_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_CARD_CURSOR_TYPE, PASCardCursorClass))
-#define PAS_IS_CARD_CURSOR(o)       (GTK_CHECK_TYPE ((o), PAS_CARD_CURSOR_TYPE))
-#define PAS_IS_CARD_CURSOR_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_CARD_CURSOR_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __PAS_CARD_CURSOR_H__ */
diff --git a/addressbook/conduit/.cvsignore b/addressbook/conduit/.cvsignore
deleted file mode 100644
index 87b35d3be5..0000000000
--- a/addressbook/conduit/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.libs
-*.lo
-Makefile.in
-Makefile
-libeaddress_conduit.la
-e-address-conduit-control-applet
-e-address-conduit-control-applet.desktop
-e-address.conduit
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
deleted file mode 100644
index d382736b46..0000000000
--- a/addressbook/conduit/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_builddir)/e-util		\
-	$(PISOCK_CFLAGS)			\
-	$(GNOME_PILOT_CFLAGS)			\
-	$(BONOBO_GNOME_CFLAGS)			\
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
-
-# Address Conduit
-e_address_conduitsdir=$(libdir)/gnome-pilot/conduits
-e_address_conduits_LTLIBRARIES = libeaddress_conduit.la
-
-libeaddress_conduit_la_SOURCES = \
-	address-conduit.c \
-	address-conduit.h \
-	address-conduit-config.h
-
-libeaddress_conduit_la_LDFLAGS = -module -avoid-version
-libeaddress_conduit_la_LIBADD = 					\
-	$(top_builddir)/addressbook/backend/ebook/libebook-static.la	\
-	$(top_builddir)/e-util/ename/libename-static.la			\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/libeconduit-static.la	 		\
-	$(top_builddir)/camel/libcamel-static.la	 		\
-	$(top_builddir)/libibex/libibex.la				\
-	$(PISOCK_LIBS) 							\
-	$(GNOME_PILOT_LIBS) 						\
-	$(BONOBO_CONF_LIBS)						\
-	$(BONOBO_GNOME_LIBS)						\
-	$(GNOME_LIBDIR) 						\
-	$(GNOME_LIBS)
-
-e-address.conduit: e-address.conduit.in Makefile
-	sed -e 's^\@prefix\@^$(prefix)^g' 				\
-	    -e 's^\@datadir\@^$(datadir)^g' 				\
-	    < $(srcdir)/e-address.conduit.in > e-address.conduit.tmp 	\
-	&& mv e-address.conduit.tmp e-address.conduit
-
-
-Conduitdir = $(datadir)/gnome-pilot/conduits/
-Conduit_DATA = e-address.conduit
-
-EXTRA_DIST = \
-	e-address.conduit.in
-
-install-data-local:
-	$(mkinstalldirs) $(Conduitdir)
diff --git a/addressbook/conduit/address-conduit-config.h b/addressbook/conduit/address-conduit-config.h
deleted file mode 100644
index 4042eff423..0000000000
--- a/addressbook/conduit/address-conduit-config.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution addressbook - Addressbook Conduit Configuration
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __ADDR_CONDUIT_CONFIG_H__
-#define __ADDR_CONDUIT_CONFIG_H__
-
-#include <gnome.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-
-/* Configuration info */
-typedef struct _EAddrConduitCfg EAddrConduitCfg;
-struct _EAddrConduitCfg {
-	gboolean open_secret;
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;   /* only used by capplet */
-};
-
-#ifdef ADDR_CONFIG_LOAD
-/* Loads the configuration data */
-static void 
-addrconduit_load_configuration (EAddrConduitCfg **c, guint32 pilot_id) 
-{
-	GnomePilotConduitManagement *management;
-	GnomePilotConduitConfig *config;
-	gchar prefix[256];
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-address-conduit/Pilot_%u/",
-		    pilot_id);
-	
-	*c = g_new0 (EAddrConduitCfg,1);
-	g_assert (*c != NULL);
-
-	(*c)->pilot_id = pilot_id;
-	management = gnome_pilot_conduit_management_new ("e_address_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	config = gnome_pilot_conduit_config_new (management, pilot_id);
-	if (!gnome_pilot_conduit_config_is_enabled (config, &(*c)->sync_type))
-		(*c)->sync_type = GnomePilotConduitSyncTypeNotSet;
-	gtk_object_unref (GTK_OBJECT (config));
-	gtk_object_unref (GTK_OBJECT (management));
-
-	/* Custom settings */
-	gnome_config_push_prefix (prefix);
-
-	(*c)->open_secret = gnome_config_get_bool ("open_secret=FALSE");
-
-	gnome_config_pop_prefix ();
-}
-#endif
-
-#ifdef ADDR_CONFIG_SAVE
-/* Saves the configuration data. */
-static void
-addrconduit_save_configuration (EAddrConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-address-conduit/Pilot_%u/",
-		    c->pilot_id);
-
-	gnome_config_push_prefix (prefix);
-	gnome_config_set_bool ("open_secret", c->open_secret);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-#endif
-
-#ifdef ADDR_CONFIG_DUPE
-/* Creates a duplicate of the configuration data */
-static EAddrConduitCfg*
-addrconduit_dupe_configuration (EAddrConduitCfg *c) 
-{
-	EAddrConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (EAddrConduitCfg, 1);
-	retval->sync_type = c->sync_type;
-	retval->open_secret = c->open_secret;
-	retval->pilot_id = c->pilot_id;
-
-	return retval;
-}
-#endif
-
-#ifdef ADDR_CONFIG_DESTROY
-/* Destroy a configuration */
-static void 
-addrconduit_destroy_configuration (EAddrConduitCfg **c) 
-{
-	g_return_if_fail (c != NULL);
-	g_return_if_fail (*c != NULL);
-
-	g_free (*c);
-	*c = NULL;
-}
-#endif
-
-#endif /* __ADDR_CONDUIT_CONFIG_H__ */
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
deleted file mode 100644
index 0c0645c2e9..0000000000
--- a/addressbook/conduit/address-conduit.c
+++ /dev/null
@@ -1,1583 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution addressbook - Address Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Ximian, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <liboaf/liboaf.h>
-#include <bonobo.h>
-#include <gnome-xml/parser.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-file.h>
-#include <pi-dlp.h>
-#include <ebook/e-book.h>
-#include <ebook/e-card-types.h>
-#include <ebook/e-card-cursor.h>
-#include <ebook/e-card.h>
-#include <ebook/e-card-simple.h>
-#include <e-pilot-util.h>
-
-#define ADDR_CONFIG_LOAD 1
-#define ADDR_CONFIG_DESTROY 1
-#include "address-conduit-config.h"
-#undef ADDR_CONFIG_LOAD
-#undef ADDR_CONFIG_DESTROY
-
-#include "address-conduit.h"
-
-static void free_local (EAddrLocalRecord *local);
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.2"
-#ifdef G_LOG_DOMAIN
-#undef G_LOG_DOMAIN
-#endif
-#define G_LOG_DOMAIN "eaddrconduit"
-
-#define DEBUG_CONDUIT 1
-/* #undef DEBUG_CONDUIT */
-
-#ifdef DEBUG_CONDUIT
-#define LOG(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-#else
-#define LOG(e...)
-#endif 
-
-#define WARN(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, e)
-#define INFO(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-
-typedef struct {
-	EBookStatus status;
-	char *id;
-} CardObjectChangeStatus;
-
-typedef enum {
-	CARD_ADDED,
-	CARD_MODIFIED,
-	CARD_DELETED
-} CardObjectChangeType;
-
-typedef struct 
-{
-	ECard *card;
-	CardObjectChangeType type;
-} CardObjectChange;
-
-enum {
-	LABEL_WORK,
-	LABEL_HOME,
-	LABEL_FAX,
-	LABEL_OTHER,
-	LABEL_EMAIL,
-	LABEL_MAIN,
-	LABEL_PAGER,
-	LABEL_MOBILE
-};
-
-static ECardSimpleField priority [] = {
-	E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,
-	E_CARD_SIMPLE_FIELD_PHONE_HOME,
-	E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX,
-	E_CARD_SIMPLE_FIELD_EMAIL,
-	E_CARD_SIMPLE_FIELD_PHONE_PAGER,
-	E_CARD_SIMPLE_FIELD_PHONE_MOBILE,
-	E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2,
-	E_CARD_SIMPLE_FIELD_PHONE_HOME_2,
-	E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,
-	E_CARD_SIMPLE_FIELD_EMAIL_2,
-	E_CARD_SIMPLE_FIELD_PHONE_OTHER,
-	E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,
-	E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX,
-	E_CARD_SIMPLE_FIELD_EMAIL_3,
-	E_CARD_SIMPLE_FIELD_LAST
-};
-
-static int priority_label [] = {
-	LABEL_WORK,
-	LABEL_HOME,
-	LABEL_FAX,
-	LABEL_EMAIL,
-	LABEL_PAGER,
-	LABEL_MOBILE,
-	LABEL_WORK,
-	LABEL_HOME,
-	LABEL_FAX,
-	LABEL_EMAIL,
-	LABEL_OTHER,
-	LABEL_MAIN,
-	LABEL_FAX,
-	LABEL_EMAIL,
-	-1
-};
-
-/* 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;
-}
-
-/* Context Routines */
-static EAddrConduitContext *
-e_addr_context_new (guint32 pilot_id) 
-{
-	EAddrConduitContext *ctxt = g_new0 (EAddrConduitContext, 1);
-
-	addrconduit_load_configuration (&ctxt->cfg, pilot_id);
-
-	ctxt->ebook = NULL;
-	ctxt->cards = NULL;
-	ctxt->changed_hash = NULL;
-	ctxt->changed = NULL;
-	ctxt->locals = NULL;
-	ctxt->map = NULL;
-
-	return ctxt;
-}
-
-static gboolean
-e_addr_context_foreach_change (gpointer key, gpointer value, gpointer data) 
-{
-	g_free (key);
-
-	return TRUE;
-}
-
-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->ebook != NULL)
-		gtk_object_unref (GTK_OBJECT (ctxt->ebook));
-
-	if (ctxt->cards != NULL) {
-		for (l = ctxt->cards; l != NULL; l = l->next)
-			gtk_object_unref (GTK_OBJECT (l->data));
-		g_list_free (ctxt->cards);
-	}
-	
-	if (ctxt->changed_hash != NULL) {
-		g_hash_table_foreach_remove (ctxt->changed_hash, e_addr_context_foreach_change, NULL);
-		g_hash_table_destroy (ctxt->changed_hash);
-	}
-	
-	if (ctxt->changed != NULL)
-		g_list_free (ctxt->changed);
-	
-	if (ctxt->locals != NULL) {
-		for (l = ctxt->locals; l != NULL; l = l->next)
-			free_local (l->data);
-		g_list_free (ctxt->locals);
-	}
-
-	if (ctxt->map != NULL)
-		e_pilot_map_destroy (ctxt->map);
-
-	g_free (ctxt);
-}
-
-/* Addressbok Server routines */
-static void
-add_card_cb (EBook *ebook, EBookStatus status, const char *id, gpointer closure)
-{
-	CardObjectChangeStatus *cons = closure;
-
-	cons->status = status;
-	cons->id = g_strdup (id);
-	
-	gtk_main_quit();
-}
-
-static void
-status_cb (EBook *ebook, EBookStatus status, gpointer closure)
-{
-	(*(EBookStatus*)closure) = status;
-	gtk_main_quit();
-}
-
-static void
-cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure)
-{
-	EAddrConduitContext *ctxt = (EAddrConduitContext*)closure;
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		long length;
-		int i;
-
-		ctxt->address_load_success = TRUE;
-
-		length = e_card_cursor_get_length (cursor);
-		ctxt->cards = NULL;
-		for (i = 0; i < length; i ++) {
-			ECard *card = e_card_cursor_get_nth (cursor, i);
-			
-			if (e_card_evolution_list (card))
-				continue;
-
-			ctxt->cards = g_list_append (ctxt->cards, card);
-		}
-
-		gtk_main_quit(); /* end the sub event loop */
-	}
-	else {
-		WARN (_("Cursor could not be loaded\n"));
-		gtk_main_quit(); /* end the sub event loop */
-	}
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	EAddrConduitContext *ctxt = (EAddrConduitContext*)closure;
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		e_book_get_cursor (book, "(contains \"full_name\" \"\")", cursor_cb, ctxt);
-	} else {
-		WARN (_("EBook not loaded\n"));
-		gtk_main_quit(); /* end the sub event loop */
-	}
-}
-
-static int
-start_addressbook_server (EAddrConduitContext *ctxt)
-{
-	gchar *uri, *path;
-
-	g_return_val_if_fail(ctxt!=NULL,-2);
-
-	ctxt->ebook = e_book_new ();
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	e_book_load_uri (ctxt->ebook, uri, book_open_cb, ctxt);
-
-	/* run a sub event loop to turn ebook's async loading into a
-           synchronous call */
-	gtk_main ();
-
-	g_free (uri);
-
-	if (ctxt->address_load_success)
-		return 0;
-
-	return -1;
-}
-
-/* Utility routines */
-static char *
-map_name (EAddrConduitContext *ctxt) 
-{
-	char *filename = NULL;
-	
-	filename = g_strdup_printf ("%s/evolution/local/Contacts/pilot-map-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
-
-	return filename;
-}
-
-static GList *
-next_changed_item (EAddrConduitContext *ctxt, GList *changes) 
-{
-	CardObjectChange *coc;
-	GList *l;
-	
-	for (l = changes; l != NULL; l = l->next) {
-		coc = l->data;
-		
-		if (g_hash_table_lookup (ctxt->changed_hash, e_card_get_id (coc->card)))
-			return l;
-	}
-	
-	return NULL;
-}
-
-static ECardSimpleField
-get_next_mail (ECardSimpleField *field)
-{
-	if (field == NULL)
-		return E_CARD_SIMPLE_FIELD_EMAIL;
-	
-	switch (*field) {
-	case E_CARD_SIMPLE_FIELD_EMAIL:
-		return E_CARD_SIMPLE_FIELD_EMAIL_2;
-	case E_CARD_SIMPLE_FIELD_EMAIL_2:
-		return E_CARD_SIMPLE_FIELD_EMAIL_3;
-	default:
-	}
-
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-static ECardSimpleField
-get_next_home (ECardSimpleField *field)
-{
-	if (field == NULL)
-		return E_CARD_SIMPLE_FIELD_PHONE_HOME;
-	
-	switch (*field) {
-	case E_CARD_SIMPLE_FIELD_PHONE_HOME:
-		return E_CARD_SIMPLE_FIELD_PHONE_HOME_2;
-	default:
-	}
-
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-static ECardSimpleField
-get_next_work (ECardSimpleField *field)
-{
-	if (field == NULL)
-		return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS;
-	
-	switch (*field) {
-	case E_CARD_SIMPLE_FIELD_PHONE_BUSINESS:
-		return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2;
-	default:
-	}
-
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-static ECardSimpleField
-get_next_fax (ECardSimpleField *field)
-{
-	if (field == NULL)
-		return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX;
-	
-	switch (*field) {
-	case E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX:
-		return E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX;
-	case E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX:
-		return E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX;
-	default:
-	}
-
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-static ECardSimpleField
-get_next_other (ECardSimpleField *field)
-{
-	if (field == NULL)
-		return E_CARD_SIMPLE_FIELD_PHONE_OTHER;
-
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-static ECardSimpleField
-get_next_main (ECardSimpleField *field)
-{
-	if (field == NULL)
-		return E_CARD_SIMPLE_FIELD_PHONE_PRIMARY;
-
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-static ECardSimpleField
-get_next_pager (ECardSimpleField *field)
-{
-	if (field == NULL)
-		return E_CARD_SIMPLE_FIELD_PHONE_PAGER;
-
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-static ECardSimpleField
-get_next_mobile (ECardSimpleField *field)
-{
-	if (field == NULL)
-		return E_CARD_SIMPLE_FIELD_PHONE_MOBILE;
-
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-static void
-get_next_init (ECardSimpleField *next_mail,
-	       ECardSimpleField *next_home,
-	       ECardSimpleField *next_work,
-	       ECardSimpleField *next_fax,
-	       ECardSimpleField *next_other,
-	       ECardSimpleField *next_main,
-	       ECardSimpleField *next_pager,
-	       ECardSimpleField *next_mobile)
-{	
-	*next_mail = get_next_mail (NULL);
-	*next_home = get_next_home (NULL);
-	*next_work = get_next_work (NULL);
-	*next_fax = get_next_fax (NULL);
-	*next_other = get_next_other (NULL);
-	*next_main = get_next_main (NULL);
-	*next_pager = get_next_pager (NULL);
-	*next_mobile = get_next_mobile (NULL);
-}
-
-static gboolean
-is_next_done (ECardSimpleField field)
-{
-	if (field == E_CARD_SIMPLE_FIELD_LAST)
-		return TRUE;
-	
-	return FALSE;
-}
-
-static gboolean
-is_syncable (EAddrConduitContext *ctxt, EAddrLocalRecord *local) 
-{	
-	ECardSimpleField next_mail, next_home, next_work, next_fax;
-	ECardSimpleField next_other, next_main, next_pager, next_mobile;
-	gboolean syncable = TRUE;
-	int i, l = 0;
-
-	/* See if there are fields we can't sync or not in priority order */
-	get_next_init (&next_mail, &next_home, &next_work, &next_fax,
-		       &next_other, &next_main, &next_pager, &next_mobile);
-	
-	for (i = entryPhone1; i <= entryPhone5 && syncable; i++) {
-		int phonelabel = local->addr->phoneLabel[i - entryPhone1];
-		const char *phone_str = local->addr->entry[i];
-		gboolean empty = !(phone_str && *phone_str);
-		
-		if (empty)
-			continue;
-		
-		for ( ; priority_label[l] != -1; l++)
-			if (phonelabel == priority_label[l])
-				break;
-
-		if (priority_label[l] == -1) {
-			syncable = FALSE;
-			continue;
-		}
-		
-		if (phonelabel == LABEL_EMAIL) {
-			if (is_next_done (next_mail) || next_mail != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_mail = get_next_mail (&next_mail);
-		} else if (phonelabel == LABEL_HOME) {
-			if (is_next_done (next_home) || next_home != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_home = get_next_home (&next_home);
-		} else if (phonelabel == LABEL_WORK) {
-			if (is_next_done (next_work) || next_work != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_work = get_next_work (&next_work);
-		} else if (phonelabel == LABEL_FAX) {
-			if (is_next_done (next_fax) || next_fax != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_fax = get_next_fax (&next_fax);
-		} else if (phonelabel == LABEL_OTHER) {
-			if (is_next_done (next_other) || next_other != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_other = get_next_other (&next_other);
-		} else if (phonelabel == LABEL_MAIN) {
-			if (is_next_done (next_main) || next_main != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_main = get_next_main (&next_main);
-		} else if (phonelabel == LABEL_PAGER) {
-			if (is_next_done (next_pager) || next_pager != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_pager = get_next_pager (&next_pager);
-		} else if (phonelabel == LABEL_MOBILE) {
-			if (is_next_done (next_mobile) || next_mobile != priority[l]) {
-				syncable = FALSE;
-				break;
-			}
-			next_mobile = get_next_mobile (&next_mobile);
-		}
-	}
-
-	return syncable;
-}
-
-static char *
-get_entry_text (struct Address address, int field)
-{
-	if (address.entry[field])
-		return e_pilot_utf8_from_pchar (address.entry[field]);
-	
-	return g_strdup ("");
-}
-
-static void
-clear_entry_text (struct Address address, int field) 
-{
-	if (address.entry[field]) {
-		free (address.entry[field]);
-		address.entry[field] = NULL;
-	}
-}
-
-static void
-compute_status (EAddrConduitContext *ctxt, EAddrLocalRecord *local, const char *uid)
-{
-	CardObjectChange *coc;
-
-	local->local.archived = FALSE;
-	local->local.secret = FALSE;
-
-	coc = g_hash_table_lookup (ctxt->changed_hash, uid);
-	
-	if (coc == NULL) {
-		local->local.attr = GnomePilotRecordNothing;
-		return;
-	}
-	
-	switch (coc->type) {
-	case CARD_ADDED:
-		local->local.attr = GnomePilotRecordNew;
-		break;	
-	case CARD_MODIFIED:
-		local->local.attr = GnomePilotRecordModified;
-		break;
-	case CARD_DELETED:
-		local->local.attr = GnomePilotRecordDeleted;
-		break;
-	}
-}
-
-static void
-free_local (EAddrLocalRecord *local) 
-{
-	gtk_object_unref (GTK_OBJECT (local->ecard));
-	free_Address (local->addr);
-	g_free (local->addr);
-	g_free (local);
-}
-
-static GnomePilotRecord
-local_record_to_pilot_record (EAddrLocalRecord *local,
-			      EAddrConduitContext *ctxt)
-{
-	GnomePilotRecord p;
-	static char record[0xffff];
-	
-	g_assert (local->addr != NULL );
-	
-	LOG ("local_record_to_pilot_record\n");
-
-	p.ID = local->local.ID;
-	p.category = local->local.category;
-	p.attr = local->local.attr;
-	p.archived = local->local.archived;
-	p.secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p.record = record;
-	p.length = pack_Address (local->addr, p.record, 0xffff);
-
-	return p;	
-}
-
-static void
-local_record_from_ecard (EAddrLocalRecord *local, ECard *ecard, EAddrConduitContext *ctxt)
-{
-	ECardSimple *simple;
-	const ECardDeliveryAddress *delivery;
-	int phone = entryPhone1;
-
-	gboolean syncable;
-	int i;
-	
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (ecard != NULL);
-
-	local->ecard = ecard;
-	gtk_object_ref (GTK_OBJECT (ecard));
-	simple = e_card_simple_new (ecard);
-	
-	local->local.ID = e_pilot_map_lookup_pid (ctxt->map, ecard->id, TRUE);
-
-	compute_status (ctxt, local, ecard->id);
-
-	local->addr = g_new0 (struct Address, 1);
-
-	/* Handle the fields and category we don't sync by making sure
-         * we don't overwrite them 
-	 */
-	if (local->local.ID != 0) {
-		struct Address addr;
-		char record[0xffff];
-		int cat = 0;
-		
-		if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, 
-					ctxt->dbi->db_handle,
-					local->local.ID, &record, 
-					NULL, NULL, NULL, &cat) > 0) {
-			local->local.category = cat;
-			memset (&addr, 0, sizeof (struct Address));
-			unpack_Address (&addr, record, 0xffff);
-			for (i = 0; i < 5; i++) {
-				if (addr.entry[entryPhone1 + i])
-					local->addr->entry[entryPhone1 + i] = 
-						strdup (addr.entry[entryPhone1 + i]);
-				local->addr->phoneLabel[i] = addr.phoneLabel[i];
-			}
-			local->addr->showPhone = addr.showPhone;
-			for (i = 0; i < 4; i++) {
-				if (addr.entry[entryCustom1 + i])
-					local->addr->entry[entryCustom1 + i] = 
-						strdup (addr.entry[entryCustom1 + i]);
-			}
-			free_Address (&addr);
-		}
-	}
-
-	if (ecard->name) {
-		local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (ecard->name->given);
-		local->addr->entry[entryLastname] = e_pilot_utf8_to_pchar (ecard->name->family);
-	}
-
-	local->addr->entry[entryCompany] = e_pilot_utf8_to_pchar (ecard->org);
-	local->addr->entry[entryTitle] = e_pilot_utf8_to_pchar (ecard->title);
-
-	delivery = e_card_simple_get_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_BUSINESS);
-	if (delivery) {
-		local->addr->entry[entryAddress] = e_pilot_utf8_to_pchar (delivery->street);
-		local->addr->entry[entryCity] = e_pilot_utf8_to_pchar (delivery->city);
-		local->addr->entry[entryState] = e_pilot_utf8_to_pchar (delivery->region);
-		local->addr->entry[entryZip] = e_pilot_utf8_to_pchar (delivery->code);
-		local->addr->entry[entryCountry] = e_pilot_utf8_to_pchar (delivery->country);
-	}
-
-	/* Phone numbers */
-
-	/* See if everything is syncable */
-	syncable = is_syncable (ctxt, local);
-	
-	if (syncable) {
-		INFO ("Syncable");
-
-		/* Sync by priority */
-		for (i = 0, phone = entryPhone1; 
-		     priority[i] != E_CARD_SIMPLE_FIELD_LAST && phone <= entryPhone5; i++) {
-			const char *phone_str;
-			
-			phone_str = e_card_simple_get_const (simple, priority[i]);
-			if (phone_str && *phone_str) {
-				clear_entry_text (*local->addr, phone);
-				local->addr->entry[phone] = e_pilot_utf8_to_pchar (phone_str);
-				local->addr->phoneLabel[phone - entryPhone1] = priority_label[i];
-				phone++;
-			}
-		}
-		for ( ; phone <= entryPhone5; phone++)
-			      local->addr->phoneLabel[phone - entryPhone1] = phone - entryPhone1;
-		local->addr->showPhone = 0;
-	} else {
-		ECardSimpleField next_mail, next_home, next_work, next_fax;
-		ECardSimpleField next_other, next_main, next_pager, next_mobile;
-
-		INFO ("Not Syncable");
-		get_next_init (&next_mail, &next_home, &next_work, &next_fax,
-			       &next_other, &next_main, &next_pager, &next_mobile);
-
-		/* Not completely syncable, so do the best we can */
-		for (i = entryPhone1; i <= entryPhone5; i++) {
-			int phonelabel = local->addr->phoneLabel[i - entryPhone1];
-			const char *phone_str = NULL;
-			
-			if (phonelabel == LABEL_EMAIL && !is_next_done (next_mail)) {
-				phone_str = e_card_simple_get_const (simple, next_mail);
-				next_mail = get_next_mail (&next_mail);
-			} else if (phonelabel == LABEL_HOME && !is_next_done (next_home)) {
-				phone_str = e_card_simple_get_const (simple, next_home);
-				next_home = get_next_home (&next_home);
-			} else if (phonelabel == LABEL_WORK && !is_next_done (next_work)) {
-				phone_str = e_card_simple_get_const (simple, next_work);
-				next_work = get_next_work (&next_work);
-			} else if (phonelabel == LABEL_FAX && !is_next_done (next_fax)) {
-				phone_str = e_card_simple_get_const (simple, next_fax);
-				next_fax = get_next_fax (&next_fax);
-			} else if (phonelabel == LABEL_OTHER && !is_next_done (next_other)) {
-				phone_str = e_card_simple_get_const (simple, next_other);
-				next_other = get_next_other (&next_other);
-			} else if (phonelabel == LABEL_MAIN && !is_next_done (next_main)) {
-				phone_str = e_card_simple_get_const (simple, next_main);
-				next_main = get_next_main (&next_main);
-			} else if (phonelabel == LABEL_PAGER && !is_next_done (next_pager)) {
-				phone_str = e_card_simple_get_const (simple, next_pager);
-				next_pager = get_next_pager (&next_pager);
-			} else if (phonelabel == LABEL_MOBILE && !is_next_done (next_mobile)) {
-				phone_str = e_card_simple_get_const (simple, next_mobile);
-				next_mobile = get_next_mobile (&next_mobile);
-			}
-			
-			if (phone_str && *phone_str) {
-				clear_entry_text (*local->addr, i);
-				local->addr->entry[i] = e_pilot_utf8_to_pchar (phone_str);
-			}
-		}
-	}
-	
-	/* Note */
-	local->addr->entry[entryNote] = e_pilot_utf8_to_pchar (ecard->note);
-
-	gtk_object_unref (GTK_OBJECT (simple));
-}
-
-static void 
-local_record_from_uid (EAddrLocalRecord *local,
-		       const char *uid,
-		       EAddrConduitContext *ctxt)
-{
-	ECard *ecard = NULL;
-	GList *l;
-	
-	g_assert (local != NULL);
-
-	for (l = ctxt->cards; l != NULL; l = l->next) {
-		ecard = l->data;
-		
-		if (ecard->id && !strcmp (ecard->id, uid))
-			break;
-
-		ecard = NULL;
-	}
-
-	if (ecard != NULL) {
-		local_record_from_ecard (local, ecard, ctxt);
-	} else {
-		ecard = e_card_new ("");
-		e_card_set_id (ecard, uid);
-		local_record_from_ecard (local, ecard, ctxt);
-	}
-}
-
-static ECard *
-ecard_from_remote_record(EAddrConduitContext *ctxt,
-			 GnomePilotRecord *remote,
-			 ECard *in_card)
-{
-	struct Address address;
-	ECard *ecard;
-	ECardSimple *simple;
-	ECardName *name;
-	ECardDeliveryAddress *delivery;
-	ECardAddrLabel *label;
-	char *txt;
-	ECardSimpleField next_mail, next_home, next_work, next_fax;
-	ECardSimpleField next_other, next_main, next_pager, next_mobile;
-	int i;
-
-	g_return_val_if_fail(remote!=NULL,NULL);
-	memset (&address, 0, sizeof (struct Address));
-	unpack_Address (&address, remote->record, remote->length);
-
-	if (in_card == NULL)
-		ecard = e_card_new("");
-	else
-		ecard = e_card_duplicate (in_card);
-
-	/* Name */
-	name = e_card_name_copy (ecard->name);
-	name->given = get_entry_text (address, entryFirstname);
-	name->family = get_entry_text (address, entryLastname);
-
-	simple = e_card_simple_new (ecard);
-	txt = e_card_name_to_string (name);	
-	e_card_simple_set (simple, E_CARD_SIMPLE_FIELD_FULL_NAME, txt);
-	e_card_simple_set_name (simple, name);
-
-	/* File as */
-	if (!(txt && *txt))
-		e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_FILE_AS, 
-				  address.entry[entryCompany]);
-
-	g_free (txt);
-	e_card_name_unref (name);
-
-	/* Title and Company */
-	txt = get_entry_text (address, entryTitle);
-	e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_TITLE, txt);
-	g_free (txt);
-
-	txt = get_entry_text (address, entryCompany);
-	e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_ORG, txt);
-	g_free (txt);
-
-	/* Address */
-	delivery = e_card_delivery_address_new ();
-	delivery->flags = E_CARD_ADDR_WORK;
-	delivery->street = get_entry_text (address, entryAddress);
-	delivery->city = get_entry_text (address, entryCity);
-	delivery->region = get_entry_text (address, entryState);
-	delivery->country = get_entry_text (address, entryCountry);
-	delivery->code = get_entry_text (address, entryZip);
-
-	label = e_card_address_label_new ();
-	label->flags = E_CARD_ADDR_WORK;
-	label->data = e_card_delivery_address_to_string (delivery);
-
-	e_card_simple_set_address (simple, E_CARD_SIMPLE_ADDRESS_ID_BUSINESS, label);
-	e_card_simple_set_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_BUSINESS, delivery);
-
-	e_card_delivery_address_unref (delivery);
-	e_card_address_label_unref (label);
-	
-	/* Phone numbers */
-	get_next_init (&next_mail, &next_home, &next_work, &next_fax,
-		       &next_other, &next_main, &next_pager, &next_mobile);
-
-	for (i = entryPhone1; i <= entryPhone5; i++) {
-		int phonelabel = address.phoneLabel[i - entryPhone1];
-		char *phonenum = get_entry_text (address, i);
-		
-		if (phonelabel == LABEL_EMAIL && !is_next_done (next_mail)) {
-			e_card_simple_set (simple, next_mail, phonenum);
-			next_mail = get_next_mail (&next_mail);
-		} else if (phonelabel == LABEL_HOME && !is_next_done (next_home)) {
-			e_card_simple_set (simple, next_home, phonenum);
-			next_home = get_next_home (&next_home);
-		} else if (phonelabel == LABEL_WORK && !is_next_done (next_work)) {
-			e_card_simple_set (simple, next_work, phonenum);
-			next_work = get_next_work (&next_work);
-		} else if (phonelabel == LABEL_FAX && !is_next_done (next_fax)) {
-			e_card_simple_set (simple, next_fax, phonenum);
-			next_fax = get_next_fax (&next_fax);
-		} else if (phonelabel == LABEL_OTHER && !is_next_done (next_other)) {
-			e_card_simple_set (simple, next_other, phonenum);
-			next_other = get_next_other (&next_other);
-		} else if (phonelabel == LABEL_MAIN && !is_next_done (next_main)) {
-			e_card_simple_set (simple, next_main, phonenum);
-			next_main = get_next_main (&next_main);
-		} else if (phonelabel == LABEL_PAGER && !is_next_done (next_pager)) {
-			e_card_simple_set (simple, next_pager, phonenum);
-			next_pager = get_next_pager (&next_pager);
-		} else if (phonelabel == LABEL_MOBILE && !is_next_done (next_mobile)) {
-			e_card_simple_set (simple, next_mobile, phonenum);
-			next_mobile = get_next_mobile (&next_mobile);
-		}
-		
-		g_free (phonenum);
-	}
-
-	/* Note */
-	txt = get_entry_text (address, entryNote);
-	e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_NOTE, txt);
-	g_free (txt);
-	
-	e_card_simple_sync_card (simple);
-	gtk_object_unref(GTK_OBJECT(simple));
-
-	free_Address(&address);
-
-	return ecard;
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, EAddrConduitContext *ctxt)
-{
-	GnomePilotConduitStandard *conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-	int map_count;
-
-	map_count = g_hash_table_size (ctxt->map->pid_map);	
-	if (map_count == 0)
-		gnome_pilot_conduit_standard_set_slow (conduit, TRUE);
-
-	if (gnome_pilot_conduit_standard_get_slow (conduit)) {
-		ctxt->map->write_touched_only = TRUE;
-		LOG ("    doing slow sync\n");
-	} else {
-		LOG ("    doing fast sync\n");
-	}
-}
-
-static void
-card_added (EBookView *book_view, const GList *cards, EAddrConduitContext *ctxt)
-{
-	const GList *l;
-
-	for (l = cards; l != NULL; l = l->next) {
-		ECard *card = E_CARD (l->data);
-		CardObjectChange *coc;
-		
-		if (e_card_evolution_list (card))
-			continue;
-		
-		coc = g_new0 (CardObjectChange, 1);
-		coc->card = card;
-		coc->type = CARD_ADDED;
-
-		gtk_object_ref (GTK_OBJECT (coc->card));
-		ctxt->changed = g_list_prepend (ctxt->changed, coc);
-		if (!e_pilot_map_uid_is_archived (ctxt->map, e_card_get_id (coc->card)))
-			g_hash_table_insert (ctxt->changed_hash, (gpointer)e_card_get_id (coc->card), coc);
-	}
-}
-
-static void
-card_changed (EBookView *book_view, const GList *cards, EAddrConduitContext *ctxt)
-{
-	const GList *l;
-
-	for (l = cards; l != NULL; l = l->next) {
-		ECard *card = E_CARD (l->data);
-		CardObjectChange *coc;
-
-		if (e_card_evolution_list (card))
-			continue;
-		
-		coc = g_new0 (CardObjectChange, 1);		
-		coc->card = E_CARD (l->data);
-		coc->type = CARD_MODIFIED;
-
-		gtk_object_ref (GTK_OBJECT (coc->card));
-		ctxt->changed = g_list_prepend (ctxt->changed, coc);
-		if (!e_pilot_map_uid_is_archived (ctxt->map, e_card_get_id (coc->card)))
-			g_hash_table_insert (ctxt->changed_hash, (gpointer)e_card_get_id (coc->card), coc);
-	}
-}
-
-
-static void
-card_removed (EBookView *book_view, const char *id, EAddrConduitContext *ctxt)
-{
-	CardObjectChange *coc;
-	gboolean archived;
-	
-	archived = e_pilot_map_uid_is_archived (ctxt->map, id);
-	
-	/* If its deleted, not in the archive and not in the map its a list */
-	if (!archived && e_pilot_map_lookup_pid (ctxt->map, id, FALSE) == 0)
-		return;	
-	
-	coc = g_new0 (CardObjectChange, 1);
-	coc->card = e_card_new ("");
-	e_card_set_id (coc->card, id);
-	coc->type = CARD_DELETED;
-
-	ctxt->changed = g_list_prepend (ctxt->changed, coc);
-	
-	if (!archived)
-		g_hash_table_insert (ctxt->changed_hash, (gpointer)e_card_get_id (coc->card), coc);
-	else
-		e_pilot_map_remove_by_uid (ctxt->map, id);
-}
-
-static void
-sequence_complete (EBookView *book_view, EAddrConduitContext *ctxt)
-{
-	gtk_signal_disconnect_by_data (GTK_OBJECT (book_view), ctxt);
-	gtk_object_unref (GTK_OBJECT (book_view));
-  	gtk_main_quit ();
-}
-
-static void
-view_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer data)
-{
-	EAddrConduitContext *ctxt = data;
-	
-	gtk_object_ref (GTK_OBJECT (book_view));
-	
-  	gtk_signal_connect (GTK_OBJECT (book_view), "card_added", 
-			    (GtkSignalFunc) card_added, ctxt);
-	gtk_signal_connect (GTK_OBJECT (book_view), "card_changed", 
-			    (GtkSignalFunc) card_changed, ctxt);
-	gtk_signal_connect (GTK_OBJECT (book_view), "card_removed", 
-			    (GtkSignalFunc) card_removed, ctxt);
-  	gtk_signal_connect (GTK_OBJECT (book_view), "sequence_complete", 
-			    (GtkSignalFunc) sequence_complete, ctxt);
-
-}
-
-/* Pilot syncing callbacks */
-static gint
-pre_sync (GnomePilotConduit *conduit,
-	  GnomePilotDBInfo *dbi,
-	  EAddrConduitContext *ctxt)
-{
-	GnomePilotConduitSyncAbs *abs_conduit;
-/*    	GList *l; */
-	int len;
-	unsigned char *buf;
-	char *filename;
-	char *change_id;
-/*  	gint num_records; */
-
-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
-
-	LOG ("---------------------------------------------------------\n");
-	LOG ("pre_sync: Addressbook Conduit v.%s", CONDUIT_VERSION);
-	/* g_message ("Addressbook Conduit v.%s", CONDUIT_VERSION); */
-
-	ctxt->dbi = dbi;	
-	ctxt->ebook = NULL;
-	
-	if (start_addressbook_server (ctxt) != 0) {
-		WARN(_("Could not start wombat server"));
-		gnome_pilot_conduit_error (conduit, _("Could not start wombat"));
-		return -1;
-	}
-
-	/* Load the uid <--> pilot id mappings */
-	filename = map_name (ctxt);
-	e_pilot_map_read (filename, &ctxt->map);
-	g_free (filename);
-
-	/* Count and hash the changes */
-	change_id = g_strdup_printf ("pilot-sync-evolution-addressbook-%d", ctxt->cfg->pilot_id);
-	ctxt->changed_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	e_book_get_changes (ctxt->ebook, change_id, view_cb, ctxt);
-	
-	/* Force the view loading to be synchronous */
-	gtk_main ();
-	g_free (change_id);
-	
-	/* Set the count information */
-/*  	num_records = cal_client_get_n_objects (ctxt->client, CALOBJ_TYPE_TODO); */
-/*  	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records); */
-/*  	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records); */
-/*  	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records); */
-/*  	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records); */
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's Address application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's Address application block"));
-		return -1;
-	}
-	unpack_AddressAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-
-  	check_for_slow_setting (conduit, ctxt);
-	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
-	    || ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
-		ctxt->map->write_touched_only = TRUE;
-
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   EAddrConduitContext *ctxt)
-{
-	gchar *filename, *change_id;
-	
-	LOG ("post_sync: Address Conduit v.%s", CONDUIT_VERSION);
-
-	filename = map_name (ctxt);
-	e_pilot_map_write (filename, ctxt->map);
-	g_free (filename);
-
-	/* FIX ME ugly hack - our changes musn't count, this does introduce
-	 * a race condition if anyone changes a record elsewhere during sycnc
-         */	
-	change_id = g_strdup_printf ("pilot-sync-evolution-addressbook-%d", ctxt->cfg->pilot_id);
-	e_book_get_changes (ctxt->ebook, change_id, view_cb, ctxt);
-	g_free (change_id);
-	gtk_main ();
-
-	LOG ("---------------------------------------------------------\n");
-	
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      EAddrLocalRecord *local,
-	      guint32 ID,
-	      EAddrConduitContext *ctxt)
-{
-	LOG ("set_pilot_id: setting to %d\n", ID);
-	
-	e_pilot_map_insert (ctxt->map, ID, local->ecard->id, FALSE);
-
-        return 0;
-}
-
-static gint
-set_status_cleared (GnomePilotConduitSyncAbs *conduit,
-		    EAddrLocalRecord *local,
-		    EAddrConduitContext *ctxt)
-{
-	LOG ("set_status_cleared: clearing status\n");
-	
-	g_hash_table_remove (ctxt->changed_hash, e_card_get_id (local->ecard));
-	
-        return 0;
-}
-
-static gint
-for_each (GnomePilotConduitSyncAbs *conduit,
-	  EAddrLocalRecord **local,
-	  EAddrConduitContext *ctxt)
-{
-  	static GList *cards, *iterator;
-  	static int count;
-
-  	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each");
-
-		cards = ctxt->cards;
-		count = 0;
-		
-		if (cards != NULL) {
-			LOG ("iterating over %d records", g_list_length (cards));
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-  			local_record_from_ecard (*local, cards->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-
-			iterator = cards;
-		} else {
-			LOG ("no events");
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_ecard (*local, iterator->data, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG ("for_each ending");
-
-  			/* Tell the pilot the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-for_each_modified (GnomePilotConduitSyncAbs *conduit,
-		   EAddrLocalRecord **local,
-		   EAddrConduitContext *ctxt)
-{
-	static GList *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, 0);
-
-	if (*local == NULL) {
-		LOG ("for_each_modified beginning\n");
-		
-		iterator = ctxt->changed;
-		
-		count = 0;
-		
-		iterator = next_changed_item (ctxt, iterator);
-		if (iterator != NULL) {
-			CardObjectChange *coc = iterator->data;
-			
-			LOG ("iterating over %d records", g_hash_table_size (ctxt->changed_hash));
-			 
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_ecard (*local, coc->card, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG ("no events");
-
-			*local = NULL;
-		}
-	} else {
-		count++;
-		iterator = g_list_next (iterator);
-		if (iterator && (iterator = next_changed_item (ctxt, iterator))) {
-			CardObjectChange *coc = iterator->data;
-
-			*local = g_new0 (EAddrLocalRecord, 1);
-			local_record_from_ecard (*local, coc->card, ctxt);
-			g_list_prepend (ctxt->locals, *local);
-		} else {
-			LOG ("for_each_modified ending");
-
-    			/* Signal the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-compare (GnomePilotConduitSyncAbs *conduit,
-	 EAddrLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EAddrConduitContext *ctxt)
-{
-	GnomePilotRecord local_pilot;
-	int retval = 0;
-
-	LOG ("compare: local=%s remote=%s...\n",
-	     print_local (local), print_remote (remote));
-
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	local_pilot = local_record_to_pilot_record (local, ctxt);
-
-	if (remote->length != local_pilot.length
-	    || memcmp (local_pilot.record, remote->record, remote->length))
-		retval = 1;
-	
-	if (retval == 0)
-		LOG ("    equal");
-	else
-		LOG ("    not equal");
-	
-	return retval;
-}
-
-static gint
-add_record (GnomePilotConduitSyncAbs *conduit,
-	    GnomePilotRecord *remote,
-	    EAddrConduitContext *ctxt)
-{
-	ECard *ecard;
-	CardObjectChangeStatus cons;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("add_record: adding %s to desktop\n", print_remote (remote));
-
-	ecard = ecard_from_remote_record (ctxt, remote, NULL);
-	
-	/* add the ecard to the server */
-	e_book_add_card (ctxt->ebook, ecard, add_card_cb, &cons);
-
-	gtk_main(); /* enter sub mainloop */
-	
-	if (cons.status != E_BOOK_STATUS_SUCCESS) {
-		WARN ("add_record: failed to add card to ebook\n");
-		return -1;
-	}
-
-	e_card_set_id (ecard, cons.id);
-	e_pilot_map_insert (ctxt->map, remote->ID, ecard->id, FALSE);
-
-	gtk_object_unref (GTK_OBJECT (ecard));
-
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		EAddrLocalRecord *local,
-		GnomePilotRecord *remote,
-		EAddrConduitContext *ctxt)
-{
-	ECard *new_ecard;
-	EBookStatus commit_status;
-	CardObjectChange *coc;
-	CardObjectChangeStatus cons;
-	char *old_id;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("replace_record: replace %s with %s\n",
-	     print_local (local), print_remote (remote));
-
-	old_id = g_strdup (e_card_get_id (local->ecard));
-	coc = g_hash_table_lookup (ctxt->changed_hash, old_id);
-	
-	new_ecard = ecard_from_remote_record (ctxt, remote, local->ecard);
-	gtk_object_unref (GTK_OBJECT (local->ecard));
-	local->ecard = new_ecard;
-
-	if (coc && coc->type == CARD_DELETED)
-		e_book_add_card (ctxt->ebook, local->ecard, add_card_cb, &cons);
-	else
-		e_book_commit_card (ctxt->ebook, local->ecard, status_cb, &commit_status);
-	
-	gtk_main (); /* enter sub mainloop */
-
-	/* Adding a record causes wombat to assign a new uid so we must tidy */
-	if (coc && coc->type == CARD_DELETED) {
-		gboolean arch = e_pilot_map_uid_is_archived (ctxt->map, e_card_get_id (local->ecard));
-		
-		e_card_set_id (local->ecard, cons.id);
-		e_pilot_map_insert (ctxt->map, remote->ID, cons.id, arch);
-
-		coc = g_hash_table_lookup (ctxt->changed_hash, old_id);
-		if (coc) {
-			g_hash_table_remove (ctxt->changed_hash, e_card_get_id (coc->card));
-			coc->card = local->ecard;
-			g_hash_table_insert (ctxt->changed_hash, (gpointer)e_card_get_id (coc->card), coc);
-			
-		}
-		
-		commit_status = cons.status;
-	}
-	
-	if (commit_status != E_BOOK_STATUS_SUCCESS)
-		WARN ("replace_record: failed to update card in ebook\n");
-
-	return retval;
-}
-
-static gint
-delete_record (GnomePilotConduitSyncAbs *conduit,
-	       EAddrLocalRecord *local,
-	       EAddrConduitContext *ctxt)
-{
-	EBookStatus commit_status;
-	int retval = 0;
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (local->ecard != NULL, -1);
-
-	LOG ("delete_record: delete %s\n", print_local (local));
-
-	e_pilot_map_remove_by_uid (ctxt->map, local->ecard->id);
-	e_book_remove_card_by_id (ctxt->ebook, local->ecard->id, status_cb, &commit_status);
-	
-	gtk_main (); /* enter sub mainloop */
-	
-	if (commit_status != E_BOOK_STATUS_SUCCESS && commit_status != E_BOOK_STATUS_CARD_NOT_FOUND)
-		WARN ("delete_record: failed to delete card in ebook\n");
-	
-	return retval;
-}
-
-static gint
-archive_record (GnomePilotConduitSyncAbs *conduit,
-		EAddrLocalRecord *local,
-		gboolean archive,
-		EAddrConduitContext *ctxt)
-{
-	int retval = 0;
-	
-	g_return_val_if_fail (local != NULL, -1);
-
-	LOG ("archive_record: %s\n", archive ? "yes" : "no");
-
-	e_pilot_map_insert (ctxt->map, local->local.ID, local->ecard->id, archive);
-	
-        return retval;
-}
-
-static gint
-match (GnomePilotConduitSyncAbs *conduit,
-       GnomePilotRecord *remote,
-       EAddrLocalRecord **local,
-       EAddrConduitContext *ctxt)
-{
-  	const char *uid;
-	
-	LOG ("match: looking for local copy of %s\n",
-	     print_remote (remote));	
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	*local = NULL;
-	uid = e_pilot_map_lookup_uid (ctxt->map, remote->ID, TRUE);
-	
-	if (!uid)
-		return 0;
-
-	LOG ("  matched\n");
-	
-	*local = g_new0 (EAddrLocalRecord, 1);
-	local_record_from_uid (*local, uid, ctxt);
-	
-	return 0;
-}
-
-static gint
-free_match (GnomePilotConduitSyncAbs *conduit,
-	    EAddrLocalRecord *local,
-	    EAddrConduitContext *ctxt)
-{
-	LOG ("free_match: freeing\n");
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	free_local (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 EAddrLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EAddrConduitContext *ctxt)
-{
-	LOG ("prepare: encoding local %s\n", print_local (local));
-	
-	*remote = local_record_to_pilot_record (local, ctxt);
-	
-	return 0;
-}
-
-static ORBit_MessageValidationResult
-accept_all_cookies (CORBA_unsigned_long request_id,
-		    CORBA_Principal *principal,
-		    CORBA_char *operation)
-{
-	/* allow ALL cookies */
-	return ORBIT_MESSAGE_ALLOW_ALL;
-}
-
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	EAddrConduitContext *ctxt;
-
-	LOG ("in address's conduit_get_gpilot_conduit\n");
-
-	/* we need to find wombat with oaf, so make sure oaf
-	   is initialized here.  once the desktop is converted
-	   to oaf and gpilotd is built with oaf, this can go away */
-	if (!oaf_is_initialized ()) {
-		char *argv[ 1 ] = {"hi"};
-		oaf_init (1, argv);
-
-		if (bonobo_init (CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL) == FALSE)
-			g_error (_("Could not initialize Bonobo"));
-
-		ORBit_set_request_validation_handler (accept_all_cookies);
-	}
-
-	retval = gnome_pilot_conduit_sync_abs_new ("AddressDB", 0x61646472);
-	g_assert (retval != NULL);
-
-	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);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-	EAddrConduitContext *ctxt;
-
-	ctxt = gtk_object_get_data (GTK_OBJECT (conduit), 
-				    "addrconduit_context");
-
-	e_addr_context_destroy (ctxt);
-
-	gtk_object_destroy (GTK_OBJECT (conduit));
-}
diff --git a/addressbook/conduit/address-conduit.h b/addressbook/conduit/address-conduit.h
deleted file mode 100644
index 999a60f12b..0000000000
--- a/addressbook/conduit/address-conduit.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution addressbook - Addressbook 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.
- */
-
-#ifndef __ADDR_CONDUIT_H__
-#define __ADDR_CONDUIT_H__
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <gnome.h>
-#include <pi-address.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <e-pilot-map.h>
-
-/* This is the local record structure for the Evolution Addressbook conduit. */
-typedef struct _EAddrLocalRecord EAddrLocalRecord;
-struct _EAddrLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding ECard object */
-	ECard *ecard;
-
-        /* pilot-link address structure, used for implementing Transmit. */
-	struct Address *addr;
-};
-
-/* This is the context for all the GnomeCal conduit methods. */
-typedef struct _EAddrConduitContext EAddrConduitContext;
-struct _EAddrConduitContext {
-	EAddrConduitCfg *cfg;
-	GnomePilotDBInfo *dbi;
-	
-	struct AddressAppInfo ai;
-
-	EBook *ebook;
-	GList *cards;
-	GList *changed;
-	GHashTable *changed_hash;
-	GList *locals;
-	
-	gboolean address_load_tried;
-	gboolean address_load_success;
-
-	EPilotMap *map;
-};
-
-#endif /* __ADDR_CONDUIT_H__ */
-
-
-
-
-
-
diff --git a/addressbook/conduit/e-address.conduit.in b/addressbook/conduit/e-address.conduit.in
deleted file mode 100644
index ac5489b9aa..0000000000
--- a/addressbook/conduit/e-address.conduit.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<gnome-pilot-conduit version="1.0">
-	<conduit id="e_address_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libeaddress_conduit.so"/>
-	<name value="EAddress"/>
-	<conduit-attribute name="description" value="Synchronizes Addressbook with Evolution"/>
-	<conduit-attribute name="default-synctype" value="synchronize"/>
-	<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
-     	<conduit-attribute name="settings" value="FALSE"/>
-	<conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-address-conduit.png"/>
-</gnome-pilot-conduit>
diff --git a/addressbook/gui/.cvsignore b/addressbook/gui/.cvsignore
deleted file mode 100644
index 09980ae6ba..0000000000
--- a/addressbook/gui/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/gui/Makefile.am b/addressbook/gui/Makefile.am
deleted file mode 100644
index 6b0850da5d..0000000000
--- a/addressbook/gui/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = contact-editor contact-list-editor merging widgets search component
diff --git a/addressbook/gui/component/.cvsignore b/addressbook/gui/component/.cvsignore
deleted file mode 100644
index 8bcb766191..0000000000
--- a/addressbook/gui/component/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-evolution-addressbook
-evolution-addressbook.pure
-test-addressbook
-GNOME_Evolution_Addressbook.oaf
-\ No newline at end of file
diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
deleted file mode 100644
index b050e8ebb8..0000000000
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
+++ /dev/null
@@ -1,134 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the Addressbook Minicard control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_MiniCard_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/vcard"/>
-		<item value="text/x-vcard"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       _value="Evolution Addressbook minicard viewer"/>
-	<oaf_attribute name="description" type="string"
-	               _value="Control that displays an Evolution addressbook minicard."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ControlFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the sample Addressbook control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Control"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_ControlFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/addressbook-control:1.0"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="A sample Bonobo control which displays an addressbook."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_ShellComponent"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               _value="Evolution component for handling contacts."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-contacts.png"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressWidgetFactory"
-	    type="exe"
-	    location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory for the Addressbook's address displayer"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressWidget"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_AddressWidgetFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/address-widget:1.0"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="A Bonobo control for displaying an address."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressPopupFactory"
-	    type="exe"
-	    location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="Factory for the Addressbook's address popup"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_AddressPopup"
-	    type="factory"
-	    location="OAFIID:GNOME_Evolution_Addressbook_AddressPopupFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/address-widget:1.0"/>
-		<item value="IDL:GNOME/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       _value="A Bonobo control for an address popup."/>
-
-</oaf_server>
-
-</oaf_info>
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
deleted file mode 100644
index 8d8c7198bc..0000000000
--- a/addressbook/gui/component/Makefile.am
+++ /dev/null
@@ -1,97 +0,0 @@
-SUBDIRS	= select-names
-
-INCLUDES =							\
-	-DG_LOG_DOMAIN=\"evolution-addressbook\"		\
-	$(EXTRA_GNOME_CFLAGS)					\
-	$(GNOME_INCLUDEDIR)					\
-	-I$(top_srcdir)						\
-	-I$(top_builddir)					\
-	-I$(top_srcdir)/shell					\
-	-I$(top_builddir)/shell					\
-	-I$(top_srcdir)/widgets/misc				\
-	-I$(top_srcdir)/addressbook/gui/contact-editor		\
-	-I$(top_srcdir)/addressbook/gui/contact-list-editor	\
-	-I$(top_srcdir)/addressbook/gui/minicard		\
-	-I$(top_srcdir)/addressbook/gui/widgets			\
-	-I$(top_srcdir)/addressbook/backend			\
-	-I$(top_builddir)/addressbook/backend			\
-	$(BONOBO_HTML_GNOME_CFLAGS)				\
-	$(GNOME_VFS_CFLAGS)					\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"			\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\"
-
-
-bin_PROGRAMS =	\
-	evolution-addressbook
-
-evolution_addressbook_SOURCES = 	\
-	addressbook-component.c		\
-	addressbook-component.h		\
-	addressbook-config.c		\
-	addressbook-config.h		\
-	addressbook-factory.c		\
-	addressbook-storage.c		\
-	addressbook-storage.h		\
-	addressbook.c			\
-	addressbook.h			\
-	e-cardlist-model.c		\
-	e-cardlist-model.h		\
-	e-address-widget.h		\
-	e-address-widget.c		\
-	e-address-popup.h		\
-	e-address-popup.c
-
-evolution_addressbook_LDADD =						\
-	select-names/libeselectnames.la					\
-	$(top_builddir)/shell/libeshell.la				\
-	$(EXTRA_GNOME_LIBS)						\
-	$(BONOBO_HTML_GNOME_LIBS)					\
-	$(GNOME_VFS_LIBS)						\
-	$(BONOBO_CONF_LIBS)						\
-	$(top_builddir)/addressbook/gui/widgets/libeminicard.a		\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/camel/libcamel.la				\
-	$(top_builddir)/libibex/libibex.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a	\
-	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a	\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a	\
-	$(top_builddir)/addressbook/gui/merging/libecardmerging.a	\
-	$(top_builddir)/filter/libfilter.la				\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/widgets/menus/libmenus.la
-
-evolution_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf` -export-dynamic
-
-@XML_I18N_MERGE_OAF_RULE@
-
-oafdir = $(datadir)/oaf
-oaf_in_files = GNOME_Evolution_Addressbook.oaf.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = addressbook-config.glade
-
-EXTRA_DIST = 			\
-	$(glade_DATA)		\
-	$(oaf_DATA)		\
-	addressbook-config.glade\
-	$(oaf_in_files)
-
-if ENABLE_PURIFY
-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-
-all-local: evolution-addressbook.pure
-
-evolution-addressbook.pure: evolution-addressbook
-	@rm -f evolution-addressbook.pure
-	$(PLINK) $(evolution_addressbook_LDFLAGS) $(evolution_addressbook_OBJECTS) $(evolution_addressbook_LDADD) $(LIBS)
-
-endif
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
deleted file mode 100644
index b1815dc794..0000000000
--- a/addressbook/gui/component/addressbook-component.c
+++ /dev/null
@@ -1,555 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-component.c
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <libgnomevfs/gnome-vfs-types.h>
-#include <libgnomevfs/gnome-vfs-uri.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include <libgnomevfs/gnome-vfs-directory.h>
-#include <libgnomevfs/gnome-vfs-file-info.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-#include <bonobo/bonobo-generic-factory.h>
-
-#include "evolution-shell-component.h"
-#include "evolution-shell-component-dnd.h"
-#include "evolution-storage.h"
-
-#include "ebook/e-book.h"
-#include "ebook/e-card.h"
-#include "ebook/e-book-util.h"
-
-#include "addressbook-storage.h"
-#include "addressbook-component.h"
-#include "addressbook.h"
-#include "addressbook/gui/merging/e-card-merging.h"
-#include "addressbook/gui/widgets/e-addressbook-util.h"
-
-
-
-#define GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID "OAFIID:GNOME_Evolution_Addressbook_ShellComponent"
-
-EvolutionShellClient *global_shell_client = NULL;
-
-EvolutionShellClient *
-addressbook_component_get_shell_client  (void)
-{
-	return global_shell_client;
-}
-
-static char *accepted_dnd_types[] = {
-	"text/x-vcard",
-	NULL
-};
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "contacts", "evolution-contacts.png", N_("Contacts"), N_("Folder containing contact information"),
-	  TRUE, accepted_dnd_types, NULL },
-	{ "ldap-contacts", "ldap.png", N_("LDAP Server"), N_("LDAP server containing contact information"),
-	  FALSE, accepted_dnd_types, NULL },
-	{ NULL }
-};
-
-#define IS_CONTACT_TYPE(x)  (g_strcasecmp((x), "contacts") == 0 || g_strcasecmp ((x), "ldap-contacts") == 0)
-
-/* EvolutionShellComponent methods and signals.  */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *type,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	BonoboControl *control;
-
-	if (!IS_CONTACT_TYPE (type))
-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-
-	control = addressbook_factory_new_control ();
-	bonobo_control_set_property (control, "folder_uri", physical_uri, NULL);
-
-	*control_return = control;
-
-	return EVOLUTION_SHELL_COMPONENT_OK;
-}
-
-static void
-create_folder (EvolutionShellComponent *shell_component,
-	       const char *physical_uri,
-	       const char *type,
-	       const GNOME_Evolution_ShellComponentListener listener,
-	       void *closure)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_ShellComponentListener_Result result;
-
-	if (!IS_CONTACT_TYPE (type))
-		result = GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE;
-	else 
-		result = GNOME_Evolution_ShellComponentListener_OK;
-
-	CORBA_exception_init(&ev);
-	GNOME_Evolution_ShellComponentListener_notifyResult(listener, result, &ev);
-	CORBA_exception_free(&ev);
-}
-
-static void
-remove_folder (EvolutionShellComponent *shell_component,
-	       const char *physical_uri,
-	       const char *type,
-	       const GNOME_Evolution_ShellComponentListener listener,
-	       void *closure)
-{
-	CORBA_Environment ev;
-	char *addressbook_db_path, *subdir_path;
-	struct stat sb;
-	int rv;
-
-	CORBA_exception_init(&ev);
-
-	if (!IS_CONTACT_TYPE (type)) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,
-								     &ev);
-		CORBA_exception_free(&ev);
-		return;
-	}
-
-	if (!strncmp (physical_uri, "ldap://", 7)) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION,
-								     &ev);
-		CORBA_exception_free(&ev);
-		return;
-	}
-	if (strncmp (physical_uri, "file://", 7)) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_INVALID_URI,
-								     &ev);
-		CORBA_exception_free(&ev);
-		return;
-	}
-
-	subdir_path = g_concat_dir_and_file (physical_uri + 7, "subfolders");
-	rv = stat (subdir_path, &sb);
-	g_free (subdir_path);
-	if (rv != -1) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_HAS_SUBFOLDERS,
-								     &ev);
-		CORBA_exception_free(&ev);
-		return;
-	}
-
-	addressbook_db_path = g_concat_dir_and_file (physical_uri + 7, "addressbook.db");
-	rv = unlink (addressbook_db_path);
-	g_free (addressbook_db_path);
-	if (rv == 0) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_OK,
-								     &ev);
-	}
-	else {
-		if (errno == EACCES || errno == EPERM)
-			GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-							     GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED,
-							     &ev);
-		else
-			GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-							     GNOME_Evolution_ShellComponentListener_INVALID_URI, /*XXX*/
-							     &ev);
-	}
-	CORBA_exception_free(&ev);
-}
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-/* This code is cut & pasted from calendar/gui/component-factory.c */
-
-static GNOME_Evolution_ShellComponentListener_Result
-xfer_file (GnomeVFSURI *base_src_uri,
-	   GnomeVFSURI *base_dest_uri,
-	   const char *file_name,
-	   int remove_source)
-{
-	GnomeVFSURI *src_uri, *dest_uri;
-	GnomeVFSHandle *hin, *hout;
-	GnomeVFSResult result;
-	GnomeVFSFileInfo file_info;
-	GnomeVFSFileSize size;
-	char *buffer;
-	
-	src_uri = gnome_vfs_uri_append_file_name (base_src_uri, file_name);
-
-	result = gnome_vfs_open_uri (&hin, src_uri, GNOME_VFS_OPEN_READ);
-	if (result == GNOME_VFS_ERROR_NOT_FOUND) {
-		gnome_vfs_uri_unref (src_uri);
-		return GNOME_Evolution_ShellComponentListener_OK; /* No need to xfer anything.  */
-	}
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_uri_unref (src_uri);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	result = gnome_vfs_get_file_info_uri (src_uri, &file_info, GNOME_VFS_FILE_INFO_DEFAULT);
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_uri_unref (src_uri);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	dest_uri = gnome_vfs_uri_append_file_name (base_dest_uri, file_name);
-
-	result = gnome_vfs_create_uri (&hout, dest_uri, GNOME_VFS_OPEN_WRITE, FALSE, 0600);
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_close (hin);
-		gnome_vfs_uri_unref (src_uri);
-		gnome_vfs_uri_unref (dest_uri);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	/* write source file to destination file */
-	buffer = g_malloc (file_info.size);
-	result = gnome_vfs_read (hin, buffer, file_info.size, &size);
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_close (hin);
-		gnome_vfs_close (hout);
-		gnome_vfs_uri_unref (src_uri);
-		gnome_vfs_uri_unref (dest_uri);
-		g_free (buffer);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	result = gnome_vfs_write (hout, buffer, file_info.size, &size);
-	if (result != GNOME_VFS_OK) {
-		gnome_vfs_close (hin);
-		gnome_vfs_close (hout);
-		gnome_vfs_uri_unref (src_uri);
-		gnome_vfs_uri_unref (dest_uri);
-		g_free (buffer);
-		return GNOME_Evolution_ShellComponentListener_PERMISSION_DENIED;
-	}
-
-	if (remove_source) {
-		char *text_uri;
-
-		/* Sigh, we have to do this as there is no gnome_vfs_unlink_uri(). :-(  */
-
-		text_uri = gnome_vfs_uri_to_string (src_uri, GNOME_VFS_URI_HIDE_NONE);
-		result = gnome_vfs_unlink (text_uri);
-		g_free (text_uri);
-	}
-
-	gnome_vfs_close (hin);
-	gnome_vfs_close (hout);
-	gnome_vfs_uri_unref (src_uri);
-	gnome_vfs_uri_unref (dest_uri);
-	g_free (buffer);
-
-	return GNOME_Evolution_ShellComponentListener_OK;
-}
-
-static void
-xfer_folder (EvolutionShellComponent *shell_component,
-	     const char *source_physical_uri,
-	     const char *destination_physical_uri,
-	     const char *type,
-	     gboolean remove_source,
-	     const GNOME_Evolution_ShellComponentListener listener,
-	     void *closure)
-{
-	CORBA_Environment ev;
-
-	GnomeVFSURI *src_uri;
-	GnomeVFSURI *dest_uri;
-	GnomeVFSResult result;
-
-	CORBA_exception_init (&ev);
-	
-	if (!IS_CONTACT_TYPE (type)) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-								     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_TYPE,
-								     &ev);
-		CORBA_exception_free(&ev);
-		return;
-	}
-
-	if (!strncmp (source_physical_uri, "ldap://", 7)
-	    || !strncmp (destination_physical_uri, "ldap://", 7)) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-							     GNOME_Evolution_ShellComponentListener_UNSUPPORTED_OPERATION,
-							     &ev);
-		CORBA_exception_free(&ev);
-		return;
-	}
-
-	if (strncmp (source_physical_uri, "file://", 7)
-	    || strncmp (destination_physical_uri, "file://", 7)) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (listener,
-							     GNOME_Evolution_ShellComponentListener_INVALID_URI,
-							     &ev);
-		CORBA_exception_free(&ev);
-		return;
-	}
-
-	/* check URIs */
-	src_uri = gnome_vfs_uri_new (source_physical_uri);
-	dest_uri = gnome_vfs_uri_new (destination_physical_uri);
-	if (!src_uri || ! dest_uri) {
-		GNOME_Evolution_ShellComponentListener_notifyResult (
-			listener,
-			GNOME_Evolution_ShellComponentListener_INVALID_URI,
-			&ev);
-		gnome_vfs_uri_unref (src_uri);
-		gnome_vfs_uri_unref (dest_uri);
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	result = xfer_file (src_uri, dest_uri, "addressbook.db", remove_source);
-	
-	GNOME_Evolution_ShellComponentListener_notifyResult (listener, result, &ev);
-
-	gnome_vfs_uri_unref (src_uri);
-	gnome_vfs_uri_unref (dest_uri);
-
-        CORBA_exception_free (&ev);	
-}
-
-static char*
-get_dnd_selection (EvolutionShellComponent *shell_component,
-		   const char *physical_uri,
-		   int type,
-		   int *format_return,
-		   const char **selection_return,
-		   int *selection_length_return,
-		   void *closure)
-{
-	/* g_print ("should get dnd selection for %s\n", physical_uri); */
-	return NULL;
-}
-
-static int owner_count = 0;
-
-static void
-owner_set_cb (EvolutionShellComponent *shell_component,
-	      EvolutionShellClient *shell_client,
-	      const char *evolution_homedir,
-	      gpointer user_data)
-{
-	owner_count ++;
-
-	if (global_shell_client == NULL)
-		global_shell_client = shell_client;
-
-	addressbook_storage_setup (shell_component, evolution_homedir);
-}
-
-static gboolean
-gtk_main_quit_cb (gpointer closure)
-{
-	gtk_main_quit ();
-	return TRUE;
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component,
-		GNOME_Evolution_Shell shell_interface,
-		gpointer user_data)
-{
-	owner_count --;
-	if (owner_count == 0) {
-		g_idle_add (gtk_main_quit_cb, NULL);
-	}
-}
-
-/* FIXME We should perhaps take the time to figure out if the book is editable. */
-static void
-local_addressbook_cb (EBook *book, gpointer closure)
-{
-	gboolean is_list = GPOINTER_TO_INT (closure);
-	if (book == NULL)
-		return;
-	if (is_list)
-		e_addressbook_show_contact_list_editor (book, e_card_new(""), TRUE, TRUE);
-	else
-		e_addressbook_show_contact_editor (book, e_card_new(""), TRUE, TRUE);
-}
-
-static void
-nonlocal_addressbook_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	if (status == E_BOOK_STATUS_SUCCESS)
-		local_addressbook_cb (book, closure);
-	else
-		local_addressbook_cb (NULL, closure);
-}
-
-static void
-user_create_new_item_cb (EvolutionShellComponent *shell_component,
-			 const char *id,
-			 const char *parent_folder_physical_uri,
-			 const char *parent_folder_type,
-			 gpointer data)
-{
-	gboolean is_contact_list;
-	if (!strcmp (id, "contact")) {
-		is_contact_list = FALSE;
-	} else if (!strcmp (id, "contact_list")) {
-		is_contact_list = TRUE;
-	} else {
-		g_warning ("Don't know how to create item of type \"%s\"", id);
-		return;
-	}
-	if (IS_CONTACT_TYPE (parent_folder_type)) {
-		EBook *book;
-		gchar *uri;
-
-		book = e_book_new ();
-		uri = g_strdup_printf ("%s/addressbook.db", parent_folder_physical_uri);
-
-		if (addressbook_load_uri (book, uri, nonlocal_addressbook_cb, GINT_TO_POINTER (is_contact_list)) == 0)
-			g_warning ("Couldn't load addressbook %s", uri);
-
-		g_free (uri);
-	} else {
-		e_book_use_local_address_book (local_addressbook_cb, GINT_TO_POINTER (is_contact_list));
-	}
-}
-
-
-/* Destination side DnD */
-
-static CORBA_boolean
-destination_folder_handle_motion (EvolutionShellComponentDndDestinationFolder *folder,
-				  const char *physical_uri,
-				  const char *folder_type,
-				  const GNOME_Evolution_ShellComponentDnd_DestinationFolder_Context * destination_context,
-				  GNOME_Evolution_ShellComponentDnd_Action * suggested_action_return,
-				  gpointer user_data)
-{
-	*suggested_action_return = GNOME_Evolution_ShellComponentDnd_ACTION_MOVE;
-	return TRUE;
-}
-
-static void
-dnd_drop_book_open_cb (EBook *book, EBookStatus status, GList *card_list)
-{
-	GList *l;
-
-	for (l = card_list; l; l = l->next) {
-		ECard *card = l->data;
-
-		e_card_merging_book_add_card (book, card, NULL /* XXX */, NULL);
-	}
-}
-
-static CORBA_boolean
-destination_folder_handle_drop (EvolutionShellComponentDndDestinationFolder *folder,
-				const char *physical_uri,
-				const char *folder_type,
-				const GNOME_Evolution_ShellComponentDnd_DestinationFolder_Context * destination_context,
-				const GNOME_Evolution_ShellComponentDnd_Action action,
-				const GNOME_Evolution_ShellComponentDnd_Data * data,
-				gpointer user_data)
-{
-	EBook *book;
-	GList *card_list;
-	char *expanded_uri;
-
-	if (action == GNOME_Evolution_ShellComponentDnd_ACTION_LINK)
-		return FALSE; /* we can't create links in our addressbook format */
-
-	/* g_print ("in destination_folder_handle_drop (%s)\n", physical_uri); */
-
-	card_list = e_card_load_cards_from_string_with_default_charset (data->bytes._buffer, "ISO-8859-1");
-
-	expanded_uri = addressbook_expand_uri (physical_uri);
-
-	book = e_book_new ();
-	addressbook_load_uri (book, expanded_uri,
-			      (EBookCallback)dnd_drop_book_open_cb, card_list);
-
-	g_free (expanded_uri);
-
-	return TRUE;
-}
-
-
-/* The factory function.  */
-
-static BonoboObject *
-create_component (void)
-{
-	EvolutionShellComponent *shell_component;
-	EvolutionShellComponentDndDestinationFolder *destination_interface;
-
-	shell_component = evolution_shell_component_new (folder_types, NULL,
-							 create_view, create_folder,
-							 remove_folder, xfer_folder,
-							 NULL,
-							 get_dnd_selection,
-							 NULL);
-
-	destination_interface = evolution_shell_component_dnd_destination_folder_new (destination_folder_handle_motion,
-										      destination_folder_handle_drop,
-										      shell_component);
-
-	bonobo_object_add_interface (BONOBO_OBJECT (shell_component),
-				     BONOBO_OBJECT (destination_interface));
-
-	evolution_shell_component_add_user_creatable_item (shell_component, "contact", _("New Contact"), _("New _Contact"), 'c');
-	evolution_shell_component_add_user_creatable_item (shell_component, "contact_list", _("New Contact List"), _("New Contact _List"), 'l');
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "user_create_new_item",
-			    GTK_SIGNAL_FUNC (user_create_new_item_cb), NULL);
-
-	return BONOBO_OBJECT (shell_component);
-}
-
-
-/* FIXME this should probably be renamed as we don't use factories anymore.  */
-void
-addressbook_component_factory_init (void)
-{
-	BonoboObject *object;
-	int result;
-
-	object = create_component ();
-
-	/* FIXME: Handle errors better?  */
-
-	result = oaf_active_server_register (GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID,
-					     bonobo_object_corba_objref (object));
-	if (result == OAF_REG_ERROR)
-		g_error ("Cannot register -- %s", GNOME_EVOLUTION_ADDRESSBOOK_COMPONENT_ID);
-}
diff --git a/addressbook/gui/component/addressbook-component.h b/addressbook/gui/component/addressbook-component.h
deleted file mode 100644
index 9b36873902..0000000000
--- a/addressbook/gui/component/addressbook-component.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-component.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _ADDRESSBOOK_COMPONENT_H
-#define _ADDRESSBOOK_COMPONENT_H
-
-#include "evolution-shell-component.h"
-#include "evolution-storage.h"
-
-void                  addressbook_component_factory_init      (void);
-EvolutionShellClient *addressbook_component_get_shell_client  (void);
-
-#endif /* _ADDRESSBOOK_COMPONENT_H */
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
deleted file mode 100644
index de65019a97..0000000000
--- a/addressbook/gui/component/addressbook-config.c
+++ /dev/null
@@ -1,487 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-stock.h>
-#include <glade/glade.h>
-#include <gal/widgets/e-unicode.h>
-#include <gtkhtml/gtkhtml.h>
-#include <e-util/e-html-utils.h>
-#include "addressbook-config.h"
-#include "addressbook-storage.h"
-
-typedef struct _AddressbookSourceDialog AddressbookSourceDialog;
-typedef struct _AddressbookSourcePageItem  AddressbookSourcePageItem;
-
-struct _AddressbookSourceDialog {
-	GladeXML *gui;
-
-	GtkWidget *dialog;
-
-	GtkWidget *notebook;
-	GtkWidget *basic_notebook;
-	GtkWidget *advanced_notebook;
-
-	GtkWidget *name;
-	GtkWidget *host;
-	GtkWidget *email;
-	GtkWidget *email_label;
-
-	GtkWidget *port;
-	GtkWidget *rootdn;
-	GtkWidget *scope_optionmenu;
-	AddressbookLDAPScopeType ldap_scope;
-	GtkWidget *auth_checkbutton;
-
-	gint id; /* button we closed the dialog with */
-
-	AddressbookSource *source; /* our result if the Ok button was clicked */
-};
-
-static void
-addressbook_source_edit_changed (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	char *data;
-	gboolean complete = TRUE;
-
-	if (complete) {
-		data = e_utf8_gtk_editable_get_chars (GTK_EDITABLE (dialog->name), 0, -1);
-		if (!data || !*data)
-			complete = FALSE;
-		g_free (data);
-	}
-
-	if (complete) {
-		if (complete) {
-			data = e_utf8_gtk_editable_get_chars (GTK_EDITABLE (dialog->host), 0, -1);
-			if (!data || !*data)
-				complete = FALSE;
-			g_free (data);
-		}
-
-		if (complete) {
-			data = e_utf8_gtk_editable_get_chars (GTK_EDITABLE (dialog->port), 0, -1);
-			if (!data || !*data)
-				complete = FALSE;
-				/* XXX more validation on port here */
-			g_free (data);
-		}
-	}
-
-	gnome_dialog_set_sensitive (GNOME_DIALOG (dialog->dialog), 0, complete);
-}
-
-static void
-auth_checkbutton_changed (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	/* make sure the change is reflected by the state of the dialog's OK button */
-	addressbook_source_edit_changed (item, dialog);
-
-	gtk_widget_set_sensitive (dialog->email_label,
-				  gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(dialog->auth_checkbutton)));
-	gtk_entry_set_editable (GTK_ENTRY(dialog->email),
-				gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(dialog->auth_checkbutton)));
-}
-
-static void
-option_menuitem_activated (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	/* make sure the change is reflected by the state of the dialog's OK button */
-	addressbook_source_edit_changed (item, dialog);
-
-	dialog->ldap_scope = g_list_index (gtk_container_children (GTK_CONTAINER (item->parent)),
-					   item);
-}
-
-typedef struct {
-	GtkWidget *notebook;
-	int page_num;
-} FocusHelpClosure;
-
-static void
-focus_help (GtkWidget *w, GdkEventFocus *event, FocusHelpClosure *closure)
-{
-	gtk_notebook_set_page (GTK_NOTEBOOK(closure->notebook), closure->page_num);
-}
-
-static void
-add_focus_handler (GtkWidget *widget, GtkWidget *notebook, int page_num)
-{
-	FocusHelpClosure *focus_closure = g_new0 (FocusHelpClosure, 1);
-	focus_closure->notebook = notebook;
-	focus_closure->page_num = page_num;
-
-	gtk_signal_connect_full (GTK_OBJECT (widget),
-				 "focus_in_event" /* XXX */,
-				 (GtkSignalFunc) focus_help, NULL,
-				 focus_closure,
-				 (GtkDestroyNotify) g_free,
-				 FALSE, FALSE);
-}
-
-static void
-addressbook_source_dialog_set_source (AddressbookSourceDialog *dialog, AddressbookSource *source)
-{
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->name), source ? source->name : "");
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->host), source ? source->host : "");
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->email), source ? source->email_addr : "");
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->port), source ? source->port : "389");
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->rootdn), source ? source->rootdn : "");
-
-	gtk_option_menu_set_history (GTK_OPTION_MENU(dialog->scope_optionmenu), source ? source->scope : ADDRESSBOOK_LDAP_SCOPE_ONELEVEL);
-	dialog->ldap_scope = source ? source->scope : ADDRESSBOOK_LDAP_SCOPE_ONELEVEL;
-
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(dialog->auth_checkbutton), source && source->auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE);
-	gtk_widget_set_sensitive (dialog->email_label, source && source->auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE);
-	gtk_entry_set_editable (GTK_ENTRY(dialog->email), source && source->auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE);
-}
-
-static AddressbookSource *
-addressbook_source_dialog_get_source (AddressbookSourceDialog *dialog)
-{
-	AddressbookSource *source = g_new0 (AddressbookSource, 1);
-
-	source->name       = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->name));
-	source->host       = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->host));
-	source->email_addr = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->email));
-	source->port       = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->port));
-	source->rootdn     = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog->rootdn));
-	source->scope      = dialog->ldap_scope;
-	source->auth       = (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->auth_checkbutton))
-			      ? ADDRESSBOOK_LDAP_AUTH_SIMPLE : ADDRESSBOOK_LDAP_AUTH_NONE);
-
-	addressbook_storage_init_source_uri (source);
-
-	return source;
-}
-
-static void
-addressbook_source_dialog_ok_clicked (GtkWidget *widget, AddressbookSourceDialog *dialog)
-{
-	dialog->source = addressbook_source_dialog_get_source (dialog);
-}
-
-static void
-add_activate_cb (GtkWidget *item, AddressbookSourceDialog *dialog)
-{
-	gtk_signal_connect (GTK_OBJECT (item), "activate",
-			    GTK_SIGNAL_FUNC (option_menuitem_activated), dialog);
-}
-
-static AddressbookSourceDialog*
-addressbook_source_dialog (GladeXML *gui, AddressbookSource *source, GtkWidget *parent)
-{
-	AddressbookSourceDialog *dialog = g_new0 (AddressbookSourceDialog, 1);
-	GtkWidget *menu;
-
-	dialog->gui = gui;
-
-	dialog->dialog = glade_xml_get_widget (gui, "add_addressbook");
-
-	if (source)
-		gtk_window_set_title (GTK_WINDOW (dialog->dialog), _("Edit Addressbook"));
-
-	gtk_window_set_modal (GTK_WINDOW (dialog->dialog), TRUE);
-	gtk_window_set_policy (GTK_WINDOW (dialog->dialog), 
-			       FALSE, TRUE, FALSE);
-
-	gnome_dialog_set_parent (GNOME_DIALOG (dialog->dialog),
-				 GTK_WINDOW (parent));
-
-	dialog->notebook = glade_xml_get_widget (gui, "add-addressbook-notebook");
-	dialog->basic_notebook = glade_xml_get_widget (gui, "basic-notebook");
-	dialog->advanced_notebook = glade_xml_get_widget (gui, "advanced-notebook");
-
-	/* BASIC STUFF */
-	dialog->name = glade_xml_get_widget (gui, "account-name-entry");
-	gtk_signal_connect (GTK_OBJECT (dialog->name), "changed",
-			    GTK_SIGNAL_FUNC (addressbook_source_edit_changed), dialog);
-	add_focus_handler (dialog->name, dialog->basic_notebook, 0);
-
-	dialog->host = glade_xml_get_widget (gui, "server-name-entry");
-	gtk_signal_connect (GTK_OBJECT (dialog->host), "changed",
-			    GTK_SIGNAL_FUNC (addressbook_source_edit_changed), dialog);
-	add_focus_handler (dialog->host, dialog->basic_notebook, 1);
-
-	dialog->email = glade_xml_get_widget (gui, "email-address-entry");
-	gtk_signal_connect (GTK_OBJECT (dialog->email), "changed",
-			    GTK_SIGNAL_FUNC (addressbook_source_edit_changed), dialog);
-	add_focus_handler (dialog->email, dialog->basic_notebook, 2);
-
-	dialog->email_label = glade_xml_get_widget (gui, "email-address-label");
-
-	dialog->auth_checkbutton = glade_xml_get_widget (gui, "auth-checkbutton");
-	add_focus_handler (dialog->auth_checkbutton, dialog->basic_notebook, 2);
-	gtk_signal_connect (GTK_OBJECT (dialog->auth_checkbutton), "toggled",
-			    GTK_SIGNAL_FUNC (auth_checkbutton_changed), dialog);
-
-	/* ADVANCED STUFF */
-	dialog->port = glade_xml_get_widget (gui, "port-entry");
-	gtk_signal_connect (GTK_OBJECT (dialog->port), "changed",
-			    GTK_SIGNAL_FUNC (addressbook_source_edit_changed), dialog);
-	add_focus_handler (dialog->port, dialog->advanced_notebook, 0);
-
-	dialog->rootdn = glade_xml_get_widget (gui, "rootdn-entry");
-	gtk_signal_connect (GTK_OBJECT (dialog->rootdn), "changed",
-			    GTK_SIGNAL_FUNC (addressbook_source_edit_changed), dialog);
-	add_focus_handler (dialog->rootdn, dialog->advanced_notebook, 1);
-
-	dialog->scope_optionmenu = glade_xml_get_widget (gui, "scope-optionmenu");
-	add_focus_handler (dialog->scope_optionmenu, dialog->advanced_notebook, 2);
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU(dialog->scope_optionmenu));
-	gtk_container_foreach (GTK_CONTAINER (menu), (GtkCallback)add_activate_cb, dialog);
-
-	/* fill in source info if there is some */
-	addressbook_source_dialog_set_source (dialog, source);
-
-	/* always start out on the first page. */
-	gtk_notebook_set_page (GTK_NOTEBOOK (dialog->notebook), 0);
-
-	gnome_dialog_set_sensitive (GNOME_DIALOG (dialog->dialog), 0, FALSE);
-	
-	gnome_dialog_button_connect( GNOME_DIALOG (dialog->dialog), 0,
-				     GTK_SIGNAL_FUNC (addressbook_source_dialog_ok_clicked),
-				     dialog);
-
-	/* and set focus to be the Account field (the first editable
-           field on the first page) */
-	gtk_widget_grab_focus (dialog->name);
-
-	return dialog;
-}
-
-static AddressbookSourceDialog *
-addressbook_config_source_with_gui (GladeXML *gui, AddressbookSource *source, GtkWidget *parent)
-{
-	AddressbookSourceDialog* dialog;
-
-	dialog = addressbook_source_dialog (gui, source, parent);
-
-	gnome_dialog_close_hides (GNOME_DIALOG(dialog->dialog), TRUE);
-
-	dialog->id = gnome_dialog_run_and_close (GNOME_DIALOG (dialog->dialog));
-
-	return dialog;
-}
-
-void
-addressbook_create_new_source (const char *new_source, GtkWidget *parent)
-{
-	AddressbookSourceDialog *dialog;
-	GladeXML *gui;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/addressbook-config.glade", NULL);
-
-	dialog = addressbook_source_dialog (gui, NULL, parent);
-
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (dialog->name), new_source);
-
-	gnome_dialog_close_hides (GNOME_DIALOG(dialog->dialog), TRUE);
-
-	dialog->id = gnome_dialog_run_and_close (GNOME_DIALOG (dialog->dialog));
-	
-	gtk_object_unref (GTK_OBJECT (dialog->gui));
-
-	if (dialog->id == 0) {
-		/* Ok was clicked */
-		addressbook_storage_add_source (addressbook_source_copy(dialog->source));
-		addressbook_storage_write_sources();
-	}
-}
-
-
-
-typedef struct {
-	GladeXML *gui;
-	GNOME_Evolution_Shell shell;
-	GtkWidget *dialog;
-	GtkWidget *clistSources;
-	GtkWidget *addSource;
-	GtkWidget *editSource;
-	GtkWidget *deleteSource;
-	gint      source_row;
-} AddressbookDialog;
-
-static void
-update_sensitivity (AddressbookDialog *dialog)
-{
-	gboolean sensitive = dialog->source_row != -1;
-
-	gtk_widget_set_sensitive (dialog->editSource, sensitive);
-	gtk_widget_set_sensitive (dialog->deleteSource, sensitive);
-}
-
-static void
-add_source_clicked (GtkWidget *widget, AddressbookDialog *dialog)
-{
-	AddressbookSourceDialog *sdialog;
-
-	sdialog = addressbook_config_source_with_gui (dialog->gui, NULL, dialog->dialog);
-	if (sdialog->id == 0) {
-		/* Ok was clicked */
-		AddressbookSource *source = addressbook_source_copy(sdialog->source);
-		gint row;
-		gchar *text[2];
-
-		text[0] = source->name;
-		text[1] = source->host;
-
-		row = e_utf8_gtk_clist_append (GTK_CLIST(dialog->clistSources), text);
-		gtk_clist_set_row_data_full (GTK_CLIST(dialog->clistSources), row, source, (GtkDestroyNotify) addressbook_source_free);
-		gnome_dialog_set_sensitive (GNOME_DIALOG(dialog->dialog), 0, TRUE);
-		gnome_dialog_set_sensitive (GNOME_DIALOG(dialog->dialog), 1, TRUE);
-		update_sensitivity (dialog);
-	}
-}
-
-static void
-edit_source_clicked (GtkWidget *widget, AddressbookDialog *dialog)
-{
-	AddressbookSource *source;
-	AddressbookSourceDialog *sdialog;
-
-	source = gtk_clist_get_row_data (GTK_CLIST (dialog->clistSources), dialog->source_row);
-
-	sdialog = addressbook_config_source_with_gui (dialog->gui, source, dialog->dialog);
-	if (sdialog->id == 0) {
-		/* Ok was clicked */
-		source = addressbook_source_copy(sdialog->source);
-
-		e_utf8_gtk_clist_set_text (GTK_CLIST (dialog->clistSources), dialog->source_row, 0, source->name);
-		e_utf8_gtk_clist_set_text (GTK_CLIST (dialog->clistSources), dialog->source_row, 1, source->host);
-		gtk_clist_set_row_data (GTK_CLIST (dialog->clistSources), dialog->source_row, source);
-		gnome_dialog_set_sensitive (GNOME_DIALOG(dialog->dialog), 0, TRUE);
-		gnome_dialog_set_sensitive (GNOME_DIALOG(dialog->dialog), 1, TRUE);
-		update_sensitivity (dialog);
-	}
-}
-
-static void
-delete_source_clicked (GtkWidget *widget, AddressbookDialog *dialog)
-{
-	gtk_clist_remove (GTK_CLIST (dialog->clistSources), dialog->source_row);
-	dialog->source_row = -1;
-	gnome_dialog_set_sensitive (GNOME_DIALOG(dialog->dialog), 0, TRUE);
-	gnome_dialog_set_sensitive (GNOME_DIALOG(dialog->dialog), 1, TRUE);
-	update_sensitivity (dialog);
-}
-
-static void
-sources_select_row (GtkWidget *widget, gint row, gint column,
-		    GdkEventButton *event, AddressbookDialog *dialog)
-{
-	dialog->source_row = row;
-
-	update_sensitivity (dialog);
-}
-
-static void
-addressbook_dialog_close (GtkWidget *w, AddressbookDialog *dialog)
-{
-	gtk_widget_destroy (dialog->dialog);
-	gtk_object_unref (GTK_OBJECT (dialog->gui));
-	g_free (dialog);
-}
-
-static void
-addressbook_dialog_apply (GtkWidget *w, AddressbookDialog *dialog)
-{
-	int i;
-
-	addressbook_storage_clear_sources();
-
-	for (i = 0; i < GTK_CLIST(dialog->clistSources)->rows; i ++) {
-		AddressbookSource *source = (AddressbookSource*)gtk_clist_get_row_data (GTK_CLIST (dialog->clistSources), i);
-		addressbook_storage_add_source (addressbook_source_copy (source));
-	}
-
-	addressbook_storage_write_sources();
-
-	gnome_dialog_set_sensitive (GNOME_DIALOG(dialog->dialog), 0, FALSE);
-	gnome_dialog_set_sensitive (GNOME_DIALOG(dialog->dialog), 1, FALSE);
-}
-
-static void
-addressbook_dialog_ok (GtkWidget *w, AddressbookDialog *dialog)
-{
-	addressbook_dialog_apply(w, dialog);
-	addressbook_dialog_close(w, dialog);
-}
-
-void
-addressbook_config (GNOME_Evolution_Shell shell)
-{
-	AddressbookDialog *dialog;
-	GladeXML *gui;
-	GtkWidget *clist;
-	GList *l;
-
-	dialog = g_new0 (AddressbookDialog, 1);
-
-	dialog->source_row = -1;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/addressbook-config.glade", NULL);
-	dialog->gui = gui;
-	dialog->shell = shell;
-
-	dialog->dialog = glade_xml_get_widget (gui, "addressbook_sources");
-
-	clist = glade_xml_get_widget (gui, "clistSources");
-	dialog->clistSources = clist;
-	
-	gtk_clist_column_titles_passive (GTK_CLIST (clist));
-	gtk_clist_set_column_width (GTK_CLIST (clist), 0, 80);
-
-	dialog->addSource = glade_xml_get_widget (gui, "addSource");
-	gtk_signal_connect (GTK_OBJECT(dialog->addSource), "clicked",
-			    GTK_SIGNAL_FUNC (add_source_clicked),
-			    dialog);
-
-	dialog->editSource = glade_xml_get_widget (gui, "editSource");
-	gtk_signal_connect (GTK_OBJECT(dialog->editSource), "clicked",
-			    GTK_SIGNAL_FUNC (edit_source_clicked),
-			    dialog);
-
-	dialog->deleteSource = glade_xml_get_widget (gui, "deleteSource");
-	gtk_signal_connect (GTK_OBJECT(dialog->deleteSource), "clicked",
-			    GTK_SIGNAL_FUNC (delete_source_clicked),
-			    dialog);
-
-	gnome_dialog_set_sensitive (GNOME_DIALOG(dialog->dialog), 0, FALSE);
-	gnome_dialog_set_sensitive (GNOME_DIALOG(dialog->dialog), 1, FALSE);
-	update_sensitivity (dialog);
-
-	l = addressbook_storage_get_sources ();
-	for (; l != NULL; l = l->next) {
-		AddressbookSource *source;
-		gint row;
-		gchar *text[2];
-
-		source = addressbook_source_copy ((AddressbookSource*)l->data);
-
-		text[0] = source->name;
-		text[1] = source->host;
-
-		row = e_utf8_gtk_clist_append (GTK_CLIST(clist), text);
-		gtk_clist_set_row_data_full (GTK_CLIST(clist), row, source, (GtkDestroyNotify) addressbook_source_free);
-	}
-
-	gtk_signal_connect (GTK_OBJECT (clist), "select_row",
-			    GTK_SIGNAL_FUNC (sources_select_row),
-			    dialog);
-
-	gnome_dialog_button_connect (GNOME_DIALOG(dialog->dialog),
-				     0 /* OK */, addressbook_dialog_ok, dialog);
-
-	gnome_dialog_button_connect (GNOME_DIALOG(dialog->dialog),
-				     1 /* APPLY */, addressbook_dialog_apply, dialog);
-
-	gnome_dialog_button_connect (GNOME_DIALOG(dialog->dialog),
-				     2 /* CLOSE */, addressbook_dialog_close, dialog);
-
-	gnome_dialog_run (GNOME_DIALOG(dialog->dialog));
-}
diff --git a/addressbook/gui/component/addressbook-config.glade b/addressbook/gui/component/addressbook-config.glade
deleted file mode 100644
index 50241167c2..0000000000
--- a/addressbook/gui/component/addressbook-config.glade
+++ /dev/null
@@ -1,926 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>add_addressbook</name>
-  <visible>False</visible>
-  <title>Add Addressbook</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <default_width>417</default_width>
-  <default_height>332</default_height>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <name>notebook2</name>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox1</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label29</name>
-	  <label>The information below is required in order to add an addressbook.  </label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>True</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table1</name>
-	  <border_width>3</border_width>
-	  <rows>3</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>3</row_spacing>
-	  <column_spacing>3</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label15</name>
-	    <label>_Account name:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>account-name-entry</default_focus_target>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>account-name-entry</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label16</name>
-	    <label>_Server name:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>server-name-entry</default_focus_target>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>server-name-entry</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>auth-checkbutton</name>
-	    <can_focus>True</can_focus>
-	    <label>_My server requires authentication</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox4</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>email-address-label</name>
-	    <label>Email Address:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>email-address-entry</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkNotebook</class>
-	  <name>basic-notebook</name>
-	  <show_tabs>False</show_tabs>
-	  <show_border>False</show_border>
-	  <tab_pos>GTK_POS_TOP</tab_pos>
-	  <scrollable>False</scrollable>
-	  <tab_hborder>2</tab_hborder>
-	  <tab_vborder>2</tab_vborder>
-	  <popup_enable>False</popup_enable>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label28</name>
-	    <label>This name will be used to identify your account. It is for display purposes only.</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>True</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label18</name>
-	    <label>label18</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label31</name>
-	    <label>This is the name of the server where your addressbook is located.</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>True</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label19</name>
-	    <label>label19</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label48</name>
-	    <label>Evolution will use this email address to authenticate you with the server</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>True</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label47</name>
-	    <label>label47</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label12</name>
-	<label>Basic</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox2</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label30</name>
-	  <label>This information is not required for most ldap servers. </label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>True</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table2</name>
-	  <border_width>3</border_width>
-	  <rows>3</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>3</row_spacing>
-	  <column_spacing>3</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label22</name>
-	    <label>_Port:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>port-entry</default_focus_target>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>port-entry</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text>389</text>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label23</name>
-	    <label>Search _base:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>rootdn-entry</default_focus_target>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>rootdn-entry</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label24</name>
-	    <label>Search s_cope: </label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkAlignment</class>
-	    <name>alignment1</name>
-	    <xalign>7.45058e-09</xalign>
-	    <yalign>7.45058e-09</yalign>
-	    <xscale>0</xscale>
-	    <yscale>1</yscale>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkOptionMenu</class>
-	      <name>scope-optionmenu</name>
-	      <can_focus>True</can_focus>
-	      <items>One
-Base
-Sub
-</items>
-	      <initial_choice>0</initial_choice>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkNotebook</class>
-	  <name>advanced-notebook</name>
-	  <show_tabs>False</show_tabs>
-	  <show_border>False</show_border>
-	  <tab_pos>GTK_POS_TOP</tab_pos>
-	  <scrollable>False</scrollable>
-	  <tab_hborder>2</tab_hborder>
-	  <tab_vborder>2</tab_vborder>
-	  <popup_enable>False</popup_enable>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label35</name>
-	    <label>This is the port that your ldap server uses.</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>True</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label25</name>
-	    <label>label18</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label36</name>
-	    <label>This is the base node for all your searches on the ldap server. Contact your server administrator for more information.</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>True</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label26</name>
-	    <label>label19</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label37</name>
-	    <label>This information is used by your ldap server to specify which nodes are used in a search. Contact your server administrator for more information.</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>True</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>label27</name>
-	    <label>label20</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label13</name>
-	<label>Advanced</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>addressbook_sources</name>
-  <visible>False</visible>
-  <title>Addressbook Sources</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <default_width>355</default_width>
-  <default_height>285</default_height>
-  <allow_shrink>True</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox2</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area2</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button7</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button8</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button9</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox3</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow2</name>
-	<hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkCList</class>
-	  <name>clistSources</name>
-	  <can_focus>True</can_focus>
-	  <columns>2</columns>
-	  <column_widths>100,80</column_widths>
-	  <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	  <show_titles>True</show_titles>
-	  <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>CList:title</child_name>
-	    <name>label43</name>
-	    <label>Account Name</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>CList:title</child_name>
-	    <name>label44</name>
-	    <label>Server Name</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox4</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label45</name>
-	  <label>
-</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkVButtonBox</class>
-	  <name>vbuttonbox3</name>
-	  <layout_style>GTK_BUTTONBOX_START</layout_style>
-	  <spacing>0</spacing>
-	  <child_min_width>85</child_min_width>
-	  <child_min_height>27</child_min_height>
-	  <child_ipad_x>7</child_ipad_x>
-	  <child_ipad_y>0</child_ipad_y>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>addSource</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_Add</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>editSource</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>_Edit</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>deleteSource</name>
-	    <can_default>True</can_default>
-	    <can_focus>True</can_focus>
-	    <label>De_lete</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h
deleted file mode 100644
index b0adbd7330..0000000000
--- a/addressbook/gui/component/addressbook-config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* addressbook-storage.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Chris Toshok
- */
-
-#ifndef __ADDRESSBOOK_CONFIG_H__
-#define __ADDRESSBOOK_CONFIG_H__
-
-#include "addressbook-storage.h"
-
-void         addressbook_config (GNOME_Evolution_Shell shell);
-void         addressbook_create_new_source (const char *new_source, GtkWidget *parent);
-
-#endif /* __ADDRESSBOOK_CONFIG_H__ */
diff --git a/addressbook/gui/component/addressbook-factory.c b/addressbook/gui/component/addressbook-factory.c
deleted file mode 100644
index d7a52c9a6d..0000000000
--- a/addressbook/gui/component/addressbook-factory.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * sample-control-factory.c
- *
- * Copyright 1999, Ximian, Inc.
- * 
- * Author:
- *   Nat Friedman (nat@nat.org)
- *
- */
-
-#include <config.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-init.h>
-#include <liboaf/liboaf.h>
-#include <bonobo/bonobo-main.h>
-#include <libgnomevfs/gnome-vfs-init.h>
-#include <glade/glade.h>
-#include <gal/widgets/e-cursors.h>
-#include <e-util/e-passwords.h>
-
-#include <camel/camel.h>
-
-#ifdef GTKHTML_HAVE_GCONF
-#include <gconf/gconf.h>
-#endif
-
-#include "addressbook.h"
-#include "addressbook-component.h"
-#include "e-address-widget.h"
-#include "e-address-popup.h"
-#include "addressbook/gui/widgets/e-minicard-control.h"
-#include "select-names/e-select-names-factory.h"
-
-
-static void
-init_corba (int *argc, char **argv)
-{
-	gnome_init_with_popt_table ("evolution-addressbook", "0.0",
-				    *argc, argv, oaf_popt_options, 0, NULL);
-
-	oaf_init (*argc, argv);
-}
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-
-#ifdef GTKHTML_HAVE_GCONF
-	gconf_init (argc, argv, NULL);
-#endif
-
-	glade_gnome_init ();
-}
-
-int
-main (int argc, char **argv)
-{
-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (PACKAGE);
-	
-	init_corba (&argc, argv);
-
-	init_bonobo (argc, argv);
-
-	if (!gnome_vfs_init ())
-		g_error (_("Could not initialize gnome-vfs"));
-
-	/* FIXME: Messy names here.  This file should be `main.c'.  `addressbook.c' should
-           be `addressbook-control-factory.c' and the functions should be called
-           `addressbook_control_factory_something()'.  And `addressbook-component.c'
-           should be `addressbook-component-factory.c'.  */
-
-	addressbook_factory_init ();
-	addressbook_component_factory_init ();
-
-	e_select_names_factory_init ();
-	
-	e_minicard_control_factory_init ();
-
-	e_address_widget_factory_init ();
-	e_address_popup_factory_init ();
-
-	e_cursors_init();
-
-	e_passwords_init("Addressbook");
-
-#if 0
-	g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
-#endif
-
-	/*g_thread_init (NULL);*/
-	camel_type_init ();
-
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c
deleted file mode 100644
index 8f22ac359a..0000000000
--- a/addressbook/gui/component/addressbook-storage.c
+++ /dev/null
@@ -1,602 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-ldap-storage.c
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Chris Toshok
- */
-
-/* The addressbook-sources.xml file goes like this:
-
-   <?xml version="1.0"?>
-   <addressbooks>
-     <contactserver>
-           <name>LDAP Server</name>
-	   <host>ldap.server.com</host>
-	   <port>389</port>
-	   <rootdn></rootdn>
-	   <authmethod>simple</authmethod>
-	   <emailaddr>toshok@blubag.com</emailaddr>
-	   <rememberpass/>
-     </contactserver>
-   </addressbooks>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "addressbook-storage.h"
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <bonobo/bonobo-object.h>
-
-#include <gal/util/e-unicode-i18n.h>
-#include <gal/util/e-util.h>
-#include <gal/util/e-xml-utils.h>
-#include <libgnome/gnome-i18n.h>
-
-#include "evolution-shell-component.h"
-
-#include "addressbook-config.h"
-
-#define ADDRESSBOOK_SOURCES_XML "addressbook-sources.xml"
-
-#ifdef HAVE_LDAP
-static gboolean load_source_data (const char *file_path);
-#endif
-
-static gboolean save_source_data (const char *file_path);
-static void deregister_storage (void);
-
-static GList *sources;
-static EvolutionStorage *storage;
-static char *storage_path;
-static GNOME_Evolution_Shell corba_shell;
-
-void
-addressbook_storage_setup (EvolutionShellComponent *shell_component,
-			   const char *evolution_homedir)
-{
-	EvolutionShellClient *shell_client;
-
-	shell_client = evolution_shell_component_get_owner (shell_component);
-	if (shell_client == CORBA_OBJECT_NIL) {
-		g_warning ("We have no shell!?");
-		return;
-	}
-
-	corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));
-
-	sources = NULL;
-
-	if (storage_path)
-		g_free (storage_path);
-	storage_path = g_concat_dir_and_file (evolution_homedir, ADDRESSBOOK_SOURCES_XML);
-#ifdef HAVE_LDAP
-	if (!load_source_data (storage_path))
-		deregister_storage ();
-#endif 
-}
-
-#ifdef HAVE_LDAP
-static void
-notify_listener (const Bonobo_Listener listener, 
-		 GNOME_Evolution_Storage_Result corba_result)
-{
-	CORBA_any any;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	any._type = TC_GNOME_Evolution_Storage_Result;
-	any._value = &corba_result;
-
-	Bonobo_Listener_event (listener, "result", &any, &ev);
-
-	CORBA_exception_free (&ev);
-}
-
-static void
-remove_ldap_folder (EvolutionStorage *storage, const Bonobo_Listener listener,
-		    const CORBA_char *path, const CORBA_char *physical_uri,
-		    gpointer data)
-{
-	
-	addressbook_storage_remove_source (path + 1);
-	addressbook_storage_write_sources();
-
-	notify_listener (listener, GNOME_Evolution_Storage_OK);
-}
-
-static void
-create_ldap_folder (EvolutionStorage *storage, const Bonobo_Listener listener,
-		    const CORBA_char *path, const CORBA_char *type,
-		    const CORBA_char *description, const CORBA_char *parent_physical_uri,
-		    gpointer data)
-{
-	if (strcmp (type, "ldap-contacts")) {
-		notify_listener (listener, GNOME_Evolution_Storage_UNSUPPORTED_TYPE);
-		return;
-	}
-
-	if (strcmp (parent_physical_uri, "")) {/* ldap servers can't have subfolders */
-		notify_listener (listener, GNOME_Evolution_Storage_INVALID_URI);
-		return;
-	}
-	addressbook_create_new_source (path + 1, NULL);
-
-	notify_listener (listener, GNOME_Evolution_Storage_OK);
-}
-#endif
-
-
-EvolutionStorage *
-addressbook_get_other_contact_storage (void) 
-{
-#ifdef HAVE_LDAP
-	EvolutionStorageResult result;
-
-	if (storage == NULL) {
-		storage = evolution_storage_new (U_("Other Contacts"), NULL, NULL);
-		gtk_signal_connect (GTK_OBJECT (storage),
-				    "remove_folder",
-				    GTK_SIGNAL_FUNC(remove_ldap_folder), NULL);
-		gtk_signal_connect (GTK_OBJECT (storage),
-				    "create_folder",
-				    GTK_SIGNAL_FUNC(create_ldap_folder), NULL);
-		result = evolution_storage_register_on_shell (storage, corba_shell);
-		switch (result) {
-		case EVOLUTION_STORAGE_OK:
-			break;
-		case EVOLUTION_STORAGE_ERROR_GENERIC : 
-			g_warning("register_storage: generic error");
-			break;
-		case EVOLUTION_STORAGE_ERROR_CORBA : 
-			g_warning("register_storage: corba error");
-			break;
-		case EVOLUTION_STORAGE_ERROR_ALREADYREGISTERED :
-			g_warning("register_storage: already registered error");
-			break;
-		case EVOLUTION_STORAGE_ERROR_EXISTS :
-			g_warning("register_storage: already exists error");
-			break;
-		default:
-			g_warning("register_storage: other error");
-			break;
-		}
-	}
-#endif
-
-	return storage;
-}
-
-static void 
-deregister_storage (void)
-{
-	if (evolution_storage_deregister_on_shell (storage, corba_shell) != 
-	    EVOLUTION_STORAGE_OK) {
-		g_warning("couldn't deregister storage");
-	}
-
-	storage = NULL;
-}
-
-#ifdef HAVE_LDAP
-static char *
-get_string_value (xmlNode *node,
-		  const char *name)
-{
-	xmlNode *p;
-	xmlChar *xml_string;
-	char *retval;
-
-	p = e_xml_get_child_by_name (node, (xmlChar *) name);
-	if (p == NULL)
-		return NULL;
-
-	p = e_xml_get_child_by_name (p, (xmlChar *) "text");
-	if (p == NULL) /* there's no text between the tags, return the empty string */
-		return g_strdup("");
-
-	xml_string = xmlNodeListGetString (node->doc, p, 1);
-	retval = g_strdup ((char *) xml_string);
-	xmlFree (xml_string);
-
-	return retval;
-}
-#endif
-
-static char *
-ldap_unparse_auth (AddressbookLDAPAuthType auth_type)
-{
-	switch (auth_type) {
-	case ADDRESSBOOK_LDAP_AUTH_NONE:
-		return "none";
-	case ADDRESSBOOK_LDAP_AUTH_SIMPLE:
-		return "simple";
-	default:
-		g_assert(0);
-		return "none";
-	}
-}
-
-#ifdef HAVE_LDAP
-static AddressbookLDAPAuthType
-ldap_parse_auth (const char *auth)
-{
-	if (!auth)
-		return ADDRESSBOOK_LDAP_AUTH_NONE;
-
-	if (!strcmp (auth, "simple"))
-		return ADDRESSBOOK_LDAP_AUTH_SIMPLE;
-	else
-		return ADDRESSBOOK_LDAP_AUTH_NONE;
-}
-#endif
-
-static char *
-ldap_unparse_scope (AddressbookLDAPScopeType scope_type)
-{
-	switch (scope_type) {
-	case ADDRESSBOOK_LDAP_SCOPE_BASE:
-		return "base";
-	case ADDRESSBOOK_LDAP_SCOPE_ONELEVEL:
-		return "one";
-	case ADDRESSBOOK_LDAP_SCOPE_SUBTREE:
-		return "sub";
-	default:
-		g_assert(0);
-		return "";
-	}
-}
-
-#ifdef HAVE_LDAP
-static AddressbookLDAPScopeType
-ldap_parse_scope (const char *scope)
-{
-	if (!scope)
-		return ADDRESSBOOK_LDAP_SCOPE_SUBTREE; /* XXX good default? */
-
-	if (!strcmp (scope, "base"))
-		return ADDRESSBOOK_LDAP_SCOPE_BASE;
-	else if (!strcmp (scope, "one"))
-		return ADDRESSBOOK_LDAP_SCOPE_ONELEVEL;
-	else
-		return ADDRESSBOOK_LDAP_SCOPE_SUBTREE;
-}
-#endif
-
-void
-addressbook_storage_init_source_uri (AddressbookSource *source)
-{
-	if (source->uri)
-		g_free (source->uri);
-
-	source->uri = g_strdup_printf  ("ldap://%s:%s/%s??%s",
-					source->host, source->port,
-					source->rootdn, ldap_unparse_scope(source->scope));
-}
-
-#ifdef HAVE_LDAP
-static gboolean
-load_source_data (const char *file_path)
-{
-	xmlDoc *doc;
-	xmlNode *root;
-	xmlNode *child;
-
-	addressbook_get_other_contact_storage();
-
- tryagain:
-	doc = xmlParseFile (file_path);
-	if (doc == NULL) {
-		/* Check to see if a addressbook-sources.xml.new file
-                   exists.  If it does, rename it and try loading it */
-		char *new_path = g_strdup_printf ("%s.new", file_path);
-		struct stat sb;
-
-		if (stat (new_path, &sb) == 0) {
-			int rv;
-
-			rv = rename (new_path, file_path);
-			g_free (new_path);
-
-			if (rv < 0) {
-				g_error ("Failed to rename %s: %s\n",
-					 ADDRESSBOOK_SOURCES_XML,
-					 strerror(errno));
-				return FALSE;
-			} else
-				goto tryagain;
-		}
-
-		g_free (new_path);
-		return FALSE;
-	}
-
-	root = xmlDocGetRootElement (doc);
-	if (root == NULL || strcmp (root->name, "addressbooks") != 0) {
-		xmlFreeDoc (doc);
-		return FALSE;
-	}
-
-	for (child = root->childs; child; child = child->next) {
-		char *path;
-		AddressbookSource *source;
-
-		source = g_new0 (AddressbookSource, 1);
-
-		if (!strcmp (child->name, "contactserver")) {
-			source->type        = ADDRESSBOOK_SOURCE_LDAP;
-			source->port   = get_string_value (child, "port");
-			source->host   = get_string_value (child, "host");
-			source->rootdn = get_string_value (child, "rootdn");
-			source->scope  = ldap_parse_scope (get_string_value (child, "scope"));
-			source->auth   = ldap_parse_auth (get_string_value (child, "authmethod"));
-			source->email_addr = get_string_value (child, "emailaddr");
-		}
-		else {
-			g_warning ("unknown node '%s' in %s", child->name, file_path);
-			g_free (source);
-			continue;
-		}
-
-		addressbook_storage_init_source_uri (source);
-
-		source->name = get_string_value (child, "name");
-		source->description = get_string_value (child, "description");
-
-		path = g_strdup_printf ("/%s", source->name);
-		evolution_storage_new_folder (storage, path, source->name,
-					      "ldap-contacts", source->uri,
-					      source->description, 0);
-
-		sources = g_list_append (sources, source);
-
-		g_free (path);
-	}
-
-	if (g_list_length (sources) == 0)
-		deregister_storage();
-
-	xmlFreeDoc (doc);
-	return TRUE;
-}
-#endif
-
-static void
-ldap_source_foreach(AddressbookSource *source, xmlNode *root)
-{
-	xmlNode *source_root = xmlNewNode (NULL,
-					   (xmlChar *) "contactserver");
-
-	xmlAddChild (root, source_root);
-
-	xmlNewChild (source_root, NULL, (xmlChar *) "name",
-		     (xmlChar *) source->name);
-	xmlNewChild (source_root, NULL, (xmlChar *) "description",
-		     (xmlChar *) source->description);
-
-	xmlNewChild (source_root, NULL, (xmlChar *) "port",
-		     (xmlChar *) source->port);
-	xmlNewChild (source_root, NULL, (xmlChar *) "host",
-		     (xmlChar *) source->host);
-	xmlNewChild (source_root, NULL, (xmlChar *) "rootdn",
-		     (xmlChar *) source->rootdn);
-	xmlNewChild (source_root, NULL, (xmlChar *) "scope",
-		     (xmlChar *) ldap_unparse_scope(source->scope));
-	xmlNewChild (source_root, NULL, (xmlChar *) "authmethod",
-		     (xmlChar *) ldap_unparse_auth(source->auth));
-	if (source->auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE) {
-		xmlNewChild (source_root, NULL, (xmlChar *) "emailaddr",
-			     (xmlChar *) source->email_addr);
-		if (source->remember_passwd)
-			xmlNewChild (source_root, NULL, (xmlChar *) "rememberpass",
-				     NULL);
-	}
-}
-
-static gboolean
-save_source_data (const char *file_path)
-{
-	xmlDoc *doc;
-	xmlNode *root;
-	int fd, rv;
-	xmlChar *buf;
-	int buf_size;
-	char *new_path = g_strdup_printf ("%s.new", file_path);
-
-	doc = xmlNewDoc ((xmlChar *) "1.0");
-	root = xmlNewDocNode (doc, NULL, (xmlChar *) "addressbooks", NULL);
-	xmlDocSetRootElement (doc, root);
-
-	g_list_foreach (sources, (GFunc)ldap_source_foreach, root);
-
-	fd = open (new_path, O_CREAT | O_TRUNC | O_WRONLY, 0600);
-	fchmod (fd, 0600);
-
-	xmlDocDumpMemory (doc, &buf, &buf_size);
-
-	if (buf == NULL) {
-		g_error ("Failed to write %s: xmlBufferCreate() == NULL", ADDRESSBOOK_SOURCES_XML);
-		return FALSE;
-	}
-
-	rv = write (fd, buf, buf_size);
-	xmlFree (buf);
-	close (fd);
-
-	if (0 > rv) {
-		g_error ("Failed to write new %s: %s\n", ADDRESSBOOK_SOURCES_XML, strerror(errno));
-		unlink (new_path);
-		return FALSE;
-	}
-	else {
-		if (0 > rename (new_path, file_path)) {
-			g_error ("Failed to rename %s: %s\n", ADDRESSBOOK_SOURCES_XML, strerror(errno));
-			unlink (new_path);
-			return FALSE;
-		}
-		return TRUE;
-	}
-}
-
-void
-addressbook_storage_add_source (AddressbookSource *source)
-{
-	char *path;
-
-	sources = g_list_append (sources, source);
-
-	/* And then to the ui */
-	addressbook_get_other_contact_storage();
-	path = g_strdup_printf ("/%s", source->name);
-	evolution_storage_new_folder (storage, path, source->name, "ldap-contacts",
-				      source->uri, source->description, 0);
-
-	g_free (path);
-}
-
-void
-addressbook_storage_remove_source (const char *name)
-{
-	char *path;
-	AddressbookSource *source = NULL;
-	GList *l;
-
-	/* remove it from our hashtable */
-	for (l = sources; l; l = l->next) {
-		AddressbookSource *s = l->data;
-		if (!strcmp (s->name, name)) {
-			source = s;
-			break;
-		}
-	}
-
-	if (!source)
-		return;
-
-	sources = g_list_remove_link (sources, l);
-	g_list_free_1 (l);
-
-	addressbook_source_free (source);
-
-	/* and then from the ui */
-	path = g_strdup_printf ("/%s", name);
-	evolution_storage_removed_folder (storage, path);
-
-	if (g_list_length (sources) == 0) 
-		deregister_storage ();
-
-	g_free (path);
-}
-
-GList *
-addressbook_storage_get_sources ()
-{
-	return sources;
-}
-
-AddressbookSource *
-addressbook_storage_get_source_by_uri (const char *uri)
-{
-	GList *l;
-
-	for (l = sources; l ; l = l->next) {
-		AddressbookSource *source = l->data;
-		if (!strcmp (uri, source->uri))
-			return source;
-	}
-
-	return NULL;
-}
-
-void
-addressbook_source_free (AddressbookSource *source)
-{
-	g_free (source->name);
-	g_free (source->description);
-	g_free (source->uri);
-	g_free (source->host);
-	g_free (source->port);
-	g_free (source->rootdn);
-	g_free (source->email_addr);
-
-	g_free (source);
-}
-
-static void
-addressbook_source_foreach (AddressbookSource *source, gpointer data)
-{
-	char *path = g_strdup_printf ("/%s", source->name);
-
-	evolution_storage_removed_folder (storage, path);
-
-	g_free (path);
-
-	addressbook_source_free (source);
-}
-
-void
-addressbook_storage_clear_sources (void)
-{
-	g_list_foreach (sources, (GFunc)addressbook_source_foreach, NULL);
-	g_list_free (sources);
-	deregister_storage ();
-	sources = NULL;
-}
-
-void
-addressbook_storage_write_sources (void)
-{
-	save_source_data (storage_path);
-}
-
-AddressbookSource *
-addressbook_source_copy (const AddressbookSource *source)
-{
-	AddressbookSource *copy;
-
-	copy = g_new0 (AddressbookSource, 1);
-	copy->name = g_strdup (source->name);
-	copy->description = g_strdup (source->description);
-	copy->type = source->type;
-	copy->uri = g_strdup (source->uri);
-
-	copy->host = g_strdup (source->host);
-	copy->port = g_strdup (source->port);
-	copy->rootdn = g_strdup (source->rootdn);
-	copy->scope = source->scope;
-	copy->auth = source->auth;
-	copy->email_addr = g_strdup (source->email_addr);
-	copy->remember_passwd = source->remember_passwd;
-
-	return copy;
-}
diff --git a/addressbook/gui/component/addressbook-storage.h b/addressbook/gui/component/addressbook-storage.h
deleted file mode 100644
index 8416d4de83..0000000000
--- a/addressbook/gui/component/addressbook-storage.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-storage.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Chris Toshok
- */
-
-#ifndef __ADDRESSBOOK_STORAGE_H__
-#define __ADDRESSBOOK_STORAGE_H__
-
-#include "evolution-shell-component.h"
-#include "evolution-storage.h"
-
-typedef enum {
-	ADDRESSBOOK_SOURCE_LDAP,
-	ADDRESSBOOK_SOURCE_FILE,
-	ADDRESSBOOK_SOURCE_LAST
-} AddressbookSourceType;
-
-typedef enum {
-	ADDRESSBOOK_LDAP_AUTH_NONE,
-	ADDRESSBOOK_LDAP_AUTH_SIMPLE,
-	ADDRESSBOOK_LDAP_AUTH_LAST
-} AddressbookLDAPAuthType;
-
-typedef enum {
-	ADDRESSBOOK_LDAP_SCOPE_ONELEVEL,
-	ADDRESSBOOK_LDAP_SCOPE_BASE,
-	ADDRESSBOOK_LDAP_SCOPE_SUBTREE,
-	ADDRESSBOOK_LDAP_SCOPE_LAST
-} AddressbookLDAPScopeType;
-
-typedef struct {
-	AddressbookSourceType type;
-	char *name;
-	char *description;
-	char *host;
-	char *port;
-	char *rootdn;
-	AddressbookLDAPScopeType scope;
-	AddressbookLDAPAuthType auth;
-	char *email_addr;                   /* used in AUTH_SIMPLE */
-	gboolean remember_passwd;
-	char *uri; /* filled in from the above */
-} AddressbookSource;
-
-void addressbook_storage_setup (EvolutionShellComponent *shell_component,
-				const char *evolution_homedir);
-
-EvolutionStorage  *addressbook_get_other_contact_storage (void);
-GList             *addressbook_storage_get_sources (void);
-AddressbookSource *addressbook_storage_get_source_by_uri (const char *uri);
-void               addressbook_storage_clear_sources (void);
-void               addressbook_storage_write_sources (void);
-AddressbookSource *addressbook_source_copy (const AddressbookSource *source);
-void               addressbook_source_free (AddressbookSource *source);
-void               addressbook_storage_init_source_uri (AddressbookSource *source);
-
-void               addressbook_storage_add_source (AddressbookSource *source);
-void               addressbook_storage_remove_source (const char *name);
-
-#endif /* __ADDRESSBOOK_STORAGE_H__ */
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
deleted file mode 100644
index 4741e5196a..0000000000
--- a/addressbook/gui/component/addressbook.c
+++ /dev/null
@@ -1,1157 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * addressbook.c: 
- *
- * Author:
- *   Chris Lahey (clahey@ximian.com)
- *
- * (C) 2000 Ximian, Inc.
- */
-
-#include <config.h>
-
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnomeui/gnome-uidefs.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <bonobo/bonobo-exception.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
-
-#include "e-util/e-categories-master-list-wombat.h"
-#include "e-util/e-sexp.h"
-#include "e-util/e-passwords.h"
-#include "select-names/e-select-names.h"
-#include "select-names/e-select-names-manager.h"
-
-#include "evolution-shell-component-utils.h"
-#include "evolution-activity-client.h"
-#include "e-contact-editor.h"
-#include "e-contact-save-as.h"
-#include "addressbook-config.h"
-#include "addressbook.h"
-#include "addressbook-component.h"
-#include "addressbook/gui/search/e-addressbook-search-dialog.h"
-#include "addressbook/gui/widgets/e-addressbook-view.h"
-#include "addressbook/gui/widgets/e-addressbook-util.h"
-#include "addressbook/printing/e-contact-print.h"
-
-#include <ebook/e-book.h>
-#include <ebook/e-book-util.h>
-#include <widgets/misc/e-search-bar.h>
-#include <widgets/misc/e-filter-bar.h>
-
-/* This is used for the addressbook status bar */
-#define EVOLUTION_CONTACTS_PROGRESS_IMAGE "evolution-contacts-mini.png"
-static GdkPixbuf *progress_icon[2] = { NULL, NULL };
-
-#define d(x)
-
-#define PROPERTY_FOLDER_URI          "folder_uri"
-
-#define PROPERTY_FOLDER_URI_IDX      1
-
-typedef struct {
-	gint refs;
-	EAddressbookView *view;
-	ESearchBar *search;
-	gint        ecml_changed_id;
-	GtkWidget *vbox;
-	EvolutionActivityClient *activity;
-	BonoboControl *control;
-	BonoboPropertyBag *properties;
-	char *uri;
-	char *passwd;
-} AddressbookView;
-
-static void addressbook_view_ref (AddressbookView *);
-static void addressbook_view_unref (AddressbookView *);
-
-static void
-new_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	EBook *book;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	if (view->view) {
-		gtk_object_get(GTK_OBJECT(view->view),
-			       "book", &book,
-			       NULL);
-
-		g_assert (E_IS_BOOK (book));
-
-		e_addressbook_show_contact_editor (book, e_card_new(""), TRUE, e_addressbook_view_can_create(view->view));
-	}
-}
-
-static void
-new_contact_list_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	EBook *book;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	if (view->view) {
-		gtk_object_get(GTK_OBJECT(view->view),
-			       "book", &book,
-			       NULL);
-
-		g_assert (E_IS_BOOK (book));
-
-		e_addressbook_show_contact_list_editor (book, e_card_new(""), TRUE, e_addressbook_view_can_create(view->view));
-	}
-}
-
-static void
-save_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_save_as(view->view);
-}
-
-static void
-config_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	addressbook_config (NULL /* XXX */);
-}
-
-static void
-search_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	if (view->view)
-		gtk_widget_show(e_addressbook_search_dialog_new(view->view));
-}
-
-static void
-delete_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_delete_selection(view->view);
-}
-
-static void
-print_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_print(view->view);
-}
-
-static void
-print_preview_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_print_preview(view->view);
-}
-
-static void
-stop_loading_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_stop(view->view);
-}
-
-static void
-cut_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_cut(view->view);
-}
-
-static void
-copy_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_copy(view->view);
-}
-
-static void
-paste_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_paste(view->view);
-}
-
-static void
-select_all_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_select_all (view->view);
-}
-
-static void
-send_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_send (view->view);
-}
-
-static void
-send_contact_to_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	if (view->view)
-		e_addressbook_view_send_to (view->view);
-}
-
-static void
-forget_passwords_cb (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	e_passwords_forget_passwords();
-}
-
-static void
-update_command_state (EAddressbookView *eav, AddressbookView *view)
-{
-	BonoboUIComponent *uic;
-
-	if (view->view == NULL)
-		return;
-
-	addressbook_view_ref (view);
-
-	uic = bonobo_control_get_ui_component (view->control);
-	
-	if (bonobo_ui_component_get_container (uic) != CORBA_OBJECT_NIL) {
-
-		/* New Contact */
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactNew",
-					      "sensitive",
-					      e_addressbook_view_can_create (view->view) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactNewList",
-					      "sensitive",
-					      e_addressbook_view_can_create (view->view) ? "1" : "0", NULL);
-		
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsSaveAsVCard",
-					      "sensitive",
-					      e_addressbook_view_can_save_as (view->view) ? "1" : "0", NULL);
-		
-		/* Print Contact */
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsPrint",
-					      "sensitive",
-					      e_addressbook_view_can_print (view->view) ? "1" : "0", NULL);
-		
-		/* Print Contact */
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsPrintPreview",
-					      "sensitive",
-					      e_addressbook_view_can_print (view->view) ? "1" : "0", NULL);
-		
-		/* Delete Contact */
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactDelete",
-					      "sensitive",
-					      e_addressbook_view_can_delete (view->view) ? "1" : "0", NULL);
-		
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsCut",
-					      "sensitive",
-					      e_addressbook_view_can_cut (view->view) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsCopy",
-					      "sensitive",
-					      e_addressbook_view_can_copy (view->view) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsPaste",
-					      "sensitive",
-					      e_addressbook_view_can_paste (view->view) ? "1" : "0", NULL);
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsSelectAll",
-					      "sensitive",
-					      e_addressbook_view_can_select_all (view->view) ? "1" : "0", NULL);
-		
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsSendContactToOther",
-					      "sensitive",
-					      e_addressbook_view_can_send (view->view) ? "1" : "0", NULL);
-		
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactsSendMessageToContact",
-					      "sensitive",
-					      e_addressbook_view_can_send_to (view->view) ? "1" : "0", NULL);
-		
-		
-		/* Stop */
-		bonobo_ui_component_set_prop (uic,
-					      "/commands/ContactStop",
-					      "sensitive",
-					      e_addressbook_view_can_stop (view->view) ? "1" : "0", NULL);
-		
-	}
-
-	addressbook_view_unref (view);
-}
-
-static void
-change_view_type (AddressbookView *view, EAddressbookViewType view_type)
-{
-	gtk_object_set (GTK_OBJECT (view->view), "type", view_type, NULL);
-}
-
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ContactsPrint", print_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsPrintPreview", print_preview_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsSaveAsVCard", save_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ToolSearch", search_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("AddressbookConfig", config_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("ContactNew", new_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactNewList", new_contact_list_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactDelete", delete_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactStop", stop_loading_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("ContactsCut", cut_contacts_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsCopy", copy_contacts_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsPaste", paste_contacts_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsSelectAll", select_all_contacts_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("ContactsSendContactToOther", send_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsSendMessageToContact", send_contact_to_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactsForgetPasswords", forget_passwords_cb),
-
-	BONOBO_UI_VERB_END
-};
-
-static EPixmap pixmaps [] = {
-	E_PIXMAP ("/menu/File/New/NewFirstItem/ContactNew", "evolution-contacts-mini.png"),
-	E_PIXMAP ("/menu/File/FileOps/ContactsSaveAsVCard", "save-as-16.png"),
-	E_PIXMAP ("/menu/File/Print/ContactsPrint", "print.xpm"),
-	E_PIXMAP ("/menu/File/Print/ContactsPrintPreview", "print-preview.xpm"),
-
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCut", "16_cut.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCopy", "16_copy.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsPaste", "16_paste.png"),
-	E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactDelete", "evolution-trash-mini.png"),
-
-	E_PIXMAP ("/menu/Tools/ComponentPlaceholder/ToolSearch", "search-16.png"),
-	E_PIXMAP ("/menu/Tools/ComponentPlaceholder/AddressbookConfig", "configure_16_addressbook.xpm"),
-
-	E_PIXMAP ("/Toolbar/ContactNew", "new_contact.xpm"),
-	E_PIXMAP ("/Toolbar/ContactNewList", "all_contacts.xpm"),
-	E_PIXMAP ("/Toolbar/ContactsPrint", "buttons/print.png"),
-	E_PIXMAP ("/Toolbar/ContactDelete", "buttons/delete-message.png"),
-
-	E_PIXMAP_END
-};
-
-static void
-control_activate (BonoboControl     *control,
-		  BonoboUIComponent *uic,
-		  AddressbookView   *view)
-{
-	Bonobo_UIContainer remote_ui_container;
-
-	remote_ui_container = bonobo_control_get_remote_ui_container (control);
-	bonobo_ui_component_set_container (uic, remote_ui_container);
-	bonobo_object_release_unref (remote_ui_container, NULL);
-
-	bonobo_ui_component_add_verb_list_with_data (
-		uic, verbs, view);
-	
-	bonobo_ui_component_freeze (uic, NULL);
-
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
-			       "evolution-addressbook.xml",
-			       "evolution-addressbook");
-
-	e_addressbook_view_setup_menus (view->view, uic);
-
-	e_pixmaps_update (uic, pixmaps);
-
-	bonobo_ui_component_thaw (uic, NULL);
-
-	update_command_state (view->view, view);
-}
-
-static void
-control_activate_cb (BonoboControl *control, 
-		     gboolean activate, 
-		     AddressbookView *view)
-{
-	BonoboUIComponent *uic;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-	
-	if (activate) {
-
-		control_activate (control, uic, view);
-		if (activate && view->view && view->view->model)
-			e_addressbook_model_force_folder_bar_message (view->view->model);
-
-	} else {
-		bonobo_ui_component_unset_container (uic);
-		e_addressbook_view_discard_menus (view->view);
-	}
-}
-
-static void
-addressbook_view_ref (AddressbookView *view)
-{
-	g_assert (view->refs > 0);
-	++view->refs;
-}
-
-static void
-addressbook_view_unref (AddressbookView *view)
-{
-	g_assert (view->refs > 0);
-	--view->refs;
-	if (view->refs == 0)
-		g_free (view);
-}
-
-static ECategoriesMasterList *
-get_master_list (void)
-{
-	static ECategoriesMasterList *category_list = NULL;
-
-	if (category_list == NULL)
-		category_list = e_categories_master_list_wombat_new ();
-	return category_list;
-}
-
-static void
-addressbook_view_clear (AddressbookView *view)
-{
-	EBook *book;
-
-	if (view->uri && view->view) {
-		gtk_object_get(GTK_OBJECT(view->view),
-			       "book", &book,
-			       NULL);
-		gtk_object_unref (GTK_OBJECT (book));
-	}
-	
-	if (view->properties) {
-		bonobo_object_unref (BONOBO_OBJECT(view->properties));
-		view->properties = NULL;
-	}
-
-	if (view->view) {
-		gtk_widget_destroy (GTK_WIDGET (view->view));
-		view->view = NULL;
-	}
-		
-	g_free(view->passwd);
-	view->passwd = NULL;
-
-	g_free(view->uri);
-	view->uri = NULL;
-
-	if (view->refs == 0)
-		g_free(view);
-
-	if (view->ecml_changed_id != 0) {
-		gtk_signal_disconnect (GTK_OBJECT(get_master_list()),
-				       view->ecml_changed_id);
-		view->ecml_changed_id = 0;
-	}
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	AddressbookView *view = closure;
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		gtk_object_set(GTK_OBJECT(view->view),
-			       "book", book,
-			       NULL);
-	} else {
-		AddressbookSource *source;
-		GtkWidget *warning_dialog, *label;
-
-        	warning_dialog = gnome_dialog_new (
-        		_("Unable to open addressbook"),
-			GNOME_STOCK_BUTTON_CLOSE,
-        		NULL);
-
-		source = addressbook_storage_get_source_by_uri (view->uri);
-
-		if (source && source->type == ADDRESSBOOK_SOURCE_LDAP) {
-#if HAVE_LDAP
-			label = gtk_label_new (
-					       _("We were unable to open this addressbook.  This either\n"
-						 "means you have entered an incorrect URI, or the LDAP server\n"
-						 "is down"));
-#else
-			label = gtk_label_new (
-					       _("This version of Evolution does not have LDAP support\n"
-						 "compiled in to it.  If you want to use LDAP in Evolution\n"
-						 "you must compile the program from the CVS sources after\n"
-						 "retrieving OpenLDAP from the link below.\n"));
-#endif
-		}
-		else {
-			label = gtk_label_new (
-					       _("We were unable to open this addressbook.  Please check that the\n"
-						 "path exists and that you have permission to access it."));
-		}
-
-		gtk_misc_set_alignment(GTK_MISC(label),
-				       0, .5);
-		gtk_label_set_justify(GTK_LABEL(label),
-				      GTK_JUSTIFY_LEFT);
-
-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), 
-				    label, TRUE, TRUE, 0);
-		gtk_widget_show (label);
-
-#ifndef HAVE_LDAP
-		if (source && source->type == ADDRESSBOOK_SOURCE_LDAP) {
-			GtkWidget *href;
-			href = gnome_href_new ("http://www.openldap.org/", "OpenLDAP at http://www.openldap.org/");
-			gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (warning_dialog)->vbox), 
-					    href, FALSE, FALSE, 0);
-			gtk_widget_show (href);
-		}
-#endif
-		gnome_dialog_run (GNOME_DIALOG (warning_dialog));
-		
-		gtk_object_destroy (GTK_OBJECT (warning_dialog));
-	}
-}
-
-static void
-destroy_callback(GtkWidget *widget, gpointer data)
-{
-	AddressbookView *view = data;
-	if (view->view && view->view->model && view->view->model->book_view)
-		e_book_view_stop (view->view->model->book_view);
-	addressbook_view_clear (view);
-	addressbook_view_unref (view);
-}
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  gpointer           user_data)
-{
-	AddressbookView *view = user_data;
-
-	switch (arg_id) {
-
-	case PROPERTY_FOLDER_URI_IDX:
-		if (view && view->uri)
-			BONOBO_ARG_SET_STRING (arg, view->uri);
-		else
-			BONOBO_ARG_SET_STRING (arg, "");
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-	}
-}
-
-char *
-addressbook_expand_uri (const char *uri)
-{
-	char *new_uri;
-
-	if (!strncmp (uri, "file:", 5)) {
-		if (strlen (uri + 7) > 3
-		    && !strcmp (uri + strlen(uri) - 3, ".db")) {
-			/* it's a .db file */
-			new_uri = g_strdup (uri);
-		}
-		else {
-			char *file_name;
-			/* we assume it's a dir and glom addressbook.db onto the end. */
-			file_name = g_concat_dir_and_file(uri + 7, "addressbook.db");
-			new_uri = g_strdup_printf("file://%s", file_name);
-			g_free(file_name);
-		}
-	}
-	else {
-		new_uri = g_strdup (uri);
-	}
-
-	return new_uri;
-}
-
-typedef struct {
-	char *uri;
-	EBookCallback cb;
-	gpointer closure;
-} LoadUriData;
-
-static void
-load_uri_auth_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	LoadUriData *data = closure;
-
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		/* pop up a nice dialog, or redo the authentication
-                   bit some number of times. */
-	}
-
-	data->cb (book, status, data->closure);
-
-	g_free (data->uri);
-	g_free (data);
-}
-
-
-static void
-load_uri_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	AddressbookSource *source;
-	LoadUriData *load_uri_data = closure;
-
-	source = addressbook_storage_get_source_by_uri (load_uri_data->uri);
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		/* check if the addressbook needs authentication */
-
-		if (source &&
-		    source->type == ADDRESSBOOK_SOURCE_LDAP &&
-		    source->auth == ADDRESSBOOK_LDAP_AUTH_SIMPLE) {
-			const char *password;
-			char *pass_dup = NULL;
-
-			password = e_passwords_get_password(load_uri_data->uri);
-
-			if (!password) {
-				char *prompt;
-				gboolean remember;
-
-				prompt = g_strdup_printf (_("Enter password for %s (user %s)"), source->name, source->email_addr);
-				remember = source->remember_passwd;
-				pass_dup = e_passwords_ask_password (
-								     prompt, load_uri_data->uri, prompt, TRUE,
-								     E_PASSWORDS_REMEMBER_FOREVER, &remember,
-								     NULL);
-				if (remember != source->remember_passwd) {
-					source->remember_passwd = remember;
-					addressbook_storage_write_sources ();
-				}
-				g_free (prompt);
-			}
-
-			if (password || pass_dup) {
-				e_book_authenticate_user (book, source->email_addr, password ? password : pass_dup,
-							  load_uri_auth_cb, closure);
-				g_free (pass_dup);
-				return;
-			}
-		}
-	}
-
-	load_uri_data->cb (book, status, load_uri_data->closure);
-	g_free (load_uri_data->uri);
-	g_free (load_uri_data);
-}
-
-gboolean
-addressbook_load_uri (EBook *book, const char *uri,
-		      EBookCallback cb, gpointer closure)
-{
-	LoadUriData *load_uri_data = g_new (LoadUriData, 1);
-	gboolean rv;
-
-	load_uri_data->uri = g_strdup (uri);
-	load_uri_data->cb = cb;
-	load_uri_data->closure = closure;
-
-	rv = e_book_load_uri (book, uri, load_uri_cb, load_uri_data);
-
-	if (!rv) {
-		g_free (load_uri_data->uri);
-		g_free (load_uri_data);
-	}
-
-	return rv;
-}
-
-typedef struct {
-	gpointer closure;
-	EBookCallback open_response;
-} DefaultBookClosure;
-
-static void
-addressbook_default_book_open (EBook *book, EBookStatus status, gpointer closure)
-{
-	DefaultBookClosure *default_book_closure = closure;
-	gpointer user_closure = default_book_closure->closure;
-	EBookCallback user_response = default_book_closure->open_response;
-
-	g_free (default_book_closure);
-
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		e_book_load_local_address_book (book, user_response, user_closure);
-	}
-	else {
-		user_response (book, status, user_closure);
-	}
-}
-
-gboolean
-addressbook_load_default_book (EBook *book, EBookCallback open_response, gpointer closure)
-{
-	char *val;
-	gboolean rv;
-	CORBA_Environment ev;
-	Bonobo_ConfigDatabase config_db;
-
-	g_return_val_if_fail (book != NULL,          FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book),      FALSE);
-	g_return_val_if_fail (open_response != NULL, FALSE);
-
-	CORBA_exception_init (&ev);
-	config_db = addressbook_config_database (&ev);
-	val = bonobo_config_get_string (config_db, "/Addressbook/default_book_uri", &ev);
-	CORBA_exception_free (&ev);
-
-	if (val) {
-		DefaultBookClosure *default_book_closure = g_new (DefaultBookClosure, 1);
-		default_book_closure->closure = closure;
-		default_book_closure->open_response = open_response;
-		rv = addressbook_load_uri (book, val,
-					   addressbook_default_book_open, default_book_closure);
-		g_free (val);
-	}
-	else {
-		rv = e_book_load_local_address_book (book, open_response, closure);
-	}
-
-	if (!rv) {
-		g_warning ("Couldn't load default addressbook");
-	}
-
-	return rv;
-}
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg   *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  gpointer           user_data)
-{
-	AddressbookView *view = user_data;
-
-	char *uri_data;
-	EBook *book;
-	
-	switch (arg_id) {
-
-	case PROPERTY_FOLDER_URI_IDX:
-		gtk_object_get(GTK_OBJECT(view->view),
-			       "book", &book,
-			       NULL);
-		if (view->uri) {
-			/* we've already had a uri set on this view, so unload it */
-			e_book_unload_uri (book);
-			g_free (view->uri);
-		} else {
-			book = e_book_new ();
-		}
-
-		view->uri = g_strdup(BONOBO_ARG_GET_STRING (arg));
-		
-		uri_data = addressbook_expand_uri (view->uri);
-
-		if (! addressbook_load_uri (book, uri_data, book_open_cb, view))
-			printf ("error calling load_uri!\n");
-
-		g_free(uri_data);
-
-		break;
-		
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-static ESearchBarItem addressbook_search_menu_items[] = {
-	E_FILTERBAR_RESET,
-	{ NULL, -1, NULL },
-};
-
-enum {
-	ESB_ANY,
-	ESB_FULL_NAME,
-	ESB_EMAIL,
-	ESB_CATEGORY,
-	ESB_ADVANCED
-};
-
-static ESearchBarItem addressbook_search_option_items[] = {
-	{ N_("Any field contains"), ESB_ANY, NULL },
-	{ N_("Name contains"), ESB_FULL_NAME, NULL },
-	{ N_("Email contains"), ESB_EMAIL, NULL },
-	{ N_("Category is"), ESB_CATEGORY, NULL }, /* We attach subitems below */
-	{ N_("Advanced..."), ESB_ADVANCED, NULL },
-	{ NULL, -1, NULL }
-};
-
-static void
-addressbook_menu_activated (ESearchBar *esb, int id, AddressbookView *view)
-{
-	switch (id) {
-	case E_FILTERBAR_RESET_ID:
-		/* e_addressbook_view_show_all(view->view); */
-
-		/* Fix option menu if we are using "Category is" */
-		if (e_search_bar_get_item_id (esb) == ESB_CATEGORY) {
-
-			e_search_bar_set_subitem_id (esb, G_MAXINT);
-
-		} else {
-
-			e_search_bar_set_text (esb, "");
-
-		}
-
-		break;
-	}
-}
-
-static void
-addressbook_query_changed (ESearchBar *esb, AddressbookView *view)
-{
-	ECategoriesMasterList *master_list;
-	char *search_word, *search_query;
-	const char *category_name;
-	int search_type, subid;
-
-	gtk_object_get(GTK_OBJECT(esb),
-		       "text", &search_word,
-		       "item_id", &search_type,
-		       NULL);
-
-	if (search_type == ESB_ADVANCED) {
-		gtk_widget_show(e_addressbook_search_dialog_new(view->view));
-	}
-	else {
-		if ((search_word && strlen (search_word)) || search_type == ESB_CATEGORY) {
-			GString *s = g_string_new ("");
-			e_sexp_encode_string (s, search_word);
-			switch (search_type) {
-			case ESB_ANY:
-				search_query = g_strdup_printf ("(contains \"x-evolution-any-field\" %s)",
-								s->str);
-				break;
-			case ESB_FULL_NAME:
-				search_query = g_strdup_printf ("(contains \"full_name\" %s)",
-								s->str);
-				break;
-			case ESB_EMAIL:
-				search_query = g_strdup_printf ("(contains \"email\" %s)",
-								s->str);
-				break;
-			case ESB_CATEGORY:
-				subid = e_search_bar_get_subitem_id (esb);
-
-				if (subid < 0 || subid == G_MAXINT) {
-					/* match everything */
-					search_query = g_strdup ("(contains \"x-evolution-any-field\" \"\")");
-				} else {
-					master_list = get_master_list ();
-					category_name = e_categories_master_list_nth (master_list, subid);
-					search_query = g_strdup_printf ("(contains \"category\" \"%s\")", category_name);
-				}
-				break;
-			default:
-				search_query = g_strdup ("(contains \"x-evolution-any-field\" \"\")");
-				break;
-			}
-			g_string_free (s, TRUE);
-		} else
-			search_query = g_strdup ("(contains \"x-evolution-any-field\" \"\")");
-
-		if (search_query)
-			gtk_object_set (GTK_OBJECT(view->view),
-					"query", search_query,
-					NULL);
-
-		g_free (search_query);
-		g_free (search_word);
-	}
-}
-
-static GNOME_Evolution_ShellView
-retrieve_shell_view_interface_from_control (BonoboControl *control)
-{
-	Bonobo_ControlFrame control_frame;
-	GNOME_Evolution_ShellView shell_view_interface;
-	CORBA_Environment ev;
-
-	shell_view_interface = gtk_object_get_data (GTK_OBJECT (control),
-						    "shell_view_interface");
-
-	if (shell_view_interface)
-		return shell_view_interface;
-
-	control_frame = bonobo_control_get_control_frame (control);
-
-	if (control_frame == NULL)
-		return CORBA_OBJECT_NIL;
-
-	CORBA_exception_init (&ev);
-	shell_view_interface = Bonobo_Unknown_queryInterface (control_frame,
-							       "IDL:GNOME/Evolution/ShellView:1.0",
-							       &ev);
-	CORBA_exception_free (&ev);
-
-	if (shell_view_interface != CORBA_OBJECT_NIL)
-		gtk_object_set_data (GTK_OBJECT (control),
-				     "shell_view_interface",
-				     shell_view_interface);
-	else
-		g_warning ("Control frame doesn't have Evolution/ShellView.");
-
-	return shell_view_interface;
-}
-
-static void
-set_status_message (EAddressbookView *eav, const char *message, AddressbookView *view)
-{
-
-	if (!message || !*message) {
-		if (view->activity) {
-			gtk_object_unref (GTK_OBJECT (view->activity));
-			view->activity = NULL;
-		}
-	}
-	else if (!view->activity) {
-		int display;
-		char *clientid = g_strdup_printf ("%p", view);
-
-		if (progress_icon[0] == NULL)
-			progress_icon[0] = gdk_pixbuf_new_from_file (EVOLUTION_IMAGESDIR "/" EVOLUTION_CONTACTS_PROGRESS_IMAGE);
-
-		view->activity = evolution_activity_client_new (addressbook_component_get_shell_client(), clientid,
-								progress_icon, message, TRUE, &display);
-
-		g_free (clientid);
-	}
-	else {
-		evolution_activity_client_update (view->activity, message, -1.0);
-	}
-
-}
-
-static void
-set_folder_bar_label (EAddressbookView *eav, const char *message, AddressbookView *view)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_ShellView shell_view_interface;
-
-	CORBA_exception_init (&ev);
-
-	shell_view_interface = retrieve_shell_view_interface_from_control (view->control);
-	if (!shell_view_interface) {
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	d(g_message("Updating via ShellView"));
-
-	if (message == NULL || message[0] == 0) {
-		GNOME_Evolution_ShellView_setFolderBarLabel (shell_view_interface,
-							     "",
-							     &ev);
-	}
-	else {
-		GNOME_Evolution_ShellView_setFolderBarLabel (shell_view_interface,
-							     message,
-							     &ev);
-	}
-
-	if (BONOBO_EX (&ev))
-		g_warning ("Exception in label update: %s",
-			   bonobo_exception_get_text (&ev));
-
-	CORBA_exception_free (&ev);
-}
-
-/* Our global singleton config database */
-static Bonobo_ConfigDatabase config_db = NULL;
-
-Bonobo_ConfigDatabase
-addressbook_config_database (CORBA_Environment *ev)
-{
-	if (config_db == NULL)
-		config_db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", ev);
-
-	return config_db;
-}
-
-static int
-compare_subitems (const void *a, const void *b)
-{
-	const ESearchBarSubitem *subitem_a = a;
-	const ESearchBarSubitem *subitem_b = b;
-
-	return strcoll (subitem_a->text, subitem_b->text);
-}
-
-static void
-make_suboptions (AddressbookView *view)
-{
-	ESearchBarSubitem *subitems;
-	ECategoriesMasterList *master_list;
-	gint i, N;
-
-	master_list = get_master_list ();
-	N = e_categories_master_list_count (master_list);
-	subitems = g_new (ESearchBarSubitem, N+2);
-
-	subitems[0].id = G_MAXINT;
-	subitems[0].text = g_strdup (_("Any Category"));
-	subitems[0].translate = FALSE;
-
-	for (i=0; i<N; ++i) {
-		const char *category = e_categories_master_list_nth (master_list, i);
-
-		subitems[i+1].id = i;
-		subitems[i+1].text = e_utf8_to_locale_string (category);
-		subitems[i+1].translate = FALSE;
-	}
-	subitems[N+1].id = -1;
-	subitems[N+1].text = NULL;
-
-	qsort (subitems + 1, N, sizeof (subitems[0]), compare_subitems);
-
-	e_search_bar_set_suboption (view->search, ESB_CATEGORY, subitems);
-}
-
-static void
-ecml_changed (ECategoriesMasterList *ecml, AddressbookView *view)
-{
-	make_suboptions (view);
-}
-
-static void
-connect_master_list_changed (AddressbookView *view)
-{
-	view->ecml_changed_id =
-		gtk_signal_connect (GTK_OBJECT (get_master_list()), "changed",
-				    GTK_SIGNAL_FUNC (ecml_changed), view);
-}
-
-BonoboControl *
-addressbook_factory_new_control (void)
-{
-	AddressbookView *view;
-	GtkWidget *frame;
-
-	frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-
-	view = g_new0 (AddressbookView, 1);
-	view->refs = 1;
-
-	view->vbox = gtk_vbox_new (FALSE, 0);
-
-	gtk_signal_connect (GTK_OBJECT (view->vbox), "destroy",
-			    GTK_SIGNAL_FUNC (destroy_callback),
-			    (gpointer) view);
-
-	/* Create the control. */
-	view->control = bonobo_control_new (view->vbox);
-
-	view->search = E_SEARCH_BAR(e_search_bar_new(addressbook_search_menu_items,
-						     addressbook_search_option_items));
-	make_suboptions (view);
-	connect_master_list_changed (view);
-
-	gtk_box_pack_start (GTK_BOX (view->vbox), GTK_WIDGET (view->search),
-			    FALSE, FALSE, 0);
-	gtk_signal_connect (GTK_OBJECT (view->search), "query_changed",
-			    GTK_SIGNAL_FUNC (addressbook_query_changed), view);
-	gtk_signal_connect (GTK_OBJECT (view->search), "menu_activated",
-			    GTK_SIGNAL_FUNC (addressbook_menu_activated), view);
-
-	view->view = E_ADDRESSBOOK_VIEW(e_addressbook_view_new());
-	gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (view->view));
-	gtk_box_pack_start (GTK_BOX (view->vbox), frame,
-			    TRUE, TRUE, 0);
-
-	/* create the initial view */
-	change_view_type (view, E_ADDRESSBOOK_VIEW_MINICARD);
-
-	gtk_widget_show (frame);
-	gtk_widget_show (view->vbox);
-	gtk_widget_show (GTK_WIDGET(view->view));
-	gtk_widget_show (GTK_WIDGET(view->search));
-
-	view->properties = bonobo_property_bag_new (get_prop, set_prop, view);
-
-	bonobo_property_bag_add (view->properties,
-				 PROPERTY_FOLDER_URI, PROPERTY_FOLDER_URI_IDX,
-				 BONOBO_ARG_STRING, NULL, _("The URI that the Folder Browser will display"), 0);
-
-	bonobo_control_set_properties (view->control,
-				       view->properties);
-
-	gtk_signal_connect (GTK_OBJECT (view->view),
-			    "status_message",
-			    GTK_SIGNAL_FUNC(set_status_message),
-			    view);
-
-	gtk_signal_connect (GTK_OBJECT (view->view),
-			    "folder_bar_message",
-			    GTK_SIGNAL_FUNC(set_folder_bar_label),
-			    view);
-
-	gtk_signal_connect (GTK_OBJECT (view->view),
-			    "command_state_change",
-			    GTK_SIGNAL_FUNC(update_command_state),
-			    view);
-	
-	view->uri = NULL;
-
-	gtk_signal_connect (GTK_OBJECT (view->control), "activate",
-			    control_activate_cb, view);
-
-	return view->control;
-}
-
-static BonoboObject *
-addressbook_factory (BonoboGenericFactory *Factory, void *closure)
-{
-	return BONOBO_OBJECT (addressbook_factory_new_control ());
-}
-
-void
-addressbook_factory_init (void)
-{
-	static BonoboGenericFactory *addressbook_control_factory = NULL;
-
-	if (addressbook_control_factory != NULL)
-		return;
-
-	addressbook_control_factory = bonobo_generic_factory_new (
-		"OAFIID:GNOME_Evolution_Addressbook_ControlFactory",
-		addressbook_factory, NULL);
-
-	if (addressbook_control_factory == NULL) {
-		g_error ("I could not register a Addressbook factory.");
-	}
-}
-
diff --git a/addressbook/gui/component/addressbook.h b/addressbook/gui/component/addressbook.h
deleted file mode 100644
index 9a99589578..0000000000
--- a/addressbook/gui/component/addressbook.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef __ADDRESSBOOK_H__
-#define __ADDRESSBOOK_H__
-
-#include <bonobo/bonobo-control.h>
-#include <bonobo-conf/bonobo-config-database.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-moniker-util.h>
-#include <ebook/e-book.h>
-
-Bonobo_ConfigDatabase addressbook_config_database (CORBA_Environment *ev);
-
-/* expand file:///foo/foo/ to file:///foo/foo/addressbook.db */
-char *         addressbook_expand_uri           (const char *uri);
-
-/* use this instead of e_book_load_uri everywhere where you want the
-   authentication to be handled for you. */
-gboolean       addressbook_load_uri             (EBook *book, const char *uri, EBookCallback cb, gpointer closure);
-gboolean       addressbook_load_default_book    (EBook *book, EBookCallback open_response, gpointer closure);
-
-BonoboControl *addressbook_factory_new_control  (void);
-void           addressbook_factory_init         (void);
-
-#endif /* __ADDRESSBOOK_H__ */
diff --git a/addressbook/gui/component/e-address-popup.c b/addressbook/gui/component/e-address-popup.c
deleted file mode 100644
index 7c04cc0130..0000000000
--- a/addressbook/gui/component/e-address-popup.c
+++ /dev/null
@@ -1,1274 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-address-popup.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-/*
- * This file is too big and this widget is too complicated.  Forgive me.
- */
-
-#include <config.h>
-#include "addressbook.h"
-#include "e-address-popup.h"
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-property-bag.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <gal/widgets/e-popup-menu.h>
-#include <gal/widgets/e-unicode.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/backend/ebook/e-book-util.h>
-#include <addressbook/gui/contact-editor/e-contact-editor.h>
-#include <addressbook/gui/contact-editor/e-contact-quick-add.h>
-#include <addressbook/gui/widgets/e-minicard-widget.h>
-#include <addressbook/gui/widgets/e-addressbook-util.h>
-
-/*
- * Some general scaffolding for our widgets.  Think of this as a really, really
- * lame implementation of a wizard (...which is still somewhat more general that
- * we really need it to be).
- */
-
-typedef struct _MiniWizard MiniWizard;
-struct _MiniWizard {
-	GtkWidget *body;
-
-	GtkWidget *vbox;
-	GtkWidget *ok_button;
-	GtkWidget *cancel_button;
-
-	void (*ok_cb) (MiniWizard *, gpointer);
-	void (*cleanup_cb) (gpointer);
-	gpointer closure;
-
-	void (*destroy_cb) (MiniWizard *, gpointer);
-	gpointer destroy_closure;
-};
-
-static void
-mini_wizard_container_add (MiniWizard *wiz, GtkWidget *w)
-{
-	GList *iter = gtk_container_children (GTK_CONTAINER (wiz->vbox));
-	while (iter != NULL) {
-		GtkWidget *oldw = (GtkWidget *) iter->data;
-		iter = g_list_next (iter);
-		gtk_container_remove (GTK_CONTAINER (wiz->vbox), oldw);
-		gtk_widget_destroy (oldw);
-	}
-	gtk_container_add (GTK_CONTAINER (wiz->vbox), w);
-}
-
-static void
-mini_wizard_destroy (MiniWizard *wiz)
-{
-	if (wiz->cleanup_cb)
-		wiz->cleanup_cb (wiz->closure);
-	wiz->cleanup_cb = NULL;
-
-	if (wiz->destroy_cb)
-		wiz->destroy_cb (wiz, wiz->destroy_closure);
-}
-
-static void
-mini_wizard_ok_cb (GtkWidget *b, gpointer closure)
-{
-	MiniWizard *wiz = (MiniWizard *) closure;
-
-	gpointer old_closure = wiz->closure;
-	void (*old_cleanup) (gpointer) = wiz->cleanup_cb;
-
-	wiz->cleanup_cb = NULL;
-
-	if (wiz->ok_cb)
-		wiz->ok_cb (wiz, wiz->closure);
-
-	if (old_cleanup)
-		old_cleanup (old_closure);
-
-}
-
-static void
-mini_wizard_cancel_cb (GtkWidget *b, gpointer closure)
-{
-	mini_wizard_destroy ((MiniWizard *) closure);
-}
-
-static void
-mini_wizard_destroy_cb (GtkWidget *w, gpointer closure)
-{
-	MiniWizard *wiz = (MiniWizard *) closure;
-	if (wiz->cleanup_cb)
-		wiz->cleanup_cb (wiz->closure);
-	g_free (wiz);
-}
-
-static MiniWizard *
-mini_wizard_new (void)
-{
-	MiniWizard *wiz = g_new (MiniWizard, 1);
-	GtkWidget *hbox;
-
-	wiz->body          = gtk_vbox_new (FALSE, 2);
-	wiz->vbox          = gtk_vbox_new (FALSE, 2);
-	wiz->ok_button     = gnome_stock_button (GNOME_STOCK_BUTTON_OK);
-	wiz->cancel_button = gnome_stock_button (GNOME_STOCK_BUTTON_CANCEL);
-
-	wiz->ok_cb      = NULL;
-	wiz->cleanup_cb = NULL;
-	wiz->closure    = NULL;
-
-	wiz->destroy_cb      = NULL;
-	wiz->destroy_closure = NULL;
-
-	hbox = gtk_hbox_new (FALSE, 2);
-	gtk_box_pack_start (GTK_BOX (hbox), wiz->ok_button, TRUE, FALSE, 2);
-	gtk_box_pack_start (GTK_BOX (hbox), wiz->cancel_button, TRUE, FALSE, 2);
-
-	gtk_box_pack_start (GTK_BOX (wiz->body), wiz->vbox, TRUE, TRUE, 2);
-	gtk_box_pack_start (GTK_BOX (wiz->body), gtk_hseparator_new (), FALSE, TRUE, 2);
-	gtk_box_pack_start (GTK_BOX (wiz->body), hbox, FALSE, TRUE, 2);
-
-	gtk_widget_show_all (wiz->body);
-
-	gtk_signal_connect (GTK_OBJECT (wiz->ok_button),
-			    "clicked",
-			    GTK_SIGNAL_FUNC (mini_wizard_ok_cb),
-			    wiz);
-	gtk_signal_connect (GTK_OBJECT (wiz->cancel_button),
-			    "clicked",
-			    GTK_SIGNAL_FUNC (mini_wizard_cancel_cb),
-			    wiz);
-	gtk_signal_connect (GTK_OBJECT (wiz->body),
-			    "destroy",
-			    GTK_SIGNAL_FUNC (mini_wizard_destroy_cb),
-			    wiz);
-
-	return wiz;
-	
-}
-
-
-
-/*
- * This is the code for the UI thingie that lets you manipulate the e-mail
- * addresses (and *only* the e-mail addresses) associated with an existing
- * card.
- */
-
-#define EMPTY_ENTRY N_("(none)")
-
-typedef struct _EMailMenu EMailMenu;
-struct _EMailMenu {
-	GtkWidget *option_menu;
-	GList *options;
-	gchar *current_selection;
-};
-
-static void
-email_menu_free (EMailMenu *menu)
-{
-	if (menu == NULL)
-		return;
-
-	g_list_foreach (menu->options, (GFunc) g_free, NULL);
-	g_list_free (menu->options);
-	g_free (menu);
-}
-
-static EMailMenu *
-email_menu_new (void)
-{
-	EMailMenu *menu = g_new (EMailMenu, 1);
-
-	menu->option_menu = gtk_option_menu_new ();
-	menu->options = NULL;
-	menu->current_selection = NULL;
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (menu->option_menu), gtk_menu_new ());
-
-	return menu;
-}
-
-static void
-menu_activate_cb (GtkWidget *w, gpointer closure)
-{
-	EMailMenu *menu = (EMailMenu *) closure;
-	gchar *addr = (gchar *) gtk_object_get_data (GTK_OBJECT (w), "addr");
-
-	menu->current_selection = addr;
-}
-
-static void
-email_menu_add_option (EMailMenu *menu, const gchar *addr)
-{
-	GtkWidget *menu_item;
-	gchar *addr_cpy;
-
-	g_return_if_fail (menu != NULL);
-	if (addr == NULL)
-		return;
-
-	addr_cpy = g_strdup (addr);
-	menu->options = g_list_append (menu->options, addr_cpy);
-
-	menu_item = gtk_menu_item_new_with_label (addr);
-	gtk_object_set_data (GTK_OBJECT (menu_item), "addr", addr_cpy);
-	gtk_widget_show_all (menu_item);
-	gtk_menu_append (GTK_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (menu->option_menu))), menu_item);
-
-	gtk_signal_connect (GTK_OBJECT (menu_item),
-			    "activate",
-			    menu_activate_cb,
-			    menu);
-}
-
-static void
-email_menu_add_options_from_card (EMailMenu *menu, ECard *card, const gchar *extra_addr)
-{
-	ECardSimple *simple;
-
-	g_return_if_fail (card && E_IS_CARD (card));
-
-	simple = e_card_simple_new (card);
-
-	/* If any of these three e-mail fields are NULL, email_menu_add_option will just
-	   return without doing anything. */
-	email_menu_add_option (menu, e_card_simple_get_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL));
-	email_menu_add_option (menu, e_card_simple_get_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL_2));
-	email_menu_add_option (menu, e_card_simple_get_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL_3));
-	email_menu_add_option (menu, extra_addr);
-	email_menu_add_option (menu, EMPTY_ENTRY);
-
-	gtk_object_unref (GTK_OBJECT (simple));
-}
-
-static void
-email_menu_set_option (EMailMenu *menu, const gchar *addr)
-{
-	guint count = 0;
-	GList *iter;
-
-	g_return_if_fail (menu != NULL);
-
-	if (addr == NULL) {
-		email_menu_set_option (menu, EMPTY_ENTRY);
-		return;
-	}
-
-	iter = menu->options;
-	while (iter && strcmp (addr, (gchar *) iter->data)) {
-		++count;
-		iter = g_list_next (iter);
-	}
-
-	if (iter) {
-		gtk_option_menu_set_history (GTK_OPTION_MENU (menu->option_menu), count);
-		menu->current_selection = (gchar *) iter->data;
-	} 
-}
-
-#ifdef UNDEFINED_FUNCTIONS_SHOULD_PLEASE_BE_INCLUDED
-static void
-email_menu_unset_option (EMailMenu *menu, const gchar *addr)
-{
-	GList *iter;
-
-	g_return_if_fail (menu != NULL);
-	g_return_if_fail (addr != NULL);
-
-	if (menu->current_selection == NULL || strcmp (addr, menu->current_selection))
-		return;
-
-	iter = menu->options;
-	while (iter && strcmp (addr, (gchar *) iter->data)) {
-		iter = g_list_next (iter);
-	}
-	if (iter) {
-		iter = g_list_next (iter);
-		if (iter) {
-			email_menu_set_option (menu, (gchar *) iter->data);
-		} else {
-			email_menu_set_option (menu, EMPTY_ENTRY);
-		}
-	}
-}
-#endif
-
-
-
-typedef struct _EMailTable EMailTable;
-struct _EMailTable {
-	GtkWidget *table;
-	ECard *card;
-	EMailMenu *primary;
-	EMailMenu *email2;
-	EMailMenu *email3;
-};
-
-static void
-email_table_cleanup_cb (gpointer closure)
-{
-	EMailTable *et = (EMailTable *) closure;
-
-	if (et == NULL)
-		return;
-
-	gtk_object_unref (GTK_OBJECT (et->card));
-	email_menu_free (et->primary);
-	email_menu_free (et->email2);
-	email_menu_free (et->email3);
-
-	g_free (et);
-}
-
-static void
-email_table_from_card (EMailTable *et)
-{
-	ECardSimple *simple;
-	
-	g_return_if_fail (et != NULL);
-
-	simple = e_card_simple_new (et->card);
-	email_menu_set_option (et->primary, e_card_simple_get_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL));
-	email_menu_set_option (et->email2,  e_card_simple_get_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL_2));
-	email_menu_set_option (et->email3,  e_card_simple_get_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL_3));
-	gtk_object_unref (GTK_OBJECT (simple));
-}
-
-static void
-email_table_to_card (EMailTable *et)
-{
-	ECardSimple *simple;
-	gchar *curr;
-
-	g_return_if_fail (et != NULL);
-
-	simple = e_card_simple_new (et->card);
-
-	curr = et->primary->current_selection;
-	if (curr && !strcmp (curr, _(EMPTY_ENTRY)))
-		curr = NULL;
-	e_card_simple_set_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL, curr);
-
-	curr = et->email2->current_selection;
-	if (curr && !strcmp (curr, _(EMPTY_ENTRY)))
-		curr = NULL;
-	e_card_simple_set_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL_2, curr);
-
-	curr = et->email3->current_selection;
-	if (curr && !strcmp (curr, _(EMPTY_ENTRY)))
-		curr = NULL;
-	e_card_simple_set_email (simple, E_CARD_SIMPLE_EMAIL_ID_EMAIL_3, curr);
-
-	e_card_simple_sync_card (simple);
-	gtk_object_unref (GTK_OBJECT (simple));
-}
-
-static void
-email_table_save_card_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	ECard *card = E_CARD (closure);
-
-	if (book) {
-		e_book_commit_card (book, card, NULL, NULL);
-		gtk_object_unref (GTK_OBJECT (book));
-	}
-	gtk_object_unref (GTK_OBJECT (card));
-}
-
-/*
- * We have to do this in an idle function because of what might be a
- * re-entrancy problems with EBook.
- */
-static gint
-add_card_idle_cb (gpointer closure)
-{
-	EBook *book;
-
-	book = e_book_new ();
-	if (!addressbook_load_default_book (book, email_table_save_card_cb, closure)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		email_table_save_card_cb (NULL, E_BOOK_STATUS_OTHER_ERROR, closure);
-	}
-
-	return 0;
-}
-
-static void
-email_table_ok_cb (MiniWizard *wiz, gpointer closure)
-{
-	EMailTable *et = (EMailTable *) closure;
-
-	email_table_to_card (et);
-
-	gtk_object_ref (GTK_OBJECT (et->card));
-	gtk_idle_add (add_card_idle_cb, et->card);
-
-	mini_wizard_destroy (wiz);
-}
-
-static void
-email_table_init (MiniWizard *wiz, ECard *card, const gchar *extra_address)
-{
-	EMailTable *et;
-
-	gchar *name_str;
-	gint xpad, ypad;
-	GtkAttachOptions label_x_opts, label_y_opts;
-	GtkAttachOptions menu_x_opts, menu_y_opts;
-
-	g_return_if_fail (card && E_IS_CARD (card));
-
-	et = g_new (EMailTable, 1);
-
-	et->card = card;
-	gtk_object_ref (GTK_OBJECT (et->card));
-
-	et->table = gtk_table_new (4, 2, FALSE);
-
-	et->primary = email_menu_new ();
-	et->email2  = email_menu_new ();
-	et->email3  = email_menu_new ();
-
-	email_menu_add_options_from_card (et->primary, et->card, extra_address);
-	email_menu_add_options_from_card (et->email2,  et->card, extra_address);
-	email_menu_add_options_from_card (et->email3,  et->card, extra_address);
-
-	email_table_from_card (et);
-
-	label_x_opts = GTK_FILL;
-	label_y_opts = GTK_FILL;
-	menu_x_opts = GTK_EXPAND | GTK_FILL;
-	menu_y_opts = GTK_EXPAND | GTK_FILL;
-	xpad = 3;
-	ypad = 3;
-
-	name_str = e_card_name_to_string (et->card->name);
-	gtk_table_attach (GTK_TABLE (et->table),
-			  gtk_label_new (name_str),
-			  0, 2, 0, 1, 
-			  label_x_opts, label_y_opts, xpad, ypad);
-	g_free (name_str);
-
-	gtk_table_attach (GTK_TABLE (et->table),
-			  gtk_label_new (_("Primary Email")),
-			  0, 1, 1, 2, 
-			  label_x_opts, label_y_opts, xpad, ypad);
-
-	gtk_table_attach (GTK_TABLE (et->table),
-			  et->primary->option_menu,
-			  1, 2, 1, 2, 
-			  menu_x_opts, menu_y_opts, xpad, ypad);
-
-	gtk_table_attach (GTK_TABLE (et->table),
-			  gtk_label_new (_("Email 2")),
-			  0, 1, 2, 3,
-			  label_x_opts, label_y_opts, xpad, ypad);
-
-	gtk_table_attach (GTK_TABLE (et->table),
-			  et->email2->option_menu,
-			  1, 2, 2, 3,
-			  menu_x_opts, menu_y_opts, xpad, ypad);
-
-	gtk_table_attach (GTK_TABLE (et->table),
-			  gtk_label_new (_("Email 3")),
-			  0, 1, 3, 4,
-			  label_x_opts, label_y_opts, xpad, ypad);
-
-	gtk_table_attach (GTK_TABLE (et->table),
-			  et->email3->option_menu,
-			  1, 2, 3, 4,
-			  menu_x_opts, menu_y_opts, xpad, ypad);
-
-	gtk_widget_show_all (et->primary->option_menu);
-	gtk_widget_show_all (et->email2->option_menu);
-	gtk_widget_show_all (et->email3->option_menu);
-
-	gtk_widget_show_all (et->table);
-	mini_wizard_container_add (wiz, et->table);
-	wiz->ok_cb      = email_table_ok_cb;
-	wiz->cleanup_cb = email_table_cleanup_cb;
-	wiz->closure    = et;
-}
-
-/*
- * This code is for the little UI thing that lets you pick from a set of cards
- * and decide which one you want to add the e-mail address to.
- */
-
-typedef struct _CardPicker CardPicker;
-struct _CardPicker {
-	GtkWidget *body;
-	GtkWidget *clist;
-	GList *cards;
-	gchar *new_name;
-	gchar *new_email;
-
-	gint current_row;
-};
-
-static void
-card_picker_row_select_cb (GtkCList *clist, gint row, gint col, GdkEventButton *ev, gpointer closure)
-{
-	MiniWizard *wiz = (MiniWizard *) closure;
-	CardPicker *pick = (CardPicker *) wiz->closure;
-	pick->current_row = row;
-	gtk_widget_set_sensitive (wiz->ok_button, TRUE);
-}
-
-static void
-card_picker_row_unselect_cb (GtkCList *clist, gint row, gint col, GdkEventButton *ev, gpointer closure)
-{
-	MiniWizard *wiz = (MiniWizard *) closure;
-	CardPicker *pick = (CardPicker *) wiz->closure;
-	pick->current_row = -1;
-	gtk_widget_set_sensitive (wiz->ok_button, FALSE);
-}
-
-static void
-card_picker_ok_cb (MiniWizard *wiz, gpointer closure)
-{
-	CardPicker *pick = (CardPicker *) closure;
-	g_return_if_fail (pick->current_row >= 0);
-
-	if (pick->current_row == 0) {
-		e_contact_quick_add (pick->new_name, pick->new_email, NULL, NULL);
-		mini_wizard_destroy (wiz);
-	} else {
-		ECard *card = (ECard *) g_list_nth_data (pick->cards, pick->current_row-1);
-		email_table_init (wiz, card, pick->new_email);
-	}
-}
-
-static void
-card_picker_cleanup_cb (gpointer closure)
-{
-	CardPicker *pick = (CardPicker *) closure;
-
-	g_list_foreach (pick->cards, (GFunc) gtk_object_unref, NULL);
-	g_list_free (pick->cards);
-
-	g_free (pick->new_name);
-	g_free (pick->new_email);
-}
-
-static void
-card_picker_init (MiniWizard *wiz, const GList *cards, const gchar *new_name, const gchar *new_email)
-{
-	CardPicker *pick;
-	gchar *str;
-	GtkWidget *w, *swin;
-
-	pick = g_new (CardPicker, 1);
-
-	pick->body  = gtk_vbox_new (FALSE, 2);
-
-	pick->clist = gtk_clist_new (1);
-	gtk_clist_set_column_title (GTK_CLIST (pick->clist), 0, _("Select an Action"));
-	gtk_clist_column_titles_show (GTK_CLIST (pick->clist));
-	gtk_clist_set_selection_mode (GTK_CLIST (pick->clist), GTK_SELECTION_SINGLE);
-
-	gtk_clist_freeze (GTK_CLIST (pick->clist));
-
-	str = g_strdup_printf (_("Create a new contact \"%s\""), new_name);
-	gtk_clist_append (GTK_CLIST (pick->clist), &str);
-	g_free (str);
-
-	pick->cards = NULL;
-	while (cards) {
-		ECard *card = (ECard *) cards->data;
-		gchar *name_str = e_card_name_to_string (card->name);
-
-		pick->cards = g_list_append (pick->cards, card);
-		gtk_object_ref (GTK_OBJECT (card));
-
-		str = g_strdup_printf (_("Add address to existing contact \"%s\""), name_str);
-		gtk_clist_append (GTK_CLIST (pick->clist), &str);
-		g_free (name_str);
-		g_free (str);
-
-		cards = g_list_next (cards);
-	}
-
-	gtk_clist_thaw (GTK_CLIST (pick->clist));
-
-	pick->new_name  = g_strdup (new_name);
-	pick->new_email = g_strdup (new_email);
-
-	pick->current_row = -1;
-	gtk_widget_set_sensitive (wiz->ok_button, FALSE);
-
-	/* Connect some signals & callbacks */
-
-	wiz->ok_cb      = card_picker_ok_cb;
-	wiz->cleanup_cb = card_picker_cleanup_cb;
-
-	gtk_signal_connect (GTK_OBJECT (pick->clist),
-			    "select-row",
-			    GTK_SIGNAL_FUNC (card_picker_row_select_cb),
-			    wiz);
-	gtk_signal_connect (GTK_OBJECT (pick->clist),
-			    "unselect-row",
-			    GTK_SIGNAL_FUNC (card_picker_row_unselect_cb),
-			    wiz);
-
-	/* Build our widget */
-
-	w = gtk_label_new (new_email);
-	gtk_box_pack_start (GTK_BOX (pick->body), w, FALSE, TRUE, 3);
-
-	swin = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin),
-					GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (swin), pick->clist);
-	
-	gtk_box_pack_start (GTK_BOX (pick->body), swin, TRUE, TRUE, 2);
-	gtk_widget_show_all (pick->body);
-
-
-	/* Put it in our mini-wizard */
-
-	wiz->closure = pick;
-	mini_wizard_container_add (wiz, pick->body);
-}
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-/*
- * The code for the actual EAddressPopup widget begins here.
- */
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-
-static GtkObjectClass *parent_class;
-
-static void e_address_popup_destroy (GtkObject *);
-static void e_address_popup_query   (EAddressPopup *);
-
-
-static void
-e_address_popup_class_init (EAddressPopupClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	parent_class = GTK_OBJECT_CLASS (gtk_type_class (gtk_event_box_get_type ()));
-
-	object_class->destroy = e_address_popup_destroy;
-}
-
-static void
-e_address_popup_init (EAddressPopup *pop)
-{
-	pop->transitory = TRUE;
-}
-
-static void
-e_address_popup_cleanup (EAddressPopup *pop)
-{
-	if (pop->card) {
-		gtk_object_unref (GTK_OBJECT (pop->card));
-		pop->card = NULL;
-	}
-
-	if (pop->scheduled_refresh) {
-		gtk_timeout_remove (pop->scheduled_refresh);
-		pop->scheduled_refresh = 0;
-	}
-
-	if (pop->query_tag) {
-		e_book_simple_query_cancel (pop->book, pop->query_tag);
-		pop->query_tag = 0;
-	}
-
-	if (pop->book) {
-		gtk_object_unref (GTK_OBJECT (pop->book));
-		pop->book = NULL;
-	}
-
-	g_free (pop->name);
-	pop->name = NULL;
-
-	g_free (pop->email);
-	pop->email = NULL;
-}
-
-static void
-e_address_popup_destroy (GtkObject *obj)
-{
-	EAddressPopup *pop = E_ADDRESS_POPUP (obj);
-
-	e_address_popup_cleanup (pop);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		GTK_OBJECT_CLASS (parent_class)->destroy (obj);
-}
-
-GtkType
-e_address_popup_get_type (void)
-{
-	static GtkType pop_type = 0;
-
-	if (!pop_type) {
-		GtkTypeInfo pop_info = {
-			"EAddressPopup",
-			sizeof (EAddressPopup),
-			sizeof (EAddressPopupClass),
-			(GtkClassInitFunc) e_address_popup_class_init,
-			(GtkObjectInitFunc) e_address_popup_init,
-			NULL, NULL,
-			(GtkClassInitFunc) NULL
-		};
-
-		pop_type = gtk_type_unique (gtk_event_box_get_type (), &pop_info);
-	}
-
-	return pop_type;
-}
-
-static void
-e_address_popup_refresh_names (EAddressPopup *pop)
-{
-	if (pop->name_widget) {
-		if (pop->name && *pop->name) {
-			gchar *s = e_utf8_to_gtk_string (pop->name_widget, pop->name);
-			gtk_label_set_text (GTK_LABEL (pop->name_widget), s);
-			g_free (s);
-			gtk_widget_show (pop->name_widget);
-		} else {
-			gtk_widget_hide (pop->name_widget);
-		}
-	}
-
-	if (pop->email_widget) {
-		if (pop->email && *pop->email) {
-			gchar *s = e_utf8_to_gtk_string (pop->email_widget, pop->email);
-			gtk_label_set_text (GTK_LABEL (pop->email_widget), s);
-			g_free (s);
-			gtk_widget_show (pop->email_widget);
-		} else {
-			gtk_widget_hide (pop->email_widget);
-		}
-	}
-
-	e_address_popup_query (pop);
-}
-
-static gint
-refresh_timeout_cb (gpointer ptr)
-{
-	EAddressPopup *pop = E_ADDRESS_POPUP (ptr);
-	e_address_popup_refresh_names (pop);
-	pop->scheduled_refresh = 0;
-	return 0;
-}
-
-static void
-e_address_popup_schedule_refresh (EAddressPopup *pop)
-{
-	if (pop->scheduled_refresh == 0)
-		pop->scheduled_refresh = gtk_timeout_add (20, refresh_timeout_cb, pop);
-}
-
-/* If we are handed something of the form "Foo <bar@bar.com>",
-   do the right thing. */
-static gboolean
-e_address_popup_set_free_form (EAddressPopup *pop, const gchar *txt)
-{
-	gchar *lt, *gt = NULL;
-
-	g_return_val_if_fail (pop && E_IS_ADDRESS_POPUP (pop), FALSE);
-
-	if (txt == NULL)
-		return FALSE;
-
-	lt = strchr (txt, '<');
-	if (lt)
-		gt = strchr (txt, '>');
-
-	if (lt && gt && lt+1 < gt) {
-		gchar *name  = g_strndup (txt,  lt-txt);
-		gchar *email = g_strndup (lt+1, gt-lt-1);
-		e_address_popup_set_name (pop, name);
-		e_address_popup_set_email (pop, email);
-
-		return TRUE;
-	}
-	
-	return FALSE;
-}
-
-void
-e_address_popup_set_name (EAddressPopup *pop, const gchar *name)
-{
-	g_return_if_fail (pop && E_IS_ADDRESS_POPUP (pop));
-
-	/* We only allow the name to be set once. */
-	if (pop->name)
-		return;
-
-	if (!e_address_popup_set_free_form (pop, name)) {
-		pop->name = g_strdup (name);
-		if (pop->name)
-			g_strstrip (pop->name);
-	}
-
-	e_address_popup_schedule_refresh (pop);
-}
-
-void
-e_address_popup_set_email (EAddressPopup *pop, const gchar *email)
-{
-	g_return_if_fail (pop && E_IS_ADDRESS_POPUP (pop));
-
-	/* We only allow the e-mail to be set once. */
-	if (pop->email)
-		return;
-
-	if (!e_address_popup_set_free_form (pop, email)) {
-		pop->email = g_strdup (email);
-		if (pop->email)
-			g_strstrip (pop->email);
-	}
-
-	e_address_popup_schedule_refresh (pop);
-}
-
-void
-e_address_popup_construct (EAddressPopup *pop)
-{
-	GtkWidget *vbox, *name_holder;
-	GdkColor color = { 0x0, 0xffff, 0xffff, 0xffff };
-
-	g_return_if_fail (pop && E_IS_ADDRESS_POPUP (pop));
-
-	pop->main_vbox = gtk_vbox_new (FALSE, 0);
-
-	/* Build Generic View */
-
-	name_holder = gtk_event_box_new ();
-	vbox = gtk_vbox_new (FALSE, 2);
-	pop->name_widget = gtk_label_new ("");
-	pop->email_widget = gtk_label_new ("");
-
-	gtk_box_pack_start (GTK_BOX (vbox), pop->name_widget, TRUE, TRUE, 2);
-	gtk_box_pack_start (GTK_BOX (vbox), pop->email_widget, TRUE, TRUE, 2);
-	gtk_container_add (GTK_CONTAINER (name_holder), GTK_WIDGET (vbox));
-
-	if (gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (name_holder)), &color, FALSE, TRUE)) {
-		GtkStyle *style = gtk_style_copy (gtk_widget_get_style (GTK_WIDGET (name_holder)));
-		style->bg[0] = color;
-		gtk_widget_set_style (GTK_WIDGET (name_holder), style);
-		gtk_style_unref (style);
-	}
-
-	pop->generic_view = gtk_frame_new (NULL);
-	gtk_container_add (GTK_CONTAINER (pop->generic_view), name_holder);
-	gtk_box_pack_start (GTK_BOX (pop->main_vbox), pop->generic_view, TRUE, TRUE, 0);
-	gtk_widget_show_all (pop->generic_view);
-
-	pop->query_msg = gtk_label_new (_("Querying Addressbook..."));
-	gtk_box_pack_start (GTK_BOX (pop->main_vbox), pop->query_msg, TRUE, TRUE, 0);
-	gtk_widget_show (pop->query_msg);
-
-	/* Build Minicard View */
-	pop->minicard_view = e_minicard_widget_new ();
-	gtk_box_pack_start (GTK_BOX (pop->main_vbox), pop->minicard_view, TRUE, TRUE, 0);
-
-
-	/* Final assembly */
-
-	gtk_container_add (GTK_CONTAINER (pop), pop->main_vbox);
-	gtk_widget_show (pop->main_vbox);
-
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
-	gtk_container_set_border_width (GTK_CONTAINER (pop), 2);
-}
-
-GtkWidget *
-e_address_popup_new (void)
-{
-	EAddressPopup *pop = gtk_type_new (E_ADDRESS_POPUP_TYPE);
-	e_address_popup_construct (pop);
-	return GTK_WIDGET (pop);
-}
-
-static void
-emit_event (EAddressPopup *pop, const char *event)
-{
-	if (pop->es) {
-		BonoboArg *arg;
-
-		arg = bonobo_arg_new (BONOBO_ARG_BOOLEAN);
-		BONOBO_ARG_SET_BOOLEAN (arg, TRUE);
-		bonobo_event_source_notify_listeners_full (pop->es,
-							   "GNOME/Evolution/Addressbook/AddressPopup",
-							   "Event",
-							   event,
-							   arg, NULL);
-		bonobo_arg_release (arg);
-	}	
-}
-
-static void
-contact_editor_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	EAddressPopup *pop = E_ADDRESS_POPUP (closure);
-	EContactEditor *ce = e_addressbook_show_contact_editor (book, pop->card, FALSE, TRUE);
-	e_address_popup_cleanup (pop);
-	emit_event (pop, "Destroy");
-	e_contact_editor_raise (ce);
-}
-
-static void
-edit_contact_info_cb (EAddressPopup *pop)
-{
-	EBook *book;
-	emit_event (pop, "Hide");
-
-	book = e_book_new ();
-	if (!addressbook_load_default_book (book, contact_editor_cb, pop)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		contact_editor_cb (NULL, E_BOOK_STATUS_OTHER_ERROR, pop);
-	}
-}
-
-static void
-e_address_popup_cardify (EAddressPopup *pop, ECard *card)
-{
-	GtkWidget *b;
-
-	g_return_if_fail (pop && E_IS_ADDRESS_POPUP (pop));
-	g_return_if_fail (card && E_IS_CARD (card));
-	g_return_if_fail (pop->card == NULL);
-
-	pop->card = card;
-	gtk_object_ref (GTK_OBJECT (pop->card));
-
-	e_minicard_widget_set_card (E_MINICARD_WIDGET (pop->minicard_view), card);
-	gtk_widget_show (pop->minicard_view);
-	gtk_widget_hide (pop->generic_view);
-
-	b = gtk_button_new_with_label (_("Edit Contact Info"));
-	gtk_box_pack_start (GTK_BOX (pop->main_vbox), b, TRUE, TRUE, 0);
-	gtk_signal_connect_object (GTK_OBJECT (b),
-				   "clicked",
-				   GTK_SIGNAL_FUNC (edit_contact_info_cb),
-				   GTK_OBJECT (pop));
-	gtk_widget_show (b);
-}
-
-static void
-add_contacts_cb (EAddressPopup *pop)
-{
-	if (pop->email && *pop->email) {
-		if (pop->name && *pop->name)
-			e_contact_quick_add (pop->name, pop->email, NULL, NULL);
-		else
-			e_contact_quick_add_free_form (pop->email, NULL, NULL);
-
-	}
-	e_address_popup_cleanup (pop);
-	emit_event (pop, "Destroy");
-}
-
-static void
-e_address_popup_no_matches (EAddressPopup *pop)
-{
-	GtkWidget *b;
-
-	g_return_if_fail (pop && E_IS_ADDRESS_POPUP (pop));
-
-	b = gtk_button_new_with_label (_("Add to Contacts"));
-	gtk_box_pack_start (GTK_BOX (pop->main_vbox), b, TRUE, TRUE, 0);
-	gtk_signal_connect_object (GTK_OBJECT (b),
-				   "clicked",
-				   GTK_SIGNAL_FUNC (add_contacts_cb),
-				   GTK_OBJECT (pop));
-	gtk_widget_show (b);
-}
-
-static void
-wizard_destroy_cb (MiniWizard *wiz, gpointer closure)
-{
-	gtk_widget_destroy (GTK_WIDGET (closure));
-}
-
-static void
-popup_size_allocate_cb (GtkWidget *widget, GtkAllocation *alloc, gpointer user_data)
-{
-	gint x, y, w, h, xmax, ymax;
-
-	xmax = gdk_screen_width ();
-	ymax = gdk_screen_height ();
-
-	if (gtk_object_get_data (GTK_OBJECT (widget), "size_allocate") == NULL) {
-		gdk_window_get_pointer (NULL, &x, &y, NULL);
-		w = alloc->width;
-		h = alloc->height;
-		x = CLAMP (x - w/2, 0, xmax - w);
-		y = CLAMP (y - h/2, 0, ymax - h);
-		gtk_widget_set_uposition (widget, x, y);
-		gtk_object_set_data (GTK_OBJECT (widget), "size_allocate", widget);
-	}
-}
-
-static void
-e_address_popup_ambiguous_email_add (EAddressPopup *pop, const GList *cards)
-{
-	MiniWizard *wiz = mini_wizard_new ();
-	GtkWidget *win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	
-	wiz->destroy_cb      = wizard_destroy_cb;
-	wiz->destroy_closure = win;
-
-	gtk_window_set_title (GTK_WINDOW (win),  _("Merge E-Mail Address"));
-	gtk_signal_connect (GTK_OBJECT (win),
-			    "size_allocate",
-			    GTK_SIGNAL_FUNC (popup_size_allocate_cb),
-			    NULL);
-
-	/* FIXME: This hard-wired size is evil. */
-	gtk_widget_set_usize (win, 275, 170);
-		
-	card_picker_init (wiz, cards, pop->name, pop->email);
-
-	e_address_popup_cleanup (pop);
-	emit_event (pop, "Destroy");
-
-	gtk_container_add (GTK_CONTAINER (win), wiz->body);
-	gtk_widget_show_all (win);
-}
-
-static void
-e_address_popup_multiple_matches (EAddressPopup *pop, const GList *cards)
-{
-	pop->multiple_matches = TRUE;
-
-	e_address_popup_ambiguous_email_add (pop, cards);
-}
-
-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
-
-/*
- *  Addressbook Query Fun
- */
-
-static void
-name_only_query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)
-{
-	EAddressPopup *pop;
-
-	if (status != E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS)
-		return;
-
-	pop = E_ADDRESS_POPUP (closure);
-
-	pop->query_tag = 0;
-
-	if (cards == NULL) {
-		e_address_popup_no_matches (pop);
-	} else {
-		e_address_popup_ambiguous_email_add (pop, cards);
-	}
-}
-
-static void
-query_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer closure)
-{
-	EAddressPopup *pop;
-
-	if (status != E_BOOK_SIMPLE_QUERY_STATUS_SUCCESS)
-		return;
-
-	pop = E_ADDRESS_POPUP (closure);
-
-	pop->query_tag = 0;
-	gtk_widget_hide (pop->query_msg);
-
-	if (cards == NULL) {
-		
-		/* Do a name-only query if:
-		   (1) The name is non-empty.
-		   (2) The e-mail is also non-empty (so that the query we just did wasn't actually a name-only query.
-		*/
-		if (pop->name && *pop->name && pop->email && *pop->email) {
-			pop->query_tag = e_book_name_and_email_query (book, pop->name, NULL, name_only_query_cb, pop);
-		} else {
-			e_address_popup_no_matches (pop);
-		}
-		
-	} else {
-		if (g_list_length ((GList *) cards) == 1)
-			e_address_popup_cardify (pop, E_CARD (cards->data));
-		else
-			e_address_popup_multiple_matches (pop, cards);
-	}
-}
-
-static void
-start_query (EBook *book, EBookStatus status, gpointer closure)
-{
-	EAddressPopup *pop = E_ADDRESS_POPUP (closure);
-	
-	if (pop->query_tag)
-		e_book_simple_query_cancel (book, pop->query_tag);
-
-	if (pop->book != book) {
-		gtk_object_ref (GTK_OBJECT (book));
-		if (pop->book)
-			gtk_object_unref (GTK_OBJECT (pop->book));
-		pop->book = book;
-	}
-		
-	pop->query_tag = e_book_name_and_email_query (book, pop->name, pop->email, query_cb, pop);
-
-	gtk_object_unref (GTK_OBJECT (pop));
-}
-
-static void
-e_address_popup_query (EAddressPopup *pop)
-{
-	EBook *book;
-
-	g_return_if_fail (pop && E_IS_ADDRESS_POPUP (pop));
-
-	book = e_book_new ();
-	gtk_object_ref (GTK_OBJECT (pop));
-
-	if (!addressbook_load_default_book (book, start_query, pop)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		start_query (NULL, E_BOOK_STATUS_OTHER_ERROR, pop);
-	}
-}
-
-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
-
-enum {
-	PROPERTY_NAME,
-	PROPERTY_EMAIL,
-	PROPERTY_TRANSITORY
-};
-
-static void
-set_prop (BonoboPropertyBag *bag, const BonoboArg *arg, guint arg_id, CORBA_Environment *ev, gpointer user_data)
-{
-	EAddressPopup *pop = E_ADDRESS_POPUP (user_data);
-
-	switch (arg_id) {
-
-	case PROPERTY_NAME:
-		e_address_popup_set_name (pop, BONOBO_ARG_GET_STRING (arg));
-		break;
-
-	case PROPERTY_EMAIL:
-		e_address_popup_set_email (pop, BONOBO_ARG_GET_STRING (arg));
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-static void
-get_prop (BonoboPropertyBag *bag, BonoboArg *arg, guint arg_id, CORBA_Environment *ev, gpointer user_data)
-{
-	EAddressPopup *pop = E_ADDRESS_POPUP (user_data);
-
-	switch (arg_id) {
-
-	case PROPERTY_NAME:
-		BONOBO_ARG_SET_STRING (arg, pop->name);
-		break;
-
-	case PROPERTY_EMAIL:
-		BONOBO_ARG_SET_STRING (arg, pop->email);
-		break;
-
-	case PROPERTY_TRANSITORY:
-		BONOBO_ARG_SET_BOOLEAN (arg, pop->transitory);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-static BonoboControl *
-e_address_popup_factory_new_control (void)
-{
-        BonoboControl *control;
-        BonoboPropertyBag *bag;
-	EAddressPopup *addy;
-	GtkWidget *w;
-
-	w = e_address_popup_new ();
-	addy = E_ADDRESS_POPUP (w);
-
-	control = bonobo_control_new (w);
-	gtk_widget_show (w);
-
-        bag = bonobo_property_bag_new (get_prop, set_prop, w);
-        bonobo_property_bag_add (bag, "name", PROPERTY_NAME,
-                                 BONOBO_ARG_STRING, NULL, NULL,
-                                 BONOBO_PROPERTY_WRITEABLE | BONOBO_PROPERTY_READABLE);
-
-        bonobo_property_bag_add (bag, "email", PROPERTY_EMAIL,
-                                 BONOBO_ARG_STRING, NULL, NULL,
-                                 BONOBO_PROPERTY_WRITEABLE | BONOBO_PROPERTY_READABLE);
-
-	bonobo_property_bag_add (bag, "transitory", PROPERTY_TRANSITORY,
-				 BONOBO_ARG_BOOLEAN, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE);
-
-        bonobo_control_set_properties (control, bag);
-        bonobo_object_unref (BONOBO_OBJECT (bag));
-
-	addy->es = bonobo_event_source_new ();
-	bonobo_object_add_interface (BONOBO_OBJECT (control),
-				     BONOBO_OBJECT (addy->es));
-
-        return control;
-}
-
-static BonoboObject *
-e_address_popup_factory (BonoboGenericFactory *factory, gpointer user_data)
-{
-	return BONOBO_OBJECT (e_address_popup_factory_new_control ());
-}
-
-void
-e_address_popup_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new ("OAFIID:GNOME_Evolution_Addressbook_AddressPopupFactory",
-					      e_address_popup_factory, NULL);
-	
-	if (factory == NULL)
-		g_error ("I could not register an AddressPopup factory.");
-}
diff --git a/addressbook/gui/component/e-address-popup.h b/addressbook/gui/component/e-address-popup.h
deleted file mode 100644
index b648b79d4f..0000000000
--- a/addressbook/gui/component/e-address-popup.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-address-popup.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __E_ADDRESS_POPUP_H__
-#define __E_ADDRESS_POPUP_H__
-
-#include <gtk/gtk.h>
-#include <libgnome/gnome-defs.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <bonobo/bonobo-event-source.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_ADDRESS_POPUP_TYPE        (e_address_popup_get_type ())
-#define E_ADDRESS_POPUP(o)          (GTK_CHECK_CAST ((o), E_ADDRESS_POPUP_TYPE, EAddressPopup))
-#define E_ADDRESS_POPUP_CLASS(k)    (GTK_CHECK_CLASS_CAST ((k), E_ADDRESS_POPUP_TYPE, EAddressPopupClass))
-#define E_IS_ADDRESS_POPUP(o)       (GTK_CHECK_TYPE ((o), E_ADDRESS_POPUP_TYPE))
-#define E_IS_ADDRESS_POPUP_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESS_POPUP_TYPE))
-
-typedef struct _EAddressPopup EAddressPopup;
-typedef struct _EAddressPopupClass EAddressPopupClass;
-
-struct _EAddressPopup {
-	GtkEventBox parent;
-
-	gchar *name;
-	gchar *email;
-
-	GtkWidget *name_widget;
-	GtkWidget *email_widget;
-	GtkWidget *query_msg;
-	
-	GtkWidget *main_vbox;
-	GtkWidget *generic_view;
-	GtkWidget *minicard_view;
-
-	gboolean transitory;
-
-	guint scheduled_refresh;
-	EBook *book;
-	guint query_tag;
-	gboolean multiple_matches;
-	ECard *card;
-
-	BonoboEventSource *es;
-};
-
-struct _EAddressPopupClass {
-	GtkEventBoxClass parent_class;
-};
-
-GtkType e_address_popup_get_type (void);
-
-void e_address_popup_set_name  (EAddressPopup *, const gchar *name);
-void e_address_popup_set_email (EAddressPopup *, const gchar *email);
-
-void e_address_popup_construct (EAddressPopup *);
-GtkWidget *e_address_popup_new (void);
-
-void e_address_popup_factory_init (void);
-
-END_GNOME_DECLS
-
-#endif /* __E_ADDRESS_POPUP_H__ */
-
diff --git a/addressbook/gui/component/e-address-widget.c b/addressbook/gui/component/e-address-widget.c
deleted file mode 100644
index d044ddf7b9..0000000000
--- a/addressbook/gui/component/e-address-widget.c
+++ /dev/null
@@ -1,576 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-address-widget.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#include <config.h>
-#include <ctype.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-property-bag.h>
-#include <bonobo/bonobo-generic-factory.h>
-#include <addressbook/gui/contact-editor/e-contact-quick-add.h>
-#include "e-address-widget.h"
-
-static void e_address_widget_class_init (EAddressWidgetClass *klass);
-static void e_address_widget_init       (EAddressWidget *obj);
-static void e_address_widget_destroy    (GtkObject *obj);
-
-static gint e_address_widget_button_press_handler (GtkWidget *w, GdkEventButton *ev);
-static void e_address_widget_popup (EAddressWidget *, GdkEventButton *ev);
-static void e_address_widget_schedule_query (EAddressWidget *);
-
-static GtkObjectClass *parent_class;
-
-static EBook *common_book = NULL; /* sort of lame */
-
-static gboolean doing_queries = FALSE;
-
-static void
-e_address_widget_class_init (EAddressWidgetClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-	parent_class = GTK_OBJECT_CLASS (gtk_type_class (gtk_event_box_get_type ()));
-
-	object_class->destroy = e_address_widget_destroy;
-
-	widget_class->button_press_event = e_address_widget_button_press_handler;
-}
-
-static void
-e_address_widget_init (EAddressWidget *addr)
-{
-
-}
-
-static void
-e_address_widget_destroy (GtkObject *obj)
-{
-	EAddressWidget *addr = E_ADDRESS_WIDGET (obj);
-
-	g_free (addr->name);
-	g_free (addr->email);
-
-	if (addr->query_tag)
-		e_book_simple_query_cancel (common_book, addr->query_tag);
-
-	if (addr->query_idle_tag)
-		gtk_idle_remove (addr->query_idle_tag);
-}
-
-static gint
-e_address_widget_button_press_handler (GtkWidget *w, GdkEventButton *ev)
-{
-	EAddressWidget *addr = E_ADDRESS_WIDGET (w);
-	if (ev->button == 3 && ev->state == 0) {
-		e_address_widget_popup (addr, ev);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-GtkType
-e_address_widget_get_type (void)
-{
-	static GtkType aw_type = 0;
-
-	if (!aw_type) {
-		GtkTypeInfo aw_info = {
-			"EAddressWidget",
-			sizeof (EAddressWidget),
-			sizeof (EAddressWidgetClass),
-			(GtkClassInitFunc) e_address_widget_class_init,
-			(GtkObjectInitFunc) e_address_widget_init,
-			NULL, NULL, /* reserved... but for what sinister purpose? */
-			(GtkClassInitFunc) NULL
-		};
-
-		aw_type = gtk_type_unique (gtk_event_box_get_type (), &aw_info);
-	}
-
-	return aw_type;
-}
-
-static void
-gtk_widget_visible (GtkWidget *w, gboolean x)
-{
-	if (x)
-		gtk_widget_show (w);
-	else
-		gtk_widget_hide (w);
-}
-
-static void
-e_address_widget_refresh (EAddressWidget *addr)
-{
-	gchar *str;
-	gboolean have_name, have_email;
-
-	g_return_if_fail (addr && E_IS_ADDRESS_WIDGET (addr));
-
-	have_name = addr->name && *addr->name;
-	have_email = addr->email && *addr->email && (addr->card == NULL || !addr->known_email);
-
-	gtk_label_set_text (GTK_LABEL (addr->name_widget), have_name ? addr->name : "");
-	gtk_widget_visible (addr->name_widget, have_name);
-	if (addr->card) {
-		gint i, N = strlen (addr->name);
-		gchar *pattern = g_malloc (N+1);
-		for (i=0; i<N; ++i)
-			pattern[i] = '_';
-		pattern[i] = '\0';
-		gtk_label_set_pattern (GTK_LABEL (addr->name_widget), pattern);
-		g_free (pattern);
-	} else {
-		gtk_label_set_pattern (GTK_LABEL (addr->name_widget), "");
-	}
-
-	if (have_email) {
-		str = g_strdup_printf (have_name ? "<%s>" : "%s", addr->email);
-		gtk_label_set_text (GTK_LABEL (addr->email_widget), str);
-		g_free (str);
-	} else {
-		gtk_label_set_text (GTK_LABEL (addr->email_widget), "");
-	}
-	gtk_widget_visible (addr->email_widget, have_email);
-
-	gtk_widget_visible (addr->spacer, have_name && have_email);
-
-	/* Launch a query to find the appropriate card, if necessary. */
-	if (addr->card == NULL) 
-		e_address_widget_schedule_query (addr);
-}
-
-void
-e_address_widget_set_name (EAddressWidget *addr, const gchar *name)
-{
-	g_return_if_fail (addr && E_IS_ADDRESS_WIDGET (addr));
-
-	g_free (addr->name);
-	addr->name = g_strdup (name);
-
-	e_address_widget_refresh (addr);
-}
-
-void
-e_address_widget_set_email (EAddressWidget *addr, const gchar *email)
-{
-	g_return_if_fail (addr && E_IS_ADDRESS_WIDGET (addr));
-
-	g_free (addr->email);
-	addr->email = g_strdup (email);
-
-	e_address_widget_refresh (addr);
-}
-
-
-void
-e_address_widget_set_text (EAddressWidget *addr, const gchar *text)
-{
-	g_return_if_fail (addr && E_IS_ADDRESS_WIDGET (addr));
-	
-	e_address_widget_set_email (addr, text); /* CRAP */
-}
-
-void
-e_address_widget_construct (EAddressWidget *addr)
-{
-	GtkWidget *box;
-
-	g_return_if_fail (addr && E_IS_ADDRESS_WIDGET (addr));
-
-	box = gtk_hbox_new (FALSE, 2);
-	
-	addr->name_widget = gtk_label_new ("");
-	addr->spacer = gtk_label_new (" ");
-	addr->email_widget = gtk_label_new ("");
-	
-	gtk_box_pack_start (GTK_BOX (box), addr->name_widget, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (box), addr->spacer, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (box), addr->email_widget, FALSE, FALSE, 0);
-
-	gtk_container_add (GTK_CONTAINER (addr), box);
-
-	gtk_widget_show (box);
-	gtk_widget_show (addr->name_widget);
-	gtk_widget_show (addr->email_widget);
-}
-
-GtkWidget *
-e_address_widget_new (void)
-{
-	EAddressWidget *addr = gtk_type_new (e_address_widget_get_type ());
-	e_address_widget_construct (addr);
-	return GTK_WIDGET (addr);
-}
-
-/*
- *
- * Cardification
- *
- */
-
-static void
-e_address_widget_cardify (EAddressWidget *addr, ECard *card, gboolean known_email)
-{
-	if (addr->card != card || addr->known_email != known_email) {
-
-		if (addr->card != card) {
-			if (addr->card)
-				gtk_object_unref (GTK_OBJECT (addr->card));
-			addr->card = card;
-			gtk_object_ref (GTK_OBJECT (addr->card));
-		}
-
-		addr->known_email = known_email;
-
-		if (!(addr->name && *addr->name)) {
-			gchar *s = e_card_name_to_string (card->name);
-			e_address_widget_set_name (addr, s);
-			g_free (s);
-		}
-
-		e_address_widget_refresh (addr);
-	}
-}
-
-static void
-query_results_cb (EBook *book, EBookSimpleQueryStatus status, const GList *cards, gpointer user_data)
-{
-	EAddressWidget *addr = user_data;
-
-	if (g_list_length ((GList *) cards) == 1) {
-		ECard *card = E_CARD (cards->data);
-		e_address_widget_cardify (addr, card, TRUE);
-	}
-
-	addr->query_tag = 0;
-}
-
-static void
-e_address_widget_do_query (EAddressWidget *addr)
-{
-	e_book_name_and_email_query (common_book, addr->name, addr->email, query_results_cb, addr);
-}
-
-static void
-book_ready_cb (EBook *book, EBookStatus status, gpointer user_data)
-{
-	EAddressWidget *addr = E_ADDRESS_WIDGET (user_data);
-
-	if (common_book == NULL) {
-		common_book = book;
-		gtk_object_ref (GTK_OBJECT (common_book));
-	} else
-		gtk_object_unref (GTK_OBJECT (book));
-
-	e_address_widget_do_query (addr);
-}
-
-static gint
-query_idle_fn (gpointer ptr)
-{
-	EAddressWidget *addr = E_ADDRESS_WIDGET (ptr);
-
-	if (common_book) {
-		e_address_widget_do_query (addr);
-	} else {
-		e_book_load_local_address_book (e_book_new (), book_ready_cb, addr);
-	}
-
-	addr->query_idle_tag = 0;
-	return FALSE;
-}
-
-static void
-e_address_widget_schedule_query (EAddressWidget *addr)
-{
-	if (addr->query_idle_tag || !doing_queries)
-		return;
-	addr->query_idle_tag = gtk_idle_add (query_idle_fn, addr);
-}
-
-/*
- *
- * Popup Menu
- *
- */
-
-#define ARBITRARY_UIINFO_LIMIT 64
-
-static gint
-popup_add_name_and_address (EAddressWidget *addr, GnomeUIInfo *uiinfo, gint i)
-{
-	gboolean flag = FALSE;
-
-	if (addr->name && *addr->name) {
-		uiinfo[i].type = GNOME_APP_UI_ITEM;
-		uiinfo[i].label = addr->name;
-		++i;
-		flag = TRUE;
-	}
-
-	if (addr->email && *addr->email) {
-		uiinfo[i].type = GNOME_APP_UI_ITEM;
-		uiinfo[i].label = addr->email;
-		++i;
-		flag = TRUE;
-	}
-
-	if (flag) {
-		uiinfo[i].type = GNOME_APP_UI_SEPARATOR;
-		++i;
-	}
-	
-	return i;
-}
-
-static void
-flip_queries_flag_cb (GtkWidget *w, gpointer user_data)
-{
-	doing_queries = !doing_queries;
-}
-
-static gint
-popup_add_query_change (EAddressWidget *addr, GnomeUIInfo *uiinfo, gint i)
-{
-	uiinfo[i].type = GNOME_APP_UI_SEPARATOR;
-	++i;
-
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = doing_queries ? _("Disable Queries") : _("Enable Queries (Dangerous!)");
-	uiinfo[i].moreinfo = flip_queries_flag_cb;
-	++i;
-
-	return i;
-}
-
-
-static GtkWidget *
-popup_menu_card (EAddressWidget *addr)
-{
-	GnomeUIInfo uiinfo[ARBITRARY_UIINFO_LIMIT];
-	GtkWidget *pop;
-	gint i=0;
-	ECard *card = E_CARD (addr->card);
-
-	g_return_val_if_fail (card != NULL, NULL);
-
-	memset (uiinfo, 0, sizeof (uiinfo));
-
-	i = popup_add_name_and_address (addr, uiinfo, i);
-
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = _("Edit Contact Info");
-	++i;
-
-	i = popup_add_query_change (addr, uiinfo, i);
-
-	uiinfo[i].type = GNOME_APP_UI_ENDOFINFO;
-	pop = gnome_popup_menu_new (uiinfo);
-	return pop;
-}
-
-static void
-post_quick_add_cb (ECard *card, gpointer user_data)
-{
-	e_address_widget_cardify (E_ADDRESS_WIDGET (user_data), card, TRUE);
-}
-
-static void
-add_contacts_cb (GtkWidget *w, gpointer user_data)
-{
-	EAddressWidget *addr = E_ADDRESS_WIDGET (user_data);
-
-	e_contact_quick_add (addr->name, addr->email, post_quick_add_cb, addr);
-}
-
-static GtkWidget *
-popup_menu_nocard (EAddressWidget *addr)
-{
-	GnomeUIInfo uiinfo[ARBITRARY_UIINFO_LIMIT];
-	GtkWidget *pop;
-	gint i=0;
-
-	memset (uiinfo, 0, sizeof (uiinfo));
-
-	i = popup_add_name_and_address (addr, uiinfo, i);
-
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = _("Add to Contacts");
-	uiinfo[i].moreinfo = add_contacts_cb;
-	++i;
-
-	i = popup_add_query_change (addr, uiinfo, i);
-
-	uiinfo[i].type = GNOME_APP_UI_ENDOFINFO;
-	pop = gnome_popup_menu_new (uiinfo);
-	return pop;
-}
-
-static void
-e_address_widget_popup (EAddressWidget *addr, GdkEventButton *ev)
-{
-	GtkWidget *pop;
-
-	g_return_if_fail (addr && E_IS_ADDRESS_WIDGET (addr));
-
-	pop = addr->card ? popup_menu_card (addr) : popup_menu_nocard (addr);
-
-	if (pop)
-		gnome_popup_menu_do_popup (pop, NULL, NULL, ev, addr);
-}
-
-/*
- *
- * Bonobo Control Magic
- *
- */
-
-enum {
-	ADDRESS_PROPERTY_NAME,
-	ADDRESS_PROPERTY_EMAIL,
-	ADDRESS_PROPERTY_TEXT,
-	ADDRESS_PROPERTY_BACKGROUND_RGB
-};
-
-
-static void
-get_prop (BonoboPropertyBag *bag, BonoboArg *arg, guint arg_id, CORBA_Environment *ev, gpointer user_data)
-{
-	EAddressWidget *addr = E_ADDRESS_WIDGET (user_data);
-
-	switch (arg_id) {
-
-	case ADDRESS_PROPERTY_NAME:
-		BONOBO_ARG_SET_STRING (arg, addr->name ? addr->name :"");
-		break;
-
-	case ADDRESS_PROPERTY_EMAIL:
-		BONOBO_ARG_SET_STRING (arg, addr->email ? addr->email : "");
-		break;
-
-	case ADDRESS_PROPERTY_TEXT:
-		BONOBO_ARG_SET_STRING (arg, "?");
-		break;
-	}
-}
-
-static void
-set_prop (BonoboPropertyBag *bag, const BonoboArg *arg, guint arg_id, CORBA_Environment *ev, gpointer user_data)
-{
-	EAddressWidget *addr = E_ADDRESS_WIDGET (user_data);
-
-	switch (arg_id) {
-	case ADDRESS_PROPERTY_NAME:
-		e_address_widget_set_name (addr, BONOBO_ARG_GET_STRING (arg));
-		break;
-
-	case ADDRESS_PROPERTY_EMAIL:
-		e_address_widget_set_email (addr, BONOBO_ARG_GET_STRING (arg));
-		break;
-
-	case ADDRESS_PROPERTY_TEXT:
-		e_address_widget_set_text (addr, BONOBO_ARG_GET_STRING (arg));
-		break;
-
-		
-	case ADDRESS_PROPERTY_BACKGROUND_RGB:
-		{
-			gint bg = BONOBO_ARG_GET_INT (arg);
-			GdkColor color;
-
-			color.red   = (bg & 0xff0000) >> 8;
-			color.green = (bg & 0x00ff00);
-			color.blue  = (bg & 0x0000ff) << 8;
-
-			if (gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (addr)), &color, FALSE, TRUE)) {
-				GtkStyle *style = gtk_style_copy (gtk_widget_get_style (GTK_WIDGET (addr)));
-				style->bg[0] = color;
-				gtk_widget_set_style (GTK_WIDGET (addr), style);
-			}
-		}
-		
-		break;
-	}
-}
-
-static BonoboControl *
-e_address_widget_factory_new_control (void)
-{
-	BonoboControl *control;
-	BonoboPropertyBag *bag;
-	GtkWidget *w;
-
-	w = e_address_widget_new ();
-	gtk_widget_show (w);
-
-	control = bonobo_control_new (w);
-
-	bag = bonobo_property_bag_new (get_prop, set_prop, w);
-	bonobo_property_bag_add (bag, "name", ADDRESS_PROPERTY_NAME,
-				 BONOBO_ARG_STRING, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);
-
-	bonobo_property_bag_add (bag, "email", ADDRESS_PROPERTY_EMAIL,
-				 BONOBO_ARG_STRING, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);
-
-	bonobo_property_bag_add (bag, "text", ADDRESS_PROPERTY_TEXT,
-				 BONOBO_ARG_STRING, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);
-
-	bonobo_property_bag_add (bag, "background_rgb", ADDRESS_PROPERTY_BACKGROUND_RGB,
-				 BONOBO_ARG_INT, NULL, NULL,
-				 BONOBO_PROPERTY_WRITEABLE);
-
-	bonobo_control_set_properties (control, bag);
-	bonobo_object_unref (BONOBO_OBJECT (bag));
-
-	return control;
-}
-
-static BonoboObject *
-e_address_widget_factory (BonoboGenericFactory *factory, gpointer user_data)
-{
-	return BONOBO_OBJECT (e_address_widget_factory_new_control ());
-}
-
-void
-e_address_widget_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new ("OAFIID:GNOME_Evolution_Addressbook_AddressWidgetFactory",
-					      e_address_widget_factory, NULL);
-
-	if (factory == NULL)
-		g_error ("I could not register an AddressWidget factory.");
-}
-
diff --git a/addressbook/gui/component/e-address-widget.h b/addressbook/gui/component/e-address-widget.h
deleted file mode 100644
index 535e51028c..0000000000
--- a/addressbook/gui/component/e-address-widget.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-address-widget.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __E_ADDRESS_WIDGET_H__
-#define __E_ADDRESS_WIDGET_H__
-
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkwidget.h>
-#include <libgnome/gnome-defs.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/backend/ebook/e-book-util.h>
-#include <addressbook/backend/ebook/e-card.h>
-
-BEGIN_GNOME_DECLS
-
-#define E_ADDRESS_WIDGET_TYPE        (e_address_widget_get_type ())
-#define E_ADDRESS_WIDGET(o)          (GTK_CHECK_CAST ((o), E_ADDRESS_WIDGET_TYPE, EAddressWidget))
-#define E_ADDRESS_WIDGET_CLASS(k)    (GTK_CHECK_CLASS_CAST ((k), E_ADDRESS_WIDGET_TYPE, EAddressWidgetClass))
-#define E_IS_ADDRESS_WIDGET(o)       (GTK_CHECK_TYPE ((o), E_ADDRESS_WIDGET_TYPE))
-#define E_IS_ADDRESS_WIDGET_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESS_WIDGET_TYPE))
-
-typedef struct _EAddressWidget EAddressWidget;
-typedef struct _EAddressWidgetClass EAddressWidgetClass;
-
-struct _EAddressWidget {
-	GtkEventBox parent;
-	
-	gchar *name;
-	gchar *email;
-	
-	GtkWidget *name_widget;
-	GtkWidget *email_widget;
-	GtkWidget *spacer;
-
-	guint query_idle_tag;
-	guint query_tag;
-
-	ECard *card;
-	gboolean known_email;
-};
-
-struct _EAddressWidgetClass {
-	GtkEventBoxClass parent_class;
-};
-
-GtkType e_address_widget_get_type (void);
-
-void e_address_widget_set_name  (EAddressWidget *, const gchar *name);
-void e_address_widget_set_email (EAddressWidget *, const gchar *email);
-void e_address_widget_set_text  (EAddressWidget *, const gchar *text);
-
-void e_address_widget_construct (EAddressWidget *);
-GtkWidget *e_address_widget_new (void);
-
-
-void e_address_widget_factory_init (void);
-
-
-
-END_GNOME_DECLS
-
-#endif /* __E_ADDRESS_WIDGET_H__ */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addressbook/gui/component/e-cardlist-model.c b/addressbook/gui/component/e-cardlist-model.c
deleted file mode 100644
index 5d9b053934..0000000000
--- a/addressbook/gui/component/e-cardlist-model.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * (C) 1999 Ximian, Inc.
- */
-
-#include <config.h>
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include "e-cardlist-model.h"
-
-#define PARENT_TYPE e_table_model_get_type()
-
-static void
-e_cardlist_model_destroy(GtkObject *object)
-{
-	ECardlistModel *model = E_CARDLIST_MODEL(object);
-	int i;
-
-	for ( i = 0; i < model->data_count; i++ ) {
-		gtk_object_unref(GTK_OBJECT(model->data[i]));
-	}
-	g_free(model->data);
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-e_cardlist_model_col_count (ETableModel *etc)
-{
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-e_cardlist_model_row_count (ETableModel *etc)
-{
-	ECardlistModel *e_cardlist_model = E_CARDLIST_MODEL(etc);
-	return e_cardlist_model->data_count;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-e_cardlist_model_value_at (ETableModel *etc, int col, int row)
-{
-	ECardlistModel *e_cardlist_model = E_CARDLIST_MODEL(etc);
-	const char *value;
-	if ( col >= E_CARD_SIMPLE_FIELD_LAST - 1|| row >= e_cardlist_model->data_count )
-		return NULL;
-	value = e_card_simple_get_const(e_cardlist_model->data[row], 
-					col + 1);
-	return (void *)(value ? value : "");
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-e_cardlist_model_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-	ECardlistModel *e_cardlist_model = E_CARDLIST_MODEL(etc);
-	ECard *card;
-	if ( col >= E_CARD_SIMPLE_FIELD_LAST - 1|| row >= e_cardlist_model->data_count )
-		return;
-	e_table_model_pre_change(etc);
-	e_card_simple_set(e_cardlist_model->data[row],
-			  col + 1,
-			  val);
-	gtk_object_get(GTK_OBJECT(e_cardlist_model->data[row]),
-		       "card", &card,
-		       NULL);
-
-	e_table_model_cell_changed(etc, col, row);
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-e_cardlist_model_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	return TRUE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-e_cardlist_model_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-e_cardlist_model_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-e_cardlist_model_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-e_cardlist_model_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-e_cardlist_model_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-void
-e_cardlist_model_add(ECardlistModel *model,
-		     ECard **cards,
-		     int count)
-{
-	int i;
-	model->data = g_realloc(model->data, model->data_count + count * sizeof(ECard *));
-	for (i = 0; i < count; i++) {
-		gboolean found = FALSE;
-		const gchar *id = e_card_get_id(cards[i]);
-		for ( i = 0; i < model->data_count; i++) {
-			if ( !strcmp(e_card_simple_get_id(model->data[i]), id) ) {
-				found = TRUE;
-				break;
-			}
-		}
-		if (!found) {
-			e_table_model_pre_change(E_TABLE_MODEL(model));
-			gtk_object_ref(GTK_OBJECT(cards[i]));
-			model->data[model->data_count++] = e_card_simple_new (cards[i]);
-			e_table_model_row_inserted(E_TABLE_MODEL(model), model->data_count - 1);
-		}
-	}
-}
-
-void
-e_cardlist_model_remove(ECardlistModel *model,
-			const char *id)
-{
-	int i;
-	for ( i = 0; i < model->data_count; i++) {
-		if ( !strcmp(e_card_simple_get_id(model->data[i]), id) ) {
-			e_table_model_pre_change(E_TABLE_MODEL(model));
-			gtk_object_unref(GTK_OBJECT(model->data[i]));
-			memmove(model->data + i, model->data + i + 1, (model->data_count - i - 1) * sizeof (ECard *));
-			e_table_model_row_deleted(E_TABLE_MODEL(model), i);
-		}
-	}
-}
-
-static void
-e_cardlist_model_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-	
-	object_class->destroy = e_cardlist_model_destroy;
-
-	model_class->column_count = e_cardlist_model_col_count;
-	model_class->row_count = e_cardlist_model_row_count;
-	model_class->value_at = e_cardlist_model_value_at;
-	model_class->set_value_at = e_cardlist_model_set_value_at;
-	model_class->is_cell_editable = e_cardlist_model_is_cell_editable;
-	model_class->duplicate_value = e_cardlist_model_duplicate_value;
-	model_class->free_value = e_cardlist_model_free_value;
-	model_class->initialize_value = e_cardlist_model_initialize_value;
-	model_class->value_is_empty = e_cardlist_model_value_is_empty;
-	model_class->value_to_string = e_cardlist_model_value_to_string;
-}
-
-static void
-e_cardlist_model_init (GtkObject *object)
-{
-	ECardlistModel *model = E_CARDLIST_MODEL(object);
-	model->data = NULL;
-	model->data_count = 0;
-}
-
-ECard *
-e_cardlist_model_get(ECardlistModel *model,
-		     int                row)
-{
-	if (model->data && row < model->data_count) {
-		ECard *card;
-		gtk_object_get(GTK_OBJECT(model->data[row]),
-			       "card", &card,
-			       NULL);
-		gtk_object_ref(GTK_OBJECT(card));
-		return card;
-	}
-	return NULL;
-}
-
-GtkType
-e_cardlist_model_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ECardlistModel",
-			sizeof (ECardlistModel),
-			sizeof (ECardlistModelClass),
-			(GtkClassInitFunc) e_cardlist_model_class_init,
-			(GtkObjectInitFunc) e_cardlist_model_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-ETableModel *
-e_cardlist_model_new (void)
-{
-	ECardlistModel *et;
-
-	et = gtk_type_new (e_cardlist_model_get_type ());
-	
-	return E_TABLE_MODEL(et);
-}
diff --git a/addressbook/gui/component/e-cardlist-model.h b/addressbook/gui/component/e-cardlist-model.h
deleted file mode 100644
index 0b9a7a2265..0000000000
--- a/addressbook/gui/component/e-cardlist-model.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_CARDLIST_MODEL_H_
-#define _E_CARDLIST_MODEL_H_
-
-#include <gal/e-table/e-table-model.h>
-#include <ebook/e-book.h>
-#include <ebook/e-book-view.h>
-#include <ebook/e-card-simple.h>
-
-#define E_CARDLIST_MODEL_TYPE        (e_cardlist_model_get_type ())
-#define E_CARDLIST_MODEL(o)          (GTK_CHECK_CAST ((o), E_CARDLIST_MODEL_TYPE, ECardlistModel))
-#define E_CARDLIST_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CARDLIST_MODEL_TYPE, ECardlistModelClass))
-#define E_IS_CARDLIST_MODEL(o)       (GTK_CHECK_TYPE ((o), E_CARDLIST_MODEL_TYPE))
-#define E_IS_CARDLIST_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CARDLIST_MODEL_TYPE))
-
-typedef struct {
-	ETableModel parent;
-
-	/* item specific fields */
-	ECardSimple **data;
-	int data_count;
-} ECardlistModel;
-
-
-typedef struct {
-	ETableModelClass parent_class;
-} ECardlistModelClass;
-
-
-GtkType e_cardlist_model_get_type (void);
-ETableModel *e_cardlist_model_new (void);
-
-/* Returns object with an extra ref count. */
-ECard *e_cardlist_model_get  (ECardlistModel  *model,
-			      int              row);
-void e_cardlist_model_add    (ECardlistModel  *model,
-			      ECard          **card,
-			      int              count);
-void e_cardlist_model_remove (ECardlistModel  *model,
-			      const char      *id);
-
-#endif /* _E_CARDLIST_MODEL_H_ */
diff --git a/addressbook/gui/component/select-names/.cvsignore b/addressbook/gui/component/select-names/.cvsignore
deleted file mode 100644
index cd669499fa..0000000000
--- a/addressbook/gui/component/select-names/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-Evolution-Addressbook-SelectNames-stubs.c
-Evolution-Addressbook-SelectNames-skels.c
-Evolution-Addressbook-SelectNames-common.c
-Evolution-Addressbook-SelectNames.h
-GNOME_Evolution_Addressbook_SelectNames.oaf
diff --git a/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl b/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
deleted file mode 100644
index 244799deb2..0000000000
--- a/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * CORBA interface for the SelectNames dialog.
- *
- * Authors:
- *   Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 2000 Ximian, Inc.
- */
-
-#include <Bonobo.idl>
-
-module GNOME {
-module Evolution {
-module Addressbook {
-
-	interface SelectNames : Bonobo::Unknown {
-		struct Section {
-			string id;
-			string title;
-		};
-
-		typedef sequence<Section> SectionList;
-
-		exception DuplicateID {};
-		exception SectionNotFound {};
-
-		void addSection (in string id, in string title)
-			raises (DuplicateID);
-		void addSectionWithLimit (in string id, in string title, in short limit)
-			raises (DuplicateID);
-
-		Bonobo::Control getEntryBySection (in string section_id)
-			raises (SectionNotFound);
-
-		void activateDialog (in string section_id);
-	};
-
-
-};
-};
-};
diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
deleted file mode 100644
index 7f26e2aaed..0000000000
--- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Factory for the Addressbook's name selection interface"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_SelectNames"
-            type="factory"
-            location="OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/Evolution/Addressbook/SelectNames"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       _value="Evolution's addressbook name selection interface."/>
-
-</oaf_server>
-
-</oaf_info>
-\ No newline at end of file
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
deleted file mode 100644
index 6c3ed1674e..0000000000
--- a/addressbook/gui/component/select-names/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-# CORBA stuff
-
-IDLS = \
-	Evolution-Addressbook-SelectNames.idl
-
-IDL_GENERATED = \
-	Evolution-Addressbook-SelectNames.h		\
-	Evolution-Addressbook-SelectNames-common.c	\
-	Evolution-Addressbook-SelectNames-skels.c	\
-	Evolution-Addressbook-SelectNames-stubs.c
-
-Evolution-Addressbook-SelectNames-impl.o: Evolution-Addressbook-SelectNames.h
-
-$(IDL_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
-		$(srcdir)/Evolution-Addressbook-SelectNames.idl
-
-oafdir = $(datadir)/oaf
-
-oaf_in_files = GNOME_Evolution_Addressbook_SelectNames.oaf.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
-@XML_I18N_MERGE_OAF_RULE@
-
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"evolution-addressbook\"	\
-	$(EXTRA_GNOME_CFLAGS)				\
-	$(GNOME_INCLUDEDIR)				\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)/widgets/e-table			\
-	-I$(top_srcdir)/addressbook/gui/minicard	\
-	-I$(top_srcdir)/addressbook/gui/widgets		\
-	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	$(BONOBO_HTML_GNOME_CFLAGS)			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
-
-lib_LTLIBRARIES = libeselectnames.la
-
-libeselectnames_la_SOURCES = 			\
-	$(IDL_GENERATED)			\
-	e-select-names-bonobo.c			\
-	e-select-names-bonobo.h			\
-	e-select-names-completion.c		\
-	e-select-names-completion.h		\
-	e-select-names-factory.c		\
-	e-select-names-factory.h		\
-	e-select-names-manager.c		\
-	e-select-names-manager.h		\
-	e-select-names-model.c			\
-	e-select-names-model.h			\
-	e-select-names-popup.c			\
-	e-select-names-popup.h			\
-	e-select-names-table-model.c		\
-	e-select-names-table-model.h		\
-	e-select-names-text-model.c		\
-	e-select-names-text-model.h		\
-	e-select-names.c			\
-	e-select-names.h
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = select-names.glade
-
-
-
-EXTRA_DIST = 			\
-	$(glade_DATA)		\
-	$(oaf_in_files)		\
-	$(oaf_DATA)		\
-	$(IDLS)
-
-BUILT_SOURCES = $(IDL_GENERATED)
-CLEANFILES = $(BUILT_SOURCES)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c
deleted file mode 100644
index 55ef3ec89a..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ /dev/null
@@ -1,465 +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/bonobo-property-bag.h>
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-event-source.h>
-
-#include <gal/util/e-util.h>
-#include <gal/e-text/e-entry.h>
-
-#include "Evolution-Addressbook-SelectNames.h"
-
-#include "e-select-names-manager.h"
-#include "e-select-names-model.h"
-#include "e-select-names-text-model.h"
-#include "e-select-names-completion.h"
-
-
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-struct _ESelectNamesBonoboPrivate {
-	ESelectNamesManager *manager;
-	BonoboEventSource *event_source;
-};
-
-enum _EntryPropertyID {
-	ENTRY_PROPERTY_ID_TEXT,
-	ENTRY_PROPERTY_ID_DESTINATIONS,
-	ENTRY_PROPERTY_ID_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:
-		{
-			ESelectNamesModel *model;
-			model = E_SELECT_NAMES_MODEL (gtk_object_get_data (GTK_OBJECT (w), "select_names_model"));
-			g_assert (model != NULL);
-			
-			BONOBO_ARG_SET_STRING (arg, e_select_names_model_get_textification (model));
-		break;
-		}
-
-	case ENTRY_PROPERTY_ID_DESTINATIONS:
-		{
-			ESelectNamesModel *model;
-			char *text;
-
-			model = E_SELECT_NAMES_MODEL (gtk_object_get_data (GTK_OBJECT (w), "select_names_model"));
-			g_assert (model != NULL);
-
-			text = e_select_names_model_export_destinationv (model);
-			BONOBO_ARG_SET_STRING (arg, text);
-			g_free (text);
-		}
-		break;
-
-	case ENTRY_PROPERTY_ID_ALLOW_CONTACT_LISTS:
-		{
-			ESelectNamesCompletion *comp;
-			comp = E_SELECT_NAMES_COMPLETION (gtk_object_get_data (GTK_OBJECT (w), "completion_handler"));
-			g_assert (comp != NULL);
-
-			BONOBO_ARG_SET_BOOLEAN (arg, e_select_names_completion_get_match_contact_lists (comp));
-			break;
-		}
-
-	case ENTRY_PROPERTY_ID_ENTRY_CHANGED:
-		/* This is a read-only property. */
-		g_assert_not_reached ();
-		break;
-
-	default:
-		break;
-	}
-}
-
-static void
-entry_set_property_fn (BonoboPropertyBag *bag,
-		       const BonoboArg *arg,
-		       guint arg_id,
-		       CORBA_Environment *ev,
-		       gpointer user_data)
-{
-	GtkWidget *w;
-
-	w = GTK_WIDGET (user_data);
-
-	switch (arg_id) {
-
-	case ENTRY_PROPERTY_ID_TEXT:
-		{
-			ESelectNamesModel *model;
-			model = E_SELECT_NAMES_MODEL (gtk_object_get_data (GTK_OBJECT (w), "select_names_model"));
-			g_assert (model != NULL);
-			
-			e_entry_set_text (E_ENTRY (w), BONOBO_ARG_GET_STRING (arg));
-			e_select_names_model_cardify_all (model, NULL, 0);
-			break;
-		}
-
-	case ENTRY_PROPERTY_ID_DESTINATIONS:
-		{
-			ESelectNamesModel *model;
-			model = E_SELECT_NAMES_MODEL (gtk_object_get_data (GTK_OBJECT (w), "select_names_model"));
-			g_assert (model != NULL);
-
-			e_select_names_model_import_destinationv (model, BONOBO_ARG_GET_STRING (arg));
-			e_select_names_model_cardify_all (model, NULL, 0);
-			break;
-		}
-
-	case ENTRY_PROPERTY_ID_ALLOW_CONTACT_LISTS:
-		{
-			ESelectNamesCompletion *comp;
-			comp = E_SELECT_NAMES_COMPLETION (gtk_object_get_data (GTK_OBJECT (w), "completion_handler"));
-			g_assert (comp != NULL);
-
-			e_select_names_completion_set_match_contact_lists (comp, BONOBO_ARG_GET_BOOLEAN (arg));
-			break;
-		}
-		
-	case ENTRY_PROPERTY_ID_ENTRY_CHANGED:
-		gtk_object_set_data (GTK_OBJECT (w), "entry_property_id_changed", GUINT_TO_POINTER (1));
-		break;
-
-	default:
-		break;
-	}
-}
-
-
-/* CORBA interface implementation.  */
-
-static POA_GNOME_Evolution_Addressbook_SelectNames__vepv SelectNames_vepv;
-
-static POA_GNOME_Evolution_Addressbook_SelectNames *
-create_servant (void)
-{
-	POA_GNOME_Evolution_Addressbook_SelectNames *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_GNOME_Evolution_Addressbook_SelectNames *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &SelectNames_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_GNOME_Evolution_Addressbook_SelectNames__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	return servant;
-}
-
-static void
-impl_SelectNames_add_section (PortableServer_Servant servant,
-			      const CORBA_char *id,
-			      const CORBA_char *title,
-			      CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object);
-	priv = select_names->priv;
-
-	e_select_names_manager_add_section (priv->manager, id, title);
-}
-
-static void
-impl_SelectNames_add_section_with_limit (PortableServer_Servant servant,
-					 const CORBA_char *id,
-					 const CORBA_char *title,
-					 CORBA_short limit,
-					 CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object);
-	priv = select_names->priv;
-
-	e_select_names_manager_add_section_with_limit (priv->manager, id, title, limit);
-}
-
-static void
-entry_changed (GtkWidget *widget, BonoboControl *control)
-{
-	gboolean changed = GPOINTER_TO_UINT (gtk_object_get_data (GTK_OBJECT (widget), "entry_property_id_changed"));
-
-	if (!changed)
-		bonobo_control_set_property (control, "entry_changed", TRUE, NULL);
-}
-
-static void
-manager_changed_cb (ESelectNamesManager *manager, const gchar *section_id, gint changed_working_copy, gpointer closure)
-{
-	ESelectNamesBonobo *select_names = E_SELECT_NAMES_BONOBO (closure);
-	BonoboArg *arg;
-
-	arg = bonobo_arg_new (BONOBO_ARG_STRING);
-	BONOBO_ARG_SET_STRING (arg, section_id);
-
-	bonobo_event_source_notify_listeners_full (select_names->priv->event_source,
-						   "GNOME/Evolution",
-						   "changed",
-						   changed_working_copy ? "working_copy" : "model",
-						   arg, NULL);
-
-	bonobo_arg_release (arg);
-}
-
-static void
-manager_ok_cb (ESelectNamesManager *manager, gpointer closure)
-{
-	ESelectNamesBonobo *select_names = E_SELECT_NAMES_BONOBO (closure);
-	BonoboArg *arg;
-
-	arg = bonobo_arg_new (BONOBO_ARG_NULL);
-
-	bonobo_event_source_notify_listeners_full (select_names->priv->event_source,
-						   "GNOME/Evolution",
-						   "ok",
-						   "dialog",
-						   arg,
-						   NULL);
-
-	bonobo_arg_release (arg);
-}
-
-static Bonobo_Control
-impl_SelectNames_get_entry_for_section (PortableServer_Servant servant,
-					const CORBA_char *section_id,
-					CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-	GtkWidget *entry_widget;
-	BonoboControl *control;
-	BonoboPropertyBag *property_bag;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object);
-	priv = select_names->priv;
-
-	entry_widget = e_select_names_manager_create_entry (priv->manager, section_id);
-	gtk_widget_show (entry_widget);
-	
-	if (entry_widget == NULL) {
-		CORBA_exception_set (ev,
-				     CORBA_USER_EXCEPTION,
-				     ex_GNOME_Evolution_Addressbook_SelectNames_SectionNotFound,
-				     NULL);
-		return CORBA_OBJECT_NIL;
-	}
-
-	control = bonobo_control_new (entry_widget);
-
-	property_bag = bonobo_property_bag_new (entry_get_property_fn, entry_set_property_fn, entry_widget);
-	bonobo_property_bag_add (property_bag, "text", ENTRY_PROPERTY_ID_TEXT,
-				 BONOBO_ARG_STRING, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);
-	bonobo_property_bag_add (property_bag, "destinations", ENTRY_PROPERTY_ID_DESTINATIONS,
-				 BONOBO_ARG_STRING, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);
-	bonobo_property_bag_add (property_bag, "allow_contact_lists", ENTRY_PROPERTY_ID_ALLOW_CONTACT_LISTS,
-				 BONOBO_ARG_BOOLEAN, NULL, NULL,
-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);
-	bonobo_property_bag_add (property_bag, "entry_changed", ENTRY_PROPERTY_ID_ENTRY_CHANGED,
-				 BONOBO_ARG_BOOLEAN, NULL, NULL,
-				 BONOBO_PROPERTY_WRITEABLE);
-
-	bonobo_control_set_properties (control, property_bag);
-
-	gtk_signal_connect (GTK_OBJECT (entry_widget), "changed", GTK_SIGNAL_FUNC (entry_changed), control);
-
-	return CORBA_Object_duplicate (bonobo_object_corba_objref (BONOBO_OBJECT (control)), ev);
-}
-
-static void
-impl_SelectNames_activate_dialog (PortableServer_Servant servant,
-				  const CORBA_char *section_id,
-				  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object);
-	priv = select_names->priv;
-
-	e_select_names_manager_activate_dialog (priv->manager, section_id);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_destroy (GtkObject *object)
-{
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-
-	select_names = E_SELECT_NAMES_BONOBO (object);
-	priv = select_names->priv;
-
-	if (priv->manager->names) {
-		gtk_widget_destroy (GTK_WIDGET (priv->manager->names));
-		priv->manager->names = NULL;
-	}
-
-	gtk_object_unref (GTK_OBJECT (priv->manager));
-
-	g_free (priv);
-}
-
-
-static void
-corba_class_init ()
-{
-	POA_GNOME_Evolution_Addressbook_SelectNames__vepv *vepv;
-	POA_GNOME_Evolution_Addressbook_SelectNames__epv *epv;
-	PortableServer_ServantBase__epv *base_epv;
-
-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
-	base_epv->_private    = NULL;
-	base_epv->finalize    = NULL;
-	base_epv->default_POA = NULL;
-
-	epv = g_new0 (POA_GNOME_Evolution_Addressbook_SelectNames__epv, 1);
-	epv->addSection          = impl_SelectNames_add_section;
-	epv->addSectionWithLimit = impl_SelectNames_add_section_with_limit;
-	epv->getEntryBySection   = impl_SelectNames_get_entry_for_section;
-	epv->activateDialog      = impl_SelectNames_activate_dialog;
-
-	vepv = &SelectNames_vepv;
-	vepv->Bonobo_Unknown_epv                    = bonobo_object_get_epv ();
-	vepv->GNOME_Evolution_Addressbook_SelectNames_epv = epv;
-}
-
-static void
-class_init (ESelectNamesBonoboClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	object_class->destroy = impl_destroy;
-
-	corba_class_init ();
-}
-
-static void
-init (ESelectNamesBonobo *select_names)
-{
-	ESelectNamesBonoboPrivate *priv;
-
-	priv = g_new (ESelectNamesBonoboPrivate, 1);
-
-	priv->manager = e_select_names_manager_new ();
-	priv->event_source = NULL;
-
-	gtk_signal_connect (GTK_OBJECT (priv->manager),
-			    "changed",
-			    GTK_SIGNAL_FUNC (manager_changed_cb),
-			    select_names);
-
-	gtk_signal_connect (GTK_OBJECT (priv->manager),
-			    "ok",
-			    GTK_SIGNAL_FUNC (manager_ok_cb),
-			    select_names);
-
-	select_names->priv = priv;
-}
-
-
-void
-e_select_names_bonobo_construct (ESelectNamesBonobo *select_names,
-				 GNOME_Evolution_Addressbook_SelectNames corba_object)
-{
-	g_return_if_fail (select_names != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_BONOBO (select_names));
-
-	bonobo_object_construct (BONOBO_OBJECT (select_names), corba_object);
-
-	g_assert (select_names->priv->event_source == NULL);
-	select_names->priv->event_source = bonobo_event_source_new ();
-	bonobo_object_add_interface (BONOBO_OBJECT (select_names), BONOBO_OBJECT (select_names->priv->event_source));
-}
-
-ESelectNamesBonobo *
-e_select_names_bonobo_new (void)
-{
-	POA_GNOME_Evolution_Addressbook_SelectNames *servant;
-	GNOME_Evolution_Addressbook_SelectNames corba_object;
-	ESelectNamesBonobo *select_names;
-
-	servant = create_servant ();
-	if (servant == NULL)
-		return NULL;
-	
-	select_names = gtk_type_new (e_select_names_bonobo_get_type ());
-
-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (select_names), servant);
-	e_select_names_bonobo_construct (select_names, corba_object);
-
-	return select_names;
-}
-
-
-E_MAKE_TYPE (e_select_names_bonobo, "ESelectNamesBonobo", ESelectNamesBonobo, class_init, init, PARENT_TYPE)
diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.h b/addressbook/gui/component/select-names/e-select-names-bonobo.h
deleted file mode 100644
index f254dd6e94..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-bonobo.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __E_SELECT_NAMES_BONOBO_H__
-#define __E_SELECT_NAMES_BONOBO_H__
-
-#include <bonobo/bonobo-object.h>
-
-#include "Evolution-Addressbook-SelectNames.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_SELECT_NAMES_BONOBO			(e_select_names_bonobo_get_type ())
-#define E_SELECT_NAMES_BONOBO(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_BONOBO, ESelectNamesBonobo))
-#define E_SELECT_NAMES_BONOBO_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_BONOBO, ESelectNamesBonoboClass))
-#define E_IS_SELECT_NAMES_BONOBO(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_BONOBO))
-#define E_IS_SELECT_NAMES_BONOBO_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_BONOBO))
-
-
-typedef struct _ESelectNamesBonobo        ESelectNamesBonobo;
-typedef struct _ESelectNamesBonoboPrivate ESelectNamesBonoboPrivate;
-typedef struct _ESelectNamesBonoboClass   ESelectNamesBonoboClass;
-
-struct _ESelectNamesBonobo {
-	BonoboObject parent;
-
-	ESelectNamesBonoboPrivate *priv;
-};
-
-struct _ESelectNamesBonoboClass {
-	BonoboObjectClass parent_class;
-};
-
-
-GtkType             e_select_names_bonobo_get_type   (void);
-void                e_select_names_bonobo_construct  (ESelectNamesBonobo *select_names,
-						      GNOME_Evolution_Addressbook_SelectNames corba_object);
-ESelectNamesBonobo *e_select_names_bonobo_new        (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_SELECT_NAMES_BONOBO_H__ */
diff --git a/addressbook/gui/component/select-names/e-select-names-completion.c b/addressbook/gui/component/select-names/e-select-names-completion.c
deleted file mode 100644
index 8e7843f149..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-completion.c
+++ /dev/null
@@ -1,1283 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-select-names-completion.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#include <config.h>
-#include "e-select-names-completion.h"
-
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-util.h>
-
-#include <gal/unicode/gunicode.h>
-
-#include <addressbook/backend/ebook/e-book-util.h>
-#include <addressbook/backend/ebook/e-destination.h>
-#include <addressbook/backend/ebook/e-card-simple.h>
-#include <addressbook/backend/ebook/e-card-compare.h>
-
-typedef struct {
-	EBook *book;
-	guint book_view_tag;
-	EBookView *book_view;
-	ESelectNamesCompletion *comp;
-	guint card_added_tag;
-	guint seq_complete_tag;
-	gboolean sequence_complete_received;
-} ESelectNamesCompletionBookData;
-
-struct _ESelectNamesCompletionPrivate {
-
-	ESelectNamesModel *model;
-
-	GList *book_data;
-	gint books_not_ready;
-	gint pending_completion_seq;
-
-	gchar *waiting_query;
-	gint waiting_pos, waiting_limit;
-	gchar *query_text;
-
-	gchar *cached_query_text;
-	GList *cached_cards;
-
-	gboolean match_contact_lists;
-	gboolean primary_only;
-
-	gboolean can_fail_due_to_too_many_hits; /* like LDAP, for example... */
-};
-
-static void e_select_names_completion_class_init (ESelectNamesCompletionClass *);
-static void e_select_names_completion_init (ESelectNamesCompletion *);
-static void e_select_names_completion_destroy (GtkObject *object);
-
-static void e_select_names_completion_got_book_view_cb (EBook *book, EBookStatus status, EBookView *view, gpointer user_data);
-static void e_select_names_completion_card_added_cb    (EBookView *, const GList *cards, gpointer user_data);
-static void e_select_names_completion_seq_complete_cb  (EBookView *, gpointer user_data);
-
-static void e_select_names_completion_do_query (ESelectNamesCompletion *, const gchar *query_text, gint pos, gint limit);
-
-static void e_select_names_completion_handle_request  (ECompletion *, const gchar *txt, gint pos, gint limit);
-static void e_select_names_completion_end    (ECompletion *);
-
-static GtkObjectClass *parent_class;
-
-static FILE *out;
-
-/*
- *
- * Query builders
- *
- */
-
-typedef gchar *(*BookQuerySExp) (ESelectNamesCompletion *);
-typedef ECompletionMatch *(*BookQueryMatchTester) (ESelectNamesCompletion *, EDestination *);
-
-static void
-our_match_destroy (ECompletionMatch *match)
-{
-	gtk_object_unref (GTK_OBJECT (match->user_data));
-}
-
-static ECompletionMatch *
-make_match (EDestination *dest, const gchar *menu_form, double score)
-{
-	ECompletionMatch *match;
-	ECard *card = e_destination_get_card (dest);
-
-	match = e_completion_match_new (e_destination_get_name (dest), menu_form, score);
-
-	e_completion_match_set_text (match, e_destination_get_name (dest), menu_form);
-
-	/* Reject any match that has null text fields. */
-	if (! (e_completion_match_get_match_text (match) && e_completion_match_get_menu_text (match))) {
-		gtk_object_unref (GTK_OBJECT (match));
-		return NULL;
-	}
-
-	/* Since we sort low to high, we negate so that larger use scores will come first */
-	match->sort_major = card ? -floor (e_card_get_use_score (card)) : 0;
-
-	match->sort_minor = e_destination_get_email_num (dest);
-
-	match->user_data = dest;
-	gtk_object_ref (GTK_OBJECT (dest));
-
-	match->destroy = our_match_destroy;
-
-	return match;
-}
-
-/*
- * Nickname query
- */
-
-static gchar *
-sexp_nickname (ESelectNamesCompletion *comp)
-{
-	gchar *query = g_strdup_printf ("(beginswith \"nickname\" \"%s\")", comp->priv->query_text);
-
-	return query;
-}
-
-static ECompletionMatch *
-match_nickname (ESelectNamesCompletion *comp, EDestination *dest)
-{
-	ECompletionMatch *match = NULL;
-	gint len;
-	ECard *card = e_destination_get_card (dest);
-	double score;
-
-	if (card->nickname == NULL)
-		return NULL;
-
-	len = g_utf8_strlen (comp->priv->query_text, -1);
-	if (card->nickname && !g_utf8_strncasecmp (comp->priv->query_text, card->nickname, len)) {
-		const gchar *name;
-		gchar *str;
-
-		score = len * 2; /* nickname gives 2 points per matching character */
-
-		if (len == g_utf8_strlen (card->nickname, -1)) /* boost score on an exact match */
-		    score *= 10;
-
-		name = e_destination_get_name (dest);
-		if (name && *name)
-			str = g_strdup_printf ("'%s' %s <%s>", card->nickname, name, e_destination_get_email (dest));
-		else
-			str = g_strdup_printf ("'%s' <%s>", card->nickname, e_destination_get_email (dest));
-
-		match = make_match (dest, str, score);
-		g_free (str);
-	}
-
-	return match;
-}
-
-/*
- * E-Mail Query
- */
-
-static gchar *
-sexp_email (ESelectNamesCompletion *comp)
-{
-	return g_strdup_printf ("(beginswith \"email\" \"%s\")", comp->priv->query_text);
-}
-
-static ECompletionMatch *
-match_email (ESelectNamesCompletion *comp, EDestination *dest)
-{
-	ECompletionMatch *match;
-	gint len = strlen (comp->priv->query_text);
-	const gchar *name = e_destination_get_name (dest);
-	const gchar *email = e_destination_get_email (dest);
-	double score;
-	
-	if (email
-	    && !g_utf8_strncasecmp (comp->priv->query_text, email, len)
-	    && !e_destination_is_evolution_list (dest)) {
-		
-		gchar *str;
-		
-		score = len * 2; /* 2 points for each matching character */
-
-		if (name && *name)
-			str = g_strdup_printf ("<%s> %s", email, name);
-		else
-			str = g_strdup (email);
-
-		match = make_match (dest, str, score);
-
-		g_free (str);
-
-		return match;
-	}
-
-	return NULL;
-}
-
-/*
- * Name Query
- */
-
-static gchar *
-name_style_query (ESelectNamesCompletion *comp, const gchar *field)
-{
-	if (comp && comp->priv->query_text && *comp->priv->query_text) {
-		gchar *cpy = g_strdup (comp->priv->query_text), *c;
-		gchar **strv;
-		gchar *query;
-		gint i, count=0;
-
-		for (c = cpy; *c; ++c) {
-			if (*c == ',')
-				*c = ' ';
-		}
-
-		strv = g_strsplit (cpy, " ", 0);
-		for (i=0; strv[i]; ++i) {
-			gchar *old;
-			++count;
-			g_strstrip (strv[i]);
-			old = strv[i];
-			strv[i] = g_strdup_printf ("(contains \"%s\" \"%s\")", field, old);
-			g_free (old);
-		}
-
-		if (count == 1) {
-			query = strv[0];
-			strv[0] = NULL;
-		} else {
-			gchar *joined = g_strjoinv (" ", strv);
-			query = g_strdup_printf ("(and %s)", joined);
-			g_free (joined);
-		}
-
-		g_free (cpy);
-		g_strfreev (strv);
-
-		return query;
-	}
-
-	return NULL;
-}
-
-static gchar *
-sexp_name (ESelectNamesCompletion *comp)
-{
-	return name_style_query (comp, "full_name");
-}
-
-static ECompletionMatch *
-match_name (ESelectNamesCompletion *comp, EDestination *dest)
-{
-	ECompletionMatch *final_match = NULL;
-	gchar *menu_text = NULL;
-	ECard *card;
-	const gchar *email;
-	gint match_len = 0;
-	ECardMatchType match;
-	ECardMatchPart first_match;
-	double score = 0;
-	gboolean have_given, have_additional, have_family;
-
-	card = e_destination_get_card (dest);
-	
-	if (card->name == NULL)
-		return NULL;
-
-	email = e_destination_get_email (dest);
-
-	match = e_card_compare_name_to_string_full (card, comp->priv->query_text, TRUE /* yes, allow partial matches */,
-						    NULL, &first_match, &match_len);
-
-	if (match <= E_CARD_MATCH_NONE)
-		return NULL;
-	
-	score = match_len * 3; /* three points per match character */
-
-#if 0
-	if (card->nickname) {
-		/* We massively boost the score if the nickname exists and is the same as one of the "real" names.  This keeps the
-		   nickname from matching ahead of the real name for this card. */
-		len = strlen (card->nickname);
-		if ((card->name->given && !g_utf8_strncasecmp (card->name->given, card->nickname, MIN (strlen (card->name->given), len)))
-		    || (card->name->family && !g_utf8_strncasecmp (card->name->family, card->nickname, MIN (strlen (card->name->family), len)))
-		    || (card->name->additional && !g_utf8_strncasecmp (card->name->additional, card->nickname, MIN (strlen (card->name->additional), len))))
-			score *= 100;
-	}
-#endif
-
-	have_given       = card->name->given && *card->name->given;
-	have_additional  = card->name->additional && *card->name->additional;
-	have_family      = card->name->family && *card->name->family;
-
-	if (e_card_evolution_list (card)) {
-
-		menu_text = e_card_name_to_string (card->name);
-
-	} else if (first_match == E_CARD_MATCH_PART_GIVEN_NAME) {
-
-		if (have_family)
-			menu_text = g_strdup_printf ("%s %s <%s>", card->name->given, card->name->family, email);
-		else
-			menu_text = g_strdup_printf ("%s <%s>", card->name->given, email);
-
-	} else if (first_match == E_CARD_MATCH_PART_ADDITIONAL_NAME) {
-
-		if (have_given) {
-
-			menu_text = g_strdup_printf ("%s%s%s, %s <%s>",
-						     card->name->additional,
-						     have_family ? " " : "",
-						     have_family ? card->name->family : "",
-						     card->name->given,
-						     email);
-		} else {
-
-			menu_text = g_strdup_printf ("%s%s%s <%s>",
-						     card->name->additional,
-						     have_family ? " " : "",
-						     have_family ? card->name->family : "",
-						     email);
-		}
-
-	} else if (first_match == E_CARD_MATCH_PART_FAMILY_NAME) { 
-
-		if (have_given)
-			menu_text = g_strdup_printf ("%s, %s%s%s <%s>",
-						     card->name->family,
-						     card->name->given,
-						     have_additional ? " " : "",
-						     have_additional ? card->name->additional : "",
-						     email);
-		else
-			menu_text = g_strdup_printf ("%s <%s>", card->name->family, email);
-
-	} else { /* something funny happened */
-
-		menu_text = g_strdup_printf ("<%s> ???", email);
-
-	}
-
-	if (menu_text) {
-		g_strstrip (menu_text);
-		final_match = make_match (dest, menu_text, score);
-		g_free (menu_text);
-	}
-	
-	return final_match;
-}
-
-/*
- * File As Query
- */
-
-static gchar *
-sexp_file_as (ESelectNamesCompletion *comp)
-{
-	return name_style_query (comp, "file_as");
-}
-
-static ECompletionMatch *
-match_file_as (ESelectNamesCompletion *comp, EDestination *dest)
-{
-	const gchar *name;
-	const gchar *email;
-	gchar *cpy, **strv, *menu_text;
-	gint i, len;
-	double score = 0.00001;
-	ECompletionMatch *match;
-
-	name = e_destination_get_name (dest);
-	email = e_destination_get_email (dest);
-
-	if (!(name && *name))
-		return NULL;
-
-	cpy = g_strdup (comp->priv->query_text);
-	strv = g_strsplit (cpy, " ", 0);
-
-	for (i=0; strv[i] && score > 0; ++i) {
-		len = g_utf8_strlen (strv[i], -1);
-		if (!g_utf8_strncasecmp (name, strv[i], len))
-			score += len; /* one point per character of the match */
-		else
-			score = 0;
-	}
-	
-	g_free (cpy);
-	g_strfreev (strv);
-
-	if (score <= 0)
-		return NULL;
-	
-	menu_text = g_strdup_printf ("%s <%s>", name, email);
-	g_strstrip (menu_text);
-	match = make_match (dest, menu_text, score);
-	g_free (menu_text);
-
-	return match;
-}
-
-/*
- * Initials Query
- */
-
-static gchar *
-sexp_initials (ESelectNamesCompletion *comp)
-{
-	return NULL;
-}
-
-static ECompletionMatch *
-match_initials (ESelectNamesCompletion *comp, EDestination *dest)
-{
-	return NULL;
-}
-
-
-typedef struct _BookQuery BookQuery;
-struct _BookQuery {
-	gboolean primary;
-	BookQuerySExp builder;
-	BookQueryMatchTester tester;
-};
-
-static BookQuery book_queries[] = {
-	{ TRUE,  sexp_nickname, match_nickname},
-	{ TRUE,  sexp_email,    match_email },
-	{ TRUE,  sexp_name,     match_name },
-	{ TRUE,  sexp_file_as,  match_file_as },
-	{ FALSE, sexp_initials, match_initials }
-};
-static gint book_query_count = sizeof (book_queries) / sizeof (BookQuery);
-
-/*
- * Build up a big compound sexp corresponding to all of our queries.
- */
-static gchar *
-book_query_sexp (ESelectNamesCompletion *comp)
-{
-	gint i, j, count = 0;
-	gchar **queryv, *query;
-
-	g_return_val_if_fail (comp && E_IS_SELECT_NAMES_COMPLETION (comp), NULL);
-
-	if (! (comp->priv->query_text && *comp->priv->query_text))
-		return NULL;
-
-	if (comp->priv->primary_only) {
-		for (i=0; i<book_query_count; ++i)
-			if (book_queries[i].primary)
-				++count;
-	} else {
-		count = book_query_count;
-	}
-
-	queryv = g_new0 (gchar *, count+1);
-	for (i=0, j=0; i<count; ++i) {
-		queryv[j] = book_queries[i].builder (comp);
-		if (queryv[j])
-			++j;
-	}
-
-	if (j == 0) {
-		query = NULL;
-	} else if (j == 1) {
-		query = queryv[0];
-		queryv[0] = NULL;
-	} else {
-		gchar *tmp = g_strjoinv (" ", queryv);
-		query = g_strdup_printf ("(or %s)", tmp);
-		g_free (tmp);
-	}
-
-	for (i=0; i<count; ++i)
-		g_free (queryv[i]);
-	g_free (queryv);
-
-	return query;
-}
-
-/*
- * Sweep across all of our query rules and find the best score/match
- * string that applies to a given destination.
- */
-static ECompletionMatch *
-book_query_score (ESelectNamesCompletion *comp, EDestination *dest)
-{
-	ECompletionMatch *best_match = NULL;
-	gint i;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp), NULL);
-	g_return_val_if_fail (E_IS_DESTINATION (dest), NULL);
-
-	if (! (comp->priv->query_text && *comp->priv->query_text))
-		return NULL;
-	
-	for (i=0; i<book_query_count; ++i) {
-
-		ECompletionMatch *this_match = NULL;
-
-		if (book_queries[i].primary || !comp->priv->primary_only) {
-			if (book_queries[i].tester && e_destination_get_card (dest)) {
-				this_match = book_queries[i].tester (comp, dest);
-			}
-
-			if (this_match) {
-				if (best_match == NULL || this_match->score > best_match->score) {
-					e_completion_match_unref (best_match);
-					best_match = this_match;
-				} else {
-					e_completion_match_unref (this_match);
-				}
-			}
-		}
-	}
-
-	return best_match;
-}
-
-static void
-book_query_process_card_list (ESelectNamesCompletion *comp, const GList *cards)
-{
-	while (cards) {
-		ECard *card = E_CARD (cards->data);
-
-		if (e_card_evolution_list (card)) {
-
-			if (comp->priv->match_contact_lists) {
-
-				EDestination *dest = e_destination_new ();
-				ECompletionMatch *match;
-				e_destination_set_card (dest, card, 0);
-				match = book_query_score (comp, dest);
-				if (match && match->score > 0) {
-					e_completion_found_match (E_COMPLETION (comp), match);
-				} else {
-					e_completion_match_unref (match);
-				}
-				gtk_object_unref (GTK_OBJECT (dest));
-
-			}
-
-		} else if (card->email) {
-			gint i;
-			for (i=0; i<e_list_length (card->email); ++i) {
-				EDestination *dest = e_destination_new ();
-				const gchar *email;
-				ECompletionMatch *match;
-				
-				e_destination_set_card (dest, card, i);
-				email = e_destination_get_email (dest);
-
-				if (email && *email) {
-				
-					match = book_query_score (comp, dest);
-					if (match && match->score > 0) {
-						e_completion_found_match (E_COMPLETION (comp), match);
-					} else {
-						e_completion_match_unref (match);
-					}
-				}
-
-				gtk_object_unref (GTK_OBJECT (dest));
-			}
-		}
-		
-		cards = g_list_next (cards);
-	}
-}
-
-#if 0
-static gchar *
-initials_query_match_cb (QueryInfo *qi, ECard *card, double *score)
-{
-	gint len;
-	gchar f='\0', m='\0', l='\0'; /* initials */
-	gchar cf, cm, cl;
-
-	len = strlen (qi->comp->priv->query_text);
-	
-	if (len == 2) {
-		
-		f = qi->comp->priv->query_text[0];
-		m = '\0';
-		l = qi->comp->priv->query_text[1];
-
-	} else if (len == 3) {
-
-		f = qi->comp->priv->query_text[0];
-		m = qi->comp->priv->query_text[1];
-		l = qi->comp->priv->query_text[2];
-
-	} else {
-		return NULL;
-	}
-
-	cf = card->name->given ? *card->name->given : '\0';
-	cm = card->name->additional ? *card->name->additional : '\0';
-	cl = card->name->family ? *card->name->family : '\0';
-
-	if (f && isupper ((gint) f))
-		f = tolower ((gint) f);
-	if (m && isupper ((gint) m))
-		m = tolower ((gint) m);
-	if (l && isupper ((gint) l))
-		l = tolower ((gint) l);
-
-	if (cf && isupper ((gint) cf))
-		cf = tolower ((gint) cf);
-	if (cm && isupper ((gint) cm))
-		cm = tolower ((gint) cm);
-	if (cl && isupper ((gint) cl))
-		cl = tolower ((gint) cl);
-
-	if ((f == '\0' || (f == cf)) && (m == '\0' || (m == cm)) && (l == '\0' || (l == cl))) {
-		if (score)
-			*score = 3;
-		if (m)
-			return g_strdup_printf ("%s %s %s", card->name->given, card->name->additional, card->name->family);
-		else
-			return g_strdup_printf ("%s %s", card->name->given, card->name->family);
-	}
-
-	return NULL;
-}
-
-static gboolean
-start_initials_query (ESelectNamesCompletion *comp)
-{
-	gint len;
-	gchar *query;
-
-	if (comp && comp->priv->query_text && *(comp->priv->query_text)) {
-		
-		len = strlen (comp->priv->query_text);
-		if (len < 2 || len > 3)
-			return FALSE;
-
-		query = g_strdup_printf ("(contains \"x-evolution-any-field\" \"%c\")", *(comp->priv->query_text));
-		query_info_start (comp, comp->priv->query_text, query, initials_query_match_cb);
-		g_free (query);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-#endif
-
-
-/*
- *
- * ESelectNamesCompletion code
- *
- */
-
-
-GtkType
-e_select_names_completion_get_type (void)
-{
-	static GtkType select_names_complete_type = 0;
-  
-	if (!select_names_complete_type) {
-		GtkTypeInfo select_names_complete_info = {
-			"ESelectNamesCompletion",
-			sizeof (ESelectNamesCompletion),
-			sizeof (ESelectNamesCompletionClass),
-			(GtkClassInitFunc) e_select_names_completion_class_init,
-			(GtkObjectInitFunc) e_select_names_completion_init,
-			NULL, NULL, /* reserved */
-			(GtkClassInitFunc) NULL
-		};
-
-		select_names_complete_type = gtk_type_unique (e_completion_get_type (), &select_names_complete_info);
-	}
-
-	return select_names_complete_type;
-}
-
-static void
-e_select_names_completion_class_init (ESelectNamesCompletionClass *klass)
-{
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
-	ECompletionClass *completion_class = E_COMPLETION_CLASS (klass);
-
-	parent_class = GTK_OBJECT_CLASS (gtk_type_class (e_completion_get_type ()));
-
-	object_class->destroy = e_select_names_completion_destroy;
-
-	completion_class->request_completion = e_select_names_completion_handle_request;
-	completion_class->end_completion = e_select_names_completion_end;
-
-	if (getenv ("EVO_DEBUG_SELECT_NAMES_COMPLETION")) {
-		out = fopen ("/tmp/evo-debug-select-names-completion", "w");
-		if (out)
-			setvbuf (out, NULL, _IONBF, 0);
-	}
-}
-
-static void
-e_select_names_completion_init (ESelectNamesCompletion *comp)
-{
-	comp->priv = g_new0 (struct _ESelectNamesCompletionPrivate, 1);
-	comp->priv->match_contact_lists = TRUE;
-}
-
-static void
-e_select_names_completion_destroy (GtkObject *object)
-{
-	ESelectNamesCompletion *comp = E_SELECT_NAMES_COMPLETION (object);
-	GList *l;
-
-	if (comp->priv->model)
-		gtk_object_unref (GTK_OBJECT (comp->priv->model));
-
-	for (l = comp->priv->book_data; l; l = l->next) {
-		ESelectNamesCompletionBookData *book_data = l->data;
-
-		if (book_data->card_added_tag) {
-			gtk_signal_disconnect (GTK_OBJECT (book_data->book_view), book_data->card_added_tag);
-			book_data->card_added_tag = 0;
-		}
-
-		if (book_data->seq_complete_tag) {
-			gtk_signal_disconnect (GTK_OBJECT (book_data->book_view), book_data->seq_complete_tag);
-			book_data->seq_complete_tag = 0;
-		}
-
-		gtk_object_unref (GTK_OBJECT (book_data->book));
-
-		if (book_data->book_view)
-			gtk_object_unref (GTK_OBJECT (book_data->book_view));
-
-		g_free (book_data);
-	}
-	g_list_free (comp->priv->book_data);
-
-	g_free (comp->priv->waiting_query);
-	g_free (comp->priv->query_text);
-
-	g_free (comp->priv->cached_query_text);
-	g_list_foreach (comp->priv->cached_cards, (GFunc)gtk_object_unref, NULL);
-	g_list_free (comp->priv->cached_cards);
-
-	g_free (comp->priv);
-
-	if (parent_class->destroy)
-		parent_class->destroy (object);
-}
-
-
-/*
- *
- *  EBook/EBookView Callbacks & Query Stuff
- *
- */
-
-static gchar *
-clean_query_text (const gchar *s)
-{
-	gchar *q = g_new (gchar, strlen(s)+1), *t;
-
-	t = q;
-	while (*s) {
-		if (*s != ',' && *s != '"') {
-			*t = *s;
-			++t;
-		}
-		++s;
-	}
-	*t = '\0';
-
-	g_strstrip (q);
-
-	return q;
-}
-
-static void
-e_select_names_completion_clear_cache (ESelectNamesCompletion *comp)
-{
-	g_free (comp->priv->cached_query_text);
-	comp->priv->cached_query_text = NULL;
-
-	g_list_foreach (comp->priv->cached_cards, (GFunc)gtk_object_unref, NULL);
-	g_list_free (comp->priv->cached_cards);
-	comp->priv->cached_cards = NULL;
-}
-
-static void
-e_select_names_completion_got_book_view_cb (EBook *book, EBookStatus status, EBookView *view, gpointer user_data)
-{
-	ESelectNamesCompletion *comp;
-	ESelectNamesCompletionBookData *book_data;
-
-	if (status != E_BOOK_STATUS_SUCCESS)
-		return;
-
-	book_data = (ESelectNamesCompletionBookData*)user_data;
-	comp = book_data->comp;
-
-	book_data->book_view_tag = 0;
-
-	if (book_data->card_added_tag) {
-		gtk_signal_disconnect (GTK_OBJECT (book_data->book_view), book_data->card_added_tag);
-		book_data->card_added_tag = 0;
-	}
-	if (book_data->seq_complete_tag) {
-		gtk_signal_disconnect (GTK_OBJECT (book_data->book_view), book_data->seq_complete_tag);
-		book_data->seq_complete_tag = 0;
-	}
-
-	gtk_object_ref (GTK_OBJECT (view));
-	if (book_data->book_view)
-		gtk_object_unref (GTK_OBJECT (book_data->book_view));
-	book_data->book_view = view;
-
-	book_data->card_added_tag = 
-		gtk_signal_connect (GTK_OBJECT (view),
-				    "card_added",
-				    GTK_SIGNAL_FUNC (e_select_names_completion_card_added_cb),
-				    book_data);
-
-	book_data->seq_complete_tag =
-		gtk_signal_connect (GTK_OBJECT (view),
-				    "sequence_complete",
-				    GTK_SIGNAL_FUNC (e_select_names_completion_seq_complete_cb),
-				    book_data);
-	book_data->sequence_complete_received = FALSE;
-	comp->priv->pending_completion_seq++;
-}
-
-static void
-e_select_names_completion_card_added_cb (EBookView *book_view, const GList *cards, gpointer user_data)
-{
-	ESelectNamesCompletionBookData *book_data = user_data;
-	ESelectNamesCompletion *comp = book_data->comp;
-
-	if (e_completion_searching (E_COMPLETION (comp))) {
-		book_query_process_card_list (comp, cards);
-
-		/* Save the list of matching cards. */
-		while (cards) {
-			comp->priv->cached_cards = g_list_prepend (comp->priv->cached_cards, cards->data);
-			gtk_object_ref (GTK_OBJECT (cards->data));
-			cards = g_list_next (cards);
-		}
-	}
-}
-
-static void
-e_select_names_completion_seq_complete_cb (EBookView *book_view, gpointer user_data)
-{
-	ESelectNamesCompletionBookData *book_data = user_data;
-	ESelectNamesCompletion *comp = E_SELECT_NAMES_COMPLETION(book_data->comp);
-
-	/*
-	 * We aren't searching, but the addressbook has changed -- clear our card cache so that
-	 * future completion requests will take the changes into account.
-	 */
-	if (! e_completion_searching (E_COMPLETION (comp))) {
-		e_select_names_completion_clear_cache (comp);
-		return;
-	}
-
-	if (!book_data->sequence_complete_received) {
-		book_data->sequence_complete_received = TRUE;
-		comp->priv->pending_completion_seq --;
-		if (comp->priv->pending_completion_seq > 0)
-			return;
-	}
-
-	g_free (comp->priv->query_text);
-	comp->priv->query_text = NULL;
-
-	if (out)
-		fprintf (out, "ending search\n");
-
-	e_completion_end_search (E_COMPLETION (comp)); /* That's all folks! */
-
-	/* Need to launch a new completion if another one is pending. */
-	if (comp->priv->waiting_query) {
-		gchar *s = comp->priv->waiting_query;
-		comp->priv->waiting_query = NULL;
-		e_completion_begin_search (E_COMPLETION (comp), s, comp->priv->waiting_pos, comp->priv->waiting_limit);
-		g_free (s);
-	}
-}
-
-static void
-e_select_names_completion_stop_query (ESelectNamesCompletion *comp)
-{
-	GList *l;
-
-	g_return_if_fail (comp && E_IS_SELECT_NAMES_COMPLETION (comp));
-
-	if (out)
-		fprintf (out, "stopping query\n");
-
-	if (comp->priv->waiting_query) {
-		if (out)
-			fprintf (out, "stopped waiting query\n");
-		g_free (comp->priv->waiting_query);
-		comp->priv->waiting_query = NULL;
-	}
-
-	g_free (comp->priv->query_text);
-	comp->priv->query_text = NULL;
-
-	for (l = comp->priv->book_data; l; l = l->next) {
-		ESelectNamesCompletionBookData *book_data = l->data;
-		if (book_data->book_view_tag) {
-			if (out)
-				fprintf (out, "cancelled book view creation\n");
-			e_book_cancel (book_data->book, book_data->book_view_tag);
-			book_data->book_view_tag = 0;
-		}
-		if (book_data->book_view) {
-			if (out)
-				fprintf (out, "disconnecting book view signals\n");
-
-			if (book_data->card_added_tag) {
-				gtk_signal_disconnect (GTK_OBJECT (book_data->book_view), book_data->card_added_tag);
-				book_data->card_added_tag = 0;
-			}
-			if (book_data->seq_complete_tag) {
-				gtk_signal_disconnect (GTK_OBJECT (book_data->book_view), book_data->seq_complete_tag);
-				book_data->seq_complete_tag = 0;
-			}
-	
-			if (out)
-				fprintf (out, "unrefed book view\n");
-			gtk_object_unref (GTK_OBJECT (book_data->book_view));
-			book_data->book_view = NULL;
-		}
-	}
-
-	/* Clear the cache, which may contain partial results. */
-	e_select_names_completion_clear_cache (comp);
-
-}
-
-static void
-e_select_names_completion_start_query (ESelectNamesCompletion *comp, const gchar *query_text)
-{
-	g_return_if_fail (comp && E_IS_SELECT_NAMES_COMPLETION (comp));
-	g_return_if_fail (query_text);
-
-	e_select_names_completion_stop_query (comp);  /* Stop any prior queries. */
-
-	if (comp->priv->books_not_ready == 0) {
-		gchar *sexp;
-	
-		g_free (comp->priv->query_text);
-		comp->priv->query_text = g_strdup (query_text);
-
-		g_free (comp->priv->cached_query_text);
-		comp->priv->cached_query_text = g_strdup (query_text);
-
-		sexp = book_query_sexp (comp);
-		if (sexp && *sexp) {
-			GList *l;
-
-			if (out)
-				fprintf (out, "\n\n**** starting query: \"%s\"\n", comp->priv->query_text);
-
-			for (l = comp->priv->book_data; l; l = l->next) {
-				ESelectNamesCompletionBookData *book_data = l->data;
-				book_data->book_view_tag = e_book_get_book_view (book_data->book, sexp, 
-										 e_select_names_completion_got_book_view_cb, book_data);
-				if (! book_data->book_view_tag)
-					g_warning ("Exception calling e_book_get_book_view");
-			}
-
-		} else {
-			g_free (comp->priv->query_text);
-			comp->priv->query_text = NULL;
-		}
-		g_free (sexp);
-
-	} else {
-
-		comp->priv->waiting_query = g_strdup (query_text);
-
-	}
-}
-
-static void
-e_select_names_completion_do_query (ESelectNamesCompletion *comp, const gchar *query_text, gint pos, gint limit)
-{
-	gchar *clean;
-	gboolean query_is_still_running, can_reuse_cached_cards;
-	GList *l;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));
-
-	clean = clean_query_text (query_text);
-	if (! (clean && *clean)) {
-		g_free (clean);
-		e_completion_end_search (E_COMPLETION (comp));
-		return;
-	}
-
-	query_is_still_running = FALSE;
-	for (l = comp->priv->book_data; l; l = l->next) {
-		ESelectNamesCompletionBookData *book_data = l->data;
-		query_is_still_running = book_data->book_view_tag;
-		if (query_is_still_running)
-			break;
-	}
-
-	if (out) {
-		fprintf (out, "do_query: %s => %s\n", query_text, clean);
-		if (query_is_still_running)
-			fprintf (out, "a query is still running!\n");
-	}
-	if (comp->priv->cached_query_text && out)
-		fprintf (out, "cached: %s\n", comp->priv->cached_query_text);
-
-	can_reuse_cached_cards = (comp->priv->cached_query_text
-				  && (!comp->priv->can_fail_due_to_too_many_hits || comp->priv->cached_cards != NULL)
-				  && (strlen (comp->priv->cached_query_text) <= strlen (clean))
-				  && !g_utf8_strncasecmp (comp->priv->cached_query_text, clean, strlen (comp->priv->cached_query_text)));
-
-
-	if (can_reuse_cached_cards) {
-
-		if (out)
-			fprintf (out, "can reuse cached card!\n");
-
-		if (query_is_still_running) {
-			g_free (comp->priv->waiting_query);
-			comp->priv->waiting_query = clean;
-			comp->priv->waiting_pos = pos;
-			comp->priv->waiting_limit = limit;
-			if (out)
-				fprintf (out, "waiting for running query to complete: %s\n", comp->priv->waiting_query);
-			return;
-		}
-
-		g_free (comp->priv->query_text);
-		comp->priv->query_text = clean;
-		if (out)
-			fprintf (out, "using existing query info: %s (vs %s)\n", comp->priv->query_text, comp->priv->cached_query_text);
-		book_query_process_card_list (comp, comp->priv->cached_cards);
-		e_completion_end_search (E_COMPLETION (comp));
-		return;
-	}
-	
-	e_select_names_completion_start_query (comp, clean);
-	g_free (clean);
-}
-
-
-/*
- *
- *  Completion Search Override - a Framework for Christian-Resurrection-Holiday Edible-Chicken-Ova
- *
- */
-
-typedef struct _SearchOverride SearchOverride;
-struct _SearchOverride {
-	const gchar *trigger;
-	const gchar *text[4];
-};
-static SearchOverride override[] = { 
-	{ "why?", { "\"I must create a system, or be enslaved by another man's.\"",
-		    "            -- Wiliam Blake, \"Jerusalem\"",
-		    NULL } },
-	{ "easter-egg?", { "What were you expecting, a flight simulator?", NULL } },
-	{ NULL, { NULL } } };
-
-static gboolean
-search_override_check (SearchOverride *over, const gchar *text)
-{
-	/* The g_utf8_validate is needed because as of 2001-06-11,
-	 * EText doesn't translate from locale->UTF8 when you paste
-	 * into it.
-	 */
-	if (over == NULL || text == NULL || !g_utf8_validate (text, -1, NULL))
-		return FALSE;
-
-	return !g_utf8_strcasecmp (over->trigger, text);
-}
-
-
-/*
- *
- *  Completion Callbacks
- *
- */
-
-static void
-e_select_names_completion_handle_request (ECompletion *comp, const gchar *text, gint pos, gint limit)
-{
-	ESelectNamesCompletion *selcomp = E_SELECT_NAMES_COMPLETION (comp);
-	const gchar *str;
-	gint index, j;
-	
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));
-	g_return_if_fail (text != NULL);
-	
-	if (out) {
-		fprintf (out, "\n\n**** requesting completion\n");
-		fprintf (out, "text=\"%s\" pos=%d limit=%d\n", text, pos, limit);
-	}
-
-	e_select_names_model_text_pos (selcomp->priv->model, pos, &index, NULL, NULL);
-	str = index >= 0 ? e_select_names_model_get_string (selcomp->priv->model, index) : NULL;
-
-	if (out)
-		fprintf (out, "index=%d str=\"%s\"\n", index, str);
-
-	if (str == NULL || *str == '\0') {
-		if (out)
-			fprintf (out, "aborting empty query\n");
-		e_completion_end_search (comp);
-		return;
-	}
-
-	for (j=0; override[j].trigger; ++j) {
-		if (search_override_check (&(override[j]), str)) {
-			gint k;
-
-			for (k=0; override[j].text[k]; ++k) {
-				ECompletionMatch *match = g_new (ECompletionMatch, 1);
-				e_completion_match_construct (match);
-				e_completion_match_set_text (match, text, override[j].text[k]);
-				match->score = 1 / (double) (k + 1);
-				e_completion_found_match (comp, match);
-			}
-
-			e_completion_end_search (comp);
-			return;
-		}
-	}
-
-	e_select_names_completion_do_query (selcomp, str, pos, limit);
-}
-
-static void
-e_select_names_completion_end (ECompletion *comp)
-{
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (E_IS_COMPLETION (comp));
-
-	if (out)
-		fprintf (out, "completion ended\n");
-}
-
-static void
-check_capabilities (ESelectNamesCompletion *comp, EBook *book)
-{
-	gchar *cap = e_book_get_static_capabilities (book);
-	comp->priv->can_fail_due_to_too_many_hits = !strcmp (cap, "net");
-	if (comp->priv->can_fail_due_to_too_many_hits) {
-		g_message ("using LDAP source for completion!");
-	}
-	g_free (cap);
-}
-
-static void
-e_select_names_completion_book_ready (EBook *book, EBookStatus status, ESelectNamesCompletion *comp)
-{
-	comp->priv->books_not_ready--;
-
-	g_return_if_fail (E_IS_BOOK (book));
-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));
-
-	check_capabilities (comp, book);
-
-	/* If waiting_query is non-NULL, someone tried to start a query before the book was ready.
-	   Now that it is, get started. */
-	if (comp->priv->books_not_ready == 0 && comp->priv->waiting_query) {
-		e_select_names_completion_start_query (comp, comp->priv->waiting_query);
-		g_free (comp->priv->waiting_query);
-		comp->priv->waiting_query = NULL;
-	}
-
-	gtk_object_unref (GTK_OBJECT (comp)); /* post-async unref */
-}
-
-
-/*
- *
- *  Our Pseudo-Constructor
- *
- */
-
-ECompletion *
-e_select_names_completion_new (EBook *book, ESelectNamesModel *model)
-{
-	ESelectNamesCompletion *comp;
-
-	g_return_val_if_fail (book == NULL || E_IS_BOOK (book), NULL);
-	g_return_val_if_fail (model, NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-
-	comp = (ESelectNamesCompletion *) gtk_type_new (e_select_names_completion_get_type ());
-
-	if (book == NULL) {
-		ESelectNamesCompletionBookData *book_data = g_new0 (ESelectNamesCompletionBookData, 1);
-
-		book_data->book = e_book_new ();
-		book_data->comp = comp;
-		gtk_object_ref (GTK_OBJECT (book_data->book));
-		gtk_object_sink (GTK_OBJECT (book_data->book));
-
-		comp->priv->book_data = g_list_append (comp->priv->book_data, book_data);
-		comp->priv->books_not_ready++;
-
-		gtk_object_ref (GTK_OBJECT (comp)); /* ref ourself before our async call */
-		e_book_load_local_address_book (book_data->book, (EBookCallback) e_select_names_completion_book_ready, comp);
-
-	} else {
-		e_select_names_completion_add_book (comp, book);
-	}
-		
-	comp->priv->model = model;
-	gtk_object_ref (GTK_OBJECT (model));
-
-	return E_COMPLETION (comp);
-}
-
-void
-e_select_names_completion_add_book (ESelectNamesCompletion *comp, EBook *book)
-{
-	ESelectNamesCompletionBookData *book_data;
-
-	g_return_if_fail (book != NULL);
-
-	book_data = g_new0 (ESelectNamesCompletionBookData, 1);
-	book_data->book = book;
-	book_data->comp = comp;
-	check_capabilities (comp, book);
-	gtk_object_ref (GTK_OBJECT (book_data->book));
-	comp->priv->book_data = g_list_append (comp->priv->book_data, book_data);
-}
-
-gboolean
-e_select_names_completion_get_match_contact_lists (ESelectNamesCompletion *comp)
-{
-	g_return_val_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp), FALSE);
-	return comp->priv->match_contact_lists;
-}
-
-
-void
-e_select_names_completion_set_match_contact_lists (ESelectNamesCompletion *comp, gboolean x)
-{
-	g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp));
-	comp->priv->match_contact_lists = x;
-}
-
diff --git a/addressbook/gui/component/select-names/e-select-names-completion.h b/addressbook/gui/component/select-names/e-select-names-completion.h
deleted file mode 100644
index 03a30c3cc2..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-completion.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-select-names-completion.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef E_SELECT_NAMES_COMPLETION_H
-#define E_SELECT_NAMES_COMPLETION_H
-
-#include <gal/e-text/e-completion.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include "e-select-names-model.h"
-
-BEGIN_GNOME_DECLS
-
-#define E_SELECT_NAMES_COMPLETION_TYPE        (e_select_names_completion_get_type ())
-#define E_SELECT_NAMES_COMPLETION(o)          (GTK_CHECK_CAST ((o), E_SELECT_NAMES_COMPLETION_TYPE, ESelectNamesCompletion))
-#define E_SELECT_NAMES_COMPLETION_CLASS(k)    (GTK_CHECK_CLASS_CAST ((k), E_SELECT_NAMES_COMPLETION_TYPE, ESelectNamesCompletionClass))
-#define E_IS_SELECT_NAMES_COMPLETION(o)       (GTK_CHECK_TYPE ((o), E_SELECT_NAMES_COMPLETION_TYPE))
-#define E_IS_SELECT_NAMES_COMPLETION_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SELECT_NAMES_COMPLETION_TYPE))
-
-typedef struct _ESelectNamesCompletion ESelectNamesCompletion;
-typedef struct _ESelectNamesCompletionClass ESelectNamesCompletionClass;
-struct _ESelectNamesCompletionPrivate;
-
-struct _ESelectNamesCompletion {
-	ECompletion parent;
-
-	struct _ESelectNamesCompletionPrivate *priv;
-};
-
-struct _ESelectNamesCompletionClass {
-	ECompletionClass parent_class;
-
-};
-
-GtkType e_select_names_completion_get_type (void);
-
-ECompletion *e_select_names_completion_new (EBook *, ESelectNamesModel *);
-void     e_select_names_completion_add_book (ESelectNamesCompletion *, EBook *);
-gboolean e_select_names_completion_get_match_contact_lists (ESelectNamesCompletion *);
-void     e_select_names_completion_set_match_contact_lists (ESelectNamesCompletion *, gboolean);
-
-END_GNOME_DECLS
-
-#endif /* E_SELECT_NAMES_COMPLETION_H */
-
diff --git a/addressbook/gui/component/select-names/e-select-names-factory.c b/addressbook/gui/component/select-names/e-select-names-factory.c
deleted file mode 100644
index d6560d6366..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-factory.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-factory.c
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo/bonobo-generic-factory.h>
-
-#include "e-select-names-bonobo.h"
-#include "e-select-names-factory.h"
-
-
-#define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_SelectNamesFactory"
-
-static BonoboGenericFactory *factory = NULL;
-
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory,
-	    void *closure)
-{
-	return BONOBO_OBJECT (e_select_names_bonobo_new ());
-}
-
-
-gboolean
-e_select_names_factory_init (void)
-{
-	if (factory != NULL)
-		return TRUE;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);
-
-	if (factory == NULL)
-		return FALSE;
-
-	return TRUE;
-}
diff --git a/addressbook/gui/component/select-names/e-select-names-factory.h b/addressbook/gui/component/select-names/e-select-names-factory.h
deleted file mode 100644
index 0fe85c8361..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-factory.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-factory.h
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_SECELT_NAMES_FACTORY_H
-#define _E_SECELT_NAMES_FACTORY_H
-
-#include <glib.h>
-
-gboolean e_select_names_factory_init (void);
-
-#endif
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c
deleted file mode 100644
index 54d7344ece..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-manager.c
+++ /dev/null
@@ -1,614 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@ximian.com>
- *   Jon Trowbridge  <trow@ximian.com.
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gal/e-text/e-entry.h>
-
-#include "e-select-names-manager.h"
-#include "e-select-names-model.h"
-#include "e-select-names-text-model.h"
-#include "e-select-names.h"
-#include "e-select-names-completion.h"
-#include "e-select-names-popup.h"
-#include <addressbook/backend/ebook/e-destination.h>
-#include <addressbook/gui/component/addressbook.h>
-#include <bonobo-conf/bonobo-config-database.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-moniker-util.h>
-
-enum {
-	CHANGED,
-	OK,
-	CANCEL,
-	LAST_SIGNAL
-};
-
-static guint e_select_names_manager_signals[LAST_SIGNAL] = { 0 };
-
-
-typedef struct {
-	char *id;
-	char *title;
-	ESelectNamesModel *model;
-	ESelectNamesModel *original_model;
-	ESelectNamesManager *manager;
-	guint changed_tag;
-} ESelectNamesManagerSection;
-
-typedef struct {
-	char *id;
-	EEntry *entry;
-	ESelectNamesManager *manager;
-	ESelectNamesModel *model;
-} ESelectNamesManagerEntry;
-
-static void e_select_names_manager_init (ESelectNamesManager *manager);
-static void e_select_names_manager_class_init (ESelectNamesManagerClass *klass);
-
-static void e_select_names_manager_destroy (GtkObject *object);
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-/* ESelectNamesManagerSection routines */
-
-static void
-section_model_changed_cb (ESelectNamesModel *model, gpointer closure)
-{
-	ESelectNamesManagerSection *section = closure;
-	gtk_signal_emit (GTK_OBJECT (section->manager),
-			 e_select_names_manager_signals[CHANGED],
-			 section->id,
-			 FALSE);
-}
-
-static ESelectNamesManagerSection *
-e_select_names_manager_section_new (ESelectNamesManager *manager,
-				    const gchar *id,
-				    const gchar *title,
-				    ESelectNamesModel *model)
-{
-	ESelectNamesManagerSection *section;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MANAGER (manager), NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-
-	section = g_new0 (ESelectNamesManagerSection, 1);
-
-	section->id = g_strdup (id);
-	section->title = g_strdup (title);
-
-	section->manager = manager;
-
-	section->model = model;
-	gtk_object_ref (GTK_OBJECT (section->model));
-	section->changed_tag =
-		gtk_signal_connect (GTK_OBJECT (section->model),
-				    "changed",
-				    GTK_SIGNAL_FUNC (section_model_changed_cb),
-				    section);
-
-	return section;
-}
-
-static void
-e_select_names_manager_section_free (ESelectNamesManagerSection *section)
-{
-	if (section == NULL)
-		return;
-
-	g_free (section->id);
-	g_free (section->title);
-
-	if (section->model) {
-		gtk_signal_disconnect (GTK_OBJECT (section->model), section->changed_tag);
-		gtk_object_unref (GTK_OBJECT (section->model));
-	}
-
-	if (section->original_model) {
-		gtk_object_unref (GTK_OBJECT (section->original_model));
-	}
-
-	g_free (section);
-}
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-/* ESelectNamesManagerEntry routines */
-
-static ESelectNamesManagerEntry *
-get_entry_info (EEntry *entry)
-{
-	g_return_val_if_fail (E_IS_ENTRY (entry), NULL);
-	return (ESelectNamesManagerEntry *) gtk_object_get_data (GTK_OBJECT (entry), "entry_info");
-}
-
-static void
-popup_cb (EEntry *eentry, GdkEventButton *ev, gint pos, gpointer user_data)
-{
-	ESelectNamesManagerEntry *entry = user_data;
-
-	e_select_names_popup (entry->model, ev, pos);
-}
-
-static gint
-focus_in_cb (GtkWidget *w, GdkEventFocus *ev, gpointer user_data)
-{
-	ESelectNamesManagerEntry *entry = user_data;
-
-	e_select_names_model_cancel_cardify_all (entry->model);
-
-	return FALSE;
-}
-
-static gint
-focus_out_cb (GtkWidget *w, GdkEventFocus *ev, gpointer user_data)
-{
-	ESelectNamesManagerEntry *entry = user_data;
-
-	e_select_names_model_clean (entry->model);
-
-	if (!e_entry_completion_popup_is_visible (entry->entry))
-		e_select_names_model_cardify_all (entry->model, entry->manager->completion_book, 100);
-
-	return FALSE;
-}
-
-static void
-completion_popup_cb (EEntry *w, gint visible, gpointer user_data)
-{
-	ESelectNamesManagerEntry *entry = user_data;
-
-	if (!visible && !GTK_WIDGET_HAS_FOCUS (GTK_WIDGET (entry->entry->canvas)))
-		e_select_names_model_cardify_all (entry->model, entry->manager->completion_book, 0);
-}
-
-static void
-completion_handler (EEntry *entry, ECompletionMatch *match)
-{
-	ESelectNamesManagerEntry *mgr_entry;
-	EDestination *dest;
-	gint i, pos, start_pos, len;
-
-	if (match == NULL || match->user_data == NULL)
-		return;
-
-	mgr_entry = get_entry_info (entry);
-	dest = E_DESTINATION (match->user_data);
-
-	/* Sometimes I really long for garbage collection.  Reference
-           counting makes you feel 31337, but sometimes it is just a
-           bitch. */
-	gtk_object_ref (GTK_OBJECT (dest));
-
-	pos = e_entry_get_position (entry);
-	e_select_names_model_text_pos (mgr_entry->model, pos, &i, NULL, NULL);
-	e_select_names_model_replace (mgr_entry->model, i, dest);
-	e_select_names_model_name_pos (mgr_entry->model, i, &start_pos, &len);
-	e_entry_set_position (entry, start_pos+len);
-}
-
-static ESelectNamesManagerEntry *
-e_select_names_manager_entry_new (ESelectNamesManager *manager, ESelectNamesModel *model, const gchar *id)
-{
-	ESelectNamesManagerEntry *entry;
-	ETextModel *text_model;
-	ECompletion *comp;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MANAGER (manager), NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-
-	entry = g_new0 (ESelectNamesManagerEntry, 1);
-
-	entry->id = g_strdup (id);
-
-	entry->entry = E_ENTRY (e_entry_new ());
-	text_model = e_select_names_text_model_new (model);
-	gtk_object_set(GTK_OBJECT(entry->entry),
-		       "model",          text_model, /* The entry takes ownership of the text model */
-		       "editable",       TRUE,
-		       "use_ellipsis",   TRUE,
-		       "allow_newlines", FALSE,
-		       NULL);
-
-	gtk_object_ref (GTK_OBJECT (entry->entry));
-
-	comp = e_select_names_completion_new (NULL, model);
-	if (manager->completion_book)
-		e_select_names_completion_add_book (E_SELECT_NAMES_COMPLETION (comp),
-						    manager->completion_book);
-
-	e_entry_enable_completion_full (entry->entry, comp, 50, completion_handler);
-
-	entry->manager = manager;
-
-	entry->model = model;
-	gtk_object_ref (GTK_OBJECT (model));
-	
-	gtk_signal_connect (GTK_OBJECT (entry->entry),
-			    "popup",
-			    GTK_SIGNAL_FUNC (popup_cb),
-			    entry);
-			
-	gtk_signal_connect (GTK_OBJECT (entry->entry->canvas),
-			    "focus_in_event",
-			    GTK_SIGNAL_FUNC (focus_in_cb),
-			    entry);
-	
-	gtk_signal_connect (GTK_OBJECT (entry->entry->canvas),
-			    "focus_out_event",
-			    GTK_SIGNAL_FUNC (focus_out_cb),
-			    entry);
-
-	gtk_signal_connect (GTK_OBJECT (entry->entry),
-			    "completion_popup",
-			    GTK_SIGNAL_FUNC (completion_popup_cb),
-			    entry);
-
-	gtk_object_set_data (GTK_OBJECT (entry->entry), "entry_info", entry);
-	gtk_object_set_data (GTK_OBJECT (entry->entry), "select_names_model", model);
-	gtk_object_set_data (GTK_OBJECT (entry->entry), "completion_handler", comp);
-
-	return entry;
-}
-
-static void
-e_select_names_manager_entry_free (ESelectNamesManagerEntry *entry)
-{
-	if (entry == NULL)
-		return;
-
-	g_free (entry->id);
-	gtk_object_unref (GTK_OBJECT (entry->model));
-	gtk_object_unref (GTK_OBJECT (entry->entry));
-
-	g_free (entry);
-}
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-static void
-e_select_names_manager_save_models (ESelectNamesManager *manager)
-{
-	GList *iter;
-	
-	for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
-		ESelectNamesManagerSection *section = iter->data;
-
-		if (section->original_model == NULL && section->model != NULL)
-			section->original_model = e_select_names_model_duplicate (section->model);
-
-	}
-}
-
-static void
-e_select_names_manager_revert_to_saved_models (ESelectNamesManager *manager)
-{
-	GList *iter;
-
-	for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
-		ESelectNamesManagerSection *section = iter->data;
-		if (section->model && section->original_model) {
-			e_select_names_model_overwrite_copy (section->model, section->original_model);
-			gtk_object_unref (GTK_OBJECT (section->original_model));
-			section->original_model = NULL;
-		}
-	}
-}
-
-static void
-e_select_names_manager_discard_saved_models (ESelectNamesManager *manager)
-{
-	GList *iter;
-
-	for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
-		ESelectNamesManagerSection *section = iter->data;
-		if (section->original_model) {
-			gtk_object_unref (GTK_OBJECT (section->original_model));
-			section->original_model = NULL;
-		}
-	}
-}
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-
-static void
-open_book_cb (EBook *book, EBookStatus status, ESelectNamesManager *manager)
-{
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		gtk_object_unref (GTK_OBJECT (book));
-		manager->completion_book = NULL;
-	}
-
-	gtk_object_unref (GTK_OBJECT (manager)); /* unref ourself (matches ref before the load_uri call below) */
-}
-
-/**
- * e_select_names_manager_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ESelectNamesManager that wraps the @VCard.
- */
-ESelectNamesManager *
-e_select_names_manager_new (void)
-{
-	ESelectNamesManager *manager = E_SELECT_NAMES_MANAGER(gtk_type_new(e_select_names_manager_get_type()));
-	Bonobo_ConfigDatabase db;
-	CORBA_Environment ev;
-	char *val;
-
-	CORBA_exception_init (&ev);
-
-	db = addressbook_config_database (&ev);
-
-	val = bonobo_config_get_string (db, "/Addressbook/Completion/uri", &ev);
-
-	CORBA_exception_free (&ev);
-
-	if (val) {
-		manager->completion_book = e_book_new ();
-		gtk_object_ref (GTK_OBJECT (manager)); /* ref ourself before our async call */
-		addressbook_load_uri (manager->completion_book, val, (EBookCallback)open_book_cb, manager);
-		g_free (val);
-	}
-	else
-		manager->completion_book = NULL;
-
-	return manager;
-}
-
-
-/*
- * ESelectNamesManager lifecycle management and vcard loading/saving.
- */
-
-
-void
-e_select_names_manager_add_section (ESelectNamesManager *manager,
-				    const char *id,
-				    const char *title)
-{
-	g_return_if_fail (E_IS_SELECT_NAMES_MANAGER (manager));
-	g_return_if_fail (id != NULL);
-	g_return_if_fail (title != NULL);
-	
-	e_select_names_manager_add_section_with_limit (manager, id, title, -1);
-}
-
-void
-e_select_names_manager_add_section_with_limit (ESelectNamesManager *manager,
-					       const char *id,
-					       const char *title,
-					       gint limit)
-{
-	ESelectNamesManagerSection *section;
-	ESelectNamesModel *model;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MANAGER (manager));
-	g_return_if_fail (id != NULL);
-	g_return_if_fail (title != NULL);
-	
-	model = e_select_names_model_new ();
-	e_select_names_model_set_limit (model, limit);
-	
-	section = e_select_names_manager_section_new (manager, id, title, model);
-
-	manager->sections = g_list_append (manager->sections, section);
-
-	gtk_object_unref (GTK_OBJECT (model));
-}
-
-ESelectNamesModel *
-e_select_names_manager_get_source (ESelectNamesManager *manager,
-				   const char *id)
-{
-	GList *iter;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MANAGER (manager), NULL);
-	g_return_val_if_fail (id != NULL, NULL);
-
-	for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
-		ESelectNamesManagerSection *section = iter->data;
-		if (!strcmp (section->id, id))
-			return section->model;
-	}
-	return NULL;
-}
-
-GtkWidget *
-e_select_names_manager_create_entry (ESelectNamesManager *manager, const char *id)
-{
-	GList *iter;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MANAGER (manager), NULL);
-	g_return_val_if_fail (id != NULL, NULL);
-
-	for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
-		ESelectNamesManagerSection *section = iter->data;
-		if (!strcmp(section->id, id)) {
-			ESelectNamesManagerEntry *entry;
-
-			entry = e_select_names_manager_entry_new (manager, section->model, section->id);
-			manager->entries = g_list_append (manager->entries, entry);
-
-			return GTK_WIDGET(entry->entry);
-		}
-	}
-
-	return NULL;
-}
-
-static void
-e_select_names_clicked(ESelectNames *dialog, gint button, ESelectNamesManager *manager)
-{
-	gnome_dialog_close(GNOME_DIALOG(dialog));
-
-	switch(button) {
-	case 0:
-		e_select_names_manager_discard_saved_models (manager);
-		gtk_signal_emit (GTK_OBJECT (manager), e_select_names_manager_signals[OK]);
-		break;
-
-	case 1:
-		e_select_names_manager_revert_to_saved_models (manager);
-		gtk_signal_emit (GTK_OBJECT (manager), e_select_names_manager_signals[CANCEL]);
-		break;
-	}
-}
-
-void
-e_select_names_manager_activate_dialog (ESelectNamesManager *manager,
-					const char *id)
-{
-	g_return_if_fail (E_IS_SELECT_NAMES_MANAGER (manager));
-	g_return_if_fail (id != NULL);
-
-	if (manager->names) {
-		
-		g_assert (GTK_WIDGET_REALIZED (GTK_WIDGET (manager->names)));
-		e_select_names_set_default (manager->names, id);
-		gdk_window_show (GTK_WIDGET (manager->names)->window);
-		gdk_window_raise (GTK_WIDGET (manager->names)->window);
-
-	} else {
-
-		GList *iter;
-
-		manager->names = E_SELECT_NAMES (e_select_names_new ());
-
-		for (iter = manager->sections; iter != NULL; iter = g_list_next (iter)) {
-			ESelectNamesManagerSection *section = iter->data;
-			e_select_names_add_section (manager->names, section->id, section->title, section->model);
-		}
-
-		e_select_names_set_default (manager->names, id);
-
-		gtk_signal_connect(GTK_OBJECT(manager->names), 
-				   "clicked",
-				   GTK_SIGNAL_FUNC(e_select_names_clicked),
-				   manager);
-
-		gtk_signal_connect(GTK_OBJECT(manager->names),
-				   "destroy",
-				   GTK_SIGNAL_FUNC(gtk_widget_destroyed), 
-				   &manager->names);
-
-		gtk_widget_show(GTK_WIDGET(manager->names));
-	}
-
-	e_select_names_manager_save_models (manager);
-}
-
-/* ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** */
-
-static void
-e_select_names_manager_init (ESelectNamesManager *manager)
-{
-	manager->sections = NULL;
-	manager->entries  = NULL;
-}
-
-static void
-e_select_names_manager_destroy (GtkObject *object)
-{
-	ESelectNamesManager *manager;
-	
-	manager = E_SELECT_NAMES_MANAGER (object);
-
-	if (manager->names) {
-		gtk_widget_destroy (GTK_WIDGET (manager->names));
-		manager->names = NULL;
-	}
-
-	g_list_foreach (manager->sections, (GFunc) e_select_names_manager_section_free, NULL);
-	g_list_free (manager->sections);
-	manager->sections = NULL;
-
-	g_list_foreach (manager->entries, (GFunc) e_select_names_manager_entry_free, NULL);
-	g_list_free (manager->entries);
-	manager->entries = NULL;
-}
-
-static void
-e_select_names_manager_class_init (ESelectNamesManagerClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	object_class->destroy = e_select_names_manager_destroy;
-
-	e_select_names_manager_signals[CHANGED] = 
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESelectNamesManagerClass, changed),
-				gtk_marshal_NONE__POINTER_INT,
-				GTK_TYPE_NONE, 2,
-				GTK_TYPE_POINTER,
-				GTK_TYPE_INT);
-
-	e_select_names_manager_signals[OK] =
-		gtk_signal_new ("ok",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESelectNamesManagerClass, ok),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_select_names_manager_signals[CANCEL] =
-		gtk_signal_new ("cancel",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESelectNamesManagerClass, cancel),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_select_names_manager_signals, LAST_SIGNAL);
-}
-
-/**
- * e_select_names_manager_get_type:
- * @void: 
- * 
- * Registers the &ESelectNamesManager class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ESelectNamesManager class.
- **/
-GtkType
-e_select_names_manager_get_type (void)
-{
-	static GtkType manager_type = 0;
-
-	if (!manager_type) {
-		GtkTypeInfo manager_info = {
-			"ESelectNamesManager",
-			sizeof (ESelectNamesManager),
-			sizeof (ESelectNamesManagerClass),
-			(GtkClassInitFunc) e_select_names_manager_class_init,
-			(GtkObjectInitFunc) e_select_names_manager_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		manager_type = gtk_type_unique (gtk_object_get_type (), &manager_info);
-	}
-
-	return manager_type;
-}
-
-
-
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.h b/addressbook/gui/component/select-names/e-select-names-manager.h
deleted file mode 100644
index 9fdad2c304..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-manager.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2000 Ximian, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_MANAGER_H__
-#define __E_SELECT_NAMES_MANAGER_H__
-
-#include <stdio.h>
-#include <time.h>
-#include <gtk/gtkobject.h>
-#include <e-util/e-list.h>
-#include "e-select-names.h"
-
-#define E_TYPE_SELECT_NAMES_MANAGER            (e_select_names_manager_get_type ())
-#define E_SELECT_NAMES_MANAGER(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_MANAGER, ESelectNamesManager))
-#define E_SELECT_NAMES_MANAGER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_MANAGER, ESelectNamesManagerClass))
-#define E_IS_SELECT_NAMES_MANAGER(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_MANAGER))
-#define E_IS_SELECT_NAMES_MANAGER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_MANAGER))
-
-typedef struct _ESelectNamesManager ESelectNamesManager;
-typedef struct _ESelectNamesManagerClass ESelectNamesManagerClass;
-
-struct _ESelectNamesManager {
-	GtkObject object;
-	
-	GList *sections;
-	GList *entries;
-
-	ESelectNames *names;
-
-	EBook *completion_book;
-};
-
-struct _ESelectNamesManagerClass {
-	GtkObjectClass parent_class;
-
-	void (*changed) (ESelectNamesManager *, const gchar *section_id, gint changed_working_copy);
-	void (*ok)      (ESelectNamesManager *);
-	void (*cancel)  (ESelectNamesManager *);
-};
-
-ESelectNamesManager *e_select_names_manager_new                    (void);
-void                 e_select_names_manager_add_section            (ESelectNamesManager *manager,
-							            const char *id,
-							            const char *title);
-void                 e_select_names_manager_add_section_with_limit (ESelectNamesManager *manager,
-								    const char *id,
-								    const char *title,
-								    gint limit);
-ESelectNamesModel   *e_select_names_manager_get_source             (ESelectNamesManager *manager,
-								    const char *id);
-GtkWidget           *e_select_names_manager_create_entry           (ESelectNamesManager *manager,
-							            const char *id);
-void                 e_select_names_manager_activate_dialog        (ESelectNamesManager *manager,
-							            const char *id);
-/* Standard Gtk function */			      
-GtkType              e_select_names_manager_get_type               (void);
-
-#endif /* ! __E_SELECT_NAMES_MANAGER_H__ */
diff --git a/addressbook/gui/component/select-names/e-select-names-model.c b/addressbook/gui/component/select-names/e-select-names-model.c
deleted file mode 100644
index 138b0d73ad..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-model.c
+++ /dev/null
@@ -1,897 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@ximian.com>
- *   Jon Trowbidge   <trow@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtkmarshal.h>
-#include <gtk/gtksignal.h>
-
-#include <gal/util/e-util.h>
-
-#include "e-select-names-model.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#define SEPARATOR ", "
-#define SEPLEN    (strlen(SEPARATOR))
-
-#define MAX_LENGTH 2047
-
-
-enum {
-	E_SELECT_NAMES_MODEL_CHANGED,
-	E_SELECT_NAMES_MODEL_RESIZED,
-	E_SELECT_NAMES_MODEL_LAST_SIGNAL
-};
-
-static guint e_select_names_model_signals[E_SELECT_NAMES_MODEL_LAST_SIGNAL] = { 0 };
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_CARD,
-};
-
-enum {
-	NAME_DATA_BLANK,
-	NAME_DATA_CARD,
-	NAME_DATA_STRING
-};
-
-enum {
-	NAME_FORMAT_GIVEN_FIRST,
-	NAME_FORMAT_FAMILY_FIRST
-};
-
-struct _ESelectNamesModelPrivate {
-	gchar *id;
-	gchar *title;
-
-	GList *data;  /* of EDestination */
-	gchar *text;
-	gchar *addr_text;
-
-	gint limit;
-
-	gint freeze_count;
-	gboolean pending_changed;
-};
-
-
-static void e_select_names_model_init (ESelectNamesModel *model);
-static void e_select_names_model_class_init (ESelectNamesModelClass *klass);
-
-static void e_select_names_model_destroy (GtkObject *object);
-static void e_select_names_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_select_names_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-GtkType
-e_select_names_model_get_type (void)
-{
-	static GtkType model_type = 0;
-
-	if (!model_type) {
-		GtkTypeInfo model_info = {
-			"ESelectNamesModel",
-			sizeof (ESelectNamesModel),
-			sizeof (ESelectNamesModelClass),
-			(GtkClassInitFunc) e_select_names_model_class_init,
-			(GtkObjectInitFunc) e_select_names_model_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		model_type = gtk_type_unique (gtk_object_get_type (), &model_info);
-	}
-
-	return model_type;
-}
-
-typedef void (*GtkSignal_NONE__INT_INT_INT) (GtkObject *object, gint arg1, gint arg2, gint arg3, gpointer user_data);
-static void
-local_gtk_marshal_NONE__INT_INT_INT (GtkObject    *object, 
-				     GtkSignalFunc func, 
-				     gpointer      func_data, 
-				     GtkArg       *args)
-{
-	GtkSignal_NONE__INT_INT_INT rfunc;
-	rfunc = (GtkSignal_NONE__INT_INT_INT) func;
-	(* rfunc) (object,
-		   GTK_VALUE_INT(args[0]),
-		   GTK_VALUE_INT(args[1]),
-		   GTK_VALUE_INT(args[2]),
-		   func_data);
-}
-
-
-static void
-e_select_names_model_class_init (ESelectNamesModelClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	e_select_names_model_signals[E_SELECT_NAMES_MODEL_CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESelectNamesModelClass, changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_select_names_model_signals[E_SELECT_NAMES_MODEL_RESIZED] =
-		gtk_signal_new ("resized",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (ESelectNamesModelClass, resized),
-				local_gtk_marshal_NONE__INT_INT_INT,
-				GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT);
-
-	gtk_object_class_add_signals (object_class, e_select_names_model_signals, E_SELECT_NAMES_MODEL_LAST_SIGNAL);
-
-	gtk_object_add_arg_type ("ESelectNamesModel::card",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CARD);
-
-	klass->changed = NULL;
-
-	object_class->destroy = e_select_names_model_destroy;
-	object_class->get_arg = e_select_names_model_get_arg;
-	object_class->set_arg = e_select_names_model_set_arg;
-}
-
-/**
- * e_select_names_model_init:
- */
-static void
-e_select_names_model_init (ESelectNamesModel *model)
-{
-	model->priv = g_new0 (struct _ESelectNamesModelPrivate, 1);
-
-	model->priv->limit = -1;
-}
-
-static void
-e_select_names_model_destroy (GtkObject *object)
-{
-	ESelectNamesModel *model = E_SELECT_NAMES_MODEL (object);
-	
-	g_free (model->priv->title);
-	g_free (model->priv->id);
-
-	g_list_foreach (model->priv->data, (GFunc) gtk_object_unref, NULL);
-	g_list_free (model->priv->data);
-
-	g_free (model->priv->text);
-	g_free (model->priv->addr_text);
-
-	g_free (model->priv);
-
-}
-
-
-/* Set_arg handler for the model */
-static void
-e_select_names_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesModel *model;
-	
-	model = E_SELECT_NAMES_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the model */
-static void
-e_select_names_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesModel *model;
-
-	model = E_SELECT_NAMES_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-
-static void
-e_select_names_model_changed (ESelectNamesModel *model)
-{
-	g_free (model->priv->text);
-	model->priv->text = NULL;
-	
-	g_free (model->priv->addr_text);
-	model->priv->addr_text = NULL;
-
-	if (model->priv->freeze_count > 0) {
-		model->priv->pending_changed = TRUE;
-	} else {
-		gtk_signal_emit (GTK_OBJECT(model), e_select_names_model_signals[E_SELECT_NAMES_MODEL_CHANGED]);
-		model->priv->pending_changed = FALSE;
-	}
-}
-
-static void
-destination_changed_proxy (EDestination *dest, gpointer closure)
-{
-	e_select_names_model_changed (E_SELECT_NAMES_MODEL (closure));
-}
-
-/** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/
-
-ESelectNamesModel *
-e_select_names_model_new (void)
-{
-	ESelectNamesModel *model;
-	model = E_SELECT_NAMES_MODEL (gtk_type_new (e_select_names_model_get_type ()));
-	return model;
-}
-
-ESelectNamesModel *
-e_select_names_model_duplicate (ESelectNamesModel *old)
-{
-	ESelectNamesModel *model = E_SELECT_NAMES_MODEL(gtk_type_new(e_select_names_model_get_type()));
-	GList *iter;
-
-	model->priv->id = g_strdup (old->priv->id);
-	model->priv->title = g_strdup (old->priv->title);
-	
-	for (iter = old->priv->data; iter != NULL; iter = g_list_next (iter)) {
-		EDestination *dup = e_destination_copy (E_DESTINATION (iter->data));
-		e_select_names_model_append (model, dup);
-	}
-
-	model->priv->limit = old->priv->limit;
-
-	return model;
-}
-
-const gchar *
-e_select_names_model_get_textification (ESelectNamesModel *model)
-{
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-
-	if (model->priv->text == NULL) {
-
-		if (model->priv->data == NULL) {
-			
-			model->priv->text = g_strdup ("");
-
-		} else {
-			gchar **strv = g_new0 (gchar *, g_list_length (model->priv->data)+1);
-			gint i = 0;
-			GList *iter = model->priv->data;
-			
-			while (iter) {
-				EDestination *dest = E_DESTINATION (iter->data);
-				strv[i] = (gchar *) e_destination_get_textrep (dest);
-				++i;
-				iter = g_list_next (iter);
-			}
-
-			model->priv->text = g_strjoinv (SEPARATOR, strv);
-
-			if (strlen(model->priv->text) > MAX_LENGTH) {
-				model->priv->text[MAX_LENGTH] = 0;
-				g_realloc (model->priv->text, MAX_LENGTH + 1);
-			}
-			
-			g_free (strv);
-		}
-	}
-
-	return model->priv->text;
-}
-
-const gchar *
-e_select_names_model_get_address_text (ESelectNamesModel *model)
-{
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), NULL);
-
-	if (model->priv->addr_text == NULL) {
-
-		if (model->priv->data == NULL) {
-
-			model->priv->addr_text = g_strdup ("");
-
-		} else {
-			gchar **strv = g_new0 (gchar *, g_list_length (model->priv->data)+1);
-			gint i = 0;
-			GList *iter = model->priv->data;
-
-			while (iter) {
-				EDestination *dest = E_DESTINATION (iter->data);
-				strv[i] = (gchar *) e_destination_get_address (dest);
-				if (strv[i])
-					++i;
-				iter = g_list_next (iter);
-			}
-
-			model->priv->addr_text = g_strjoinv (SEPARATOR, strv);
-
-			g_free (strv);
-		}
-	}
-
-	return model->priv->addr_text;
-}
-
-gint
-e_select_names_model_count (ESelectNamesModel *model)
-{
-	g_return_val_if_fail (model != NULL, 0);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), 0);
-
-	return g_list_length (model->priv->data);
-}
-
-gint
-e_select_names_model_get_limit (ESelectNamesModel *model)
-{
-	g_return_val_if_fail (model != NULL, 0);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), 0);
-
-	return model->priv->limit;
-}
-
-void
-e_select_names_model_set_limit (ESelectNamesModel *model, gint limit)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-
-	model->priv->limit = MAX (limit, -1);
-}
-
-gboolean
-e_select_names_model_at_limit (ESelectNamesModel *model)
-{
-	g_return_val_if_fail (model != NULL, TRUE);
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), TRUE);
-
-	return model->priv->limit >= 0 && g_list_length (model->priv->data) >= model->priv->limit;
-}
-
-const EDestination *
-e_select_names_model_get_destination (ESelectNamesModel *model, gint index)
-{
-	g_return_val_if_fail (model && E_IS_SELECT_NAMES_MODEL (model), NULL);
-	g_return_val_if_fail (0 <= index, NULL);
-	g_return_val_if_fail (index < g_list_length (model->priv->data), NULL);
-
-	return E_DESTINATION (g_list_nth_data (model->priv->data, index));
-}
-
-gchar *
-e_select_names_model_export_destinationv (ESelectNamesModel *model)
-{
-	EDestination **destv;
-	gchar *str;
-	gint i, len = 0;
-	GList *j;
-	g_return_val_if_fail (model && E_IS_SELECT_NAMES_MODEL (model), NULL);
-
-	len = g_list_length (model->priv->data);
-	destv = g_new0 (EDestination *, len+1);
-	
-	for (i=0, j = model->priv->data; j != NULL; j = g_list_next (j)) {
-		EDestination *dest = E_DESTINATION (j->data);
-
-		if (dest)
-			destv[i++] = dest;
-	}
-
-	str = e_destination_exportv (destv);
-	g_free (destv);
-
-	return str;
-}
-
-static
-void send_changed (EDestination *dest, ECard *card, gpointer closure)
-{
-	ESelectNamesModel *model = closure;
-	e_select_names_model_changed (model);
-}
-
-void
-e_select_names_model_import_destinationv (ESelectNamesModel *model,
-					  gchar *destinationv)
-{
-	EDestination **destv;
-	gint i;
-
-	g_return_if_fail (model && E_IS_SELECT_NAMES_MODEL (model));
-
-	destv = e_destination_importv (destinationv);
-
-	e_select_names_model_delete_all (model);
-
-	if (destv == NULL)
-		return;
-
-	for (i = 0; destv[i]; i++) {
-		e_destination_use_card (destv[i], send_changed, model);
-		e_select_names_model_append (model, destv[i]);
-	}
-	g_free (destv);
-}
-
-ECard *
-e_select_names_model_get_card (ESelectNamesModel *model, gint index)
-{
-	const EDestination *dest;
-
-	g_return_val_if_fail (model && E_IS_SELECT_NAMES_MODEL (model), NULL);
-	g_return_val_if_fail (0 <= index, NULL);
-	g_return_val_if_fail (index < g_list_length (model->priv->data), NULL);
-
-	dest = e_select_names_model_get_destination (model, index);
-	return dest ? e_destination_get_card (dest) : NULL;
-
-}
-
-const gchar *
-e_select_names_model_get_string (ESelectNamesModel *model, gint index)
-{
-	const EDestination *dest;
-
-	g_return_val_if_fail (model && E_IS_SELECT_NAMES_MODEL (model), NULL);
-	g_return_val_if_fail (0 <= index, NULL);
-	g_return_val_if_fail (index < g_list_length (model->priv->data), NULL);
-
-	dest = e_select_names_model_get_destination (model, index);
-	
-	return dest ? e_destination_get_textrep (dest) : "";
-}
-
-static void
-connect_destination (ESelectNamesModel *model, EDestination *dest)
-{
-	gtk_signal_connect (GTK_OBJECT (dest),
-			    "changed",
-			    destination_changed_proxy,
-			    model);
-}
-
-static void
-disconnect_destination (ESelectNamesModel *model, EDestination *dest)
-{
-	gtk_signal_disconnect_by_func (GTK_OBJECT (dest), destination_changed_proxy, model);
-}
-
-gboolean
-e_select_names_model_contains (ESelectNamesModel *model, const EDestination *dest)
-{
-	GList *iter;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), FALSE);
-	g_return_val_if_fail (E_IS_DESTINATION (dest), FALSE);
-
-	for (iter = model->priv->data; iter != NULL; iter = g_list_next (iter)) {
-		if (iter->data != NULL && e_destination_equal (dest, E_DESTINATION (iter->data)))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-void
-e_select_names_model_insert (ESelectNamesModel *model, gint index, EDestination *dest)
-{
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (0 <= index && index <= g_list_length (model->priv->data));
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-
-	if (e_select_names_model_at_limit (model)) {
-		/* FIXME: This is bad. */
-		gtk_object_unref (GTK_OBJECT (dest));
-		return;
-	}
-
-	connect_destination (model, dest);
-
-	model->priv->data = g_list_insert (model->priv->data, dest, index);
-	
-	gtk_object_ref (GTK_OBJECT (dest));
-	gtk_object_sink (GTK_OBJECT (dest));
-
-	e_select_names_model_changed (model);
-}
-
-void
-e_select_names_model_append (ESelectNamesModel *model, EDestination *dest)
-{
-	g_return_if_fail (model && E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-
-	if (e_select_names_model_at_limit (model)) {
-		/* FIXME: This is bad. */
-		gtk_object_unref (GTK_OBJECT (dest));
-		return;
-	}
-
-	connect_destination (model, dest);
-
-	model->priv->data = g_list_append (model->priv->data, dest);
-
-	gtk_object_ref  (GTK_OBJECT (dest));
-	gtk_object_sink (GTK_OBJECT (dest));
-
-	e_select_names_model_changed (model);
-}
-
-void
-e_select_names_model_replace (ESelectNamesModel *model, gint index, EDestination *dest)
-{
-	GList *node;
-	const gchar *new_str, *old_str;
-	gint old_strlen=0, new_strlen=0;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (model->priv->data == NULL || (0 <= index && index < g_list_length (model->priv->data)));
-	g_return_if_fail (dest && E_IS_DESTINATION (dest));
-	
-	new_str = e_destination_get_textrep (dest);
-	new_strlen = new_str ? strlen (new_str) : 0;
-
-	if (model->priv->data == NULL) {
-
-		connect_destination (model, dest);
-
-		model->priv->data = g_list_append (model->priv->data, dest);
-		gtk_object_ref (GTK_OBJECT (dest));
-		gtk_object_sink (GTK_OBJECT (dest));
-
-	} else {
-		
-		node = g_list_nth (model->priv->data, index);
-
-		if (node->data != dest) {
-
-			disconnect_destination (model, E_DESTINATION (node->data));
-			connect_destination (model, dest);
-
-			old_str = e_destination_get_textrep (E_DESTINATION (node->data));
-			old_strlen = old_str ? strlen (old_str) : 0;
-
-			gtk_object_unref (GTK_OBJECT (node->data));
-
-			node->data = dest;
-			gtk_object_ref (GTK_OBJECT (dest));
-			gtk_object_sink (GTK_OBJECT (dest));
-		}
-	}
-
-	e_select_names_model_changed (model);
-
-	gtk_signal_emit (GTK_OBJECT (model), e_select_names_model_signals[E_SELECT_NAMES_MODEL_RESIZED],
-			 index, old_strlen, new_strlen);
-}
-
-void
-e_select_names_model_delete (ESelectNamesModel *model, gint index)
-{
-	GList *node;
-	EDestination *dest;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (0 <= index && index < g_list_length (model->priv->data));
-	
-	node = g_list_nth (model->priv->data, index);
-	dest = E_DESTINATION (node->data);
-
-	disconnect_destination (model, dest);
-	gtk_object_unref (GTK_OBJECT (dest));
-
-	model->priv->data = g_list_remove_link (model->priv->data, node);
-	g_list_free_1 (node);
-
-	e_select_names_model_changed (model);
-}
-
-void
-e_select_names_model_clean (ESelectNamesModel *model)
-{
-	GList *iter, *next;
-	gboolean changed = FALSE;
-
-	g_return_if_fail (model != NULL && E_IS_SELECT_NAMES_MODEL (model));
-
-	iter = model->priv->data;
-
-	while (iter) {
-		EDestination *dest;
-
-		next = g_list_next (iter);
-		dest = iter->data ? E_DESTINATION (iter->data) : NULL;
-
-		if (dest == NULL || e_destination_is_empty (dest)) {
-			if (dest) {
-				disconnect_destination (model, dest);
-				gtk_object_unref (GTK_OBJECT (dest));
-			}
-			model->priv->data = g_list_remove_link (model->priv->data, iter);
-			g_list_free_1 (iter);
-			changed = TRUE;
-		}
-		
-		iter = next;
-	}
-
-	if (changed)
-		e_select_names_model_changed (model);
-}
-
-static void
-delete_all_iter (gpointer data, gpointer closure)
-{
-	disconnect_destination (E_SELECT_NAMES_MODEL (closure), E_DESTINATION (data));
-	gtk_object_unref (GTK_OBJECT (data));
-}
-
-void
-e_select_names_model_delete_all (ESelectNamesModel *model)
-{
-	g_return_if_fail (model != NULL && E_IS_SELECT_NAMES_MODEL (model));
-
-	g_list_foreach (model->priv->data, delete_all_iter, model);
-	g_list_free (model->priv->data);
-	model->priv->data = NULL;
-
-	e_select_names_model_changed (model);
-}
-
-void
-e_select_names_model_overwrite_copy (ESelectNamesModel *dest, ESelectNamesModel *src)
-{
-	gint i, len;
-
-	g_return_if_fail (dest && E_IS_SELECT_NAMES_MODEL (dest));
-	g_return_if_fail (src && E_IS_SELECT_NAMES_MODEL (src));
-
-	if (src == dest)
-		return;
-
-	e_select_names_model_delete_all (dest);
-	len = e_select_names_model_count (src);
-	for (i = 0; i < len; ++i) {
-		const EDestination *d = e_select_names_model_get_destination (src, i);
-		if (d)
-			e_select_names_model_append (dest, e_destination_copy (d));
-	}
-}
-
-void
-e_select_names_model_merge (ESelectNamesModel *dest, ESelectNamesModel *src)
-{
-	gint i, len;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (dest));
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (src));
-
-	if (src == dest)
-		return;
-
-	len = e_select_names_model_count (src);
-	for (i = 0; i < len; ++i) {
-		const EDestination *d = e_select_names_model_get_destination (src, i);
-		if (d && !e_select_names_model_contains (dest, d))
-			e_select_names_model_append (dest, e_destination_copy (d));
-	}
-}
-
-void
-e_select_names_model_name_pos (ESelectNamesModel *model, gint index, gint *pos, gint *length)
-{
-	gint rp = 0, i, len = 0;
-	GList *iter;
-	const gchar *str;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-
-	i = 0;
-	iter = model->priv->data;
-	while (iter && i <= index) {
-		rp += len + (i > 0 ? SEPLEN : 0);
-		str = e_destination_get_textrep (E_DESTINATION (iter->data));
-		len = str ? strlen (str) : 0;
-		++i;
-		iter = g_list_next (iter);
-	}
-	
-	if (i <= index) {
-		rp = -1;
-		len = 0;
-	}
-	
-	if (pos)
-		*pos = rp;
-	if (length)
-		*length = len;
-}
-
-void
-e_select_names_model_text_pos (ESelectNamesModel *model, gint pos, gint *index, gint *start_pos, gint *length)
-{
-	GList *iter;
-	const gchar *str;
-	gint len = 0, i = 0, sp = 0, adj = 0;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-
-	iter = model->priv->data;
-
-	while (iter != NULL) {
-		str = e_destination_get_textrep (E_DESTINATION (iter->data));
-		len = str ? strlen (str) : 0;
-
-		if (sp <= pos && pos <= sp + len + adj) {
-			break;
-		}
-
-		sp += len + adj + 1;
-		adj = 1;
-		++i;
-
-		iter = g_list_next (iter);
-	}
-
-	if (i != 0)
-		++sp; /* skip past "magic space" */
-
-	if (iter == NULL) {
-#if 0
-		g_print ("text_pos ended NULL\n");
-#endif
-		i = -1;
-		sp = -1;
-		len = 0;
-	} else {
-#if 0
-		g_print ("text_pos got index %d\n", i);
-#endif
-	}
-
-	if (index)
-		*index = i;
-	if (start_pos)
-		*start_pos = sp;
-	if (length)
-		*length = len;
-}
-
-void
-e_select_names_model_cardify (ESelectNamesModel *model, EBook *book, gint index, gint delay)
-{
-	EDestination *dest;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (book == NULL || E_IS_BOOK (book));
-	g_return_if_fail (0 <= index && index < g_list_length (model->priv->data));
-
-	dest = E_DESTINATION (g_list_nth_data (model->priv->data, index));
-
-	if (!e_destination_is_empty (dest)) {
-
-		if (delay > 0)
-			e_destination_cardify_delayed (dest, book, delay);
-		else
-			e_destination_cardify (dest, book);
-	}
-}
-
-gboolean
-e_select_names_model_uncardify (ESelectNamesModel *model, gint index)
-{
-	EDestination *dest;
-	gboolean rv = FALSE;
-
-	g_return_val_if_fail (E_IS_SELECT_NAMES_MODEL (model), FALSE);
-	g_return_val_if_fail (0 <= index && index < g_list_length (model->priv->data), FALSE);
-
-	dest = E_DESTINATION (g_list_nth_data (model->priv->data, index));
-
-	if (!e_destination_is_empty (dest)) {
-		EDestination *cpy_dest = e_destination_copy (dest);
-
-		rv = e_destination_uncardify (cpy_dest);
-
-		if (rv) {
-			e_select_names_model_replace (model, index, cpy_dest);
-		}
-		
-	}
-
-	return rv;
-}
-
-void
-e_select_names_model_cancel_cardify (ESelectNamesModel *model, gint index)
-{
-	EDestination *dest;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (0 <= index && index < g_list_length (model->priv->data));
-
-	dest = E_DESTINATION (g_list_nth_data (model->priv->data, index));
-	
-	e_destination_cancel_cardify (dest);
-}
-
-void
-e_select_names_model_cardify_all (ESelectNamesModel *model, EBook *book, gint delay)
-{
-	GList *iter;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (book == NULL || E_IS_BOOK (book));
-
-	for (iter = model->priv->data; iter != NULL; iter = g_list_next (iter)) {
-		EDestination *dest = E_DESTINATION (iter->data);
-		if (!e_destination_is_empty (dest)) {
-
-			if (delay > 0)
-				e_destination_cardify_delayed (dest, book, delay);
-			else
-				e_destination_cardify (dest, book);
-		}
-	}
-}
-
-void
-e_select_names_model_cancel_cardify_all (ESelectNamesModel *model)
-{
-	GList *iter;
-
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-
-	for (iter = model->priv->data; iter != NULL; iter = g_list_next (iter)) {
-		EDestination *dest = E_DESTINATION (iter->data);
-		e_destination_cancel_cardify (dest);
-	}
-}
-
-void
-e_select_names_model_freeze (ESelectNamesModel *model)
-{
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	
-	++model->priv->freeze_count;
-}
-
-void
-e_select_names_model_thaw (ESelectNamesModel *model)
-{
-	g_return_if_fail (E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (model->priv->freeze_count > 0);
-
-	--model->priv->freeze_count;
-	if (model->priv->pending_changed)
-		e_select_names_model_changed (model);
-}
diff --git a/addressbook/gui/component/select-names/e-select-names-model.h b/addressbook/gui/component/select-names/e-select-names-model.h
deleted file mode 100644
index b7fa04d6cd..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-model.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *   Jon Trowbridge <trow@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_MODEL_H__
-#define __E_SELECT_NAMES_MODEL_H__
-
-#include <time.h>
-#include <gtk/gtkobject.h>
-#include <stdio.h>
-#include <e-util/e-list.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-destination.h>
-
-#define E_TYPE_SELECT_NAMES_MODEL            (e_select_names_model_get_type ())
-#define E_SELECT_NAMES_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_MODEL, ESelectNamesModel))
-#define E_SELECT_NAMES_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_MODEL, ESelectNamesModelClass))
-#define E_IS_SELECT_NAMES_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_MODEL))
-#define E_IS_SELECT_NAMES_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_MODEL))
-
-typedef struct _ESelectNamesModel ESelectNamesModel;
-typedef struct _ESelectNamesModelClass ESelectNamesModelClass;
-struct _ESelectNamesModelPrivate;
-
-struct _ESelectNamesModel {
-	GtkObject object;
-	
-	struct _ESelectNamesModelPrivate *priv;
-};
-
-struct _ESelectNamesModelClass {
-	GtkObjectClass parent_class;
-
-	void (*changed) (ESelectNamesModel *model);
-	void (*resized) (ESelectNamesModel *model, gint index, gint old_len, gint new_len);
-};
-
-GtkType e_select_names_model_get_type  (void);
-
-ESelectNamesModel *e_select_names_model_new       (void);
-ESelectNamesModel *e_select_names_model_duplicate (ESelectNamesModel *old);
-
-const gchar  *e_select_names_model_get_textification (ESelectNamesModel *model);
-const gchar  *e_select_names_model_get_address_text  (ESelectNamesModel *model);
-
-gint                e_select_names_model_count               (ESelectNamesModel *model);
-gint                e_select_names_model_get_limit           (ESelectNamesModel *model);
-void                e_select_names_model_set_limit           (ESelectNamesModel *model, gint limit);
-gboolean            e_select_names_model_at_limit            (ESelectNamesModel *model);
-
-const EDestination *e_select_names_model_get_destination     (ESelectNamesModel *model, gint index);
-gchar              *e_select_names_model_export_destinationv (ESelectNamesModel *model);
-void                e_select_names_model_import_destinationv (ESelectNamesModel *model,
-							      gchar *destinationv);
-ECard              *e_select_names_model_get_card            (ESelectNamesModel *model, gint index);
-const gchar        *e_select_names_model_get_string          (ESelectNamesModel *model, gint index);
-
-gboolean      e_select_names_model_contains       (ESelectNamesModel *model, const EDestination *dest);
-
-void          e_select_names_model_insert         (ESelectNamesModel *model, gint index, EDestination *dest);
-void          e_select_names_model_append         (ESelectNamesModel *model, EDestination *dest);
-void          e_select_names_model_replace        (ESelectNamesModel *model, gint index, EDestination *dest);
-void          e_select_names_model_delete         (ESelectNamesModel *model, gint index);
-void          e_select_names_model_delete_all     (ESelectNamesModel *model);
-void          e_select_names_model_overwrite_copy (ESelectNamesModel *dest, ESelectNamesModel *src);
-void          e_select_names_model_merge          (ESelectNamesModel *dest, ESelectNamesModel *src);
-
-void          e_select_names_model_clean      (ESelectNamesModel *model);
-
-void          e_select_names_model_name_pos (ESelectNamesModel *model, gint index, gint *pos, gint *length);
-void          e_select_names_model_text_pos (ESelectNamesModel *model, gint pos, gint *index, gint *start_pos, gint *length);
-
-void          e_select_names_model_cardify            (ESelectNamesModel *model, EBook *book, gint index, gint delay);
-gboolean      e_select_names_model_uncardify          (ESelectNamesModel *model, gint index);
-void          e_select_names_model_cancel_cardify     (ESelectNamesModel *model, gint index);
-void          e_select_names_model_cardify_all        (ESelectNamesModel *model, EBook *book, gint delay);
-void          e_select_names_model_cancel_cardify_all (ESelectNamesModel *model);
-
-/* This is a mildly annoying freeze/thaw pair, in that it only applies to the 'changed'
-   signal and not to 'resized'.  This could cause unexpected results in some cases. */
-void          e_select_names_model_freeze (ESelectNamesModel *model);
-void          e_select_names_model_thaw   (ESelectNamesModel *model);
-
-
-#endif /* ! __E_SELECT_NAMES_MODEL_H__ */
diff --git a/addressbook/gui/component/select-names/e-select-names-popup.c b/addressbook/gui/component/select-names/e-select-names-popup.c
deleted file mode 100644
index a6e6bdea8e..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-popup.c
+++ /dev/null
@@ -1,561 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-select-names-popup.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#include <glib.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-app-helper.h>
-#include <libgnomeui/gnome-popup-menu.h>
-#include <gal/widgets/e-unicode.h>
-
-#include <addressbook/backend/ebook/e-book-util.h>
-#include <addressbook/gui/contact-editor/e-contact-editor.h>
-#include <addressbook/gui/contact-editor/e-contact-quick-add.h>
-#include "e-addressbook-util.h"
-#include "e-select-names-popup.h"
-
-typedef struct _PopupInfo PopupInfo;
-struct _PopupInfo {
-	ESelectNamesModel *model;
-	const EDestination *dest;
-	gint pos;
-	gint index;
-};
-
-static PopupInfo *
-popup_info_new (ESelectNamesModel *model, const EDestination *dest, gint pos, gint index)
-{
-	PopupInfo *info = g_new0 (PopupInfo, 1);
-	info->model = model;
-	info->dest = dest;
-	info->pos = pos;
-	info->index = index;
-
-	if (model)
-		gtk_object_ref (GTK_OBJECT (model));
-
-	if (dest)
-		gtk_object_ref (GTK_OBJECT (dest));
-
-	return info;
-}
-
-static void
-popup_info_free (PopupInfo *info)
-{
-	if (info) {
-		
-		if (info->model)
-			gtk_object_unref (GTK_OBJECT (info->model));
-
-		if (info->dest)
-			gtk_object_unref (GTK_OBJECT (info->dest));
-
-		g_free (info);
-	}
-}
-
-static void
-popup_info_cleanup (GtkWidget *w, gpointer info)
-{
-	popup_info_free ((PopupInfo *) info);
-}
-
-/* You are in a maze of twisty little callbacks, all alike... */
-
-static void
-make_contact_editor_cb (EBook *book, gpointer user_data)
-{
-	if (book) {
-		EDestination *dest = E_DESTINATION (user_data);
-		ECard *card;
-
-		card = (ECard *) e_destination_get_card (dest);
-		if (e_card_evolution_list (card)) {
-			EContactListEditor *ce;
-			ce = e_addressbook_show_contact_list_editor (book, card, FALSE, TRUE);
-			e_contact_list_editor_raise (ce);
-		}
-		else {
-			EContactEditor *ce;
-			ce = e_addressbook_show_contact_editor (book, card, FALSE, TRUE);
-			e_contact_editor_raise (ce);
-		}
-		gtk_object_unref (GTK_OBJECT (dest));
-	}
-}
-
-static void
-edit_contact_info_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	if (info == NULL)
-		return;
-
-	gtk_object_ref (GTK_OBJECT (info->dest));
-	e_book_use_local_address_book (make_contact_editor_cb, (gpointer) info->dest);
-}
-
-static void
-change_email_num_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	gint n;
-	EDestination *dest;
-	
-	if (info == NULL) 
-		return;
-
-	if (! GTK_CHECK_MENU_ITEM (w)->active)
-		return;
-
-	n = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (w), "number"));
-
-	if (n != e_destination_get_email_num (info->dest)) {
-		dest = e_destination_new ();
-		e_destination_set_card (dest, e_destination_get_card (info->dest), n);
-		e_select_names_model_replace (info->model, info->index, dest);
-
-	}
-}
-
-static void
-remove_recipient_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	e_select_names_model_delete (info->model, info->index);
-}
-
-static void
-add_remove_recipient (GnomeUIInfo *uiinfo, PopupInfo *info)
-{
-	uiinfo->type = GNOME_APP_UI_ITEM;
-	uiinfo->label = _("Remove");
-	uiinfo->moreinfo = remove_recipient_cb;
-}
-
-static void
-remove_all_recipients_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	e_select_names_model_delete_all (info->model);
-}
-
-static void
-add_remove_all_recipients (GnomeUIInfo *uiinfo, PopupInfo *info)
-{
-	uiinfo->type = GNOME_APP_UI_ITEM;
-	uiinfo->label = _("Remove All");
-	uiinfo->moreinfo = remove_all_recipients_cb;
-}
-
-static void
-toggle_html_mail_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	GtkCheckMenuItem *item = GTK_CHECK_MENU_ITEM (w);
-	const EDestination *dest;
-
-	if (info == NULL)
-		return;
-
-	dest = info->dest;
-
-	item = GTK_CHECK_MENU_ITEM (item);
-	e_destination_set_html_mail_pref ((EDestination *) dest, item->active);
-}
-
-static void
-add_html_mail (GnomeUIInfo *uiinfo, PopupInfo *info)
-{
-	uiinfo->type = GNOME_APP_UI_TOGGLEITEM;
-	uiinfo->label = _("Send HTML Mail?");
-	uiinfo->moreinfo = toggle_html_mail_cb;
-}
-
-static void
-init_html_mail (GnomeUIInfo *uiinfo, PopupInfo *info)
-{
-	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (uiinfo->widget),
-					e_destination_get_html_mail_pref (info->dest));
-	gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (uiinfo->widget), TRUE);
-
-}
-
-static void
-set_uiinfo_label (GnomeUIInfo *uiinfo, const gchar *str)
-{
-	GtkWidget *label;
-	gchar *label_txt;
-	GList *item_children;
-	
-	label_txt = e_utf8_to_locale_string (str);
-	item_children = gtk_container_children (GTK_CONTAINER (uiinfo->widget));
-	label = item_children->data;
-	g_list_free (item_children);
-	gtk_label_set_text (GTK_LABEL (label), label_txt);
-	g_free (label_txt);
-}
-
-#define ARBITRARY_UIINFO_LIMIT 64
-static GtkWidget *
-popup_menu_card (PopupInfo *info)
-{
-	GnomeUIInfo uiinfo[ARBITRARY_UIINFO_LIMIT];
-	GnomeUIInfo radioinfo[ARBITRARY_UIINFO_LIMIT];
-	gboolean using_radio = FALSE;
-	ECard *card;
-	gint i=0;
-	GtkWidget *pop;
-	EIterator *iterator;
-	gint html_toggle;
-	gint mail_label = -1;
-	const gchar *mail_label_str = NULL;
-
-	/*
-	 * Build up our GnomeUIInfo array.
-	 */
-
-	memset (uiinfo, 0, sizeof (uiinfo));
-	memset (radioinfo, 0, sizeof (radioinfo));
-
-	card = e_destination_get_card (info->dest);
-
-	/* Use an empty label for now, we'll fill it later.
-	   If we set uiinfo label to contact name here, gnome_popup_menu_new
-	   could screw it up trying make a "translation". */
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = "";
-	++i;
-
-	uiinfo[i].type = GNOME_APP_UI_SEPARATOR;
-	++i;
-
-	if (card->email) {
-		
-		if (e_list_length (card->email) > 1) {
-			gint j = 0;
-
-			using_radio = TRUE;
-
-			iterator = e_list_get_iterator (card->email);
-			for (e_iterator_reset (iterator); e_iterator_is_valid (iterator); e_iterator_next (iterator)) {
-				gchar *label = (gchar *)e_iterator_get (iterator);
-				if (label && *label) {
-					radioinfo[j].label = "";
-					radioinfo[j].type = GNOME_APP_UI_ITEM;
-					radioinfo[j].moreinfo = change_email_num_cb;
-					++j;
-				}
-			}
-			gtk_object_unref (GTK_OBJECT (iterator));
-			
-			radioinfo[j].type = GNOME_APP_UI_ENDOFINFO;
-			
-			uiinfo[i].type = GNOME_APP_UI_RADIOITEMS;
-			uiinfo[i].moreinfo = radioinfo;
-			++i;
-			
-		} else {
-			uiinfo[i].type = GNOME_APP_UI_ITEM;
-			uiinfo[i].label = "";
-			mail_label_str = e_destination_get_email (info->dest);
-			mail_label = i;
-			++i;
-		}
-
-		uiinfo[i].type = GNOME_APP_UI_SEPARATOR;
-		++i;
-	}
-
-	add_html_mail (&(uiinfo[i]), info);
-	html_toggle = i;
-	++i;
-
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = N_("Edit Contact Info");
-	uiinfo[i].moreinfo = edit_contact_info_cb;
-	++i;
-
-	add_remove_recipient (&(uiinfo[i]), info);
-	++i;
-	
-	add_remove_all_recipients (&(uiinfo[i]), info);
-	++i;
-		
-	uiinfo[i].type = GNOME_APP_UI_ENDOFINFO;
-
-	/*
-	 * Now do something with it...
-	 */
-
-	pop = gnome_popup_menu_new (uiinfo);
-
-	init_html_mail (&(uiinfo[html_toggle]), info);
-
-	/* Properly handle the names & e-mail addresses so that they don't get leaked and so that
-	   underscores are interpreted as key accelerators.  This sucks. */
-
-	set_uiinfo_label (&(uiinfo[0]), e_destination_get_name (info->dest));
-	
-	if (mail_label >= 0) {
-		set_uiinfo_label (&(uiinfo[mail_label]), e_destination_get_email (info->dest));
-	}
-
-	if (using_radio) {
-		gint n = e_destination_get_email_num (info->dest);
-		gint j = 0;
-		iterator = e_list_get_iterator (card->email);
-		for (e_iterator_reset (iterator); e_iterator_is_valid (iterator); e_iterator_next (iterator)) {
-			gchar *label = (gchar *)e_iterator_get (iterator);
-			if (label && *label) {
-				set_uiinfo_label (&(radioinfo[j]), label);
-				
-				gtk_object_set_data (GTK_OBJECT (radioinfo[j].widget), "number", GINT_TO_POINTER (j));
-
-				if (j == n) 
-					gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (radioinfo[n].widget), TRUE);
-				
-				++j;
-			}
-		}
-		gtk_object_unref (GTK_OBJECT (iterator));
-	}
-
-	return pop;
-}
-
-static GtkWidget *
-popup_menu_list (PopupInfo *info)
-{
-	GnomeUIInfo uiinfo[ARBITRARY_UIINFO_LIMIT];
-	GtkWidget *pop;
-	const gchar *str;
-	gchar *gs;
-	gint i = 0, subcount = 0, max_subcount = 10;
-	ECard *card;
-	EIterator *iterator;
-
-	memset (uiinfo, 0, sizeof (uiinfo));
-
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = "";
-	++i;
-
-	uiinfo[i].type = GNOME_APP_UI_SEPARATOR;
-	++i;
-
-	card = e_destination_get_card (info->dest);
-
-	if (card->email) {
-		
-		iterator = e_list_get_iterator (card->email);
-		for (e_iterator_reset (iterator); e_iterator_is_valid (iterator) && subcount < max_subcount; e_iterator_next (iterator)) {
-			gchar *label = (gchar *) e_iterator_get (iterator);
-			if (label && *label) {
-				uiinfo[i].type = GNOME_APP_UI_ITEM;
-				uiinfo[i].label = "";
-				++i;
-				++subcount;
-			}
-		}
-		if (e_iterator_is_valid (iterator)) {
-			uiinfo[i].type = GNOME_APP_UI_ITEM;
-			uiinfo[i].label = "";
-			++i;
-		}
-		
-		uiinfo[i].type = GNOME_APP_UI_SEPARATOR;
-		++i;
-
-		gtk_object_unref (GTK_OBJECT (iterator));
-	}
-
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = N_("Edit Contact List");
-	uiinfo[i].moreinfo = edit_contact_info_cb;
-	++i;
-
-	add_remove_recipient (&(uiinfo[i]), info);
-	++i;
-	
-	add_remove_all_recipients (&(uiinfo[i]), info);
-	++i;
-
-	uiinfo[i].type = GNOME_APP_UI_ENDOFINFO;
-
-	pop = gnome_popup_menu_new (uiinfo);
-
-	/* Now set labels properly. */
-	
-	str = e_destination_get_name (info->dest);
-	if (!(str && *str))
-		str = _("Unnamed Contact List");
-	set_uiinfo_label (&(uiinfo[0]), str);
-
-	if (card->email) {
-		
-		iterator = e_list_get_iterator (card->email);
-		i = 2;
-		for (e_iterator_reset (iterator); e_iterator_is_valid (iterator) && subcount < max_subcount; e_iterator_next (iterator)) {
-			gchar *label = (gchar *) e_iterator_get (iterator);
-			if (label && *label) {
-				EDestination *subdest = e_destination_import (label);
-				set_uiinfo_label (&(uiinfo[i]), e_destination_get_address (subdest));
-				++i;
-				gtk_object_unref (GTK_OBJECT (subdest));
-			}
-		}
-		if (e_iterator_is_valid (iterator)) {
-			gs = g_strdup_printf (N_("(%d not shown)"), e_list_length (card->email) - max_subcount);
-			set_uiinfo_label (&(uiinfo[i]), gs);
-			g_free (gs);
-		}
-
-		gtk_object_unref (GTK_OBJECT (iterator));
-	}
-
-
-	return pop;
-}
-
-static void
-quick_add_cb (GtkWidget *w, gpointer user_data)
-{
-	PopupInfo *info = (PopupInfo *) user_data;
-	e_contact_quick_add_free_form (e_destination_get_address (info->dest), NULL, NULL);
-}
-
-static GtkWidget *
-popup_menu_nocard (PopupInfo *info)
-{
-	GnomeUIInfo uiinfo[ARBITRARY_UIINFO_LIMIT];
-	gint i=0;
-	GtkWidget *pop;
-	const gchar *str;
-	gint html_toggle;
-
-	memset (uiinfo, 0, sizeof (uiinfo));
-
-	/* Use an empty label for now, we'll fill it later.
-	   If we set uiinfo label to contact name here, gnome_popup_menu_new
-	   could screw it up trying make a "translation". */
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = "";
-	++i;
-
-	uiinfo[i].type = GNOME_APP_UI_SEPARATOR;
-	++i;
-
-	add_html_mail (&(uiinfo[i]), info);
-	html_toggle = i;
-	++i;
-	
-	uiinfo[i].type = GNOME_APP_UI_ITEM;
-	uiinfo[i].label = _("Add to Contacts");
-	uiinfo[i].moreinfo = quick_add_cb;
-	++i;
-
-	add_remove_recipient (&(uiinfo[i]), info);
-	++i;
-
-	add_remove_all_recipients (&(uiinfo[i]), info);
-	++i;
-
-	uiinfo[i].type = GNOME_APP_UI_ENDOFINFO;
-
-	pop = gnome_popup_menu_new (uiinfo);
-
-	init_html_mail (&(uiinfo[html_toggle]), info);
-
-	/* Now set label of the first item to contact name */
-	str = e_destination_get_name (info->dest);
-	if (! (str && *str))
-		str = e_destination_get_email (info->dest);
-	if (! (str && *str))
-		str = _("Unnamed Contact");
-	
-	set_uiinfo_label (&(uiinfo[0]), str);
-	
-	return pop;
-}
-
-void
-e_select_names_popup (ESelectNamesModel *model, GdkEventButton *ev, gint pos)
-{
-	GtkWidget *popup;
-	PopupInfo *info;
-	const EDestination *dest;
-	ECard *card;
-	gint index;
-
-	g_return_if_fail (model && E_IS_SELECT_NAMES_MODEL (model));
-	g_return_if_fail (ev);
-	g_return_if_fail (0 <= pos);
-
-	e_select_names_model_text_pos (model, pos, &index, NULL, NULL);
-	if (index < 0 || index >= e_select_names_model_count (model))
-		return;
-
-	dest = e_select_names_model_get_destination (model, index);
-	if (e_destination_is_empty (dest))
-		return;
-
-	card = e_destination_get_card (dest);
-
-	info = popup_info_new (model, dest, pos, index);
-	
-	if (e_destination_contains_card (dest)) {
-		if (e_destination_is_evolution_list (dest))
-			popup = popup_menu_list (info);
-		else
-			popup = popup_menu_card (info);
-	} else {
-		popup = popup_menu_nocard (info);
-	}
-
-	if (popup) {
-		/* Clean up our info item after we've made our selection. */
-		gtk_signal_connect (GTK_OBJECT (popup),
-				    "selection-done",
-				    GTK_SIGNAL_FUNC (popup_info_cleanup),
-				    info);
-
-		gnome_popup_menu_do_popup (popup, NULL, NULL, ev, info);
-
-	} else {
-
-		popup_info_free (info);
-
-	}
-}
diff --git a/addressbook/gui/component/select-names/e-select-names-popup.h b/addressbook/gui/component/select-names/e-select-names-popup.h
deleted file mode 100644
index 5a4685f8cb..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-popup.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-select-names-popup.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __E_SELECT_NAMES_POPUP_H__
-#define __E_SELECT_NAMES_POPUP_H__
-
-#include "e-select-names-model.h"
-
-void e_select_names_popup (ESelectNamesModel *model, GdkEventButton *ev, gint pos);
-
-#endif /* __E_SELECT_NAMES_POPUP_H__ */
-
diff --git a/addressbook/gui/component/select-names/e-select-names-table-model.c b/addressbook/gui/component/select-names/e-select-names-table-model.c
deleted file mode 100644
index a4faf69503..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-table-model.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@ximian.com>
- *
- * Copyright (C) 2000 Ximian, Inc.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gtk/gtksignal.h>
-#include <gal/util/e-util.h>
-
-#include "e-select-names-table-model.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_SOURCE,
-};
-
-static void e_select_names_table_model_init       (ESelectNamesTableModel *model);
-static void e_select_names_table_model_class_init (ESelectNamesTableModelClass *klass);
-
-static void e_select_names_table_model_destroy    (GtkObject *object);
-static void e_select_names_table_model_set_arg    (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_select_names_table_model_get_arg    (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void e_select_names_table_model_model_changed (ESelectNamesModel *source,
-						      ESelectNamesTableModel *model);
-
-
-static void
-e_select_names_table_model_add_source (ESelectNamesTableModel *model,
-				       ESelectNamesModel     *source)
-{
-	model->source = source;
-	if (model->source)
-		gtk_object_ref(GTK_OBJECT(model->source));
-	model->source_changed_id = gtk_signal_connect(GTK_OBJECT(model->source), "changed",
-						      GTK_SIGNAL_FUNC(e_select_names_table_model_model_changed),
-						      model);
-}
-
-static void
-e_select_names_table_model_drop_source (ESelectNamesTableModel *model)
-{
-	if (model->source_changed_id)
-		gtk_signal_disconnect(GTK_OBJECT(model->source), model->source_changed_id);
-	if (model->source)
-		gtk_object_unref(GTK_OBJECT(model->source));
-	model->source = NULL;
-	model->source_changed_id = 0;
-}
-
-/**
- * e_select_names_table_model_get_type:
- * @void: 
- * 
- * Registers the &ESelectNamesTableModel class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ESelectNamesTableModel class.
- **/
-GtkType
-e_select_names_table_model_get_type (void)
-{
-	static GtkType model_type = 0;
-
-	if (!model_type) {
-		GtkTypeInfo model_info = {
-			"ESelectNamesTableModel",
-			sizeof (ESelectNamesTableModel),
-			sizeof (ESelectNamesTableModelClass),
-			(GtkClassInitFunc) e_select_names_table_model_class_init,
-			(GtkObjectInitFunc) e_select_names_table_model_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		model_type = gtk_type_unique (e_table_model_get_type (), &model_info);
-	}
-
-	return model_type;
-}
-
-/**
- * e_select_names_table_model_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ESelectNamesTableModel that wraps the @VCard.
- */
-ETableModel *
-e_select_names_table_model_new (ESelectNamesModel *source)
-{
-	ETableModel *model = E_TABLE_MODEL(gtk_type_new(e_select_names_table_model_get_type()));
-	gtk_object_set(GTK_OBJECT(model),
-		       "source", source,
-		       NULL);
-	return model;
-}
-
-static void
-fill_in_info (ESelectNamesTableModel *model)
-{
-	if (model->source) {
-		int count = e_select_names_model_count (model->source);
-		gint i;
-
-		model->count = count;
-		model->data = g_new(ESelectNamesTableModelData, count);
-
-		for (i = 0; i < count; ++i) {
-			const EDestination *dest = e_select_names_model_get_destination (model->source, i);
-			ECard *card = dest ? e_destination_get_card (dest) : NULL;
-
-			if (card) {
-				ECardSimple *simple = e_card_simple_new(card);
-				model->data[i].name =  e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_NAME_OR_ORG);
-				if (model->data[i].name == 0)
-					model->data[i].name = g_strdup("");
-				model->data[i].email = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_EMAIL);
-				if (model->data[i].email == 0)
-					model->data[i].email = g_strdup("");
-				gtk_object_unref(GTK_OBJECT(simple));
-			} else {
-				const gchar *name = e_destination_get_name (dest);
-				const gchar *email = e_destination_get_email (dest);
-
-				model->data[i].name =  g_strdup (name && *name ? name : email);
-				model->data[i].email = g_strdup (email);
-			}
-		}
-	} else {
-		model->count = 0;
-	}
-}
-
-static void
-clear_info (ESelectNamesTableModel *model)
-{
-	int i;
-	for (i = 0; i < model->count; i++) {
-		g_free(model->data[i].name);
-		g_free(model->data[i].email);
-	}
-	g_free(model->data);
-	model->data = NULL;
-	model->count = -1;
-}
-
-/*
- * ESelectNamesTableModel lifecycle management and vcard loading/saving.
- */
-
-static void
-e_select_names_table_model_destroy (GtkObject *object)
-{
-	ESelectNamesTableModel *model;
-	
-	model = E_SELECT_NAMES_TABLE_MODEL (object);
-
-	e_select_names_table_model_drop_source (model);
-	clear_info(model);
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-e_select_names_table_model_col_count (ETableModel *etc)
-{
-	return 2;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-e_select_names_table_model_row_count (ETableModel *etc)
-{
-	ESelectNamesTableModel *e_select_names_table_model = E_SELECT_NAMES_TABLE_MODEL(etc);
-	if (e_select_names_table_model->count == -1) {
-		if (e_select_names_table_model->source) {
-			fill_in_info(e_select_names_table_model);
-		} else {
-			return 0;
-		}
-	}
-	return e_select_names_table_model->count;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-e_select_names_table_model_value_at (ETableModel *etc, int col, int row)
-{
-	ESelectNamesTableModel *e_select_names_table_model = E_SELECT_NAMES_TABLE_MODEL(etc);
-	if (e_select_names_table_model->data == NULL) {
-		fill_in_info(e_select_names_table_model);
-	}
-	switch (col) {
-	case 0:
-		if (e_select_names_table_model->data[row].name == NULL) {
-			fill_in_info(e_select_names_table_model);
-		}
-		return e_select_names_table_model->data[row].name;
-		break;
-	case 1:
-		if (e_select_names_table_model->data[row].email == NULL) {
-			fill_in_info(e_select_names_table_model);
-		}
-		return e_select_names_table_model->data[row].email;
-		break;
-	}
-	return "";
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-e_select_names_table_model_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-e_select_names_table_model_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	return FALSE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-e_select_names_table_model_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-e_select_names_table_model_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-e_select_names_table_model_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-e_select_names_table_model_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-e_select_names_table_model_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-static void
-e_select_names_table_model_model_changed (ESelectNamesModel     *source,
-					  ESelectNamesTableModel *model)
-{
-	e_table_model_pre_change(E_TABLE_MODEL(model));
-	clear_info(model);
-	e_table_model_changed(E_TABLE_MODEL(model));
-}
-
-/* Set_arg handler for the model */
-static void
-e_select_names_table_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesTableModel *model;
-	
-	model = E_SELECT_NAMES_TABLE_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_SOURCE:
-		e_select_names_table_model_drop_source (model);
-		e_select_names_table_model_add_source (model, E_SELECT_NAMES_MODEL(GTK_VALUE_OBJECT (*arg)));
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the model */
-static void
-e_select_names_table_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesTableModel *model;
-
-	model = E_SELECT_NAMES_TABLE_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_SOURCE:
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(model->source);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-/**
- * e_select_names_table_model_init:
- */
-static void
-e_select_names_table_model_init (ESelectNamesTableModel *model)
-{
-	model->source = NULL;
-	model->source_changed_id = 0;
-
-	model->count = -1;
-	model->data = NULL;
-}
-
-static void
-e_select_names_table_model_class_init (ESelectNamesTableModelClass *klass)
-{
-	GtkObjectClass *object_class;
-	ETableModelClass *table_model_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	table_model_class = E_TABLE_MODEL_CLASS(klass);
-
-	gtk_object_add_arg_type ("ESelectNamesTableModel::source",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_SOURCE);
-
-	object_class->destroy = e_select_names_table_model_destroy;
-	object_class->get_arg = e_select_names_table_model_get_arg;
-	object_class->set_arg = e_select_names_table_model_set_arg;
-
-	table_model_class->column_count = e_select_names_table_model_col_count;
-	table_model_class->row_count = e_select_names_table_model_row_count;
-	table_model_class->value_at = e_select_names_table_model_value_at;
-	table_model_class->set_value_at = e_select_names_table_model_set_value_at;
-	table_model_class->is_cell_editable = e_select_names_table_model_is_cell_editable;
-	table_model_class->duplicate_value = e_select_names_table_model_duplicate_value;
-	table_model_class->free_value = e_select_names_table_model_free_value;
-	table_model_class->initialize_value = e_select_names_table_model_initialize_value;
-	table_model_class->value_is_empty = e_select_names_table_model_value_is_empty;
-	table_model_class->value_to_string = e_select_names_table_model_value_to_string;
-}
diff --git a/addressbook/gui/component/select-names/e-select-names-table-model.h b/addressbook/gui/component/select-names/e-select-names-table-model.h
deleted file mode 100644
index f917ff17d8..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-table-model.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * Copyright (C) 2000 Ximian, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_TABLE_MODEL_H__
-#define __E_SELECT_NAMES_TABLE_MODEL_H__
-
-#include <time.h>
-#include <stdio.h>
-#include <gtk/gtkobject.h>
-#include <gal/e-table/e-table-model.h>
-#include "e-select-names-model.h"
-
-#define E_TYPE_SELECT_NAMES_TABLE_MODEL            (e_select_names_table_model_get_type ())
-#define E_SELECT_NAMES_TABLE_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_TABLE_MODEL, ESelectNamesTableModel))
-#define E_SELECT_NAMES_TABLE_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_TABLE_MODEL, ESelectNamesTableModelClass))
-#define E_IS_SELECT_NAMES_TABLE_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_TABLE_MODEL))
-#define E_IS_SELECT_NAMES_TABLE_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_TABLE_MODEL))
-
-typedef struct {
-	char *name;
-	char *email;
-} ESelectNamesTableModelData;
-
-typedef struct _ESelectNamesTableModel ESelectNamesTableModel;
-typedef struct _ESelectNamesTableModelClass ESelectNamesTableModelClass;
-
-struct _ESelectNamesTableModel {
-	ETableModel parent;
-
-	ESelectNamesModel *source;
-	int source_changed_id;
-
-	int count;
-	ESelectNamesTableModelData *data; /* This is used as an array. */
-};
-
-struct _ESelectNamesTableModelClass {
-	ETableModelClass parent_class;
-};
-
-ETableModel *e_select_names_table_model_new  (ESelectNamesModel *source);
-
-/* Standard Gtk function */			      
-GtkType     e_select_names_table_model_get_type (void);
-
-#endif /* ! __E_SELECT_NAMES_TABLE_MODEL_H__ */
diff --git a/addressbook/gui/component/select-names/e-select-names-text-model.c b/addressbook/gui/component/select-names/e-select-names-text-model.c
deleted file mode 100644
index d2e77d6316..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-text-model.c
+++ /dev/null
@@ -1,739 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey    <clahey@ximian.com>
- *   Jon Trowbridge <trow@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <gal/e-text/e-text-model-repos.h>
-
-#include <addressbook/gui/contact-editor/e-contact-editor.h>
-#include "e-select-names-text-model.h"
-#include "e-addressbook-util.h"
-
-static FILE *out = NULL; /* stream for debugging spew */
-
-#define SEPLEN 2
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_SOURCE,
-};
-
-static void e_select_names_text_model_class_init (ESelectNamesTextModelClass *klass);
-static void e_select_names_text_model_init       (ESelectNamesTextModel *model);
-static void e_select_names_text_model_destroy    (GtkObject *object);
-static void e_select_names_text_model_set_arg    (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_select_names_text_model_get_arg    (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void e_select_names_text_model_set_source (ESelectNamesTextModel *model, ESelectNamesModel *source);
-
-static const gchar *e_select_names_text_model_get_text      (ETextModel *model);
-static void         e_select_names_text_model_set_text      (ETextModel *model, const gchar *text);
-static void         e_select_names_text_model_insert        (ETextModel *model, gint position, const gchar *text);
-static void         e_select_names_text_model_insert_length (ETextModel *model, gint position, const gchar *text, gint length);
-static void         e_select_names_text_model_delete        (ETextModel *model, gint position, gint length);
-
-static gint         e_select_names_text_model_obj_count   (ETextModel *model);
-static const gchar *e_select_names_text_model_get_nth_obj (ETextModel *model, gint n, gint *len);
-static void         e_select_names_text_model_activate_obj (ETextModel *model, gint n);
-
-
-ETextModelClass *parent_class;
-#define PARENT_TYPE e_text_model_get_type()
-
-/**
- * e_select_names_text_model_get_type:
- * @void: 
- * 
- * Registers the &ESelectNamesTextModel class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ESelectNamesTextModel class.
- **/
-GtkType
-e_select_names_text_model_get_type (void)
-{
-	static GtkType model_type = 0;
-
-	if (!model_type) {
-		GtkTypeInfo model_info = {
-			"ESelectNamesTextModel",
-			sizeof (ESelectNamesTextModel),
-			sizeof (ESelectNamesTextModelClass),
-			(GtkClassInitFunc) e_select_names_text_model_class_init,
-			(GtkObjectInitFunc) e_select_names_text_model_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		model_type = gtk_type_unique (PARENT_TYPE, &model_info);
-	}
-
-	return model_type;
-}
-
-static void
-e_select_names_text_model_class_init (ESelectNamesTextModelClass *klass)
-{
-	GtkObjectClass *object_class;
-	ETextModelClass *text_model_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	text_model_class = E_TEXT_MODEL_CLASS(klass);
-
-	parent_class = gtk_type_class(PARENT_TYPE);
-
-	gtk_object_add_arg_type ("ESelectNamesTextModel::source",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_SOURCE);
-
-	object_class->destroy = e_select_names_text_model_destroy;
-	object_class->get_arg = e_select_names_text_model_get_arg;
-	object_class->set_arg = e_select_names_text_model_set_arg;
-
-	text_model_class->get_text      = e_select_names_text_model_get_text;
-	text_model_class->set_text      = e_select_names_text_model_set_text;
-	text_model_class->insert        = e_select_names_text_model_insert;
-	text_model_class->insert_length = e_select_names_text_model_insert_length;
-	text_model_class->delete        = e_select_names_text_model_delete;
-
-	text_model_class->obj_count     = e_select_names_text_model_obj_count;
-	text_model_class->get_nth_obj   = e_select_names_text_model_get_nth_obj;
-	text_model_class->object_activated = e_select_names_text_model_activate_obj;
-
-	if (getenv ("EVO_DEBUG_SELECT_NAMES_TEXT_MODEL")) {
-		out = fopen ("/tmp/evo-debug-select-names-text-model", "w");
-		if (out)
-			setvbuf (out, NULL, _IONBF, 0);
-	}
-}
-
-static void
-dump_model (ESelectNamesTextModel *text_model)
-{
-	ESelectNamesModel *model = text_model->source;
-	gint i;
-
-	if (out == NULL)
-		return;
-	
-	fprintf (out, "\n*** Model State: count=%d\n", e_select_names_model_count (model));
-
-	for (i=0; i<e_select_names_model_count (model); ++i)
-		fprintf (out, "[%d] \"%s\" %s\n", i,
-			 e_select_names_model_get_string (model, i),
-			 e_select_names_model_get_card (model, i) ? "<card>" : "");
-	fprintf (out, "\n");
-}
-
-static void
-e_select_names_text_model_init (ESelectNamesTextModel *model)
-{
-	model->last_magic_comma_pos = -1;
-}
-
-static void
-e_select_names_text_model_destroy (GtkObject *object)
-{
-	ESelectNamesTextModel *model;
-	
-	model = E_SELECT_NAMES_TEXT_MODEL (object);
-	
-	e_select_names_text_model_set_source (model, NULL);
-	
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		GTK_OBJECT_CLASS(parent_class)->destroy(object);
-}
-
-static void
-e_select_names_text_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesTextModel *model;
-	
-	model = E_SELECT_NAMES_TEXT_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_SOURCE:
-		e_select_names_text_model_set_source(model, E_SELECT_NAMES_MODEL (GTK_VALUE_OBJECT (*arg)));
-		break;
-	default:
-		return;
-	}
-}
-
-static void
-e_select_names_text_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesTextModel *model;
-
-	model = E_SELECT_NAMES_TEXT_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_SOURCE:
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(model->source);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-resize_cb (ESelectNamesModel *source, gint index, gint old_len, gint new_len, ETextModel *model)
-{
-	EReposDeleteShift repos_del;
-	EReposInsertShift repos_ins;
-	gint pos;
-
-	e_select_names_model_name_pos (source, index, &pos, NULL);
-
-	if (new_len < old_len) {
-
-		repos_del.model = model;
-		repos_del.pos = pos;
-		repos_del.len = old_len - new_len;
-		e_text_model_reposition (model, e_repos_delete_shift, &repos_del);
-
-	} else if (old_len < new_len) {
-
-		repos_ins.model = model;
-		repos_ins.pos = pos;
-		repos_ins.len = new_len - old_len;
-		e_text_model_reposition (model, e_repos_insert_shift, &repos_ins);
-
-	}
-}
-
-
-static void
-e_select_names_text_model_set_source (ESelectNamesTextModel *model,
-				      ESelectNamesModel     *source)
-{
-	if (source == model->source)
-		return;
-	
-	if (model->source) {
-		gtk_signal_disconnect (GTK_OBJECT (model->source), model->source_changed_id);
-		gtk_signal_disconnect (GTK_OBJECT (model->source), model->source_resize_id);
-		gtk_object_unref (GTK_OBJECT (model->source));
-	}
-
-	model->source = source;
-
-	if (model->source) {
-		gtk_object_ref (GTK_OBJECT (model->source));
-		model->source_changed_id = gtk_signal_connect_object (GTK_OBJECT(model->source),
-								      "changed",
-								      GTK_SIGNAL_FUNC (e_text_model_changed),
-								      GTK_OBJECT (model));
-		model->source_resize_id = gtk_signal_connect (GTK_OBJECT(model->source),
-							      "resized",
-							      GTK_SIGNAL_FUNC (resize_cb),
-							      model);
-	}
-}
-
-ETextModel *
-e_select_names_text_model_new (ESelectNamesModel *source)
-{
-	ETextModel *model = E_TEXT_MODEL (gtk_type_new (e_select_names_text_model_get_type()));
-	e_select_names_text_model_set_source (E_SELECT_NAMES_TEXT_MODEL (model), source);
-	return model;
-}
-
-static const gchar *
-e_select_names_text_model_get_text (ETextModel *model)
-{
-	ESelectNamesTextModel *snm = E_SELECT_NAMES_TEXT_MODEL(model);
-
-	return snm ? e_select_names_model_get_textification (snm->source) : "";
-}
-
-static void
-e_select_names_text_model_set_text (ETextModel *model, const gchar *text)
-{
-	ESelectNamesTextModel *snm = E_SELECT_NAMES_TEXT_MODEL(model);
-
-	e_select_names_model_delete_all (snm->source);
-	e_select_names_text_model_insert (model, 0, text);
-}
-
-static void
-e_select_names_text_model_insert (ETextModel *model, gint position, const gchar *text)
-{
-	e_select_names_text_model_insert_length (model, position, text, strlen (text));
-}
-
-static void
-e_select_names_text_model_insert_length (ETextModel *model, gint pos, const gchar *text, gint length)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL (model)->source;
-	gint i;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (E_IS_SELECT_NAMES_TEXT_MODEL (model));
-
-	if (out) {
-		gchar *tmp = g_strndup (text, length);
-		fprintf (out, ">> insert  \"%s\" (len=%d) at %d\n", tmp, length, pos);
-		g_free (tmp);
-	}
-
-	pos = CLAMP (pos, 0, strlen (e_select_names_model_get_textification (source)));
-
-	/* We want to control all cursor motions ourselves, rather than taking hints
-	   from the ESelectNamesModel. */
-	gtk_signal_handler_block (GTK_OBJECT (source), E_SELECT_NAMES_TEXT_MODEL (model)->source_resize_id);
-
-	/* We handle this one character at a time. */
-
-	for (i = 0; i < length && text[i]; ++i) {
-		gint index, start_pos, text_len;
-		gboolean inside_quote = FALSE;
-
-		E_SELECT_NAMES_TEXT_MODEL (model)->last_magic_comma_pos = -1;
-
-		if (out) 
-			fprintf (out, "processing [%c]\n", text[i]);
-
-		e_select_names_model_text_pos (source, pos, &index, &start_pos, &text_len);
-
-		if (out) 
-			fprintf (out, "index=%d start_pos=%d text_len=%d\n", index, start_pos, text_len);
-
-		if (text[i] == ',' && index >= 0) { /* Is this a quoted or an unquoted comma we are dealing with? */
-			const EDestination *dest = e_select_names_model_get_destination (source, index);
-			if (dest) {
-				const gchar *str = e_destination_get_textrep (dest);
-				gint j;
-				if (out)
-					fprintf (out, "str=%s pos=%d\n", str, pos);
-				for (j=0; j<pos-start_pos && str[j]; ++j)
-					if (str[j] == '"') {
-						inside_quote = !inside_quote;
-						if (out)
-							fprintf (out, "flip to %d at %d\n", start_pos+j, inside_quote);
-					}
-			}
-			if (out)
-				fprintf (out, inside_quote ? "inside quote\n" : "not inside quote\n");
-		}
-
-
-		if (text[i] == ',' && !inside_quote) {
-
-			/* This is the case of hitting , first thing in an empty entry */
-			if (index == -1) {
-				EReposAbsolute repos;
-				
-				e_select_names_model_insert (source, 0, e_destination_new ());
-				e_select_names_model_insert (source, 0, e_destination_new ());
-
-				repos.model = model;
-				repos.pos = -1; /* At end */
-				e_text_model_reposition (model, e_repos_absolute, &repos);
-				
-
-			} else if (pos <= start_pos || pos == start_pos + text_len) {
-				EReposInsertShift repos;
-				gint ins_point = index;
-
-				if (text_len != 0 && pos == start_pos + text_len)
-					++ins_point;
-				
-				/* Block adjacent blank cards. */
-				if (! ((ins_point < e_select_names_model_count (source) &&
-					(e_select_names_model_get_string (source, ins_point) == NULL)) 
-				       || (ins_point > 0 && (e_select_names_model_get_string (source, ins_point-1) == NULL)))) {
-
-					e_select_names_model_insert (source, ins_point, e_destination_new ());
-
-					repos.model = model;
-					repos.pos = pos;
-					repos.len = SEPLEN;
-					e_text_model_reposition (model, e_repos_insert_shift, &repos);
-					pos += SEPLEN;
-				} 
-
-			} else {
-				EReposInsertShift repos;
-				gint offset = MAX (pos - start_pos, 0);
-				const gchar *str = e_select_names_model_get_string (source, index);
-				gchar *str1 = g_strndup (str, offset);
-				gchar *str2 = g_strdup (str+offset);
-				EDestination *d1 = e_destination_new (), *d2 = e_destination_new ();
-
-				e_destination_set_raw (d1, str1);
-				e_destination_set_raw (d2, str2);
-
-				e_select_names_model_replace (source, index, d1);
-				e_select_names_model_insert (source, index+1, d2);
-
-				g_free (str1);
-				g_free (str2);
-
-				repos.model = model;
-				repos.pos = pos;
-				repos.len = SEPLEN;
-				e_text_model_reposition (model, e_repos_insert_shift, &repos);
-				pos += SEPLEN;
-			}
-
-			E_SELECT_NAMES_TEXT_MODEL (model)->last_magic_comma_pos = pos;
-
-		} else {
-			EReposInsertShift repos;
-			gint offset = MAX (pos - start_pos, 0);
-			const gchar *str;
-			gchar *new_str = NULL;
-			gint this_length = 1;
-			gboolean whitespace = isspace ((gint) text[i]);
-
-			str = index >= 0 ? e_select_names_model_get_string (source, index) : NULL;
-			if (str && *str) {
-				if (pos <= start_pos) {
-					if (whitespace) {
-						/* swallow leading whitespace */
-						this_length = 0;
-					} else {
-						/* Adjust for our "magic white space" */
-						new_str = g_strdup_printf("%c%s%s", text[i], pos < start_pos ? " " : "", str);
-						if (pos < start_pos)
-							++this_length;
-					}
-				} else {
-					new_str = g_strdup_printf ("%.*s%c%s", offset, str, text[i], str + offset);
-				}
-			} else {
-				if (whitespace) {
-					/* swallow leading whitespace */
-					this_length = 0;
-				} else {
-					new_str = g_strdup_printf ("%c", text[i]);
-				}
-			}
-
-			if (new_str) {
-
-				EDestination *dest;
-				dest = index >= 0 ? e_destination_copy (e_select_names_model_get_destination (source, index)) : e_destination_new ();
-				e_destination_set_raw (dest, new_str);
-				e_select_names_model_replace (source, index, dest);
-				
-				/* e_select_names_model_replace (source, index, dest); */
-
-				if (this_length > 0) {
-					repos.model = model;
-					repos.pos = pos;
-					repos.len = this_length;
-					e_text_model_reposition (model, e_repos_insert_shift, &repos);
-
-					pos += this_length;
-				}
-
-				g_free (new_str);
-			}
-		}
-	}
-
-	dump_model (E_SELECT_NAMES_TEXT_MODEL (model));
-
-	gtk_signal_handler_unblock (GTK_OBJECT (source), E_SELECT_NAMES_TEXT_MODEL (model)->source_resize_id);
-}
-
-
-static void
-e_select_names_text_model_delete (ETextModel *model, gint pos, gint length)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL (model)->source;
-	gint index, start_pos, text_len, offset;
-		
-	if (out) {
-		const gchar *str = e_select_names_model_get_textification (source);
-		gint i, len;
-
-		fprintf (out, ">> delete %d at pos %d\n", length, pos);
-
-		len = strlen (str);
-		for (i=0; i<pos && i<len; ++i)
-			fprintf (out, "%c", str[i]);
-		fprintf (out, "[");
-		for (i=pos; i<pos+length && i<len; ++i)
-			fprintf (out, "%c", str[i]);
-		fprintf (out, "]");
-		for (i=pos+length; i<len; ++i)
-			fprintf (out, "%c", str[i]);
-		fprintf (out, "\n");
-	}
-
-	if (length < 0)
-		return;
-
-	if (E_SELECT_NAMES_TEXT_MODEL (model)->last_magic_comma_pos == pos+1
-	    && length == 1) {
-		--pos;
-		if (pos >= 0)
-			++length;
-		E_SELECT_NAMES_TEXT_MODEL (model)->last_magic_comma_pos = -1;
-	}
-
-	e_select_names_model_text_pos (source, pos, &index, &start_pos, &text_len);
-
-	if (out) 
-		fprintf (out, "index=%d, start_pos=%d, text_len=%d\n", index, start_pos, text_len);
-
-	/* We want to control all cursor motions ourselves, rather than taking hints
-	   from the ESelectNamesModel. */
-	gtk_signal_handler_block (GTK_OBJECT (source), E_SELECT_NAMES_TEXT_MODEL (model)->source_resize_id);
-
-	/* First, we handle a few tricky cases. */
-
-	if (pos < start_pos) {
-		EReposAbsolute repos;
-
-		repos.model = model;
-		repos.pos = pos;
-		e_text_model_reposition (model, e_repos_absolute, &repos);
-
-		length -= start_pos - pos;
-
-		if (length > 0)
-			e_select_names_text_model_delete (model, start_pos, length);
-		goto finished;
-	}
-
-	if (pos == start_pos + text_len) {
-		/* We are positioned right at the end of an entry, possibly right in front of a comma. */
-
-		if (index+1 < e_select_names_model_count (source)) {
-			EReposDeleteShift repos;
-			EDestination *new_dest;
-			const gchar *str1 = e_select_names_model_get_string (source, index);
-			const gchar *str2 = e_select_names_model_get_string (source, index+1);
-			gchar *new_str;
-
-			while (str1 && *str1 && isspace ((gint) *str1))
-				++str1;
-			while (str2 && *str2 && isspace ((gint) *str2))
-				++str2;
-			
-			if (str1 && str2)
-				new_str = g_strdup_printf ("%s %s", str1, str2);
-			else if (str1)
-				new_str = g_strdup (str1);
-			else if (str2)
-				new_str = g_strdup (str2);
-			else
-				new_str = g_strdup ("");
-
-			if (out)
-				fprintf (out, "joining \"%s\" and \"%s\" to \"%s\"\n", str1, str2, new_str);
-
-			e_select_names_model_delete (source, index+1);
-
-			new_dest = e_destination_new ();
-			e_destination_set_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 = SEPLEN - 1;
-
-			e_text_model_reposition (model, e_repos_delete_shift, &repos);
-
-			if (length > 1)
-				e_select_names_text_model_delete (model, pos, length-1);
-		} else {
-			/* If we are at the end of the last entry (which we must be if we end up in this block),
-			   we can just do nothing.  So this else-block is here just to give us a place to
-			   put this comment. */
-		}
-
-		goto finished;
-	}
-	
-	if (pos + length > start_pos + text_len) {
-		/* Uh oh... our changes straddle two objects. */
-
-		if (pos == start_pos) { /* Delete the whole thing */
-			EReposDeleteShift repos;
-		
-			e_select_names_model_delete (source, index);
-
-			if (out) 
-				fprintf (out, "deleted all of %d\n", index);
-
-			repos.model = model;
-			repos.pos = pos;
-			repos.len = text_len + SEPLEN;
-		
-			e_text_model_reposition (model, e_repos_delete_shift, &repos);
-
-			length -= text_len + SEPLEN;
-			if (length > 0)
-				e_select_names_text_model_delete (model, pos, length);
-
-		} else {
-			/* Delete right up to the end, and then call e_select_names_text_model_delete again
-			   to finish the job. */
-			gint len1, len2;
-			
-			len1 = text_len - (pos - start_pos);
-			len2 = length - len1;
-
-			if (out) 
-				fprintf (out, "two-stage delete: %d, %d\n", len1, len2);
-
-
-			e_select_names_text_model_delete (model, pos, len1);
-			e_select_names_text_model_delete (model, pos, len2);
-		}
-
-		goto finished;
-	}
-
-	/* Our changes are confined to just one entry. */
-	if (length > 0) {
-		const gchar *str;
-		gchar *new_str;
-		
-		offset = pos - start_pos;
-		
-		str = e_select_names_model_get_string (source, index);
-		new_str = str ? g_strdup_printf ("%.*s%s", offset, str, str + offset + length) : NULL;
-		
-		if (new_str) {
-			EReposDeleteShift repos;
-			EDestination *dest;
-
-			dest = index >= 0 ? e_destination_copy (e_select_names_model_get_destination (source, index)) : e_destination_new ();
-			e_destination_set_raw (dest, new_str);
-			e_select_names_model_replace (source, index, dest);
-			
-			if (out)
-				fprintf (out, "new_str: \"%s\"\n", new_str);
-
-			g_free (new_str);
-			
-			repos.model = model;
-			repos.pos = pos;
-			repos.len = length;
-			
-			e_text_model_reposition (model, e_repos_delete_shift, &repos);
-			
-		} else {
-			EReposDeleteShift repos;
-			
-			e_select_names_model_delete (source, index);
-			
-			if (out)
-				fprintf (out, "deleted %d\n", index);
-
-			
-			repos.model = model;
-			repos.pos = pos;
-			repos.len = SEPLEN;
-			
-			e_text_model_reposition (model, e_repos_delete_shift, &repos);
-		}
-	}
-
- finished:
-	E_SELECT_NAMES_TEXT_MODEL (model)->last_magic_comma_pos = -1;
-	gtk_signal_handler_unblock (GTK_OBJECT (source), E_SELECT_NAMES_TEXT_MODEL (model)->source_resize_id);
-	dump_model (E_SELECT_NAMES_TEXT_MODEL (model));
-}
-
-static gint
-e_select_names_text_model_obj_count (ETextModel *model)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL (model)->source;
-	gint i, count;
-
-	count = i = e_select_names_model_count (source);
-	while (i > 0) {
-		const EDestination *dest;
-		--i;
-		dest = e_select_names_model_get_destination (source, i);
-		if (e_destination_get_card (dest) == NULL)
-			--count;
-	}
-
-	return count;
-}
-
-static gint
-nth_obj_index (ESelectNamesModel *source, gint n)
-{
-	gint i, N;
-
-	i = 0;
-	N = e_select_names_model_count (source);
-	
-	do {
-		const EDestination *dest = e_select_names_model_get_destination (source, i);
-		if (e_destination_get_card (dest))
-			--n;
-		++i;
-	} while (n >= 0 && i < N);
-
-	if (i <= N)
-		--i;
-	else
-		i = -1;
-
-	return i;
-}
-
-static const gchar *
-e_select_names_text_model_get_nth_obj (ETextModel *model, gint n, gint *len)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL (model)->source;
-	const gchar *txt;
-	gint i, pos;
-
-	i = nth_obj_index (source, n);
-	if (i < 0)
-		return NULL;
-	
-	e_select_names_model_name_pos (source, i, &pos,  len);
-	if (pos < 0)
-		return NULL;
-	
-	txt = e_select_names_model_get_textification (source);
-	return txt + pos;
-}
-
-static void
-e_select_names_text_model_activate_obj (ETextModel *model, gint n)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL (model)->source;
-	EContactEditor *contact_editor;
-	ECard *card;
-	gint i;
-
-	i = nth_obj_index (source, n);
-	g_return_if_fail (i >= 0);
-
-	card = e_select_names_model_get_card (source, i);
-	g_return_if_fail (card != NULL);
-	
-	/* present read-only contact editor when someone double clicks from here */
-	contact_editor = e_addressbook_show_contact_editor (e_card_get_book (card), card, FALSE, FALSE);
-	e_contact_editor_raise (contact_editor);
-}
-
-
-
diff --git a/addressbook/gui/component/select-names/e-select-names-text-model.h b/addressbook/gui/component/select-names/e-select-names-text-model.h
deleted file mode 100644
index fa6ab11a63..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-text-model.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey    <clahey@ximian.com>
- *   Jon Trowbridge <trow@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_TEXT_MODEL_H__
-#define __E_SELECT_NAMES_TEXT_MODEL_H__
-
-#include <time.h>
-#include <stdio.h>
-#include <gtk/gtkobject.h>
-#include <gal/e-text/e-text-model.h>
-#include "e-select-names-model.h"
-
-#define E_TYPE_SELECT_NAMES_TEXT_MODEL            (e_select_names_text_model_get_type ())
-#define E_SELECT_NAMES_TEXT_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_TEXT_MODEL, ESelectNamesTextModel))
-#define E_SELECT_NAMES_TEXT_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_TEXT_MODEL, ESelectNamesTextModelClass))
-#define E_IS_SELECT_NAMES_TEXT_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_TEXT_MODEL))
-#define E_IS_SELECT_NAMES_TEXT_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_TEXT_MODEL))
-
-typedef struct _ESelectNamesTextModel ESelectNamesTextModel;
-typedef struct _ESelectNamesTextModelClass ESelectNamesTextModelClass;
-
-struct _ESelectNamesTextModel {
-	ETextModel parent;
-
-	ESelectNamesModel *source;
-	gint source_changed_id;
-	gint source_resize_id;
-
-	gint last_magic_comma_pos;
-};
-
-struct _ESelectNamesTextModelClass {
-	ETextModelClass parent_class;
-};
-
-ETextModel *e_select_names_text_model_new  (ESelectNamesModel *source);
-
-/* Standard Gtk function */			      
-GtkType     e_select_names_text_model_get_type (void);
-
-#endif /* ! __E_SELECT_NAMES_TEXT_MODEL_H__ */
diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c
deleted file mode 100644
index 5d6baa26fa..0000000000
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ /dev/null
@@ -1,955 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-select-names.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
-
-#include <gal/e-table/e-table-simple.h>
-#include <gal/e-table/e-table-without.h>
-#include <gal/widgets/e-font.h>
-#include <gal/widgets/e-popup-menu.h>
-
-#include <addressbook/gui/widgets/e-addressbook-model.h>
-#include <addressbook/gui/widgets/e-addressbook-table-adapter.h>
-#include <addressbook/gui/component/e-cardlist-model.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/gui/component/addressbook-component.h>
-#include <addressbook/gui/component/addressbook-storage.h>
-#include <addressbook/gui/component/addressbook.h>
-#include <shell/evolution-shell-client.h>
-
-#include "e-select-names.h"
-#include <addressbook/backend/ebook/e-card-simple.h>
-#include "e-select-names-table-model.h"
-#include <gal/widgets/e-categories-master-list-combo.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/e-text/e-entry.h>
-#include <e-util/e-categories-master-list-wombat.h>
-
-static void e_select_names_init		(ESelectNames		 *card);
-static void e_select_names_class_init	(ESelectNamesClass	 *klass);
-static void e_select_names_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_select_names_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_select_names_destroy (GtkObject *object);
-
-static GnomeDialogClass *parent_class = NULL;
-#define PARENT_TYPE gnome_dialog_get_type()
-
-/* The arguments we take */
-enum {
-	ARG_0,
-};
-
-typedef struct {
-	char              *title;
-	ETableModel       *model;
-	ESelectNamesModel *source;
-	ESelectNames      *names;
-	GtkWidget         *label;
-} ESelectNamesChild;
-
-GtkType
-e_select_names_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info =
-		{
-			"ESelectNames",
-			sizeof (ESelectNames),
-			sizeof (ESelectNamesClass),
-			(GtkClassInitFunc) e_select_names_class_init,
-			(GtkObjectInitFunc) e_select_names_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-static void
-e_select_names_class_init (ESelectNamesClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass*) klass;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->set_arg = e_select_names_set_arg;
-	object_class->get_arg = e_select_names_get_arg;
-	object_class->destroy = e_select_names_destroy;
-}
-
-#define SPEC "<ETableSpecification no-headers=\"true\" cursor-mode=\"line\"> \
-  <ETableColumn model_col= \"%d\" _title=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-	<ETableState>                   			       \
-		<column source=\"0\"/>     			       \
-	        <grouping> <leaf column=\"0\" ascending=\"true\"/> </grouping> \
-	</ETableState>                  			       \
-</ETableSpecification>"
-
-#define SPEC2 "<ETableSpecification no-headers=\"true\" cursor-mode=\"line\"> \
-  <ETableColumn model_col= \"0\" _title=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-	<ETableState>                   			       \
-		<column source=\"0\"/>     			       \
-        	<grouping> <leaf column=\"0\" ascending=\"true\"/> </grouping> \
-	</ETableState>                  			       \
-</ETableSpecification>"
-
-GtkWidget *e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int num1, int num2);
-
-static void
-set_book(EBook *book, EBookStatus status, EAddressbookModel *model)
-{
-	gtk_object_set(GTK_OBJECT(model),
-		       "book", book,
-		       NULL);
-	gtk_object_unref(GTK_OBJECT(book));
-	gtk_object_unref(GTK_OBJECT(model));
-}
-
-static void
-addressbook_model_set_uri(EAddressbookModel *model, char *uri)
-{
-	EBook *book;
-
-	/* If uri == the current uri, then we don't have to do anything */
-	book = e_addressbook_model_get_ebook (model);
-	if (book) {
-		const gchar *current_uri = e_book_get_uri (book);
-		if (uri && current_uri && !strcmp (uri, current_uri))
-			return;
-	}
-
-	book = e_book_new();
-	gtk_object_ref(GTK_OBJECT(model));
-	addressbook_load_uri(book, uri, (EBookCallback) set_book, model);
-}
-
-static void *
-card_key (ECard *card)
-{
-	EBook *book;
-	const gchar *book_uri;
-	
-	if (card == NULL)
-		return NULL;
-
-	g_assert (E_IS_CARD (card));
-
-	book = e_card_get_book (card);
-	book_uri = book ? e_book_get_uri (book) : "NoBook";
-	return g_strdup_printf ("%s|%s", book_uri ? book_uri : "NoURI", e_card_get_id (card));
-}
-
-static void
-sync_one_model (gpointer k, gpointer val, gpointer closure)
-{
-	ETableWithout *etw = E_TABLE_WITHOUT (closure);
-	ESelectNamesChild *child = val;
-	ESelectNamesModel *model = child->source;
-	gint i, count;
-	ECard *card;
-	void *key;
-	
-	count = e_select_names_model_count (model);
-	for (i = 0; i < count; ++i) {
-		card = e_select_names_model_get_card (model, i);
-		if (card) {
-			key = card_key (card);
-			e_table_without_hide (etw, key);
-			g_free (key);
-		}
-	}
-}
-
-static void
-sync_table_and_models (ESelectNamesModel *triggering_model, ESelectNames *esl)
-{
-	e_table_without_show_all (E_TABLE_WITHOUT (esl->without));
-	g_hash_table_foreach (esl->children, sync_one_model, esl->without);
-}
-
-static void
-real_add_address_cb (int model_row, gpointer closure)
-{
-	ESelectNamesChild *child = closure;
-	ESelectNames *names = child->names;
-	ECard *card;
-	EDestination *dest = e_destination_new ();
-	gint mapped_row;
-
-	mapped_row = e_table_subset_view_to_model_row (E_TABLE_SUBSET (names->without), model_row);
-
-	card = e_addressbook_model_get_card (E_ADDRESSBOOK_MODEL(names->model), mapped_row);
-	
-	if (card != NULL) {
-		e_destination_set_card (dest, card, 0);
-
-		e_select_names_model_append (child->source, dest);
-		e_select_names_model_clean (child->source);
-
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-}
-
-static void
-real_add_address(ESelectNames *names, ESelectNamesChild *child)
-{
-	e_select_names_model_freeze (child->source);
-	e_table_selected_row_foreach(e_table_scrolled_get_table(names->table),
-				     real_add_address_cb, child);
-	e_select_names_model_thaw (child->source);
-}
-
-static void
-add_address(ETable *table, int row, int col, GdkEvent *event, ESelectNames *names)
-{
-	ESelectNamesChild *child;
-
-	child = g_hash_table_lookup(names->children, names->def);
-	if (child) {
-		real_add_address(names, child);
-	}
-}
-
-static void *
-esn_get_key_fn (ETableModel *source, int row, void *closure)
-{
-	EAddressbookModel *model = E_ADDRESSBOOK_MODEL (closure);
-	ECard *card = e_addressbook_model_get_card (model, row);
-	void *key = card_key (card);
-	gtk_object_unref (GTK_OBJECT (card));
-	return key;
-}
-
-static void *
-esn_dup_key_fn (const void *key, void *closure)
-{
-	void *dup = (void *) g_strdup ((const gchar *) key);
-	return dup;
-}
-
-static void
-esn_free_gotten_key_fn (void *key, void *closure)
-{
-	g_free (key);
-}
-
-static void
-esn_free_duped_key_fn (void *key, void *closure)
-{
-	g_free (key);
-}
-
-GtkWidget *
-e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int num1, int num2)
-{
-	ETableModel *adapter;
-	ETableModel *without;
-	EAddressbookModel *model;
-	GtkWidget *table;
-	char *filename;
-	char *uri;
-	char *spec;
-
-	model = e_addressbook_model_new ();
-	adapter = E_TABLE_MODEL (e_addressbook_table_adapter_new (model));
-
-	filename = gnome_util_prepend_user_home("evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf("file://%s", filename);
-
-	addressbook_model_set_uri(model, uri);
-
-	g_free(uri);
-	g_free(filename);
-
-	gtk_object_set(GTK_OBJECT(model),
-		       "editable", FALSE,
-		       "query", "(contains \"email\" \"\")",
-		       NULL);
-
-	without = e_table_without_new (adapter,
-				       g_str_hash,
-				       g_str_equal,
-				       esn_get_key_fn,
-				       esn_dup_key_fn,
-				       esn_free_gotten_key_fn,
-				       esn_free_duped_key_fn,
-				       model);
-
-	spec = g_strdup_printf(SPEC, E_CARD_SIMPLE_FIELD_NAME_OR_ORG);
-	table = e_table_scrolled_new (without, NULL, spec, NULL);
-	g_free(spec);
-
-	gtk_object_set_data(GTK_OBJECT(table), "adapter", adapter);
-	gtk_object_set_data(GTK_OBJECT(table), "without", without);
-	gtk_object_set_data(GTK_OBJECT(table), "model", model);
-
-	return table;
-}
-
-typedef struct {
-	char *description;
-	char *display_name;
-	char *uri;
-
-} ESelectNamesFolder;
-
-static void
-e_select_names_folder_free(ESelectNamesFolder *e_folder)
-{
-	g_free(e_folder->description );
-	g_free(e_folder->display_name);
-	g_free(e_folder->uri);
-	g_free(e_folder);
-}
-
-static void
-e_select_names_option_activated(GtkWidget *widget, ESelectNames *e_select_names)
-{
-	ESelectNamesFolder *e_folder = gtk_object_get_data (GTK_OBJECT (widget), "EsnChoiceFolder");
-
-	addressbook_model_set_uri(e_select_names->model, e_folder->uri);
-}
-
-typedef struct {
-	ESelectNames *names;
-	GtkWidget *menu;
-} NamesAndMenu;
-
-static void
-add_menu_item		(gpointer	key,
-			 gpointer	value,
-			 gpointer	user_data)
-{
-	GtkWidget *menu;
-	GtkWidget *item;
-	ESelectNamesFolder *e_folder;
-	NamesAndMenu *nnm;
-	ESelectNames *e_select_names;
-	gchar *label;
-
-	nnm = user_data;
-	e_folder = value;
-	menu = nnm->menu;
-	e_select_names = nnm->names;
-
-	label = e_utf8_to_locale_string (_(e_folder->display_name));
-	item = gtk_menu_item_new_with_label (label);
-	g_free (label);
-
-	gtk_menu_append (GTK_MENU (menu), item);
-	gtk_object_set_data (GTK_OBJECT (item), "EsnChoiceFolder", e_folder);
-
-	gtk_signal_connect (GTK_OBJECT (item), "activate",
-			    GTK_SIGNAL_FUNC (e_select_names_option_activated),
-			    e_select_names);
-}
-
-static void
-update_option_menu(ESelectNames *e_select_names)
-{
-	GtkWidget *menu;
-	GtkWidget *option;
-
-	option = glade_xml_get_widget (e_select_names->gui,
-				       "optionmenu-folder");
-	if (option) {
-		NamesAndMenu nnm;
-		menu = gtk_menu_new ();
-
-		nnm.names = e_select_names;
-		nnm.menu = menu;
-
-		g_hash_table_foreach	(e_select_names->folders,
-					 add_menu_item,
-					 &nnm);
-
-		gtk_widget_show_all (menu);
-
-		gtk_option_menu_set_menu (GTK_OPTION_MENU (option), 
-					  menu);
-		gtk_option_menu_set_history (GTK_OPTION_MENU (option), 0);
-		gtk_widget_set_sensitive (option, TRUE);
-	}
-}
-
-static void
-new_folder      (EvolutionStorageListener *storage_listener,
-		 const char *path,
-		 const GNOME_Evolution_Folder *folder,
-		 ESelectNames *e_select_names)
-{
-	if (!strcmp(folder->type, "contacts")
-	    || !strcmp(folder->type, "ldap-contacts")) {
-		ESelectNamesFolder *e_folder = g_new(ESelectNamesFolder, 1);
-		e_folder->description  = g_strdup(folder->description );
-		e_folder->display_name = g_strdup(folder->displayName);
-		if (!strncmp (folder->physicalUri, "file:", 5))
-			e_folder->uri = g_strdup_printf ("%s/addressbook.db", folder->physicalUri);
-		else
-			e_folder->uri = g_strdup(folder->physicalUri);
-		g_hash_table_insert(e_select_names->folders,
-				    g_strdup(path), e_folder);
-		update_option_menu(e_select_names);
-	}
-}
-
-static void
-removed_folder  (EvolutionStorageListener *storage_listener,
-		 const char *path,
-		 ESelectNames *e_select_names)
-{
-	ESelectNamesFolder *e_folder;
-	char *orig_path;
-
-	if (g_hash_table_lookup_extended(e_select_names->folders, path, (void **) &orig_path, (void **) &e_folder)) {
-		g_hash_table_remove(e_select_names->folders, path);
-		e_select_names_folder_free(e_folder);
-		g_free(orig_path);
-		update_option_menu(e_select_names);
-	}
-}
-
-static void
-update_query (GtkWidget *button, ESelectNames *e_select_names)
-{
-	char *category = "";
-	char *search = "";
-	char *query;
-	char *q_array[4];
-	int i;
-	if (e_select_names->categories_entry) {
-		category = gtk_entry_get_text (GTK_ENTRY (e_select_names->categories_entry));
-	}
-	if (e_select_names->search_entry) {
-		search = gtk_entry_get_text (GTK_ENTRY (e_select_names->search_entry));
-	}
-	i = 0;
-	q_array[i++] = "(contains \"email\" \"\")";
-	if (category && *category)
-		q_array[i++] = g_strdup_printf ("(is \"category\" \"%s\")", category);
-	if (search && *search)
-		q_array[i++] = g_strdup_printf ("(contains \"x-evolution-any-field\" \"%s\")", search);
-	q_array[i++] = NULL;
-	if (i > 2) {
-		char *temp = g_strjoinv (" ", q_array);
-		query = g_strdup_printf ("(and %s)", temp);
-		g_free (temp);
-	} else {
-		query = g_strdup (q_array[0]);
-	}
-	gtk_object_set (GTK_OBJECT (e_select_names->model),
-			"query", query,
-			NULL);
-	for (i = 1; q_array[i]; i++) {
-		g_free (q_array[i]);
-	}
-	g_free (query);
-}
-
-static void
-hookup_listener (ESelectNames *e_select_names,
-		 GNOME_Evolution_Storage storage,
-		 EvolutionStorageListener *listener,
-		 CORBA_Environment *ev)
-{
-	GNOME_Evolution_StorageListener corba_listener;
-
-	g_return_if_fail (storage != CORBA_OBJECT_NIL);
-
-	corba_listener = evolution_storage_listener_corba_objref(listener);
-
-	gtk_signal_connect(GTK_OBJECT(listener), "new_folder",
-			   GTK_SIGNAL_FUNC(new_folder), e_select_names);
-	gtk_signal_connect(GTK_OBJECT(listener), "removed_folder",
-			   GTK_SIGNAL_FUNC(removed_folder), e_select_names);
-
-	GNOME_Evolution_Storage_addListener(storage, corba_listener, ev);
-
-	if (ev->_major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_select_names_init: Exception adding listener to "
-			   "remote GNOME_Evolution_Storage interface.\n");
-		return;
-	}
-}
-
-static void
-e_select_names_hookup_shell_listeners (ESelectNames *e_select_names)
-{
-	EvolutionStorage *other_contact_storage;
-	GNOME_Evolution_Storage storage;
-	CORBA_Environment ev;
-	
-	CORBA_exception_init(&ev);
-
-	storage = (GNOME_Evolution_Storage) (evolution_shell_client_get_local_storage(addressbook_component_get_shell_client()));
-	e_select_names->local_listener = evolution_storage_listener_new();
-
-	/* This should really never happen, but a bug report (ximian #5193) came in w/ a backtrace suggesting that it did in
-	   fact happen to someone, so the best we can do is try to avoid crashing in this case. */
-	if (storage == CORBA_OBJECT_NIL) {
-		GtkWidget *oh_shit;
-
-#if 0
-		oh_shit = gnome_error_dialog (_("Evolution is unable to get the addressbook local storage.\n"
-						"This may have been caused by the evolution-addressbook component crashing.\n"
-						"To help us better understand and ultimately resolve this problem,\n"
-						"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
-						"detailed description of the circumstances under which this error\n"
-						"occurred.  Thank you."));
-#endif
-
-		oh_shit = gnome_error_dialog (_("Evolution is unable to get the addressbook local storage.\n"
-						"Under normal circumstances, this should never happen.\n"
-						"You may need to exit and restart Evolution in order to\n"
-						"correct this problem."));
-		gtk_widget_show (oh_shit);
-		return;
-	}
-	else {
-		hookup_listener (e_select_names, storage, e_select_names->local_listener, &ev);
-		bonobo_object_release_unref(storage, &ev);
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("e_select_names_init: Exception unref'ing "
-				   "remote GNOME_Evolution_Storage interface.\n");
-			CORBA_exception_free (&ev);
-			return;
-		}
-	}
-
-	other_contact_storage = addressbook_get_other_contact_storage ();
-	if (other_contact_storage) {
-		storage = bonobo_object_corba_objref (BONOBO_OBJECT (other_contact_storage));
-		e_select_names->other_contacts_listener = evolution_storage_listener_new();
-
-		hookup_listener (e_select_names, storage, e_select_names->other_contacts_listener, &ev);
-	}
-
-	CORBA_exception_free(&ev);
-}
-
-GtkWidget *e_select_names_create_categories (gchar *name,
-					     gchar *string1, gchar *string2,
-					     gint int1, gint int2);
-
-GtkWidget *
-e_select_names_create_categories (gchar *name,
-				  gchar *string1, gchar *string2,
-				  gint int1, gint int2)
-{
-	ECategoriesMasterList *ecml;
-	GtkWidget *combo;
-
-	ecml = e_categories_master_list_wombat_new ();
-	combo = e_categories_master_list_combo_new (ecml);
-	gtk_object_unref (GTK_OBJECT (ecml));
-
-	return combo;
-}
-
-static void
-e_select_names_init (ESelectNames *e_select_names)
-{
-	GladeXML *gui;
-	GtkWidget *widget, *button;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/select-names.glade", NULL);
-	e_select_names->gui = gui;
-
-	e_select_names->children = g_hash_table_new(g_str_hash, g_str_equal);
-	e_select_names->child_count = 0;
-	e_select_names->def = NULL;
-
-	widget = glade_xml_get_widget(gui, "table-top");
-	if (!widget) {
-		return;
-	}
-	gtk_widget_ref(widget);
-	gtk_widget_unparent(widget);
-	gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(e_select_names)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-
-	gnome_dialog_append_buttons(GNOME_DIALOG(e_select_names),
-				    GNOME_STOCK_BUTTON_OK,
-				    GNOME_STOCK_BUTTON_CANCEL,
-				    NULL);
-	gnome_dialog_set_default(GNOME_DIALOG(e_select_names), 0);
-
-	gtk_window_set_title(GTK_WINDOW(e_select_names), _("Select Contacts from Addressbook")); 
-	gtk_window_set_policy(GTK_WINDOW(e_select_names), FALSE, TRUE, FALSE);
-
-	e_select_names->table = E_TABLE_SCROLLED(glade_xml_get_widget(gui, "table-source"));
-	e_select_names->model = gtk_object_get_data(GTK_OBJECT(e_select_names->table), "model");
-	e_select_names->adapter = gtk_object_get_data(GTK_OBJECT(e_select_names->table), "adapter");
-	e_select_names->without = gtk_object_get_data(GTK_OBJECT(e_select_names->table), "without");
-
-	e_select_names->categories = glade_xml_get_widget (gui, "custom-categories");
-	if (e_select_names->categories && !GTK_IS_COMBO (e_select_names->categories))
-		e_select_names->categories = NULL;
-	if (e_select_names->categories) {
-		e_select_names->categories_entry = GTK_COMBO (e_select_names->categories)->entry;
-	} else
-		e_select_names->categories_entry = NULL;
-	e_select_names->search_entry = glade_xml_get_widget (gui, "entry-find");
-	if (e_select_names->search_entry && !GTK_IS_ENTRY (e_select_names->search_entry))
-		e_select_names->search_entry = NULL;
-	if (e_select_names->search_entry)
-		gtk_signal_connect(GTK_OBJECT(e_select_names->search_entry), "activate",
-				   GTK_SIGNAL_FUNC(update_query), e_select_names);
-	if (e_select_names->categories_entry)
-		gtk_signal_connect(GTK_OBJECT(e_select_names->categories_entry), "changed",
-				   GTK_SIGNAL_FUNC(update_query), e_select_names);
-
-	button  = glade_xml_get_widget (gui, "button-find");
-	if (button)
-		gtk_signal_connect(GTK_OBJECT(button), "clicked",
-				   GTK_SIGNAL_FUNC(update_query), e_select_names);
-
-	e_select_names->folders = g_hash_table_new(g_str_hash, g_str_equal);
-
-	e_select_names_hookup_shell_listeners (e_select_names);
-
-	gtk_signal_connect (GTK_OBJECT (e_table_scrolled_get_table (e_select_names->table)), "double_click",
-			    GTK_SIGNAL_FUNC (add_address), e_select_names);
-}
-
-static void e_select_names_child_free(char *key, ESelectNamesChild *child, ESelectNames *e_select_names)
-{
-	gtk_signal_disconnect_by_func (GTK_OBJECT (child->source), GTK_SIGNAL_FUNC (sync_table_and_models), e_select_names);
-	g_free(child->title);
-	gtk_object_unref(GTK_OBJECT(child->model));
-	gtk_object_unref(GTK_OBJECT(child->source));
-	g_free(key);
-}
-
-static void
-e_select_names_destroy (GtkObject *object)
-{
-	ESelectNames *e_select_names = E_SELECT_NAMES(object);
-
-	if (e_select_names->local_listener) {
-		gtk_signal_disconnect_by_data(GTK_OBJECT(e_select_names->local_listener), e_select_names);
-		gtk_object_unref(GTK_OBJECT(e_select_names->local_listener));
-	}
-
-	if (e_select_names->other_contacts_listener) {
-		gtk_signal_disconnect_by_data(GTK_OBJECT(e_select_names->other_contacts_listener), e_select_names);
-		gtk_object_unref(GTK_OBJECT(e_select_names->other_contacts_listener));
-	}
-
-	gtk_object_unref(GTK_OBJECT(e_select_names->gui));
-	g_hash_table_foreach(e_select_names->children, (GHFunc) e_select_names_child_free, e_select_names);
-	g_hash_table_destroy(e_select_names->children);
-
-	g_free(e_select_names->def);
-}
-
-GtkWidget*
-e_select_names_new (void)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_select_names_get_type ()));
-	return widget;
-}
-
-static void
-e_select_names_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	ESelectNames *editor;
-
-	editor = E_SELECT_NAMES (o);
-	
-	switch (arg_id){
-	default:
-		return;
-	}
-}
-
-static void
-e_select_names_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNames *e_select_names;
-
-	e_select_names = E_SELECT_NAMES (object);
-
-	switch (arg_id) {
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-button_clicked(GtkWidget *button, ESelectNamesChild *child)
-{
-	real_add_address(child->names, child);
-}
-
-static void
-remove_address(ETable *table, int row, int col, GdkEvent *event, ESelectNamesChild *child)
-{
-	e_select_names_model_delete (child->source, row);
-}
-
-struct _RightClickData {
-	ETable *table;
-	ESelectNamesChild *child;
-};
-typedef struct _RightClickData RightClickData;
-
-static GSList *selected_rows = NULL;
-
-static void
-etable_selection_foreach_cb (int row, void *data)
-{
-	/* Build a list of rows in reverse order, then remove them,
-           necessary because otherwise it'll start trying to delete
-           rows out of index in ETableModel */
-	selected_rows = g_slist_prepend (selected_rows, GINT_TO_POINTER (row));
-}
-
-static void
-selected_rows_foreach_cb (void *row, void *data)
-{
-	ESelectNamesChild *child = data;
-
-	remove_address (NULL, GPOINTER_TO_INT (row), 0, NULL, child);
-}
-
-static void
-remove_cb (GtkWidget *widget, void *data)
-{
-	RightClickData *rcdata = (RightClickData *)data;
-
-	e_select_names_model_freeze (rcdata->child->source);
-
-	/* Build a list of selected rows */
-	e_table_selected_row_foreach (rcdata->table,
-				      etable_selection_foreach_cb,
-				      rcdata->child);
-
-	/* Now process the list we made, removing each selected row */
-	g_slist_foreach (selected_rows,
-			 (GFunc)selected_rows_foreach_cb,
-			 rcdata->child);
-
-	e_select_names_model_thaw (rcdata->child->source);
-
-	/* Free everything we've created */
-	g_free (rcdata);
-	g_slist_free (selected_rows);
-	selected_rows = NULL;
-}
-
-static void
-section_right_click_cb (ETable *table, gint row, gint col, GdkEvent *event, ESelectNamesChild *child)
-{
-	EPopupMenu right_click_menu[] = {
-		{ N_("Remove"), NULL,
-		  GTK_SIGNAL_FUNC (remove_cb), NULL, 0 },
-		{ NULL, NULL, NULL, 0 }
-	};
-
-	RightClickData *rcdata = g_new0 (RightClickData, 1);
-	rcdata->table = table;
-	rcdata->child = child;
-
-	e_popup_menu_run (right_click_menu, event, 0, 0,
-			  rcdata);
-}
-
-void
-e_select_names_add_section(ESelectNames *e_select_names, char *name, char *id, ESelectNamesModel *source)
-{
-	ESelectNamesChild *child;
-	GtkWidget *button;
-	GtkWidget *alignment;
-	GtkWidget *label;
-	GtkTable *table;
-	char *label_text;
-
-	ETableModel *model;
-	GtkWidget *etable;
-
-	if (g_hash_table_lookup(e_select_names->children, id)) {
-		return;
-	}
-
-	table = GTK_TABLE(glade_xml_get_widget (e_select_names->gui, "table-recipients"));
-
-	child = g_new(ESelectNamesChild, 1);
-
-	child->names = e_select_names;
-	child->title = e_utf8_from_locale_string(_(name));
-
-	e_select_names->child_count++;
-
-	alignment = gtk_alignment_new(0, 0, 1, 0);
-
-	button = gtk_button_new ();
-
-	label = e_entry_new ();
-	gtk_object_set(GTK_OBJECT(label),
-		       "draw_background", FALSE,
-		       "draw_borders", FALSE,
-		       "draw_button", TRUE,
-		       "editable", FALSE,
-		       "text", "",
-		       "use_ellipsis", FALSE,
-		       "justification", GTK_JUSTIFY_CENTER,
-		       NULL);
-
-	label_text = g_strconcat (child->title, " ->", NULL);
-	gtk_object_set (GTK_OBJECT (label),
-			"text", label_text,
-			"emulate_label_resize", TRUE,
-			NULL);
-	g_free (label_text);
-	gtk_container_add (GTK_CONTAINER (button), label);
-	child->label = label;
-
-	gtk_container_add(GTK_CONTAINER(alignment), button);
-	gtk_widget_show_all(alignment);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(button_clicked), child);
-	gtk_table_attach(table, alignment,
-			 0, 1,
-			 e_select_names->child_count,
-			 e_select_names->child_count + 1,
-			 GTK_FILL, GTK_FILL,
-			 0, 0);
-
-	model = e_select_names_table_model_new(source);
-	etable = e_table_scrolled_new (model, NULL, SPEC2, NULL);
-
-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(etable))), "right_click",
-			   GTK_SIGNAL_FUNC(section_right_click_cb), child);
-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(etable))), "double_click",
-			   GTK_SIGNAL_FUNC(remove_address), child);
-
-	child->model = model;
-	child->source = source;
-	gtk_object_ref(GTK_OBJECT(child->model));
-	gtk_object_ref(GTK_OBJECT(child->source));
-
-	gtk_signal_connect (GTK_OBJECT (child->source),
-			    "changed",
-			    GTK_SIGNAL_FUNC (sync_table_and_models),
-			    e_select_names);
-	
-	gtk_widget_show(etable);
-	
-	gtk_table_attach(table, etable,
-			 1, 2,
-			 e_select_names->child_count,
-			 e_select_names->child_count + 1,
-			 GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
-			 0, 0);
-
-	g_hash_table_insert(e_select_names->children, g_strdup(id), child);
-
-	sync_table_and_models (child->source, e_select_names);
-}
-
-static void *
-card_copy(const void *value, void *closure)
-{
-	gtk_object_ref(GTK_OBJECT(value));
-	return (void *)value;
-}
-
-static void
-card_free(void *value, void *closure)
-{
-	gtk_object_unref(GTK_OBJECT(value));
-}
-
-EList *
-e_select_names_get_section(ESelectNames *e_select_names, char *id)
-{
-	ESelectNamesChild *child;
-	int i;
-	int rows;
-	EList *list;
-	
-	child = g_hash_table_lookup(e_select_names->children, id);
-	if (!child)
-		return NULL;
-	rows = e_table_model_row_count(child->model);
-	
-	list = e_list_new(card_copy, card_free, NULL);
-	for (i = 0; i < rows; i++) {
-		ECard *card = e_cardlist_model_get(E_CARDLIST_MODEL(child->model), i);
-		e_list_append(list, card);
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-	return list;
-}
-
-ESelectNamesModel *
-e_select_names_get_source(ESelectNames *e_select_names,
-			  char *id)
-{
-	ESelectNamesChild *child = g_hash_table_lookup(e_select_names->children, id);
-	if (child) {
-		if (child->source)
-			gtk_object_ref(GTK_OBJECT(child->source));
-		return child->source;
-	} else
-		return NULL;
-}
-
-void
-e_select_names_set_default (ESelectNames *e_select_names,
-			    const char *id)
-{
-	ESelectNamesChild *child;
-
-	if (e_select_names->def) {
-		child = g_hash_table_lookup(e_select_names->children, e_select_names->def);
-		if (child)
-			gtk_object_set (GTK_OBJECT (E_ENTRY (child->label)->item),
-					"bold", FALSE,
-					NULL);
-	}
-
-	g_free(e_select_names->def);
-	e_select_names->def = g_strdup(id);
-
-	if (e_select_names->def) {
-		child = g_hash_table_lookup(e_select_names->children, e_select_names->def);
-		if (child)
-			gtk_object_set (GTK_OBJECT (E_ENTRY (child->label)->item),
-					"bold", TRUE,
-					NULL);
-	}
-}
diff --git a/addressbook/gui/component/select-names/e-select-names.h b/addressbook/gui/component/select-names/e-select-names.h
deleted file mode 100644
index 379a9ef137..0000000000
--- a/addressbook/gui/component/select-names/e-select-names.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-select-names.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_SELECT_NAMES_H__
-#define __E_SELECT_NAMES_H__
-
-#include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <glade/glade.h>
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-table-scrolled.h>
-
-#include <addressbook/gui/widgets/e-addressbook-model.h>
-
-#include "e-select-names-model.h"
-#include "e-util/e-list.h"
-#include "shell/evolution-storage-listener.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* ESelectNames - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_SELECT_NAMES_TYPE			(e_select_names_get_type ())
-#define E_SELECT_NAMES(obj)			(GTK_CHECK_CAST ((obj), E_SELECT_NAMES_TYPE, ESelectNames))
-#define E_SELECT_NAMES_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_SELECT_NAMES_TYPE, ESelectNamesClass))
-#define E_IS_SELECT_NAMES(obj)		(GTK_CHECK_TYPE ((obj), E_SELECT_NAMES_TYPE))
-#define E_IS_SELECT_NAMES_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_SELECT_NAMES_TYPE))
-
-typedef struct _ESelectNames       ESelectNames;
-typedef struct _ESelectNamesClass  ESelectNamesClass;
-
-struct _ESelectNames
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	GladeXML *gui;
-	
-	GHashTable *children; /* Of type char * to ESelectNamesChild */
-	int child_count;
-	ETableScrolled *table;
-	ETableModel *adapter;
-	ETableModel *without;
-	EAddressbookModel *model;
-	GtkWidget *categories;
-	GtkWidget *categories_entry;
-	GtkWidget *search_entry;
-	EvolutionStorageListener *local_listener;
-	EvolutionStorageListener *other_contacts_listener;
-	GHashTable *folders;
-	char *def;
-};
-
-struct _ESelectNamesClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_select_names_new          (void);
-GtkType    e_select_names_get_type     (void);
-
-void       e_select_names_add_section  (ESelectNames *e_select_names,
-				       	char         *name,
-				       	char         *id,
-				       	ESelectNamesModel *source);
-ESelectNamesModel *e_select_names_get_source   (ESelectNames *e_select_names,
-						char *id);
-void e_select_names_set_default (ESelectNames *e_select_names,
-				 const char *id);
-/* Returns a ref counted list of addresses. */
-EList     *e_select_names_get_section  (ESelectNames *e_select_names,
-				       	char         *id);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_SELECT_NAMES_H__ */
diff --git a/addressbook/gui/component/select-names/recipient.glade b/addressbook/gui/component/select-names/recipient.glade
deleted file mode 100644
index b60972d094..0000000000
--- a/addressbook/gui/component/select-names/recipient.glade
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Recipient</name>
-  <program_name>recipient</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>window1</name>
-  <visible>False</visible>
-  <title>window1</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkHBox</class>
-    <name>hbox-top</name>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-
-    <widget>
-      <class>GtkAlignment</class>
-      <name>alignment1</name>
-      <xalign>1.08033e-07</xalign>
-      <yalign>0</yalign>
-      <xscale>1</xscale>
-      <yscale>0</yscale>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>text-button</name>
-	<can_focus>True</can_focus>
-	<label>-&gt;</label>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/component/select-names/select-names.glade b/addressbook/gui/component/select-names/select-names.glade
deleted file mode 100644
index dbfd36f86f..0000000000
--- a/addressbook/gui/component/select-names/select-names.glade
+++ /dev/null
@@ -1,444 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Select-names</name>
-  <program_name>select-names</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-top</name>
-  <visible>False</visible>
-  <title>Select Names</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <default_width>417</default_width>
-  <default_height>332</default_height>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button4</name>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button5</name>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-top</name>
-      <rows>2</rows>
-      <columns>1</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>0</row_spacing>
-      <column_spacing>0</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox5</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table4</name>
-	  <rows>2</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>6</row_spacing>
-	  <column_spacing>6</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table-recipients</name>
-	    <rows>1</rows>
-	    <columns>2</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>4</row_spacing>
-	    <column_spacing>4</column_spacing>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>True</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label20</name>
-	      <label>_Message Recipients:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox6</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>3</spacing>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>True</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>True</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label22</name>
-	      <label>Co_ntacts:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>table-source</name>
-	      <creation_function>e_addressbook_create_ebook_table</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Sat, 10 Jun 2000 22:02:57 GMT</last_modification_time>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>dialog-vbox1</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox3</name>
-	  <border_width>3</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>3</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label4</name>
-	    <label>Show contacts matching the following criteria:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox1</name>
-	    <border_width>3</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>8</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label5</name>
-	      <label>_Folder:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <default_focus_target>optionmenu-folder</default_focus_target>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkOptionMenu</class>
-	      <name>optionmenu-folder</name>
-	      <can_focus>True</can_focus>
-	      <items></items>
-	      <initial_choice>0</initial_choice>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label6</name>
-	      <label>_Category:</label>
-	      <justify>GTK_JUSTIFY_RIGHT</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <default_focus_target>custom-categories</default_focus_target>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>custom-categories</name>
-	      <can_focus>True</can_focus>
-	      <creation_function>e_select_names_create_categories</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Wed, 27 Jun 2001 01:47:01 GMT</last_modification_time>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox2</name>
-	    <border_width>3</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>3</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label7</name>
-	      <label>C_ontaining:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <default_focus_target>entry-find</default_focus_target>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <name>entry-find</name>
-	      <can_focus>True</can_focus>
-	      <editable>True</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text></text>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHButtonBox</class>
-	      <name>hbuttonbox1</name>
-	      <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
-	      <spacing>0</spacing>
-	      <child_min_width>85</child_min_width>
-	      <child_min_height>27</child_min_height>
-	      <child_ipad_x>7</child_ipad_x>
-	      <child_ipad_y>0</child_ipad_y>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkButton</class>
-		<name>button-find</name>
-		<can_default>True</can_default>
-		<can_focus>True</can_focus>
-		<label>F_ind</label>
-		<relief>GTK_RELIEF_NORMAL</relief>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator1</name>
-	  <child>
-	    <padding>8</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-editor/.cvsignore b/addressbook/gui/contact-editor/.cvsignore
deleted file mode 100644
index 6fd0b5075c..0000000000
--- a/addressbook/gui/contact-editor/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-contact-editor-test
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
deleted file mode 100644
index 19598eeb7b..0000000000
--- a/addressbook/gui/contact-editor/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-INCLUDES =					\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)			\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook/		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_srcdir)/addressbook/gui/merging	\
-	-I$(top_srcdir)/widgets/e-table		\
-	-I$(top_builddir)/shell			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
-	-DDATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\
-	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\
-	-DG_LOG_DOMAIN=\"contact-editor\"
-
-noinst_LIBRARIES =				\
-	libecontacteditor.a
-
-libecontacteditor_a_SOURCES = 			\
-	e-contact-editor-address.c		\
-	e-contact-editor-address.h		\
-	e-contact-editor-fullname.c		\
-	e-contact-editor-fullname.h		\
-	e-contact-editor.c			\
-	e-contact-editor.h			\
-	e-contact-save-as.c			\
-	e-contact-save-as.h			\
-	e-contact-quick-add.c			\
-	e-contact-quick-add.h
-
-# noinst_PROGRAMS =		\
-# 	contact-editor-test
-
-# contact_editor_test_SOURCES = 	\
-# 	test-editor.c
-
-# contact_editor_test_LDADD =					\
-# 	libecontacteditor.a					\
-# 	$(top_builddir)/e-util/libeutil.la			\
-# 	$(top_builddir)/addressbook/printing/libecontactprint.a	\
-# 	$(top_builddir)/addressbook/backend/ebook/libebook.la   \
-# 	$(top_builddir)/e-util/ename/libename.la		\
-# 	$(top_builddir)/libversit/libversit.la			\
-# 	$(GNOMEGNORBA_LIBS)					\
-# 	$(BONOBO_GNOME_LIBS)				\
-# 	$(top_builddir)/widgets/misc/libemiscwidgets.a \
-# 	$(top_builddir)/e-util/libeutil.la			\
-# 	$(GNOME_PRINT_LIBS)					\
-#	$(EXTRA_GNOME_LIBS)
-
-evolutiondir = $(datadir)/evolution
-
-evolution_DATA = arrow.png
-
-gladedir   = $(datadir)/evolution/glade
-
-glade_DATA = 				\
-	contact-editor.glade		\
-	fulladdr.glade			\
-	fullname.glade			\
-	file-exists.glade		\
-	e-contact-editor-confirm-delete.glade
-
-EXTRA_DIST = $(evolution_DATA)		\
-	$(glade_DATA)
diff --git a/addressbook/gui/contact-editor/arrow.png b/addressbook/gui/contact-editor/arrow.png
deleted file mode 100644
index b102356c78..0000000000
--- a/addressbook/gui/contact-editor/arrow.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
deleted file mode 100644
index 6e554c36ea..0000000000
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ /dev/null
@@ -1,2538 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Contact-editor</name>
-  <program_name>contact-editor</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <backup_source_files>False</backup_source_files>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog2</name>
-  <border_width>2</border_width>
-  <visible>False</visible>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox2</name>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area2</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button28</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button29</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button30</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table2</name>
-      <rows>2</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>0</row_spacing>
-      <column_spacing>2</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry2</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox1</name>
-	<homogeneous>False</homogeneous>
-	<spacing>2</spacing>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button31</name>
-	  <border_width>2</border_width>
-	  <can_focus>True</can_focus>
-	  <label>_Add</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button32</name>
-	  <border_width>2</border_width>
-	  <can_focus>True</can_focus>
-	  <label>_Delete</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow1</name>
-	<height>200</height>
-	<hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
-	<vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkCList</class>
-	  <name>clist1</name>
-	  <can_focus>True</can_focus>
-	  <columns>1</columns>
-	  <column_widths>80</column_widths>
-	  <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-	  <show_titles>True</show_titles>
-	  <shadow_type>GTK_SHADOW_NONE</shadow_type>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>CList:title</child_name>
-	    <name>label20</name>
-	    <label>Phone Types</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-add-phone</name>
-  <visible>False</visible>
-  <title>New phone type</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox2</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button43</name>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<label>_Add</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button44</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame-add-phone</name>
-      <border_width>4</border_width>
-      <label>New phone type</label>
-      <label_xalign>0</label_xalign>
-      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkAlignment</class>
-	<name>alignment9</name>
-	<border_width>9</border_width>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xscale>1</xscale>
-	<yscale>1</yscale>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-add-phone</name>
-	  <can_focus>True</can_focus>
-	  <has_focus>True</has_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeApp</class>
-  <name>contact editor</name>
-  <visible>False</visible>
-  <title>Contact Editor</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <enable_layout_config>True</enable_layout_config>
-
-  <widget>
-    <class>GnomeDock</class>
-    <child_name>GnomeApp:dock</child_name>
-    <name>dock1</name>
-    <allow_floating>True</allow_floating>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <child_name>GnomeDock:contents</child_name>
-      <name>notebook-contact-editor</name>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table-contact-editor-general</name>
-	<border_width>7</border_width>
-	<rows>14</rows>
-	<columns>8</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone1</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone2</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone3</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-phone4</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkText</class>
-	  <name>text-address</name>
-	  <width>1</width>
-	  <height>1</height>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text></text>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-fullname</name>
-	  <can_focus>True</can_focus>
-	  <label>Full _Name...</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment3</name>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-email1</name>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment5</name>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone4</name>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment7</name>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone2</name>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment8</name>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone1</name>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator4</name>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment6</name>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-phone3</name>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-fullname</name>
-	  <can_default>True</can_default>
-	  <has_default>True</has_default>
-	  <can_focus>True</can_focus>
-	  <has_focus>True</has_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-jobtitle</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-company</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-email1</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-web</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator5</name>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkCombo</class>
-	  <name>combo-file-as</name>
-	  <value_in_list>False</value_in_list>
-	  <ok_if_empty>True</ok_if_empty>
-	  <case_sensitive>True</case_sensitive>
-	  <use_arrows>True</use_arrows>
-	  <use_arrows_always>False</use_arrows_always>
-	  <items></items>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <child_name>GtkCombo:entry</child_name>
-	    <name>entry-file-as</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator6</name>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>8</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment-htmlmail</name>
-	  <xalign>0.5</xalign>
-	  <yalign>0</yalign>
-	  <xscale>1</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>6</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>True</xshrink>
-	    <yshrink>True</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton-htmlmail</name>
-	    <can_focus>True</can_focus>
-	    <label>Wants to receive _HTML mail</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment4</name>
-	  <xalign>1</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>6</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-address</name>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox1</name>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone1</name>
-	    <label>Business</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-phone1</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox2</name>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone2</name>
-	    <label>Home</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-phone2</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox3</name>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone3</name>
-	    <label>Business Fax</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-phone3</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox4</name>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-phone4</name>
-	    <label>Mobile</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-phone4</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox5</name>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-email1</name>
-	    <label>Primary Email</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-email1</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox-business</name>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-address</name>
-	    <label>Business</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>text-address</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment2</name>
-	  <xalign>0</xalign>
-	  <yalign>0</yalign>
-	  <xscale>0</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>9</top_attach>
-	    <bottom_attach>10</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton-mailingaddress</name>
-	    <visible>False</visible>
-	    <label>This is the _mailing address</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator9</name>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>11</top_attach>
-	    <bottom_attach>12</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator10</name>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>11</top_attach>
-	    <bottom_attach>12</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment-contacts</name>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-contacts</name>
-	    <can_focus>True</can_focus>
-	    <label>C_ontacts...</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment15</name>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>7</left_attach>
-	    <right_attach>8</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>entry-categories</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment16</name>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-categories</name>
-	    <can_focus>True</can_focus>
-	    <label>Ca_tegories...</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox7</name>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-jobtitle</name>
-	    <label>_Job title:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>entry-jobtitle</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom1</name>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>malehead.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:47 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom2</name>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>cellphone.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:02 GMT</last_modification_time>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom3</name>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>envelope.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:51 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom4</name>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>house.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:06 GMT</last_modification_time>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>10</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom5</name>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>evolution-contacts-plain.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:59 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>14</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom6</name>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>briefcase.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:09 GMT</last_modification_time>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>14</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom10</name>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>globe.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:19:56 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>10</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-company</name>
-	  <label>Organi_zation:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-company</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-fulladdr</name>
-	  <can_focus>True</can_focus>
-	  <label>Add_ress...</label>
-	  <relief>GTK_RELIEF_NORMAL</relief>
-	  <child>
-	    <left_attach>5</left_attach>
-	    <right_attach>7</right_attach>
-	    <top_attach>6</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment17</name>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>0</yscale>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>12</top_attach>
-	    <bottom_attach>13</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table-contacts</name>
-	    <rows>1</rows>
-	    <columns>1</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>0</row_spacing>
-	    <column_spacing>0</column_spacing>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>accellabel-fileas</name>
-	  <label>File A_s:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-file-as</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>accellabel-web</name>
-	  <label>_Web page address:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-web</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label15</name>
-	<label>General</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table-contact-editor-details</name>
-	<border_width>7</border_width>
-	<rows>9</rows>
-	<columns>6</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-department</name>
-	  <label>D_epartment:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-department</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-office</name>
-	  <label>_Office:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-office</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-profession</name>
-	  <label>P_rofession:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-profession</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-nickname</name>
-	  <label>_Nickname:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-nickname</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-spouse</name>
-	  <label>S_pouse:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-spouse</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-birthday</name>
-	  <label>Birthda_y:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>dateedit-birthday</focus_target>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-assistant</name>
-	  <label>A_ssistant's name:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-assistant</focus_target>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-manager</name>
-	  <label>_Manager's Name:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-manager</focus_target>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-anniversary</name>
-	  <label>Anni_versary:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>dateedit-anniversary</focus_target>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-spouse</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-department</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-office</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-profession</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-nickname</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-assistant</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-manager</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator7</name>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label-comments</name>
-	  <label>No_tes:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>text-comments</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>8</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator8</name>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>6</top_attach>
-	    <bottom_attach>7</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom7</name>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>briefcase.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:13 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom8</name>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>malehead.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:16 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow2</name>
-	  <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	  <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	  <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	  <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>True</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkText</class>
-	    <name>text-comments</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom9</name>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>globe.png</string1>
-	  <string2></string2>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Thu, 18 May 2000 12:20:19 GMT</last_modification_time>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>dateedit-birthday</name>
-	  <can_focus>True</can_focus>
-	  <creation_function>e_contact_editor_create_date</creation_function>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Tue, 05 Jun 2001 02:36:27 GMT</last_modification_time>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>dateedit-anniversary</name>
-	  <can_focus>True</can_focus>
-	  <creation_function>e_contact_editor_create_date</creation_function>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Tue, 05 Jun 2001 02:36:32 GMT</last_modification_time>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>6</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label16</name>
-	<label>Details</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox3</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox1</name>
-	  <border_width>7</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>Custom</class>
-	    <name>custom12</name>
-	    <creation_function>e_create_image_widget</creation_function>
-	    <string1>globe.png</string1>
-	    <string2></string2>
-	    <int1>0</int1>
-	    <int2>0</int2>
-	    <last_modification_time>Thu, 18 May 2000 12:20:13 GMT</last_modification_time>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label24</name>
-	    <label>If this person publishes free/busy or other calendar information on the Internet, enter the address
-of that information here.</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>7.45058e-09</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment18</name>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>0.75</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table-contact-editor-collaboration</name>
-	    <border_width>7</border_width>
-	    <rows>2</rows>
-	    <columns>2</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>4</row_spacing>
-	    <column_spacing>4</column_spacing>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label-caluri</name>
-	      <label>_Public Calendar URL:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <focus_target>entry-caluri</focus_target>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label-fburl</name>
-	      <label>F_ree/Busy URL:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <focus_target>entry-fburl</focus_target>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <name>entry-caluri</name>
-	      <can_focus>True</can_focus>
-	      <editable>True</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text></text>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <name>entry-fburl</name>
-	      <can_focus>True</can_focus>
-	      <editable>True</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text></text>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label21</name>
-	<label>Collaboration</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-
-  <widget>
-    <class>GnomeAppBar</class>
-    <child_name>GnomeApp:appbar</child_name>
-    <name>appbar1</name>
-    <has_progress>True</has_progress>
-    <has_status>True</has_status>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c
deleted file mode 100644
index a826849f2f..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ /dev/null
@@ -1,280 +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 <libgnomeui/gnome-stock.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <e-contact-editor-address.h>
-#include <gtk/gtkcombo.h>
-
-static void e_contact_editor_address_init		(EContactEditorAddress		 *card);
-static void e_contact_editor_address_class_init	(EContactEditorAddressClass	 *klass);
-static void e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_address_destroy (GtkObject *object);
-
-static void fill_in_info(EContactEditorAddress *editor);
-static void extract_info(EContactEditorAddress *editor);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_ADDRESS,
-	ARG_IS_READ_ONLY
-};
-
-GtkType
-e_contact_editor_address_get_type (void)
-{
-	static GtkType contact_editor_address_type = 0;
-
-	if (!contact_editor_address_type)
-		{
-			static const GtkTypeInfo contact_editor_address_info =
-			{
-				"EContactEditorAddress",
-				sizeof (EContactEditorAddress),
-				sizeof (EContactEditorAddressClass),
-				(GtkClassInitFunc) e_contact_editor_address_class_init,
-				(GtkObjectInitFunc) e_contact_editor_address_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			contact_editor_address_type = gtk_type_unique (gnome_dialog_get_type (), &contact_editor_address_info);
-		}
-
-	return contact_editor_address_type;
-}
-
-static void
-e_contact_editor_address_class_init (EContactEditorAddressClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeDialogClass *dialog_class;
-
-	object_class = (GtkObjectClass*) klass;
-	dialog_class = (GnomeDialogClass *) klass;
-
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-
-	gtk_object_add_arg_type ("EContactEditorAddress::address", GTK_TYPE_POINTER, 
-				 GTK_ARG_READWRITE, ARG_ADDRESS);
-	gtk_object_add_arg_type ("EContactEditorAddress::editable", GTK_TYPE_BOOL, 
-				 GTK_ARG_READWRITE, ARG_IS_READ_ONLY);
- 
-	object_class->set_arg = e_contact_editor_address_set_arg;
-	object_class->get_arg = e_contact_editor_address_get_arg;
-	object_class->destroy = e_contact_editor_address_destroy;
-}
-
-static GList *
-add_to_tab_order(GList *list, GladeXML *gui, char *name)
-{
-	GtkWidget *widget = glade_xml_get_widget(gui, name);
-	return g_list_prepend(list, widget);
-}
-
-static void
-setup_tab_order(GladeXML *gui)
-{
-	GtkWidget *container;
-	GList *list = NULL;
-
-	container = glade_xml_get_widget(gui, "table-checkaddress");
-
-	if (container) {
-		list = add_to_tab_order(list, gui, "entry-city");
-		list = add_to_tab_order(list, gui, "entry-region");
-		list = add_to_tab_order(list, gui, "entry-code");
-		list = add_to_tab_order(list, gui, "combo-country");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-	}
-}
-
-static void
-e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_address), FALSE, TRUE, FALSE);
-
-	e_contact_editor_address->address = NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fulladdr.glade", NULL);
-	e_contact_editor_address->gui = gui;
-
-	setup_tab_order (gui);
-
-	widget = glade_xml_get_widget(gui, "table-checkaddress");
-	gtk_widget_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-}
-
-void
-e_contact_editor_address_destroy (GtkObject *object)
-{
-	EContactEditorAddress *e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS(object);
-
-	if (e_contact_editor_address->gui)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor_address->gui));
-	e_card_delivery_address_unref(e_contact_editor_address->address);
-}
-
-GtkWidget*
-e_contact_editor_address_new (const ECardDeliveryAddress *address)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_address_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"address", address,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (o);
-	
-	switch (arg_id){
-	case ARG_ADDRESS:
-		e_card_delivery_address_unref(e_contact_editor_address->address);
-		e_contact_editor_address->address = e_card_delivery_address_copy(GTK_VALUE_POINTER (*arg));
-		fill_in_info(e_contact_editor_address);
-		break;
-	case ARG_IS_READ_ONLY: {
-		int i;
-		char *entry_names[] = {
-			"entry-street",
-			"entry-city",
-			"entry-ext",
-			"entry-po",
-			"entry-region",
-			"combo-country",
-			"entry-code",
-			NULL
-		};
-		e_contact_editor_address->editable = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		for (i = 0; entry_names[i] != NULL; i ++) {
-			GtkWidget *w = glade_xml_get_widget(e_contact_editor_address->gui, entry_names[i]);
-			if (GTK_IS_ENTRY (w)) {
-				gtk_entry_set_editable (GTK_ENTRY (w),
-							e_contact_editor_address->editable);
-			}
-			else if (GTK_IS_COMBO (w)) {
-				gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (w)->entry),
-							e_contact_editor_address->editable);
-				gtk_widget_set_sensitive (GTK_COMBO (w)->button, e_contact_editor_address->editable);
-			}
-		}
-		break;
-	}
-	}
-}
-
-static void
-e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (object);
-
-	switch (arg_id) {
-	case ARG_ADDRESS:
-		extract_info(e_contact_editor_address);
-		GTK_VALUE_POINTER (*arg) = e_card_delivery_address_ref(e_contact_editor_address->address);
-		break;
-	case ARG_IS_READ_ONLY:
-		GTK_VALUE_BOOL (*arg) = e_contact_editor_address->editable ? TRUE : FALSE;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-fill_in_field(EContactEditorAddress *editor, char *field, char *string)
-{
-	GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, field));
-	if (editable) {
-		e_utf8_gtk_editable_set_text(editable, string);
-	}
-}
-
-static void
-fill_in_info(EContactEditorAddress *editor)
-{
-	ECardDeliveryAddress *address = editor->address;
-	if (address) {
-		fill_in_field(editor, "entry-street" , address->street );
-		fill_in_field(editor, "entry-po"     , address->po     );
-		fill_in_field(editor, "entry-ext"    , address->ext    );
-		fill_in_field(editor, "entry-city"   , address->city   );
-		fill_in_field(editor, "entry-region" , address->region );
-		fill_in_field(editor, "entry-code"   , address->code   );
-		fill_in_field(editor, "entry-country", address->country);
-	}
-}
-
-static char *
-extract_field(EContactEditorAddress *editor, char *field)
-{
-	GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor->gui, field));
-	if (editable)
-		return e_utf8_gtk_editable_get_text(editable);
-	else
-		return NULL;
-}
-
-static void
-extract_info(EContactEditorAddress *editor)
-{
-	ECardDeliveryAddress *address = editor->address;
-	if (!address) {
-		address = e_card_delivery_address_new();
-		editor->address = address;
-	}
-	address->street  = extract_field(editor, "entry-street" );
-	address->po      = extract_field(editor, "entry-po"     );
-	address->ext     = extract_field(editor, "entry-ext"    );
-	address->city    = extract_field(editor, "entry-city"   );
-	address->region  = extract_field(editor, "entry-region" );
-	address->code    = extract_field(editor, "entry-code"   );
-	address->country = extract_field(editor, "entry-country");
-}
diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.h b/addressbook/gui/contact-editor/e-contact-editor-address.h
deleted file mode 100644
index ff29c5b7ec..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-address.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-address.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_ADDRESS_H__
-#define __E_CONTACT_EDITOR_ADDRESS_H__
-
-#include <libgnomeui/gnome-dialog.h>
-#include <glade/glade.h>
-#include <ebook/e-card.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditorAddress - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * name         ECardName *     RW              The card currently being edited. Returns a copy.
- */
-
-#define E_CONTACT_EDITOR_ADDRESS_TYPE			(e_contact_editor_address_get_type ())
-#define E_CONTACT_EDITOR_ADDRESS(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE, EContactEditorAddress))
-#define E_CONTACT_EDITOR_ADDRESS_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_ADDRESS_TYPE, EContactEditorAddressClass))
-#define E_IS_CONTACT_EDITOR_ADDRESS(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE))
-#define E_IS_CONTACT_EDITOR_ADDRESS_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE))
-
-
-typedef struct _EContactEditorAddress       EContactEditorAddress;
-typedef struct _EContactEditorAddressClass  EContactEditorAddressClass;
-
-struct _EContactEditorAddress
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	ECardDeliveryAddress *address;
-
-	guint editable : 1;
-
-	GladeXML *gui;
-};
-
-struct _EContactEditorAddressClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_address_new(const ECardDeliveryAddress *name);
-GtkType    e_contact_editor_address_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_ADDRESS_H__ */
diff --git a/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade b/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade
deleted file mode 100644
index b91a040d46..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-contact-editor-confirm-delete</name>
-  <program_name>e-contact-editor-confirm-delete</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-</project>
-
-<widget>
-  <class>GnomeMessageBox</class>
-  <name>confirm-dialog</name>
-  <message_box_type>GNOME_MESSAGE_BOX_QUESTION</message_box_type>
-  <message>Are you sure you want
-to delete this contact?</message>
-  <title>Delete Contact?</title>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>True</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
deleted file mode 100644
index 5ae8b36a9b..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-fullname.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <libgnomeui/gnome-stock.h>
-#include <gal/widgets/e-unicode.h>
-#include "e-contact-editor-fullname.h"
-#include <gtk/gtkcombo.h>
-
-static void e_contact_editor_fullname_init		(EContactEditorFullname		 *card);
-static void e_contact_editor_fullname_class_init	(EContactEditorFullnameClass	 *klass);
-static void e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_fullname_destroy (GtkObject *object);
-
-static void fill_in_info(EContactEditorFullname *editor);
-static void extract_info(EContactEditorFullname *editor);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_NAME,
-	ARG_IS_READ_ONLY
-};
-
-GtkType
-e_contact_editor_fullname_get_type (void)
-{
-	static GtkType contact_editor_fullname_type = 0;
-
-	if (!contact_editor_fullname_type)
-		{
-			static const GtkTypeInfo contact_editor_fullname_info =
-			{
-				"EContactEditorFullname",
-				sizeof (EContactEditorFullname),
-				sizeof (EContactEditorFullnameClass),
-				(GtkClassInitFunc) e_contact_editor_fullname_class_init,
-				(GtkObjectInitFunc) e_contact_editor_fullname_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			contact_editor_fullname_type = gtk_type_unique (gnome_dialog_get_type (), &contact_editor_fullname_info);
-		}
-
-	return contact_editor_fullname_type;
-}
-
-static void
-e_contact_editor_fullname_class_init (EContactEditorFullnameClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeDialogClass *dialog_class;
-
-	object_class = (GtkObjectClass*) klass;
-	dialog_class = (GnomeDialogClass *) klass;
-
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
-
-	gtk_object_add_arg_type ("EContactEditorFullname::name", GTK_TYPE_POINTER, 
-				 GTK_ARG_READWRITE, ARG_NAME);
-
-	gtk_object_add_arg_type ("EContactEditorFullname::editable", GTK_TYPE_BOOL, 
-				 GTK_ARG_READWRITE, ARG_IS_READ_ONLY);
- 
-	object_class->set_arg = e_contact_editor_fullname_set_arg;
-	object_class->get_arg = e_contact_editor_fullname_get_arg;
-	object_class->destroy = e_contact_editor_fullname_destroy;
-}
-
-static void
-e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullname)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_fullname), TRUE, TRUE, FALSE);
-
-	e_contact_editor_fullname->name = NULL;
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fullname.glade", NULL);
-	e_contact_editor_fullname->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "table-checkfullname");
-	gtk_widget_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-}
-
-void
-e_contact_editor_fullname_destroy (GtkObject *object)
-{
-	EContactEditorFullname *e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME(object);
-
-	if (e_contact_editor_fullname->gui)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor_fullname->gui));
-	e_card_name_unref(e_contact_editor_fullname->name);
-}
-
-GtkWidget*
-e_contact_editor_fullname_new (const ECardName *name)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_fullname_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"name", name,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (o);
-	
-	switch (arg_id){
-	case ARG_NAME:
-		e_card_name_unref(e_contact_editor_fullname->name);
-		e_contact_editor_fullname->name = e_card_name_copy(GTK_VALUE_POINTER (*arg));
-		fill_in_info(e_contact_editor_fullname);
-		break;
-	case ARG_IS_READ_ONLY: {
-		int i;
-		char *entry_names[] = {
-			"combo-title",
-			"combo-suffix",
-			"entry-first",
-			"entry-middle",
-			"entry-last",
-			NULL
-		};
-		e_contact_editor_fullname->editable = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		for (i = 0; entry_names[i] != NULL; i ++) {
-			GtkWidget *w = glade_xml_get_widget(e_contact_editor_fullname->gui, entry_names[i]);
-			if (GTK_IS_ENTRY (w)) {
-				gtk_entry_set_editable (GTK_ENTRY (w),
-							e_contact_editor_fullname->editable);
-			}
-			else if (GTK_IS_COMBO (w)) {
-				gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (w)->entry),
-							e_contact_editor_fullname->editable);
-				gtk_widget_set_sensitive (GTK_COMBO (w)->button, e_contact_editor_fullname->editable);
-			}
-		}
-		break;
-	}
-	}
-}
-
-static void
-e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (object);
-
-	switch (arg_id) {
-	case ARG_NAME:
-		extract_info(e_contact_editor_fullname);
-		GTK_VALUE_POINTER (*arg) = e_card_name_ref(e_contact_editor_fullname->name);
-		break;
-	case ARG_IS_READ_ONLY:
-		GTK_VALUE_BOOL (*arg) = e_contact_editor_fullname->editable ? TRUE : FALSE;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-fill_in_field(EContactEditorFullname *editor, char *field, char *string)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry) {
-		if (string)
-			e_utf8_gtk_entry_set_text(entry, string);
-		else
-			gtk_entry_set_text(entry, "");
-	}
-}
-
-static void
-fill_in_info(EContactEditorFullname *editor)
-{
-	ECardName *name = editor->name;
-	if (name) {
-		fill_in_field(editor, "entry-title",  name->prefix);
-		fill_in_field(editor, "entry-first",  name->given);
-		fill_in_field(editor, "entry-middle", name->additional);
-		fill_in_field(editor, "entry-last",   name->family);
-		fill_in_field(editor, "entry-suffix", name->suffix);
-	}
-}
-
-static char *
-extract_field(EContactEditorFullname *editor, char *field)
-{
-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor->gui, field));
-	if (entry)
-		return e_utf8_gtk_entry_get_text(entry);
-	else
-		return NULL;
-}
-
-static void
-extract_info(EContactEditorFullname *editor)
-{
-	ECardName *name = editor->name;
-	if (!name) {
-		name = e_card_name_new();
-		editor->name = name;
-	}
-
-	name->prefix     = extract_field(editor, "entry-title" );
-	name->given      = extract_field(editor, "entry-first" );
-	name->additional = extract_field(editor, "entry-middle");
-	name->family     = extract_field(editor, "entry-last"  );
-	name->suffix     = extract_field(editor, "entry-suffix");
-}
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h
deleted file mode 100644
index 0d09b13700..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-fullname.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_FULLNAME_H__
-#define __E_CONTACT_EDITOR_FULLNAME_H__
-
-#include <libgnomeui/gnome-dialog.h>
-#include <glade/glade.h>
-#include <ebook/e-card.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditorFullname - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * name         ECardName *     RW              The card currently being edited. Returns a copy.
- */
-
-#define E_CONTACT_EDITOR_FULLNAME_TYPE			(e_contact_editor_fullname_get_type ())
-#define E_CONTACT_EDITOR_FULLNAME(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_FULLNAME_TYPE, EContactEditorFullname))
-#define E_CONTACT_EDITOR_FULLNAME_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_FULLNAME_TYPE, EContactEditorFullnameClass))
-#define E_IS_CONTACT_EDITOR_FULLNAME(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_FULLNAME_TYPE))
-#define E_IS_CONTACT_EDITOR_FULLNAME_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_FULLNAME_TYPE))
-
-
-typedef struct _EContactEditorFullname       EContactEditorFullname;
-typedef struct _EContactEditorFullnameClass  EContactEditorFullnameClass;
-
-struct _EContactEditorFullname
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	ECardName *name;
-	GladeXML *gui;
-
-	/* Whether the dialog will accept modifications */
-	guint editable : 1;
-};
-
-struct _EContactEditorFullnameClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_fullname_new(const ECardName *name);
-GtkType    e_contact_editor_fullname_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_FULLNAME_H__ */
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
deleted file mode 100644
index ea28563cc1..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ /dev/null
@@ -1,2618 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include "e-contact-editor.h"
-
-#include <time.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkcombo.h>
-#include <gtk/gtktext.h>
-#include <libgnomeui/gnome-popup-menu.h>
-#include <libgnomeui/gnome-dialog-util.h>
-#include <libgnomeui/gnome-stock.h>
-#include <libgnome/gnome-i18n.h>
-
-#include <bonobo/bonobo-ui-container.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include <gal/widgets/e-categories.h>
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/e-text/e-entry.h>
-
-#include <e-util/e-categories-master-list-wombat.h>
-
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-#include "addressbook/gui/widgets/e-addressbook-util.h"
-#include "e-util/e-gui-utils.h"
-#include "widgets/misc/e-dateedit.h"
-#include "shell/evolution-shell-component-utils.h"
-
-#include "e-card-merging.h"
-
-#include "e-contact-editor-address.h"
-#include "e-contact-editor-fullname.h"
-#include "e-contact-save-as.h"
-
-/* Signal IDs */
-enum {
-	CARD_ADDED,
-	CARD_MODIFIED,
-	CARD_DELETED,
-	EDITOR_CLOSED,
-	LAST_SIGNAL
-};
-
-static void e_contact_editor_init		(EContactEditor		 *card);
-static void e_contact_editor_class_init	(EContactEditorClass	 *klass);
-static void e_contact_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_destroy (GtkObject *object);
-
-#if 0
-static GtkWidget *e_contact_editor_build_dialog(EContactEditor *editor, gchar *entry_id, gchar *label_id, gchar *title, GList **list, GnomeUIInfo **info);
-#endif
-static void _email_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);
-static void _phone_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);
-static void _address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor);
-static void enable_writable_fields(EContactEditor *editor);
-static void set_editable(EContactEditor *editor);
-static void fill_in_info(EContactEditor *editor);
-static void extract_info(EContactEditor *editor);
-static void set_fields(EContactEditor *editor);
-static void set_address_field(EContactEditor *editor, int result);
-static void add_field_callback(GtkWidget *widget, EContactEditor *editor);
-static void command_state_changed (EContactEditor *ce);
-static void widget_changed (GtkWidget *widget, EContactEditor *editor);
-static void close_dialog (EContactEditor *ce);
-static void enable_widget (GtkWidget *widget, gboolean enabled);
-
-static GtkObjectClass *parent_class = NULL;
-
-static guint contact_editor_signals[LAST_SIGNAL];
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_CARD,
-	ARG_IS_NEW_CARD,
-	ARG_EDITABLE,
-	ARG_CHANGED,
-	ARG_WRITABLE_FIELDS
-};
-
-enum {
-	DYNAMIC_LIST_EMAIL,
-	DYNAMIC_LIST_PHONE,
-	DYNAMIC_LIST_ADDRESS
-};
-
-GtkType
-e_contact_editor_get_type (void)
-{
-  static GtkType contact_editor_type = 0;
-
-  if (!contact_editor_type)
-    {
-      static const GtkTypeInfo contact_editor_info =
-      {
-        "EContactEditor",
-        sizeof (EContactEditor),
-        sizeof (EContactEditorClass),
-        (GtkClassInitFunc) e_contact_editor_class_init,
-        (GtkObjectInitFunc) e_contact_editor_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      contact_editor_type = gtk_type_unique (GTK_TYPE_OBJECT, &contact_editor_info);
-    }
-
-  return contact_editor_type;
-}
-
-typedef void (*GtkSignal_NONE__INT_OBJECT) (GtkObject * object,
-					    gint arg1,
-					    GtkObject *arg2,
-					    gpointer user_data);
-
-static void
-e_marshal_NONE__INT_OBJECT (GtkObject * object,
-			    GtkSignalFunc func,
-			    gpointer func_data, GtkArg * args)
-{
-	GtkSignal_NONE__INT_OBJECT rfunc;
-	rfunc = (GtkSignal_NONE__INT_OBJECT) func;
-	(*rfunc) (object,
-		  GTK_VALUE_INT (args[0]),
-		  GTK_VALUE_OBJECT (args[1]),
-		  func_data);
-}
-
-static void
-e_contact_editor_class_init (EContactEditorClass *klass)
-{
-  GtkObjectClass *object_class;
-
-  object_class = (GtkObjectClass*) klass;
-
-  parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-  gtk_object_add_arg_type ("EContactEditor::book", GTK_TYPE_OBJECT, 
-			   GTK_ARG_READWRITE, ARG_BOOK);
-  gtk_object_add_arg_type ("EContactEditor::card", GTK_TYPE_OBJECT, 
-			   GTK_ARG_READWRITE, ARG_CARD);
-  gtk_object_add_arg_type ("EContactEditor::is_new_card", GTK_TYPE_BOOL,
-			   GTK_ARG_READWRITE, ARG_IS_NEW_CARD);
-  gtk_object_add_arg_type ("EContactEditor::writable_fields", GTK_TYPE_POINTER,
-			   GTK_ARG_READWRITE, ARG_WRITABLE_FIELDS);
-  gtk_object_add_arg_type ("EContactEditor::editable", GTK_TYPE_BOOL,
-			   GTK_ARG_READWRITE, ARG_EDITABLE);
-  gtk_object_add_arg_type ("EContactEditor::changed", GTK_TYPE_BOOL,
-			   GTK_ARG_READWRITE, ARG_CHANGED);
-
-  contact_editor_signals[CARD_ADDED] =
-	  gtk_signal_new ("card_added",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, card_added),
-			  e_marshal_NONE__INT_OBJECT,
-			  GTK_TYPE_NONE, 2,
-			  GTK_TYPE_INT, GTK_TYPE_OBJECT);
-
-  contact_editor_signals[CARD_MODIFIED] =
-	  gtk_signal_new ("card_modified",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, card_modified),
-			  e_marshal_NONE__INT_OBJECT,
-			  GTK_TYPE_NONE, 2,
-			  GTK_TYPE_INT, GTK_TYPE_OBJECT);
-
-  contact_editor_signals[CARD_DELETED] =
-	  gtk_signal_new ("card_deleted",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, card_deleted),
-			  e_marshal_NONE__INT_OBJECT,
-			  GTK_TYPE_NONE, 2,
-			  GTK_TYPE_INT, GTK_TYPE_OBJECT);
-
-  contact_editor_signals[EDITOR_CLOSED] =
-	  gtk_signal_new ("editor_closed",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, editor_closed),
-			  gtk_marshal_NONE__NONE,
-			  GTK_TYPE_NONE, 0);
-
-  gtk_object_class_add_signals (object_class, contact_editor_signals, LAST_SIGNAL);
- 
-  object_class->set_arg = e_contact_editor_set_arg;
-  object_class->get_arg = e_contact_editor_get_arg;
-  object_class->destroy = e_contact_editor_destroy;
-}
-
-static void
-_replace_button(EContactEditor *editor, gchar *button_xml, gchar *image, GtkSignalFunc func)
-{
-	GladeXML *gui = editor->gui;
-	GtkWidget *button = glade_xml_get_widget(gui, button_xml);
-	GtkWidget *pixmap;
-	gchar *image_temp;
-	if (button && GTK_IS_BUTTON(button)) {
-		image_temp = g_strdup_printf("%s/%s", EVOLUTIONDIR, image);
-		pixmap = e_create_image_widget(NULL, image_temp, NULL, 0, 0);
-		gtk_container_add(GTK_CONTAINER(button),
-				  pixmap);
-		g_free(image_temp);
-		gtk_widget_show(pixmap);
-		gtk_signal_connect(GTK_OBJECT(button), "button_press_event", func, editor);
-	}
-}
-
-static void
-_replace_buttons(EContactEditor *editor)
-{
-	_replace_button(editor, "button-phone1", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-phone2", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-phone3", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-phone4", "arrow.png", _phone_arrow_pressed);
-	_replace_button(editor, "button-address", "arrow.png", _address_arrow_pressed);
-	_replace_button(editor, "button-email1", "arrow.png", _email_arrow_pressed);
-}
-
-static void
-wants_html_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	gboolean wants_html;
-	gtk_object_get(GTK_OBJECT(widget),
-		       "active", &wants_html,
-		       NULL);
-	gtk_object_set(GTK_OBJECT(editor->card),
-		       "wants_html", wants_html,
-		       NULL);
-
-	widget_changed (widget, editor);
-}
-
-static void
-phone_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int which;
-	GtkEntry *entry = GTK_ENTRY(widget);
-	ECardPhone *phone;
-
-	if ( widget == glade_xml_get_widget(editor->gui, "entry-phone1") ) {
-		which = 1;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone2") ) {
-		which = 2;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone3") ) {
-		which = 3;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone4") ) {
-		which = 4;
-	} else
-		return;
-	phone = e_card_phone_new();
-	phone->number = e_utf8_gtk_entry_get_text(entry);
-	e_card_simple_set_phone(editor->simple, editor->phone_choice[which - 1], phone);
-	e_card_phone_unref(phone);
-	set_fields(editor);
-
-	widget_changed (widget, editor);
-}
-
-static void
-email_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	gchar *string;
-	GtkEntry *entry = GTK_ENTRY(widget);
-
-	string = e_utf8_gtk_entry_get_text(entry);
-
-	e_card_simple_set_email(editor->simple, editor->email_choice, string);
-
-	g_free (string);
-
-	widget_changed (widget, editor);
-}
-
-static void
-address_text_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	GtkEditable *editable = GTK_EDITABLE(widget);
-	ECardAddrLabel *address;
-
-	if (editor->address_choice == -1)
-		return;
-
-	address = e_card_address_label_new();
-
-	address->data = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-	e_card_simple_set_address(editor->simple, editor->address_choice, address);
-	e_card_address_label_unref(address);
-
-	widget_changed (widget, editor);
-}
-
-/* This function tells you whether name_to_style will make sense.  */
-static gboolean
-style_makes_sense(const ECardName *name, char *company, int style)
-{
-	switch (style) {
-	case 0: /* Fall Through */
-	case 1:
-		return TRUE;
-	case 2:
-		if (company && *company)
-			return TRUE;
-		else
-			return FALSE;
-	case 3: /* Fall Through */
-	case 4:
-		if (company && *company && name && ((name->given && *name->given) || (name->family && *name->family)))
-			return TRUE;
-		else
-			return FALSE;
-	default:
-		return FALSE;
-	}
-}
-
-static char *
-name_to_style(const ECardName *name, char *company, int style)
-{
-	char *string;
-	char *strings[4], **stringptr;
-	char *substring;
-	switch (style) {
-	case 0:
-		stringptr = strings;
-		if (name) {
-			if (name->family && *name->family)
-				*(stringptr++) = name->family;
-			if (name->given && *name->given)
-				*(stringptr++) = name->given;
-		}
-		*stringptr = NULL;
-		string = g_strjoinv(", ", strings);
-		break;
-	case 1:
-		stringptr = strings;
-		if (name) {
-			if (name->given && *name->given)
-				*(stringptr++) = name->given;
-			if (name->family && *name->family)
-				*(stringptr++) = name->family;
-		}
-		*stringptr = NULL;
-		string = g_strjoinv(" ", strings);
-		break;
-	case 2:
-		string = g_strdup(company);
-		break;
-	case 3: /* Fall Through */
-	case 4:
-		stringptr = strings;
-		if (name) {
-			if (name->family && *name->family)
-				*(stringptr++) = name->family;
-			if (name->given && *name->given)
-				*(stringptr++) = name->given;
-		}
-		*stringptr = NULL;
-		substring = g_strjoinv(", ", strings);
-		if (!(company && *company))
-			company = "";
-		if (style == 3)
-			string = g_strdup_printf("%s (%s)", substring, company);
-		else
-			string = g_strdup_printf("%s (%s)", company, substring);
-		g_free(substring);
-		break;
-	default:
-		string = g_strdup("");
-	}
-	return string;
-}
-
-static int
-file_as_get_style (EContactEditor *editor)
-{
-	GtkEntry *file_as = GTK_ENTRY(glade_xml_get_widget(editor->gui, "entry-file-as"));
-	char *filestring;
-	char *trystring;
-	ECardName *name = editor->name;
-	int i;
-	int style;
-
-	if (!(file_as && GTK_IS_ENTRY(file_as)))
-		return -1;
-
-	filestring = e_utf8_gtk_entry_get_text(file_as);
-
-	style = -1;
-	for (i = 0; i < 5; i++) {
-		trystring = name_to_style(name, editor->company, i);
-		if (!strcmp(trystring, filestring)) {
-			g_free(trystring);
-			g_free(filestring);
-			return i;
-		}
-		g_free(trystring);
-	}
-	g_free (filestring);
-	return -1;
-}
-
-static void
-file_as_set_style(EContactEditor *editor, int style)
-{
-	char *string;
-	int i;
-	GList *strings = NULL;
-	GtkEntry *file_as = GTK_ENTRY(glade_xml_get_widget(editor->gui, "entry-file-as"));
-	GtkWidget *widget;
-		
-
-	if (!(file_as && GTK_IS_ENTRY(file_as)))
-		return;
-
-	if (style == -1) {
-		string = e_utf8_gtk_entry_get_text(file_as);
-		strings = g_list_append(strings, string);
-	}
-
-	widget = glade_xml_get_widget(editor->gui, "combo-file-as");
-
-	for (i = 0; i < 5; i++) {
-		if (style_makes_sense(editor->name, editor->company, i)) {
-			char *u;
-			u = name_to_style(editor->name, editor->company, i);
-			string = e_utf8_to_gtk_string (widget, u);
-			g_free (u);
-			if (string) strings = g_list_append(strings, string);
-		}
-	}
-
-	if (widget && GTK_IS_COMBO(widget)) {
-		GtkCombo *combo = GTK_COMBO(widget);
-		gtk_combo_set_popdown_strings(combo, strings);
-		g_list_foreach(strings, (GFunc) g_free, NULL);
-		g_list_free(strings);
-	}
-
-	if (style != -1) {
-		string = name_to_style(editor->name, editor->company, style);
-		e_utf8_gtk_entry_set_text(file_as, string);
-		g_free(string);
-	}
-}
-
-static void
-name_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int style = 0;
-	char *string;
-
-	style = file_as_get_style(editor);
-	
-	e_card_name_unref(editor->name);
-
-	string = e_utf8_gtk_entry_get_text (GTK_ENTRY(widget));
-	editor->name = e_card_name_from_string(string);
-	g_free (string);
-	
-	file_as_set_style(editor, style);
-
-	widget_changed (widget, editor);
-}
-
-static void
-company_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int style = 0;
-
-	style = file_as_get_style(editor);
-	
-	g_free(editor->company);
-	
-	editor->company = e_utf8_gtk_entry_get_text(GTK_ENTRY(widget));
-	
-	file_as_set_style(editor, style);
-
-	widget_changed (widget, editor);
-}
-
-static void
-field_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	if (!editor->changed) {
-		editor->changed = TRUE;
-		command_state_changed (editor);
-	}
-}
-
-static void
-set_entry_changed_signal_phone(EContactEditor *editor, char *id)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, id);
-	if (widget && GTK_IS_ENTRY(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   phone_entry_changed, editor);
-}
-
-static void
-widget_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	if (!editor->editable) {
-		g_warning ("non-editable contact editor has an editable field in it.");
-		return;
-	}
-
-	if (!editor->changed) {
-		editor->changed = TRUE;
-		command_state_changed (editor);
-	}
-}
-
-static void
-set_entry_changed_signal_field(EContactEditor *editor, char *id)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, id);
-	if (widget && GTK_IS_ENTRY(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   field_changed, editor);
-}
-
-static void
-set_entry_changed_signals(EContactEditor *editor)
-{
-	GtkWidget *widget;
-	set_entry_changed_signal_phone(editor, "entry-phone1");
-	set_entry_changed_signal_phone(editor, "entry-phone2");
-	set_entry_changed_signal_phone(editor, "entry-phone3");
-	set_entry_changed_signal_phone(editor, "entry-phone4");
-	widget = glade_xml_get_widget(editor->gui, "entry-email1");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   email_entry_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "text-address");
-	if (widget && GTK_IS_TEXT(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   address_text_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-fullname");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   name_entry_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-company");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   company_entry_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-web");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-categories");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-jobtitle");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-file-as");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-manager");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-assistant");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-office");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-department");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-profession");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-nickname");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-spouse");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "text-comments");
-	if (widget && GTK_IS_TEXT(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-	if (widget && E_IS_DATE_EDIT(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-	if (widget && E_IS_DATE_EDIT(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-	widget = glade_xml_get_widget(editor->gui, "entry-web");
-	if (widget && GTK_IS_ENTRY(widget)) {
-		gtk_signal_connect(GTK_OBJECT(widget), "changed",
-				   widget_changed, editor);
-	}
-
-}
-
-static void
-full_name_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	GnomeDialog *dialog = GNOME_DIALOG(e_contact_editor_fullname_new(editor->name));
-	int result;
-
-	gtk_object_set (GTK_OBJECT (dialog),
-			"editable", editor->editable,
-			NULL);
-	gtk_widget_show(GTK_WIDGET(dialog));
-	result = gnome_dialog_run (dialog);
-
-	if (result == 0) {
-		ECardName *name;
-		GtkWidget *fname_widget;
-		int style = 0;
-
-		gtk_object_get(GTK_OBJECT(dialog),
-			       "name", &name,
-			       NULL);
-
-		style = file_as_get_style(editor);
-
-		fname_widget = glade_xml_get_widget(editor->gui, "entry-fullname");
-		if (fname_widget && GTK_IS_ENTRY(fname_widget)) {
-			char *full_name = e_card_name_to_string(name);
-			e_utf8_gtk_entry_set_text(GTK_ENTRY(fname_widget), full_name);
-			g_free(full_name);
-		}
-
-		e_card_name_unref(editor->name);
-		editor->name = e_card_name_ref(name);
-
-		file_as_set_style(editor, style);
-	}
-	gtk_object_unref(GTK_OBJECT(dialog));
-}
-
-static void
-full_addr_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	GnomeDialog *dialog;
-	int result;
-	const ECardDeliveryAddress *address;
-
-	address = e_card_simple_get_delivery_address(editor->simple, editor->address_choice);
-
-	dialog = GNOME_DIALOG(e_contact_editor_address_new(address));
-	gtk_object_set (GTK_OBJECT (dialog),
-			"editable", editor->editable,
-			NULL);
-	gtk_widget_show(GTK_WIDGET(dialog));
-
-	result = gnome_dialog_run (dialog);
-	if (result == 0) {
-		ECardDeliveryAddress *new_address;
-		GtkWidget *address_widget;
-
-		gtk_object_get(GTK_OBJECT(dialog),
-			       "address", &new_address,
-			       NULL);
-
-		address_widget = glade_xml_get_widget(editor->gui, "text-address");
-		if (address_widget && GTK_IS_EDITABLE(address_widget)) {
-			char *string = e_card_delivery_address_to_string(new_address);
-			e_utf8_gtk_editable_set_text(GTK_EDITABLE(address_widget), string);
-			g_free(string);
-		} else {
-			ECardAddrLabel *address = e_card_delivery_address_to_label(new_address);
-			e_card_simple_set_address(editor->simple, editor->address_choice, address);
-			e_card_address_label_unref(address);
-		}
-
-		e_card_simple_set_delivery_address(editor->simple, editor->address_choice, new_address);
-
-		e_card_delivery_address_unref(new_address);
-	}
-	gtk_object_unref(GTK_OBJECT(dialog));
-}
-
-static void
-categories_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	char *categories = NULL;
-	GnomeDialog *dialog;
-	int result;
-	GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories");
-	ECategoriesMasterList *ecml;
-	if (entry && GTK_IS_ENTRY(entry))
-		categories = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry));
-	else if (editor->card)
-		gtk_object_get(GTK_OBJECT(editor->card),
-			       "categories", &categories,
-			       NULL);
-	dialog = GNOME_DIALOG(e_categories_new(categories));
-
-	if (dialog == NULL) {
-		GtkWidget *uh_oh = gnome_error_dialog (_("Category editor not available."));
-		gtk_widget_show (uh_oh);
-		return;
-	}
-
-	ecml = e_categories_master_list_wombat_new ();
-	gtk_object_set(GTK_OBJECT(dialog),
-		       "header", _("This contact belongs to these categories:"),
-		       "ecml", ecml,
-		       NULL);
-	gtk_object_unref (GTK_OBJECT (ecml));
-	gtk_widget_show(GTK_WIDGET(dialog));
-	result = gnome_dialog_run (dialog);
-	g_free (categories);
-	if (result == 0) {
-		gtk_object_get(GTK_OBJECT(dialog),
-			       "categories", &categories,
-			       NULL);
-		if (entry && GTK_IS_ENTRY(entry))
-			e_utf8_gtk_entry_set_text(GTK_ENTRY(entry), categories);
-		else
-			gtk_object_set(GTK_OBJECT(editor->card),
-				       "categories", categories,
-				       NULL);
-		g_free(categories);
-	}
-	gtk_object_destroy(GTK_OBJECT(dialog));
-}
-
-static void
-ensure_select_names_contact (EContactEditor *editor)
-{
-	if (editor->select_names_contacts == NULL) {
-		editor->select_names_contacts = e_select_names_manager_new ();
-		e_select_names_manager_add_section (editor->select_names_contacts,
-						    "contacts",
-						    "Related Contacts");
-	}
-
-	set_entry_changed_signal_field(editor, "entry-caluri");
-	set_entry_changed_signal_field(editor, "entry-fburl");
-}
-
-static void
-contacts_clicked (GtkWidget *button, EContactEditor *editor)
-{
-	ensure_select_names_contact (editor);
-	e_select_names_manager_activate_dialog (editor->select_names_contacts,
-						"contacts");
-}
-
-static void
-add_lists (EContactEditor *editor)
-{
-	GtkWidget *table = glade_xml_get_widget (editor->gui, "table-contacts");
-	if (table && GTK_IS_TABLE (table)) {
-		GtkWidget *entry;
-
-		ensure_select_names_contact (editor);
-		entry = e_select_names_manager_create_entry (editor->select_names_contacts,
-							     "contacts");
-		gtk_signal_connect(GTK_OBJECT(entry), "changed",
-				   widget_changed, editor);
-		gtk_table_attach_defaults (GTK_TABLE (table), entry, 0, 1, 0, 1);
-		gtk_widget_show (entry);
-	}
-}
-
-
-typedef struct {
-	EContactEditor *ce;
-	gboolean should_close;
-} EditorCloseStruct;
-
-static void
-card_added_cb (EBook *book, EBookStatus status, const char *id, EditorCloseStruct *ecs)
-{
-	EContactEditor *ce = ecs->ce;
-	gboolean should_close = ecs->should_close;
-
-	gtk_widget_set_sensitive (ce->app, TRUE);
-	ce->in_async_call = FALSE;
-
-	e_card_set_id (ce->card, id);
-
-	gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[CARD_ADDED],
-			 status, ce->card);
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		ce->is_new_card = FALSE;
-
-		if (should_close) {
-			close_dialog (ce);
-		}
-		else {
-			ce->changed = FALSE;
-			command_state_changed (ce);
-		}
-	}
-
-	gtk_object_unref (GTK_OBJECT (ce));
-	g_free (ecs);
-}
-
-static void
-card_modified_cb (EBook *book, EBookStatus status, EditorCloseStruct *ecs)
-{
-	EContactEditor *ce = ecs->ce;
-	gboolean should_close = ecs->should_close;
-
-	gtk_widget_set_sensitive (ce->app, TRUE);
-	ce->in_async_call = FALSE;
-
-	gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[CARD_MODIFIED],
-			 status, ce->card);
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		if (should_close) {
-			close_dialog (ce);
-		}
-		else {
-			ce->changed = FALSE;
-			command_state_changed (ce);
-		}
-	}
-
-	gtk_object_unref (GTK_OBJECT (ce));
-	g_free (ecs);
-}
-
-/* Emits the signal to request saving a card */
-static void
-save_card (EContactEditor *ce, gboolean should_close)
-{
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	if (ce->book) {
-		EditorCloseStruct *ecs = g_new(EditorCloseStruct, 1);
-		
-		ecs->ce = ce;
-		gtk_object_ref (GTK_OBJECT (ecs->ce));
-
-		ecs->should_close = should_close;
-
-		gtk_widget_set_sensitive (ce->app, FALSE);
-		ce->in_async_call = TRUE;
-
-		if (ce->is_new_card)
-			e_card_merging_book_add_card (ce->book, ce->card, GTK_SIGNAL_FUNC(card_added_cb), ecs);
-		else
-			e_card_merging_book_commit_card (ce->book, ce->card, GTK_SIGNAL_FUNC(card_modified_cb), ecs);
-	}
-}
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (EContactEditor *ce)
-{
-	if (ce->app != NULL) {
-		gtk_widget_destroy (ce->app);
-		ce->app = NULL;
-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[EDITOR_CLOSED]);
-	}
-}
-
-static gboolean
-prompt_to_save_changes (EContactEditor *editor)
-{
-	if (!editor->changed)
-		return TRUE;
-
-	switch (e_addressbook_prompt_save_dialog (GTK_WINDOW(editor->app))) {
-	case 0: /* Save */
-		save_card (editor, FALSE);
-		return TRUE;
-	case 1: /* Discard */
-		return TRUE;
-	case 2: /* Cancel */
-	default:
-		return FALSE;
-	}
-}
-
-/* Menu callbacks */
-
-/* File/Save callback */
-static void
-file_save_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_card (ce, FALSE);
-}
-
-/* File/Close callback */
-static void
-file_close_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	if (!prompt_to_save_changes (ce))
-		return;
-
-	close_dialog (ce);
-}
-
-static void
-file_save_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-	ECard *card;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	card = ce->card;
-	e_contact_save_as(_("Save Contact as VCard"), card);
-}
-
-static void
-file_send_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-	ECard *card;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	card = ce->card;
-	e_card_send(card, E_CARD_DISPOSITION_AS_ATTACHMENT);
-}
-
-static void
-file_send_to_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-	ECard *card;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	card = ce->card;
-	e_card_send(card, E_CARD_DISPOSITION_AS_TO);
-}
-
-gboolean
-e_contact_editor_confirm_delete(GtkWindow *parent)
-{
-	GnomeDialog *dialog;
-	GladeXML *gui;
-	int result;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/e-contact-editor-confirm-delete.glade", NULL);
-
-	dialog = GNOME_DIALOG(glade_xml_get_widget(gui, "confirm-dialog"));
-
-	gnome_dialog_set_parent(dialog, parent);
-	
-	result = gnome_dialog_run_and_close(dialog);
-
-	gtk_object_unref(GTK_OBJECT(gui));
-
-	return !result;
-}
-
-static void
-card_deleted_cb (EBook *book, EBookStatus status, EContactEditor *ce)
-{
-	gtk_widget_set_sensitive (ce->app, TRUE);
-	ce->in_async_call = FALSE;
-
-	gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[CARD_DELETED],
-			 status, ce->card);
-
-	/* always close the dialog after we successfully delete a card */
-	if (status == E_BOOK_STATUS_SUCCESS)
-		close_dialog (ce);
-}
-
-static void
-delete_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce = E_CONTACT_EDITOR (data);
-	ECard *card = ce->card;
-	ECardSimple *simple = ce->simple;
-
-	gtk_object_ref(GTK_OBJECT(card));
-	gtk_object_ref(GTK_OBJECT(simple));
-
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(ce->app))) {
-
-		extract_info (ce);
-		e_card_simple_sync_card (simple);
-		
-		if (!ce->is_new_card && ce->book) {
-			gtk_widget_set_sensitive (ce->app, FALSE);
-			ce->in_async_call = TRUE;
-
-			e_book_remove_card (ce->book, card, GTK_SIGNAL_FUNC(card_deleted_cb), ce);
-		}
-	}
-
-	gtk_object_unref(GTK_OBJECT(card));
-	gtk_object_unref(GTK_OBJECT(simple));
-}
-
-/* Emits the signal to request printing a card */
-static void
-print_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	gtk_widget_show(e_contact_print_card_dialog_new(ce->card));
-}
-
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-/* Emits the signal to request printing a card */
-static void
-print_envelope_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	gtk_widget_show(e_contact_print_envelope_dialog_new(ce->card));
-}
-#endif
-
-/* Toolbar/Save and Close callback */
-static void
-tb_save_and_close_cb (BonoboUIComponent *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_card (ce, TRUE);
-}
-
-static
-BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSave", file_save_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveAs", file_save_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveClose", tb_save_and_close_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSendAs", file_send_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSendTo", file_send_to_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorDelete", delete_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrint", print_cb),
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrintEnvelope", print_envelope_cb),
-#endif
-	/*	BONOBO_UI_UNSAFE_VERB ("ContactEditorPageSetup", file_page_setup_menu), */
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorClose", file_close_cb),
-	
-	BONOBO_UI_VERB_END
-};
-
-EPixmap pixmaps[] = {
-	E_PIXMAP ("/commands/ContactEditorSave", "save-16.png"),
-	E_PIXMAP ("/commands/ContactEditorSaveClose", "save-16.png"),
-	E_PIXMAP ("/commands/ContactEditorSaveAs", "save-as-16.png"),
-	E_PIXMAP ("/commands/ContactEditorDelete", "evolution-trash-mini.png"),
-	E_PIXMAP ("/commands/ContactEditorPrint", "print.xpm"),
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-	E_PIXMAP ("/commands/ContactEditorPrintEnvelope", "print.xpm"),
-#endif
-	E_PIXMAP ("/Toolbar/ContactEditorSaveClose", "buttons/save-24.png"),
-	E_PIXMAP ("/Toolbar/ContactEditorDelete", "buttons/delete-message.png"),
-	E_PIXMAP ("/Toolbar/ContactEditorPrint", "buttons/print.png"),
-
-	E_PIXMAP_END
-};
-
-static void
-create_ui (EContactEditor *ce)
-{
-	bonobo_ui_component_add_verb_list_with_data (ce->uic, verbs, ce);
-
-	bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR,
-			       "evolution-contact-editor.xml",
-			       "evolution-contact-editor");
-
-	e_pixmaps_update (ce->uic, pixmaps);
-}
-
-/* Callback used when the dialog box is destroyed */
-static gint
-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	/* if we're saving, don't allow the dialog to close */
-	if (ce->in_async_call)
-		return TRUE;
-
-	if (!prompt_to_save_changes (ce))
-		return TRUE;
-
-	close_dialog (ce);
-	return TRUE;
-}
-
-static GList *
-add_to_tab_order(GList *list, GladeXML *gui, char *name)
-{
-	GtkWidget *widget = glade_xml_get_widget(gui, name);
-	return g_list_prepend(list, widget);
-}
-
-static void
-setup_tab_order(GladeXML *gui)
-{
-	GtkWidget *container;
-	GList *list = NULL;
-
-	container = glade_xml_get_widget(gui, "table-contact-editor-general");
-
-	if (container) {
-		list = add_to_tab_order(list, gui, "entry-fullname");
-		list = add_to_tab_order(list, gui, "entry-jobtitle");
-		list = add_to_tab_order(list, gui, "entry-company");
-		list = add_to_tab_order(list, gui, "combo-file-as");
-		list = add_to_tab_order(list, gui, "entry-phone1");
-		list = add_to_tab_order(list, gui, "entry-phone2");
-		list = add_to_tab_order(list, gui, "entry-phone3");
-		list = add_to_tab_order(list, gui, "entry-phone4");
-
-		list = add_to_tab_order(list, gui, "entry-email1");
-		list = add_to_tab_order(list, gui, "alignment-htmlmail");
-		list = add_to_tab_order(list, gui, "entry-web");
-		list = add_to_tab_order(list, gui, "button-fulladdr");
-		list = add_to_tab_order(list, gui, "text-address");
-		list = add_to_tab_order(list, gui, "alignment-contacts");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-	}
-}
-
-static void
-e_contact_editor_init (EContactEditor *e_contact_editor)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-	GtkWidget *bonobo_win;
-	GtkWidget *wants_html;
-	BonoboUIContainer *container;
-
-	e_contact_editor->email_info = NULL;
-	e_contact_editor->phone_info = NULL;
-	e_contact_editor->address_info = NULL;
-	e_contact_editor->email_popup = NULL;
-	e_contact_editor->phone_popup = NULL;
-	e_contact_editor->address_popup = NULL;
-	e_contact_editor->email_list = NULL;
-	e_contact_editor->phone_list = NULL;
-	e_contact_editor->address_list = NULL;
-	e_contact_editor->name = e_card_name_new();
-	e_contact_editor->company = g_strdup("");
-	
-	e_contact_editor->email_choice = 0;
-	e_contact_editor->phone_choice[0] = E_CARD_SIMPLE_PHONE_ID_BUSINESS;
-	e_contact_editor->phone_choice[1] = E_CARD_SIMPLE_PHONE_ID_HOME;
-	e_contact_editor->phone_choice[2] = E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX;
-	e_contact_editor->phone_choice[3] = E_CARD_SIMPLE_PHONE_ID_MOBILE;
-	e_contact_editor->address_choice = 0;
-
-	e_contact_editor->arbitrary_fields = NULL;
-	
-	e_contact_editor->simple = e_card_simple_new(NULL);
-
-	e_contact_editor->card = NULL;
-	e_contact_editor->changed = FALSE;
-	e_contact_editor->in_async_call = FALSE;
-	e_contact_editor->editable = TRUE;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/contact-editor.glade", NULL);
-	e_contact_editor->gui = gui;
-
-	setup_tab_order(gui);
-
-	e_contact_editor->app = glade_xml_get_widget (gui, "contact editor");
-
-	e_container_foreach_leaf (GTK_CONTAINER (e_contact_editor->app),
-				  (GtkCallback) add_field_callback,
-				  e_contact_editor);
-
-	_replace_buttons(e_contact_editor);
-	add_lists (e_contact_editor);
-	set_entry_changed_signals(e_contact_editor);
-
-	wants_html = glade_xml_get_widget(e_contact_editor->gui, "checkbutton-htmlmail");
-	if (wants_html && GTK_IS_TOGGLE_BUTTON(wants_html))
-		gtk_signal_connect(GTK_OBJECT(wants_html), "toggled",
-				   wants_html_changed, e_contact_editor);
-	
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-fullname");
-	if (widget && GTK_IS_BUTTON(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",
-				   full_name_clicked, e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-fulladdr");
-	if (widget && GTK_IS_BUTTON(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",
-				   full_addr_clicked, e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories");
-	if (widget && GTK_IS_BUTTON(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",
-				   categories_clicked, e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "button-contacts");
-	if (widget && GTK_IS_BUTTON(widget))
-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",
-				   contacts_clicked, e_contact_editor);
-
-
-	/* Construct the app */
-	bonobo_win = bonobo_window_new ("contact-editor-dialog", _("Contact Editor"));
-
-	/* FIXME: The sucking bit */
-	{
-		GtkWidget *contents;
-
-		contents = gnome_dock_get_client_area (
-			GNOME_DOCK (GNOME_APP (e_contact_editor->app)->dock));
-		if (!contents) {
-			g_message ("contact_editor_construct(): Could not get contents");
-			return;
-		}
-		gtk_widget_ref (contents);
-		gtk_container_remove (GTK_CONTAINER (contents->parent), contents);
-		bonobo_window_set_contents (BONOBO_WINDOW (bonobo_win), contents);
-		gtk_widget_destroy (e_contact_editor->app);
-		e_contact_editor->app = bonobo_win;
-	}
-
-	/* Build the menu and toolbar */
-
-	container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (e_contact_editor->app));
-
-	e_contact_editor->uic = bonobo_ui_component_new_default ();
-	if (!e_contact_editor->uic) {
-		g_message ("e_contact_editor_init(): eeeeek, could not create the UI handler!");
-		return;
-	}
-	bonobo_ui_component_set_container (e_contact_editor->uic,
-					   bonobo_object_corba_objref (
-						   BONOBO_OBJECT (container)));
-
-	create_ui (e_contact_editor);
-
-	widget = glade_xml_get_widget(e_contact_editor->gui, "entry-fullname");
-	if (widget)
-		gtk_widget_grab_focus (widget);
-
-	/* Connect to the deletion of the dialog */
-
-	gtk_signal_connect (GTK_OBJECT (e_contact_editor->app), "delete_event",
-			    GTK_SIGNAL_FUNC (app_delete_event_cb), e_contact_editor);
-}
-
-void
-e_contact_editor_destroy (GtkObject *object) {
-	EContactEditor *e_contact_editor = E_CONTACT_EDITOR(object);
-
-	if (e_contact_editor->writable_fields) {
-		gtk_object_unref(GTK_OBJECT(e_contact_editor->writable_fields));
-	}
-	if (e_contact_editor->email_list) {
-		g_list_foreach(e_contact_editor->email_list, (GFunc) g_free, NULL);
-		g_list_free(e_contact_editor->email_list);
-	}
-	if (e_contact_editor->email_info) {
-		g_free(e_contact_editor->email_info);
-	}
-	if (e_contact_editor->email_popup) {
-		gtk_widget_unref(e_contact_editor->email_popup);
-	}
-	
-	if (e_contact_editor->phone_list) {
-		g_list_foreach(e_contact_editor->phone_list, (GFunc) g_free, NULL);
-		g_list_free(e_contact_editor->phone_list);
-	}
-	if (e_contact_editor->phone_info) {
-		g_free(e_contact_editor->phone_info);
-	}
-	if (e_contact_editor->phone_popup) {
-		gtk_widget_unref(e_contact_editor->phone_popup);
-	}
-	
-	if (e_contact_editor->address_list) {
-		g_list_foreach(e_contact_editor->address_list, (GFunc) g_free, NULL);
-		g_list_free(e_contact_editor->address_list);
-	}
-	if (e_contact_editor->address_info) {
-		g_free(e_contact_editor->address_info);
-	}
-	if (e_contact_editor->address_popup) {
-		gtk_widget_unref(e_contact_editor->address_popup);
-	}
-	
-	if (e_contact_editor->simple)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor->simple));
-
-	if (e_contact_editor->book)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor->book));
-
-	e_card_name_unref(e_contact_editor->name);
-	g_free (e_contact_editor->company);
-
-	gtk_object_unref(GTK_OBJECT(e_contact_editor->gui));
-}
-
-static void
-command_state_changed (EContactEditor *ce)
-{
-	bonobo_ui_component_set_prop (ce->uic,
-				      "/commands/ContactEditorSaveClose",
-				      "sensitive",
-				      ce->changed ? "1" : "0", NULL);
-	bonobo_ui_component_set_prop (ce->uic,
-				      "/commands/ContactEditorSave",
-				      "sensitive",
-				      ce->changed ? "1" : "0", NULL);
-	bonobo_ui_component_set_prop (ce->uic,
-				      "/commands/ContactEditorDelete",
-				      "sensitive",
-				      (ce->editable && !ce->is_new_card) ? "1" : "0", NULL);
-}
-
-static void
-supported_fields_cb (EBook *book, EBookStatus status,
-		     EList *fields, EContactEditor *ce)
-{
-	gtk_object_set (GTK_OBJECT (ce),
-			"writable_fields", fields,
-			NULL);
-
-	e_contact_editor_show (ce);
-
-	command_state_changed (ce);
-}
-
-EContactEditor *
-e_contact_editor_new (EBook *book,
-		      ECard *card,
-		      gboolean is_new_card,
-		      gboolean editable)
-{
-	EContactEditor *ce;
-
-	g_return_val_if_fail (E_IS_BOOK (book), NULL);
-	g_return_val_if_fail (E_IS_CARD (card), NULL);
-
-	ce = E_CONTACT_EDITOR (gtk_type_new (E_CONTACT_EDITOR_TYPE));
-
-	gtk_object_set (GTK_OBJECT (ce),
-			"book", book,
-			"card", card,
-			"is_new_card", is_new_card,
-			"editable", editable,
-			NULL);
-
-	if (book)
-		e_book_get_supported_fields (book, (EBookFieldsCallback)supported_fields_cb, ce);
-
-	return ce;
-}
-
-static void
-e_contact_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditor *editor;
-
-	editor = E_CONTACT_EDITOR (o);
-	
-	switch (arg_id){
-	case ARG_BOOK:
-		if (editor->book)
-			gtk_object_unref(GTK_OBJECT(editor->book));
-		editor->book = E_BOOK(GTK_VALUE_OBJECT (*arg));
-		gtk_object_ref (GTK_OBJECT (editor->book));
-		/* XXX more here about editable/etc. */
-		break;
-	case ARG_CARD:
-		if (editor->card)
-			gtk_object_unref(GTK_OBJECT(editor->card));
-		editor->card = e_card_duplicate(E_CARD(GTK_VALUE_OBJECT (*arg)));
-		gtk_object_set(GTK_OBJECT(editor->simple),
-			       "card", editor->card,
-			       NULL);
-		fill_in_info(editor);
-		editor->changed = FALSE;
-		break;
-
-	case ARG_IS_NEW_CARD:
-		editor->is_new_card = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		break;
-
-	case ARG_EDITABLE: {
-		gboolean new_value = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		gboolean changed = (editor->editable != new_value);
-
-		editor->editable = new_value;
-
-		if (changed) {
-			set_editable (editor);
-			command_state_changed (editor);
-		}
-		break;
-	}
-
-	case ARG_CHANGED: {
-		gboolean new_value = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		gboolean changed = (editor->changed != new_value);
-
-		editor->changed = new_value;
-
-		if (changed)
-			command_state_changed (editor);
-		break;
-	}
-	case ARG_WRITABLE_FIELDS:
-		if (editor->writable_fields)
-			gtk_object_unref(GTK_OBJECT(editor->writable_fields));
-		editor->writable_fields = GTK_VALUE_POINTER (*arg);
-		if (editor->writable_fields)
-			gtk_object_ref (GTK_OBJECT (editor->writable_fields));
-		else
-			editor->writable_fields = e_list_new(NULL, NULL, NULL);
-		enable_writable_fields (editor);
-		break;
-	}
-}
-
-static void
-e_contact_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditor *e_contact_editor;
-
-	e_contact_editor = E_CONTACT_EDITOR (object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_contact_editor->book);
-		break;
-
-	case ARG_CARD:
-		e_card_simple_sync_card(e_contact_editor->simple);
-		extract_info(e_contact_editor);
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_contact_editor->card);
-		break;
-
-	case ARG_IS_NEW_CARD:
-		GTK_VALUE_BOOL (*arg) = e_contact_editor->is_new_card ? TRUE : FALSE;
-		break;
-
-	case ARG_EDITABLE:
-		GTK_VALUE_BOOL (*arg) = e_contact_editor->editable ? TRUE : FALSE;
-		break;
-
-	case ARG_CHANGED:
-		GTK_VALUE_BOOL (*arg) = e_contact_editor->changed ? TRUE : FALSE;
-		break;
-
-	case ARG_WRITABLE_FIELDS:
-		if (e_contact_editor->writable_fields)
-			GTK_VALUE_POINTER (*arg) = e_list_duplicate (e_contact_editor->writable_fields);
-		else
-			GTK_VALUE_POINTER (*arg) = NULL;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-_popup_position(GtkMenu *menu,
-		gint *x,
-		gint *y,
-		gpointer data)
-{
-	GtkWidget *button = GTK_WIDGET(data);
-	GtkRequisition request;
-	int mh, mw;
-	gdk_window_get_origin (button->window, x, y);
-	*x += button->allocation.width;
-	*y += button->allocation.height;
-
-	gtk_widget_size_request(GTK_WIDGET(menu), &request);
-
-	mh = request.height;
-	mw = request.width;
-
-	*x -= mw;
-	if (*x < 0)
-		*x = 0;
-	
-	if (*y < 0)
-		*y = 0;
-	
-	if ((*x + mw) > gdk_screen_width ())
-		*x = gdk_screen_width () - mw;
-	
-	if ((*y + mh) > gdk_screen_height ())
-		*y = gdk_screen_height () - mh;
-}
-
-static gint
-_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor, GtkWidget *popup, GList **list, GnomeUIInfo **info, gchar *label, gchar *entry, gchar *dialog_title)
-{
-	gint menu_item;
-	gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "button_press_event");
-	gtk_widget_realize(popup);
-	menu_item = gnome_popup_menu_do_popup_modal(popup, _popup_position, widget, button, editor);
-	if ( menu_item != -1 ) {
-#if 0
-		if (menu_item == g_list_length (*list)) {
-			e_contact_editor_build_dialog(editor, entry, label, dialog_title, list, info);
-		} else {
-#endif
-			GtkWidget *label_widget = glade_xml_get_widget(editor->gui, label);
-			if (label_widget && GTK_IS_LABEL(label_widget)) {
-				gtk_object_set(GTK_OBJECT(label_widget),
-					       "label", _(g_list_nth_data(*list, menu_item)),
-					       NULL);
-			}
-#if 0
-		}
-#endif
-	}
-	return menu_item;
-}
-
-static void
-e_contact_editor_build_ui_info(GList *list, GnomeUIInfo **infop)
-{
-	GnomeUIInfo *info;
-	GnomeUIInfo singleton = { GNOME_APP_UI_TOGGLEITEM, NULL, NULL, NULL, NULL, NULL, GNOME_APP_PIXMAP_NONE, 0, 0, 0, NULL };
-	GnomeUIInfo end = GNOMEUIINFO_END;
-	int length;
-	int i;
-
-	info = *infop;
-
-	if ( info )
-		g_free(info);
-	length = g_list_length( list );
-	info = g_new(GnomeUIInfo, length + 2);
-	for (i = 0; i < length; i++) {
-		info[i] = singleton;
-		info[i].label = _(list->data);
-		list = list->next;
-	}
-	info[i] = end;
-
-	*infop = info;
-}
-
-static void
-e_contact_editor_build_phone_ui (EContactEditor *editor)
-{
-	int i;
-
-	if (editor->phone_list == NULL) {
-		static char *info[] = {
-			N_("Assistant"),
-			N_("Business"),
-			N_("Business 2"),
-			N_("Business Fax"),
-			N_("Callback"),
-			N_("Car"),
-			N_("Company"),
-			N_("Home"),
-			N_("Home 2"),
-			N_("Home Fax"),
-			N_("ISDN"),
-			N_("Mobile"),
-			N_("Other"),
-			N_("Other Fax"),
-			N_("Pager"),
-			N_("Primary"),
-			N_("Radio"),
-			N_("Telex"),
-			N_("TTY/TDD")
-		};
-		
-		for (i = 0; i < sizeof(info) / sizeof(info[0]); i++) {
-			editor->phone_list = g_list_append(editor->phone_list, g_strdup(info[i]));
-		}
-	}
-	if (editor->phone_info == NULL) {
-		e_contact_editor_build_ui_info(editor->phone_list, &editor->phone_info);
-		
-		if ( editor->phone_popup )
-			gtk_widget_unref(editor->phone_popup);
-		
-		editor->phone_popup = gnome_popup_menu_new(editor->phone_info);
-	}
-}
-
-static void
-e_contact_editor_build_email_ui (EContactEditor *editor)
-{
-	int i;
-
-	if (editor->email_list == NULL) {
-		static char *info[] = {
-			N_("Primary Email"),
-			N_("Email 2"),
-			N_("Email 3")
-		};
-		
-		for (i = 0; i < sizeof(info) / sizeof(info[0]); i++) {
-			editor->email_list = g_list_append(editor->email_list, g_strdup(info[i]));
-		}
-	}
-	if (editor->email_info == NULL) {
-		e_contact_editor_build_ui_info(editor->email_list, &editor->email_info);
-
-		if ( editor->email_popup )
-			gtk_widget_unref(editor->email_popup);
-		
-		editor->email_popup = gnome_popup_menu_new(editor->email_info);
-	}
-}
-
-static void
-e_contact_editor_build_address_ui (EContactEditor *editor)
-{
-	int i;
-
-	if (editor->address_list == NULL) {
-		static char *info[] = {
-			N_("Business"),
-			N_("Home"),
-			N_("Other")
-		};
-		
-		for (i = 0; i < sizeof(info) / sizeof(info[0]); i++) {
-			editor->address_list = g_list_append(editor->address_list, g_strdup(info[i]));
-		}
-	}
-	if (editor->address_info == NULL) {
-		e_contact_editor_build_ui_info(editor->address_list, &editor->address_info);
-
-		if ( editor->address_popup )
-			gtk_widget_unref(editor->address_popup);
-		
-		editor->address_popup = gnome_popup_menu_new(editor->address_info);
-	}
-}
-#if 0
-static void
-_dialog_clicked(GtkWidget *dialog, gint button, EContactEditor *editor)
-{
-	GtkWidget *label = gtk_object_get_data(GTK_OBJECT(dialog),
-					       "e_contact_editor_label");
-
-	GtkWidget *dialog_entry = gtk_object_get_data(GTK_OBJECT(dialog),
-						      "e_contact_editor_dialog_entry");
-	
-	GList **list = gtk_object_get_data(GTK_OBJECT(dialog),
-					   "e_contact_editor_list");
-	GList **info = gtk_object_get_data(GTK_OBJECT(dialog),
-					   "e_contact_editor_info");
-	switch (button) {
-	case 0:
-		if (label && GTK_IS_LABEL(label)) {
-			gtk_object_set(GTK_OBJECT(label),
-				       "label", gtk_entry_get_text(GTK_ENTRY(dialog_entry)),
-				       NULL);
-			*list = g_list_append(*list, e_utf8_gtk_entry_get_text(GTK_ENTRY(dialog_entry)));
-			g_free(*info);
-			*info = NULL;
-		}
-		break;
-	}
-	gnome_dialog_close(GNOME_DIALOG(dialog));
-}
-
-static void
-_dialog_destroy(EContactEditor *editor, GtkWidget *dialog)
-{
-	gnome_dialog_close(GNOME_DIALOG(dialog));
-}
-
-static GtkWidget *
-e_contact_editor_build_dialog(EContactEditor *editor, gchar *entry_id, gchar *label_id, gchar *title, GList **list, GnomeUIInfo **info)
-{
-	GtkWidget *dialog_entry = gtk_entry_new();
-	GtkWidget *entry = glade_xml_get_widget(editor->gui, entry_id);
-	GtkWidget *label = glade_xml_get_widget(editor->gui, label_id);
-	
-	GtkWidget *dialog = gnome_dialog_new(title,
-					     NULL);
-	
-	gtk_container_add(GTK_CONTAINER(GNOME_DIALOG(dialog)->vbox),
-			  gtk_widget_new (gtk_frame_get_type(),
-					  "border_width", 4,
-					  "label", title,
-					  "child", gtk_widget_new(gtk_alignment_get_type(),
-								  "child", dialog_entry,
-								  "xalign", .5,
-								  "yalign", .5,
-								  "xscale", 1.0,
-								  "yscale", 1.0,
-								  "border_width", 9,
-								  NULL),
-					  NULL));
-
-	gnome_dialog_append_button_with_pixmap(GNOME_DIALOG(dialog),
-					       "Add",
-					       GNOME_STOCK_PIXMAP_ADD);
-	gnome_dialog_append_button(GNOME_DIALOG(dialog), GNOME_STOCK_BUTTON_CANCEL);
-	gnome_dialog_set_default(GNOME_DIALOG(dialog), 0);
-	
-	gtk_signal_connect(GTK_OBJECT(dialog), "clicked",
-			   _dialog_clicked, editor);
-	gtk_signal_connect_while_alive(GTK_OBJECT(editor), "destroy",
-				       _dialog_destroy, GTK_OBJECT(dialog), GTK_OBJECT(dialog));
-	
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_entry", entry);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_label", label);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_dialog_entry", dialog_entry);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_list", list);
-	gtk_object_set_data(GTK_OBJECT(dialog),
-			    "e_contact_editor_info", info);
-
-	gtk_widget_show_all(dialog);
-	return dialog;
-}
-#endif
-
-static void
-_phone_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int which;
-	int i;
-	gchar *label;
-	gchar *entry;
-	int result;
-	if ( widget == glade_xml_get_widget(editor->gui, "button-phone1") ) {
-		which = 1;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "button-phone2") ) {
-		which = 2;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "button-phone3") ) {
-		which = 3;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "button-phone4") ) {
-		which = 4;
-	} else
-		return;
-	
-	label = g_strdup_printf("label-phone%d", which);
-	entry = g_strdup_printf("entry-phone%d", which);
-
-	e_contact_editor_build_phone_ui (editor);
-	
-	for(i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i++) {
-		const ECardPhone *phone = e_card_simple_get_phone(editor->simple, i);
-		gboolean checked;
-		checked = phone && phone->number && *phone->number;
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->phone_info[i].widget),
-					       checked);
-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor->phone_info[i].widget),
-						    TRUE);
-	}
-	
-	result = _arrow_pressed (widget, button, editor, editor->phone_popup, &editor->phone_list, &editor->phone_info, label, entry, "Add new phone number type");
-	
-	if (result != -1) {
-		editor->phone_choice[which - 1] = result;
-		set_fields(editor);
-		enable_widget (glade_xml_get_widget (editor->gui, label), TRUE);
-		enable_widget (glade_xml_get_widget (editor->gui, entry), editor->editable);
-	}
-
-	g_free(label);
-	g_free(entry);
-}
-
-static void
-_email_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int i;
-	int result;
-
-	e_contact_editor_build_email_ui (editor);
-
-	for(i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++) {
-		const char *string = e_card_simple_get_email(editor->simple, i);
-		gboolean checked;
-		checked = string && *string;
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->email_info[i].widget),
-					       checked);
-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor->email_info[i].widget),
-						    TRUE);
-	}
-	
-	result = _arrow_pressed (widget, button, editor, editor->email_popup, &editor->email_list, &editor->email_info, "label-email1", "entry-email1", "Add new Email type");
-	
-	if (result != -1) {
-		editor->email_choice = result;
-		set_fields(editor);
-
-		/* make sure the buttons/entry is/are sensitive */
-		enable_widget (glade_xml_get_widget (editor->gui, "label-email1"), TRUE);
-		enable_widget (glade_xml_get_widget (editor->gui, "entry-email1"), editor->editable);
-		enable_widget (glade_xml_get_widget (editor->gui, "checkbutton-htmlmail"), editor->editable);
-	}
-}
-
-static void
-_address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int i;
-	int result;
-
-	e_contact_editor_build_address_ui (editor);
-
-	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-		const ECardAddrLabel *address = e_card_simple_get_address(editor->simple, i);
-		gboolean checked;
-		checked = address && address->data && *address->data;
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(editor->address_info[i].widget),
-					       checked);
-		gtk_check_menu_item_set_show_toggle(GTK_CHECK_MENU_ITEM(editor->address_info[i].widget),
-						    TRUE);
-	}
-	
-	result = _arrow_pressed (widget, button, editor, editor->address_popup, &editor->address_list, &editor->address_info, "label-address", "text-address", "Add new Address type");
-
-	if (result != -1) {
-		set_address_field(editor, result);
-
-		/* make sure the buttons/entry is/are sensitive */
-		enable_widget (glade_xml_get_widget (editor->gui, "label-address"), TRUE);
-		enable_widget (glade_xml_get_widget (editor->gui, "text-address"), editor->editable);
-	}
-}
-
-static void
-set_field(GtkEntry *entry, const char *string)
-{
-	char *oldstring = e_utf8_gtk_entry_get_text(entry);
-	if (!string)
-		string = "";
-	if (strcmp(string, oldstring))
-		e_utf8_gtk_entry_set_text(entry, string);
-	g_free (oldstring);
-}
-
-static void
-set_phone_field(GtkWidget *entry, const ECardPhone *phone)
-{
-	set_field(GTK_ENTRY(entry), phone ? phone->number : "");
-}
-
-static void
-set_fields(EContactEditor *editor)
-{
-	GtkWidget *entry;
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone1");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[0]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone2");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[1]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone3");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[2]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone4");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[3]));
-	
-	entry = glade_xml_get_widget(editor->gui, "entry-email1");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_field(GTK_ENTRY(entry), e_card_simple_get_email(editor->simple, editor->email_choice));
-	
-	set_address_field(editor, -1);
-}
-
-static void
-set_address_field(EContactEditor *editor, int result)
-{
-	GtkWidget *widget;
-	
-	widget = glade_xml_get_widget(editor->gui, "text-address");
-
-	if (widget && GTK_IS_TEXT(widget)) {
-		int position;
-		GtkEditable *editable;
-		const ECardAddrLabel *address;
-
-		if (result == -1)
-			result = editor->address_choice;
-		editor->address_choice = -1;
-
-		position = 0;
-		editable = GTK_EDITABLE(widget);
-		gtk_editable_delete_text(editable, 0, -1);
-		address = e_card_simple_get_address(editor->simple, result);
-		if (address && address->data) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, address->data);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-
-		editor->address_choice = result;
-	}
-}
-
-static void
-add_field_callback(GtkWidget *widget, EContactEditor *editor)
-{
-	const char *name;
-	int i;
-	static const char *builtins[] = {
-		"entry-fullname",
-		"entry-web",
-		"entry-company",
-		"entry-department",
-		"entry-office",
-		"entry-jobtitle",
-		"entry-profession",
-		"entry-manager",
-		"entry-assistant",
-		"entry-nickname",
-		"entry-spouse",
-		"text-comments",
-		"entry-categories",
-		"entry-contacts",
-		"entry-file-as",
-		"dateedit-anniversary",
-		"dateedit-birthday",
-		"entry-phone1",
-		"entry-phone2",
-		"entry-phone3",
-		"entry-phone4",
-		"entry-email1",
-		"text-address",
-		"checkbutton-mailingaddress",
-		"checkbutton-htmlmail",
-		"entry-caluri",
-		"entry-fburl",
-		NULL
-	};
-	name = glade_get_widget_name(widget);
-	if (name) {
-		for (i = 0; builtins[i]; i++) {
-			if (!strcmp(name, builtins[i]))
-				return;
-		}
-		if (GTK_IS_ENTRY(widget) || GTK_IS_TEXT(widget)) {
-			editor->arbitrary_fields = g_list_prepend(editor->arbitrary_fields, g_strdup(name));
-		}
-	}
-}
-
-static struct {
-	char *id;
-	char *key;
-} field_mapping [] = {
-	{ "entry-fullname", "full_name" },
-	{ "entry-web", "url" },
-	{ "entry-company", "org" },
-	{ "entry-department", "org_unit" },
-	{ "entry-office", "office" },
-	{ "entry-jobtitle", "title" },
-	{ "entry-profession", "role" },
-	{ "entry-manager", "manager" },
-	{ "entry-assistant", "assistant" },
-	{ "entry-nickname", "nickname" },
-	{ "entry-spouse", "spouse" },
-	{ "text-comments", "note" },
-	{ "entry-categories", "categories" },
-	{ "entry-caluri", "caluri" },
-	{ "entry-fburl", "fburl" },
-};
-
-static void
-fill_in_field(EContactEditor *editor, char *id, char *value)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, id);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		int position = 0;
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		gtk_editable_delete_text(editable, 0, -1);
-		if (value) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, value);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-	}
-}
-
-static void
-fill_in_card_field(EContactEditor *editor, ECard *card, char *id, char *key)
-{
-	char *string;
-	gtk_object_get(GTK_OBJECT(card),
-		       key, &string,
-		       NULL);
-	fill_in_field(editor, id, string);
-}
-
-static void
-fill_in_single_field(EContactEditor *editor, char *name)
-{
-	ECardSimple *simple = editor->simple;
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, name);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		int position = 0;
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		const ECardArbitrary *arbitrary;
-
-		gtk_editable_delete_text(editable, 0, -1);
-		arbitrary = e_card_simple_get_arbitrary(simple,
-							name);
-		if (arbitrary && arbitrary->value) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, arbitrary->value);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-	}
-}
-
-static void
-disable_widget_foreach (char *key, GtkWidget *widget, gpointer closure)
-{
-	enable_widget (widget, FALSE);
-}
-
-static struct {
-	char *widget_name;
-	ECardSimpleField field_id;
-	gboolean desensitize_for_read_only;
-} widget_field_mappings[] = {
-	{ "entry-web", E_CARD_SIMPLE_FIELD_URL, TRUE },
-	{ "accellabel-web", E_CARD_SIMPLE_FIELD_URL },
-
-	{ "entry-jobtitle", E_CARD_SIMPLE_FIELD_TITLE, TRUE },
-	{ "label-jobtitle", E_CARD_SIMPLE_FIELD_TITLE },
-
-	{ "entry-company", E_CARD_SIMPLE_FIELD_ORG, TRUE },
-	{ "label-company", E_CARD_SIMPLE_FIELD_ORG },
-
-	{ "combo-file-as", E_CARD_SIMPLE_FIELD_FILE_AS, TRUE },
-	{ "entry-file-as", E_CARD_SIMPLE_FIELD_FILE_AS, TRUE },
-	{ "accellabel-fileas", E_CARD_SIMPLE_FIELD_FILE_AS },
-
-	{ "label-department", E_CARD_SIMPLE_FIELD_ORG_UNIT },
-	{ "entry-department", E_CARD_SIMPLE_FIELD_ORG_UNIT, TRUE },
-
-	{ "label-office", E_CARD_SIMPLE_FIELD_OFFICE },
-	{ "entry-office", E_CARD_SIMPLE_FIELD_OFFICE, TRUE },
-
-	{ "label-profession", E_CARD_SIMPLE_FIELD_ROLE },
-	{ "entry-profession", E_CARD_SIMPLE_FIELD_ROLE, TRUE },
-
-	{ "label-manager", E_CARD_SIMPLE_FIELD_MANAGER },
-	{ "entry-manager", E_CARD_SIMPLE_FIELD_MANAGER, TRUE },
-
-	{ "label-assistant", E_CARD_SIMPLE_FIELD_ASSISTANT },
-	{ "entry-assistant", E_CARD_SIMPLE_FIELD_ASSISTANT, TRUE },
-
-	{ "label-nickname", E_CARD_SIMPLE_FIELD_NICKNAME },
-	{ "entry-nickname", E_CARD_SIMPLE_FIELD_NICKNAME, TRUE },
-
-	{ "label-spouse", E_CARD_SIMPLE_FIELD_SPOUSE },
-	{ "entry-spouse", E_CARD_SIMPLE_FIELD_SPOUSE, TRUE },
-
-	{ "label-birthday", E_CARD_SIMPLE_FIELD_BIRTH_DATE },
-	{ "dateedit-birthday", E_CARD_SIMPLE_FIELD_BIRTH_DATE, TRUE },
-
-	{ "label-anniversary", E_CARD_SIMPLE_FIELD_ANNIVERSARY },
-	{ "dateedit-anniversary", E_CARD_SIMPLE_FIELD_ANNIVERSARY, TRUE },
-
-	{ "label-comments", E_CARD_SIMPLE_FIELD_NOTE },
-	{ "text-comments", E_CARD_SIMPLE_FIELD_NOTE, TRUE },
-
-	{ "entry-fullname", E_CARD_SIMPLE_FIELD_FULL_NAME, TRUE },
-
-	{ "button-categories", E_CARD_SIMPLE_FIELD_CATEGORIES, TRUE },
-	{ "entry-categories", E_CARD_SIMPLE_FIELD_CATEGORIES, TRUE },
-
-	{ "label-caluri", E_CARD_SIMPLE_FIELD_CALURI },
-	{ "entry-caluri", E_CARD_SIMPLE_FIELD_CALURI, TRUE },
-
-	{ "label-fburl", E_CARD_SIMPLE_FIELD_FBURL },
-	{ "entry-fburl", E_CARD_SIMPLE_FIELD_FBURL, TRUE }
-};
-static int num_widget_field_mappings = sizeof(widget_field_mappings) / sizeof (widget_field_mappings[0]);
-
-static void
-enable_writable_fields(EContactEditor *editor)
-{
-	EList *fields = editor->writable_fields;
-	EIterator *iter;
-	GHashTable *dropdown_hash, *supported_hash;
-	int i;
-	ECardSimple *simple;
-	ECard *card;
-	char *widget_name;
-
-	if (!fields)
-		return;
-
-	card = e_card_new ("");
-	simple = e_card_simple_new (card);
-
-	dropdown_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	supported_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	/* build our hashtable of the drop down menu items */
-	e_contact_editor_build_phone_ui (editor);
-	for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++)
-		g_hash_table_insert (dropdown_hash,
-				     (char*)e_card_simple_get_ecard_field(simple, e_card_simple_map_phone_to_field (i)),
-				     editor->phone_info[i].widget);
-	e_contact_editor_build_email_ui (editor);
-	for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++)
-		g_hash_table_insert (dropdown_hash,
-				     (char*)e_card_simple_get_ecard_field(simple, e_card_simple_map_email_to_field (i)),
-				     editor->email_info[i].widget);
-	e_contact_editor_build_address_ui (editor);
-	for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++)
-		g_hash_table_insert (dropdown_hash,
-				     (char*)e_card_simple_get_ecard_field(simple, e_card_simple_map_address_to_field (i)),
-				     editor->address_info[i].widget);
-
-	/* then disable them all */
-	g_hash_table_foreach (dropdown_hash, (GHFunc)disable_widget_foreach, NULL);
-
-	/* disable the label widgets for the dropdowns (4 phone, 1
-           email and the toggle button, and 1 address and one for
-           the full adress button */
-	for (i = 0; i < 4; i ++) {
-		widget_name = g_strdup_printf ("label-phone%d", i+1);
-		enable_widget (glade_xml_get_widget (editor->gui, widget_name), FALSE);
-		g_free (widget_name);
-		widget_name = g_strdup_printf ("entry-phone%d", i+1);
-		enable_widget (glade_xml_get_widget (editor->gui, widget_name), FALSE);
-		g_free (widget_name);
-	}
-	enable_widget (glade_xml_get_widget (editor->gui, "label-email1"), FALSE);
-	enable_widget (glade_xml_get_widget (editor->gui, "entry-email1"), FALSE);
-	enable_widget (glade_xml_get_widget (editor->gui, "checkbutton-htmlmail"), FALSE);
-	enable_widget (glade_xml_get_widget (editor->gui, "label-address"), FALSE);
-	enable_widget (glade_xml_get_widget (editor->gui, "text-address"), FALSE);
-
-	/* enable widgets that map directly from a field to a widget (the drop down items) */
-	iter = e_list_get_iterator (fields);
-	for (; e_iterator_is_valid (iter); e_iterator_next (iter)) {
-		char *field = (char*)e_iterator_get (iter);
-		GtkWidget *widget = g_hash_table_lookup (dropdown_hash, field);
-
-		if (widget) {
-			enable_widget (widget, editor->editable);
-		}
-		else {
-			/* if it's not a field that's handled by the
-                           dropdown items, add it to the has to be
-                           used in the second step */
-			g_hash_table_insert (supported_hash, field, field);
-		}
-
-		/* ugh - this is needed to make sure we don't have a
-                   disabled label next to a drop down when the item in
-                   the menu (the one reflected in the label) is
-                   enabled. */
-		if (!strcmp (field, e_card_simple_get_ecard_field (simple, e_card_simple_map_email_to_field(editor->email_choice)))) {
-			enable_widget (glade_xml_get_widget (editor->gui, "label-email1"), TRUE);
-			enable_widget (glade_xml_get_widget (editor->gui, "entry-email1"), editor->editable);
-			enable_widget (glade_xml_get_widget (editor->gui, "checkbutton-htmlmail"), editor->editable);
-		}
-		else if (!strcmp (field, e_card_simple_get_ecard_field (simple, e_card_simple_map_address_to_field(editor->address_choice)))) {
-			enable_widget (glade_xml_get_widget (editor->gui, "label-address"), TRUE);
-			enable_widget (glade_xml_get_widget (editor->gui, "text-address"), editor->editable);
-		}
-		else for (i = 0; i < 4; i ++) {
-			if (!strcmp (field, e_card_simple_get_ecard_field (simple, e_card_simple_map_phone_to_field(editor->phone_choice[i])))) {
-				widget_name = g_strdup_printf ("label-phone%d", i+1);
-				enable_widget (glade_xml_get_widget (editor->gui, widget_name), TRUE);
-				g_free (widget_name);
-				widget_name = g_strdup_printf ("entry-phone%d", i+1);
-				enable_widget (glade_xml_get_widget (editor->gui, widget_name), editor->editable);
-				g_free (widget_name);
-			}
-		}
-	}
-
-	/* handle the label next to the dropdown widgets */
-
-	for (i = 0; i < num_widget_field_mappings; i ++) {
-		gboolean enabled;
-		GtkWidget *w;
-		const char *field;
-
-		w = glade_xml_get_widget(editor->gui, widget_field_mappings[i].widget_name);
-		if (!w) {
-			g_warning (_("Could not find widget for a field: `%s'"),
-				   widget_field_mappings[i].widget_name);
-			continue;
-		}
-		field = e_card_simple_get_ecard_field (simple,
-						       widget_field_mappings[i].field_id);
-
-		enabled = (g_hash_table_lookup (supported_hash, field) != NULL);
-
-		enable_widget (w, enabled);
-	}
-
-	g_hash_table_destroy (dropdown_hash);
-	g_hash_table_destroy (supported_hash);
-	gtk_object_unref (GTK_OBJECT(simple));
-	gtk_object_unref (GTK_OBJECT(card));
-}
-
-static void
-set_editable (EContactEditor *editor)
-{
-	int i;
-	char *entry;
-	/* set the sensitivity of all the non-dropdown entry/texts/dateedits */
-	for (i = 0; i < num_widget_field_mappings; i ++) {
-		if (widget_field_mappings[i].desensitize_for_read_only) {
-			GtkWidget *widget = glade_xml_get_widget(editor->gui, widget_field_mappings[i].widget_name);
-			enable_widget (widget, editor->editable);
-		}
-	}
-
-	/* handle the phone dropdown entries */
-	for (i = 0; i < 4; i ++) {
-		entry = g_strdup_printf ("entry-phone%d", i+1);
-
-		enable_widget (glade_xml_get_widget(editor->gui, entry),
-			       editor->editable);
-
-		g_free (entry);
-	}
-
-	/* handle the email dropdown entry */
-	entry = "entry-email1";
-	enable_widget (glade_xml_get_widget(editor->gui, entry),
-		       editor->editable);
-	enable_widget (glade_xml_get_widget(editor->gui, "checkbutton-htmlmail"),
-		       editor->editable);
-
-	/* handle the address dropdown entry */
-	entry = "text-address";
-	enable_widget (glade_xml_get_widget(editor->gui, entry),
-		       editor->editable);
-}
-
-static void
-fill_in_info(EContactEditor *editor)
-{
-	ECard *card = editor->card;
-	if (card) {
-		char *file_as;
-		char *related_contacts;
-		ECardName *name;
-		const ECardDate *anniversary;
-		const ECardDate *bday;
-		int i;
-		GtkWidget *widget;
-		GList *list;
-		gboolean wants_html, wants_html_set;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "file_as",          &file_as,
-			       "related_contacts", &related_contacts,
-			       "name",             &name,
-			       "anniversary",      &anniversary,
-			       "birth_date",       &bday,
-			       "wants_html_set",   &wants_html_set,
-			       "wants_html",       &wants_html,
-			       NULL);
-	
-		for (i = 0; i < sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {
-			fill_in_card_field(editor, card, field_mapping[i].id, field_mapping[i].key);
-		}
-
-		for (list = editor->arbitrary_fields; list; list = list->next) {
-			fill_in_single_field(editor, list->data);
-		}
-
-		if (wants_html_set) {
-			GtkWidget *widget = glade_xml_get_widget(editor->gui, "checkbutton-htmlmail");
-			if (widget && GTK_IS_CHECK_BUTTON(widget)) {
-				gtk_object_set(GTK_OBJECT(widget),
-					       "active", wants_html,
-					       NULL);
-			}
-		}
-
-		/* File as has to come after company and name or else it'll get messed up when setting them. */
-		fill_in_field(editor, "entry-file-as", file_as);
-		
-		e_card_name_unref(editor->name);
-		editor->name = e_card_name_ref(name);
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (widget && E_IS_DATE_EDIT(widget)) {
-			EDateEdit *dateedit;
-			dateedit = E_DATE_EDIT(widget);
-			if (anniversary)
-				e_date_edit_set_date (dateedit,
-						      anniversary->year,
-						      anniversary->month,
-						      anniversary->day);
-			else
-				e_date_edit_set_time (dateedit, -1);
-		}
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (widget && E_IS_DATE_EDIT(widget)) {
-			EDateEdit *dateedit;
-			dateedit = E_DATE_EDIT(widget);
-			if (bday)
-				e_date_edit_set_date (dateedit,
-						      bday->year,
-						      bday->month,
-						      bday->day);
-			else
-				e_date_edit_set_time (dateedit, -1);
-		}
-
-		if (editor->select_names_contacts && related_contacts && *related_contacts) {
-			ESelectNamesModel *model = e_select_names_manager_get_source (editor->select_names_contacts,
-										      "contacts");
-			e_select_names_model_import_destinationv (model, related_contacts);
-		}
-
-		set_fields(editor);
-	}
-}
-
-static void
-extract_field(EContactEditor *editor, ECard *card, char *editable_id, char *key)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, editable_id);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-		if (string && *string)
-			gtk_object_set(GTK_OBJECT(card),
-				       key, string,
-				       NULL);
-		else
-			gtk_object_set(GTK_OBJECT(card),
-				       key, NULL,
-				       NULL);
-
-		if (string) g_free(string);
-	}
-}
-
-static void
-extract_single_field(EContactEditor *editor, char *name)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, name);
-	ECardSimple *simple = editor->simple;
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-		if (string && *string)
-			e_card_simple_set_arbitrary(simple,
-						    name,
-						    NULL,
-						    string);
-		else
-			e_card_simple_set_arbitrary(simple,
-						    name,
-						    NULL,
-						    NULL);
-		if (string) g_free(string);
-	}
-}
-
-static void
-extract_info(EContactEditor *editor)
-{
-	ECard *card = editor->card;
-	if (card) {
-		ECardDate anniversary;
-		ECardDate bday;
-		int i;
-		GtkWidget *widget;
-		GList *list;
-
-		widget = glade_xml_get_widget(editor->gui, "entry-file-as");
-		if (widget && GTK_IS_EDITABLE(widget)) {
-			GtkEditable *editable = GTK_EDITABLE(widget);
-			char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-			if (string && *string)
-				gtk_object_set(GTK_OBJECT(card),
-					       "file_as", string,
-					       NULL);
-
-			if (string) g_free(string);
-		}
-
-		for (i = 0; i < sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {
-			extract_field(editor, card, field_mapping[i].id, field_mapping[i].key);
-		}
-
-		for (list = editor->arbitrary_fields; list; list = list->next) {
-			extract_single_field(editor, list->data);
-		}
-
-		if (editor->select_names_contacts) {
-			ESelectNamesModel *model = e_select_names_manager_get_source (editor->select_names_contacts,
-										      "contacts");
-			char *string = e_select_names_model_export_destinationv (model);
-			if (string && *string)
-				gtk_object_set (GTK_OBJECT (card),
-						"related_contacts", string,
-						NULL);
-			else
-				gtk_object_set (GTK_OBJECT (card),
-						"related_contacts", NULL,
-						NULL);
-			g_free (string);
-		}
-
-		if (editor->name)
-			gtk_object_set(GTK_OBJECT(card),
-				       "name", editor->name,
-				       NULL);
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (widget && E_IS_DATE_EDIT(widget)) {
-			if (e_date_edit_get_date (E_DATE_EDIT (widget),
-						  &anniversary.year,
-						  &anniversary.month,
-						  &anniversary.day)) {
-				/* g_print ("%d %d %d\n", anniversary.year, anniversary.month, anniversary.day); */
-				gtk_object_set(GTK_OBJECT(card),
-					       "anniversary", &anniversary,
-					       NULL);
-			} else
-				gtk_object_set(GTK_OBJECT(card),
-					       "anniversary", NULL,
-					       NULL);
-		}
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (widget && E_IS_DATE_EDIT(widget)) {
-			if (e_date_edit_get_date (E_DATE_EDIT (widget),
-						  &bday.year,
-						  &bday.month,
-						  &bday.day)) {
-				/* g_print ("%d %d %d\n", bday.year, bday.month, bday.day); */
-				gtk_object_set(GTK_OBJECT(card),
-					       "birth_date", &bday,
-					       NULL);
-			} else
-				gtk_object_set(GTK_OBJECT(card),
-					       "birth_date", NULL,
-					       NULL);
-		}
-	}
-}
-
-/**
- * e_contact_editor_raise:
- * @config: The %EContactEditor object.
- *
- * Raises the dialog associated with this %EContactEditor object.
- */
-void
-e_contact_editor_raise (EContactEditor *editor)
-{
-	/* FIXME: perhaps we should raise at realize time */
-	if (GTK_WIDGET (editor->app)->window)
-		gdk_window_raise (GTK_WIDGET (editor->app)->window);
-}
-
-/**
- * e_contact_editor_show:
- * @ce: The %EContactEditor object.
- *
- * Shows the dialog associated with this %EContactEditor object.
- */
-void
-e_contact_editor_show (EContactEditor *ce)
-{
-	gtk_widget_show (ce->app);
-}
-
-GtkWidget *
-e_contact_editor_create_date(gchar *name,
-			     gchar *string1, gchar *string2,
-			     gint int1, gint int2);
-
-GtkWidget *
-e_contact_editor_create_date(gchar *name,
-			     gchar *string1, gchar *string2,
-			     gint int1, gint int2)
-{
-	GtkWidget *widget = e_date_edit_new ();
-	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (widget),
-					   TRUE);
-	e_date_edit_set_show_time (E_DATE_EDIT (widget), FALSE);
-	e_date_edit_set_time (E_DATE_EDIT (widget), -1);
-	return widget;
-}
-
-static void
-enable_widget (GtkWidget *widget, gboolean enabled)
-{
-	if (GTK_IS_ENTRY (widget)) {
-		gtk_entry_set_editable (GTK_ENTRY (widget), enabled);
-	}
-	else if (GTK_IS_TEXT (widget)) {
-		gtk_text_set_editable (GTK_TEXT (widget), enabled);
-	}
-	else if (GTK_IS_COMBO (widget)) {
-		gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (widget)->entry),
-					enabled);
-		gtk_widget_set_sensitive (GTK_COMBO (widget)->button, enabled);
-	}
-	else if (E_IS_DATE_EDIT (widget)) {
-		e_date_edit_set_editable (E_DATE_EDIT (widget), enabled);
-	}
-	else
-		gtk_widget_set_sensitive (widget, enabled);
-}
diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h
deleted file mode 100644
index 69036ef9a8..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_H__
-#define __E_CONTACT_EDITOR_H__
-
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-app-helper.h>
-#include <bonobo/bonobo-ui-component.h>
-#include <glade/glade.h>
-
-#include "addressbook/gui/component/select-names/e-select-names-manager.h"
-#include "addressbook/backend/ebook/e-book.h"
-#include "addressbook/backend/ebook/e-card.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditor - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * card         ECard *         RW              The card currently being edited
- */
-
-#define E_CONTACT_EDITOR_TYPE			(e_contact_editor_get_type ())
-#define E_CONTACT_EDITOR(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_TYPE, EContactEditor))
-#define E_CONTACT_EDITOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_TYPE, EContactEditorClass))
-#define E_IS_CONTACT_EDITOR(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_TYPE))
-#define E_IS_CONTACT_EDITOR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_TYPE))
-
-
-typedef struct _EContactEditor       EContactEditor;
-typedef struct _EContactEditorClass  EContactEditorClass;
-
-struct _EContactEditor
-{
-	GtkObject object;
-	
-	/* item specific fields */
-	EBook *book;
-	ECard *card;
-	ECardSimple *simple;
-
-	/* UI handler */
-	BonoboUIComponent *uic;
-	
-	GladeXML *gui;
-	GtkWidget *app;
-	GnomeUIInfo *email_info;
-	GnomeUIInfo *phone_info;
-	GnomeUIInfo *address_info;
-	GtkWidget *email_popup;
-	GtkWidget *phone_popup;
-	GtkWidget *address_popup;
-	GList *email_list;
-	GList *phone_list;
-	GList *address_list;
-
-	ESelectNamesManager *select_names_contacts;
-
-	ECardName *name;
-	char *company;
-
-	ECardSimpleEmailId email_choice;
-	ECardSimplePhoneId phone_choice[4];
-	ECardSimpleAddressId address_choice;
-	
-	GList *arbitrary_fields;
-
-	/* Whether we are editing a new card or an existing one */
-	guint is_new_card : 1;
-
-	/* Whether the card has been changed since bringing up the contact editor */
-	guint changed : 1;
-
-	/* Whether the contact editor will accept modifications */
-	guint editable : 1;
-
-	/* Whether an async wombat call is in progress */
-	guint in_async_call : 1;
-
-	EList *writable_fields;
-};
-
-struct _EContactEditorClass
-{
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* card_added)    (EContactEditor *ce, EBookStatus status, ECard *card);
-	void (* card_modified) (EContactEditor *ce, EBookStatus status, ECard *card);
-	void (* card_deleted)  (EContactEditor *ce, EBookStatus status, ECard *card);
-	void (* editor_closed) (EContactEditor *ce);
-};
-
-EContactEditor *e_contact_editor_new             (EBook *book,
-						  ECard *card,
-						  gboolean is_new_card,
-						  gboolean editable);
-GtkType         e_contact_editor_get_type        (void);
-void            e_contact_editor_show            (EContactEditor *editor);
-void            e_contact_editor_close           (EContactEditor *editor);
-void            e_contact_editor_raise           (EContactEditor *editor);
-
-
-gboolean        e_contact_editor_confirm_delete  (GtkWindow      *parent);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_H__ */
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
deleted file mode 100644
index f36d0b101e..0000000000
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ /dev/null
@@ -1,468 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-contact-quick-add.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#include <config.h>
-#include <ctype.h>
-#include <glib.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-stock.h>
-#include <gal/widgets/e-unicode.h>
-#include <addressbook/gui/component/addressbook.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/backend/ebook/e-book-util.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include "e-contact-editor.h"
-#include "e-contact-quick-add.h"
-#include "e-card-merging.h"
-
-typedef struct _QuickAdd QuickAdd;
-struct _QuickAdd {
-	gchar *name;
-	gchar *email;
-	ECard *card;
-
-	EContactQuickAddCallback cb;
-	gpointer closure;
-
-	GtkWidget *name_entry;
-	GtkWidget *email_entry;
-
-	gint refs;
-
-};
-
-static QuickAdd *
-quick_add_new (void)
-{
-	QuickAdd *qa = g_new0 (QuickAdd, 1);
-	qa->card = e_card_new ("");
-	qa->refs = 1;
-	return qa;
-}
-
-static void
-quick_add_ref (QuickAdd *qa)
-{
-	if (qa) {
-		++qa->refs;
-	}
-}
-
-static void
-quick_add_unref (QuickAdd *qa)
-{
-	if (qa) {
-		--qa->refs;
-		if (qa->refs == 0) {
-			g_free (qa->name);
-			g_free (qa->email);
-			gtk_object_unref (GTK_OBJECT (qa->card));
-			g_free (qa);
-		}
-	}
-}
-
-static void
-quick_add_set_name (QuickAdd *qa, const gchar *name)
-{
-	ECardSimple *simple;
-
-	if (name == qa->name)
-		return;
-
-	g_free (qa->name);
-	qa->name = g_strdup (name);
-
-	simple = e_card_simple_new (qa->card);
-	e_card_simple_set (simple, E_CARD_SIMPLE_FIELD_FULL_NAME, name);
-	e_card_simple_sync_card (simple);
-	gtk_object_unref (GTK_OBJECT (simple));
-}
-
-static void
-quick_add_set_email (QuickAdd *qa, const gchar *email)
-{
-	ECardSimple *simple;
-
-	if (email == qa->email)
-		return;
-
-	g_free (qa->email);
-	qa->email = g_strdup (email);
-
-	simple = e_card_simple_new (qa->card);
-	e_card_simple_set (simple, E_CARD_SIMPLE_FIELD_EMAIL, email);
-	e_card_simple_sync_card (simple);
-	gtk_object_unref (GTK_OBJECT (simple));
-}
-
-static void
-merge_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) closure;
-
-	if (book != NULL) {
-		e_card_merging_book_add_card (book, qa->card, NULL, NULL);
-		if (qa->cb)
-			qa->cb (qa->card, qa->closure);
-		gtk_object_unref (GTK_OBJECT (book));
-	} else {
-		/* Something went wrong. */
-		if (qa->cb)
-			qa->cb (NULL, qa->closure);
-	}
-	
-	quick_add_unref (qa);
-}
-
-static void
-quick_add_merge_card (QuickAdd *qa)
-{
-	EBook *book;
-
-	quick_add_ref (qa);
-
-	book = e_book_new ();
-	if (!addressbook_load_default_book (book, merge_cb, qa)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		merge_cb (book, E_BOOK_STATUS_OTHER_ERROR, qa);
-	}
-}
-
-
-/*
- * Raise a contact editor with all fields editable, and hook up all signals accordingly.
- */
-
-static void
-card_added_cb (EContactEditor *ce, EBookStatus status, ECard *card, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) gtk_object_get_data (GTK_OBJECT (ce), "quick_add");
-
-	if (qa) {
-
-		if (qa->cb)
-			qa->cb (qa->card, qa->closure);
-	
-		/* We don't need to unref qa because we set_data_full below */
-		gtk_object_set_data (GTK_OBJECT (ce), "quick_add", NULL);
-	}
-}
-
-static void
-editor_closed_cb (GtkWidget *w, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) gtk_object_get_data (GTK_OBJECT (w), "quick_add");
-
-	if (qa) {
-		/* We don't need to unref qa because we set_data_full below */
-		gtk_object_set_data (GTK_OBJECT (w), "quick_add", NULL);
-		gtk_object_unref (GTK_OBJECT (w));
-	}
-}
-
-static void
-ce_have_book (EBook *book, EBookStatus status, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) closure;
-
-	if (book == NULL) {
-		g_warning ("Couldn't open local address book.");
-		quick_add_unref (qa);
-	} else {
-		EContactEditor *contact_editor = e_contact_editor_new (book, qa->card, TRUE, TRUE /* XXX */);
-
-		/* mark it as changed so the Save buttons are enabled when we bring up the dialog. */
-		gtk_object_set (GTK_OBJECT(contact_editor),
-				"changed", TRUE,
-				NULL);
-
-		/* We pass this via object data, so that we don't get a dangling pointer referenced if both
-		   the "card_added" and "editor_closed" get emitted.  (Which, based on a backtrace in bugzilla,
-		   I think can happen and cause a crash. */
-		gtk_object_set_data_full (GTK_OBJECT (contact_editor), "quick_add", qa,
-					  (GtkDestroyNotify) quick_add_unref);
-
-		gtk_signal_connect (GTK_OBJECT (contact_editor),
-				    "card_added",
-				    GTK_SIGNAL_FUNC (card_added_cb),
-				    NULL);
-		gtk_signal_connect (GTK_OBJECT (contact_editor),
-				    "editor_closed",
-				    GTK_SIGNAL_FUNC (editor_closed_cb),
-				    NULL);
-
-		gtk_object_unref (GTK_OBJECT (book));
-	}
-}
-
-static void
-edit_card (QuickAdd *qa)
-{
-	EBook *book;
-	book = e_book_new ();
-	if (!addressbook_load_default_book (book, ce_have_book, qa)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		ce_have_book (book, E_BOOK_STATUS_OTHER_ERROR, qa);
-	}
-}
-
-static void
-clicked_cb (GtkWidget *w, gint button, gpointer closure)
-{
-	QuickAdd *qa = (QuickAdd *) closure;
-
-	/* Get data out of entries. */
-	if (button == 0 || button == 1) {
-		gchar *name = NULL;
-		gchar *email = NULL;
-
-		if (qa->name_entry) {
-			gchar *tmp;
-			tmp = gtk_editable_get_chars (GTK_EDITABLE (qa->name_entry), 0, -1);
-			name = e_utf8_from_gtk_string (qa->name_entry, tmp);
-			g_free (tmp);
-		}
-
-		if (qa->email_entry) {
-			gchar *tmp;
-			tmp = gtk_editable_get_chars (GTK_EDITABLE (qa->email_entry), 0, -1);
-			email = e_utf8_from_gtk_string (qa->email_entry, tmp);
-			g_free (tmp);
-		}
-
-		quick_add_set_name (qa, name);
-		quick_add_set_email (qa, email);
-	
-		g_free (name);
-		g_free (email);
-	}
-
-	gtk_widget_destroy (w);
-
-	if (button == 0) {
-
-		/* OK */
-		quick_add_merge_card (qa);
-
-	} else if (button == 1) {
-		
-		/* EDIT FULL */
-		edit_card (qa);
-
-	} else {
-		/* CANCEL */
-		quick_add_unref (qa);
-	}
-
-}
-
-static GtkWidget *
-build_quick_add_dialog (QuickAdd *qa)
-{
-	GtkWidget *dialog;
-	GtkTable *table;
-	const gint xpad=1, ypad=1;
-
-	g_return_val_if_fail (qa != NULL, NULL);
-
-	dialog = gnome_dialog_new (_("Contact Quick-Add"),
-				   GNOME_STOCK_BUTTON_OK,
-				   _("Edit Full"),
-				   GNOME_STOCK_BUTTON_CANCEL,
-				   NULL);
-
-	gtk_signal_connect (GTK_OBJECT (dialog),
-			    "clicked",
-			    clicked_cb,
-			    qa);
-
-	qa->name_entry = gtk_entry_new ();
-	if (qa->name) {
-		gchar *str = e_utf8_to_gtk_string (qa->name_entry, qa->name);
-		gtk_entry_set_text (GTK_ENTRY (qa->name_entry), str);
-		g_free (str);
-	}
-
-
-	qa->email_entry = gtk_entry_new ();
-	if (qa->email) {
-		gchar *str = e_utf8_to_gtk_string (qa->email_entry, qa->email);
-		gtk_entry_set_text (GTK_ENTRY (qa->email_entry), str);
-		g_free (str);
-	}
-
-	table = GTK_TABLE (gtk_table_new (2, 2, FALSE));
-
-	gtk_table_attach (table, gtk_label_new (_("Full Name")),
-			  0, 1, 0, 1,
-			  0, 0, xpad, ypad);
-	gtk_table_attach (table, qa->name_entry,
-			  1, 2, 0, 1,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND, xpad, ypad);
-	gtk_table_attach (table, gtk_label_new (_("E-mail")),
-			  0, 1, 1, 2,
-			  0, 0, xpad, ypad);
-	gtk_table_attach (table, qa->email_entry,
-			  1, 2, 1, 2,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND, xpad, ypad);
-
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox),
-			    GTK_WIDGET (table),
-			    TRUE, TRUE, 0);
-	gtk_widget_show_all (GTK_WIDGET (table));
-			  
-	
-	return dialog;
-}
-
-void
-e_contact_quick_add (const gchar *in_name, const gchar *email,
-		     EContactQuickAddCallback cb, gpointer closure)
-{
-	QuickAdd *qa;
-	GtkWidget *dialog;
-	gchar *name = NULL;
-	gint len;
-
-	/* We need to have *something* to work with. */
-	if (in_name == NULL && email == NULL) {
-		if (cb)
-			cb (NULL, closure);
-		return;
-	}
-
-	if (in_name) {
-		name = g_strdup (in_name);
-
-		/* Remove extra whitespace and the quotes some mailers put around names. */
-		g_strstrip (name);
-		len = strlen (name);
-		if ((name[0] == '\'' && name[len-1] == '\'') || (name[0] == '"' && name[len-1] == '"')) {
-			name[0] = ' ';
-			name[len-1] = ' ';
-		}
-		g_strstrip (name);
-	}
-
-	qa = quick_add_new ();
-	qa->cb = cb;
-	qa->closure = closure;
-	if (name)
-		quick_add_set_name (qa, name);
-	if (email)
-		quick_add_set_email (qa, email);
-
-	dialog = build_quick_add_dialog (qa);
-	gtk_widget_show_all (dialog);
-
-	g_free (name);
-}
-
-void
-e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, gpointer closure)
-{
-	gchar *name=NULL, *email=NULL;
-	const gchar *last_at, *s;
-	gboolean in_quote;
-
-	if (text == NULL) {
-		e_contact_quick_add (NULL, NULL, cb, closure);
-		return;
-	}
-
-	/* Look for things that look like e-mail addresses embedded in text */
-	in_quote = FALSE;
-	last_at = NULL;
-	for (s = text; *s; ++s) {
-		if (*s == '@' && !in_quote)
-			last_at = s;
-		else if (*s == '"')
-			in_quote = !in_quote;
-	}
-
-	
-	if (last_at == NULL) {
-		/* No at sign, so we treat it all as the name */
-		name = g_strdup (text);
-	} else {
-		gboolean bad_char = FALSE;
-		
-		/* walk backwards to whitespace or a < or a quote... */
-		while (last_at >= text && !bad_char
-		       && !(isspace ((gint) *last_at) || *last_at == '<' || *last_at == '"')) {
-			/* Check for some stuff that can't appear in a legal e-mail address. */
-			if (*last_at == '['
-			    || *last_at == ']'
-			    || *last_at == '('
-			    || *last_at == ')')
-				bad_char = TRUE;
-			--last_at;
-		}
-		if (last_at < text)
-			last_at = text;
-
-		/* ...and then split the text there */
-		if (!bad_char) {
-			if (text < last_at)
-				name = g_strndup (text, last_at-text);
-			email = g_strdup (last_at);
-		}
-	}
-
-	/* If all else has failed, make it the name. */
-	if (name == NULL && email == NULL) 
-		name = g_strdup (text);
-		
-
-
-	/* Clean up email, remove bracketing <>s */
-	if (email && *email) {
-		gboolean changed = FALSE;
-		g_strstrip (email);
-		if (*email == '<') {
-			*email = ' ';
-			changed = TRUE;
-		}
-		if (email[strlen (email)-1] == '>') {
-			email[strlen (email)-1] = ' ';
-			changed = TRUE;
-		}
-		if (changed)
-			g_strstrip (email);
-	}
-	
-
-	e_contact_quick_add (name, email, cb, closure);
-	g_free (name);
-	g_free (email);
-}
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.h b/addressbook/gui/contact-editor/e-contact-quick-add.h
deleted file mode 100644
index 1bf69ee114..0000000000
--- a/addressbook/gui/contact-editor/e-contact-quick-add.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * e-contact-quick-add.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge <trow@ximian.com>
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef __E_CONTACT_QUICK_ADD_H__
-#define __E_CONTACT_QUICK_ADD_H__
-
-#include <addressbook/backend/ebook/e-card.h>
-
-typedef void (*EContactQuickAddCallback) (ECard *new_card, gpointer closure);
-
-void e_contact_quick_add (const gchar *name, const gchar *email, 
-			  EContactQuickAddCallback cb, gpointer closure);
-
-void e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, gpointer closure);
-
-#endif /* __E_CONTACT_QUICK_ADD_H__ */
-
diff --git a/addressbook/gui/contact-editor/e-contact-save-as.c b/addressbook/gui/contact-editor/e-contact-save-as.c
deleted file mode 100644
index 78994ea405..0000000000
--- a/addressbook/gui/contact-editor/e-contact-save-as.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include "e-contact-save-as.h"
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtk.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <gal/util/e-util.h>
-#include <libgnome/gnome-i18n.h>
-#include <errno.h>
-#include <string.h>
-#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock.h>
-
-static int file_exists(GtkFileSelection *filesel, const char *filename);
-
-typedef struct {
-	GtkFileSelection *filesel;
-	char *vcard;
-} SaveAsInfo;
-
-static void
-save_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	gint error = 0;
-	gint response = 0;
-	
-	const char *filename = gtk_file_selection_get_filename (info->filesel);
-
-	error = e_write_file (filename, info->vcard, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC);
-
-	if (error == EEXIST) {
-		response = file_exists(info->filesel, filename);
-		switch (response) {
-			case 0 : /* Overwrite */
-				e_write_file(filename, info->vcard, O_WRONLY | O_CREAT | O_TRUNC);
-				break;
-			case 1 : /* cancel */
-				return;
-		}
-	} else if (error != 0) {
-		GtkWidget *dialog;
-		char *str;
-
-		str = g_strdup_printf ("Error saving %s: %s", filename, strerror(errno));
-		dialog = gnome_message_box_new (str, GNOME_MESSAGE_BOX_ERROR, GNOME_STOCK_BUTTON_OK, NULL);
-		g_free (str);
-
-		gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (info->filesel));
-
-		gtk_widget_show (dialog);
-		
-		return;
-	}
-	
-	g_free (info->vcard);
-	gtk_widget_destroy(GTK_WIDGET(info->filesel));
-	g_free(info);
-}
-
-static void
-close_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	g_free (info->vcard);
-	gtk_widget_destroy (GTK_WIDGET (info->filesel));
-	g_free (info);
-}
-
-static void
-delete_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	g_free (info->vcard);
-	g_free (info);
-}
-
-static char *
-make_safe_filename (const char *prefix, char *name)
-{
-	char *safe, *p;
-
-	if (!name) {
-		/* This is a filename. Translators take note. */
-		name = _("card.vcf");
-	}
-
-	p = strrchr (name, '/');
-	if (p)
-		safe = g_strdup_printf ("%s%s%s", prefix, p, ".vcf");
-	else
-		safe = g_strdup_printf ("%s/%s%s", prefix, name, ".vcf");
-	
-	p = strrchr (safe, '/') + 1;
-	if (p)
-		e_filename_make_safe (p);
-	
-	return safe;
-}
-
-void
-e_contact_save_as(char *title, ECard *card)
-{
-	GtkFileSelection *filesel;
-	char *file;
-	char *name;
-	SaveAsInfo *info = g_new(SaveAsInfo, 1);
-
-	filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title));
-
-	gtk_object_get (GTK_OBJECT (card),
-			"file_as", &name,
-			NULL);
-	file = make_safe_filename (g_get_home_dir(), name);
-	gtk_file_selection_set_filename (filesel, file);
-	g_free (file);
-
-	info->filesel = filesel;
-	info->vcard = e_card_get_vcard(card);
-
-	gtk_signal_connect(GTK_OBJECT(filesel->ok_button), "clicked",
-			   save_it, info);
-	gtk_signal_connect(GTK_OBJECT(filesel->cancel_button), "clicked",
-			   close_it, info);
-	gtk_signal_connect(GTK_OBJECT(filesel), "delete_event",
-			   delete_it, info);
-	gtk_widget_show(GTK_WIDGET(filesel));
-}
-
-void
-e_contact_list_save_as(char *title, GList *list)
-{
-	GtkFileSelection *filesel;
-	SaveAsInfo *info = g_new(SaveAsInfo, 1);
-
-	filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title));
-
-	/* This is a filename. Translators take note. */
-	if (list && list->data && list->next == NULL) {
-		char *name, *file;
-		gtk_object_get (GTK_OBJECT (list->data),
-				"file_as", &name,
-				NULL);
-		file = make_safe_filename (g_get_home_dir(), name);
-		gtk_file_selection_set_filename (filesel, file);
-		g_free (file);
-	} else {
-		char *file;
-		file = make_safe_filename (g_get_home_dir(), _("list"));
-		gtk_file_selection_set_filename (filesel, file);
-		g_free (file);
-	}
-
-	info->filesel = filesel;
-	info->vcard = e_card_list_get_vcard (list);
-	
-	gtk_signal_connect(GTK_OBJECT(filesel->ok_button), "clicked",
-			   save_it, info);
-	gtk_signal_connect(GTK_OBJECT(filesel->cancel_button), "clicked",
-			   close_it, info);
-	gtk_signal_connect(GTK_OBJECT(filesel), "delete_event",
-			   delete_it, info);
-	gtk_widget_show(GTK_WIDGET(filesel));
-}
-
-static int
-file_exists(GtkFileSelection *filesel, const char *filename)
-{
-	GnomeDialog *dialog = NULL;
-	GtkWidget *label;
-	GladeXML *gui = NULL;
-	int result = 0;
-	char *string;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/file-exists.glade", NULL);
-	dialog = GNOME_DIALOG(glade_xml_get_widget(gui, "dialog-exists"));
-	
-	label = glade_xml_get_widget (gui, "label-exists");
-	if (GTK_IS_LABEL (label)) {
-		string = g_strdup_printf (_("%s already exists\nDo you want to overwrite it?"), filename);
-		gtk_label_set_text (GTK_LABEL (label), string);
-		g_free (string);
-	}
-
-	gnome_dialog_set_parent(dialog, GTK_WINDOW(filesel));
-
-	gtk_widget_show (GTK_WIDGET (dialog));
-	result = gnome_dialog_run_and_close(dialog);
-
-	g_free(gui);
-
-	return result;
-}
diff --git a/addressbook/gui/contact-editor/e-contact-save-as.h b/addressbook/gui/contact-editor/e-contact-save-as.h
deleted file mode 100644
index b97d25ee3a..0000000000
--- a/addressbook/gui/contact-editor/e-contact-save-as.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-save-as.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_SAVE_AS_H__
-#define __E_CONTACT_SAVE_AS_H__
-
-#include <glade/glade.h>
-#include "addressbook/backend/ebook/e-card.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-void
-e_contact_save_as(gchar *title, ECard *card);
-void
-e_contact_list_save_as(gchar *title, GList *list);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_H__ */
diff --git a/addressbook/gui/contact-editor/file-exists.glade b/addressbook/gui/contact-editor/file-exists.glade
deleted file mode 100644
index 7c457cb892..0000000000
--- a/addressbook/gui/contact-editor/file-exists.glade
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>File_exists.glade</name>
-  <program_name>file_exists.glade</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-exists</name>
-  <visible>False</visible>
-  <title>Confirm Overwrite</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<label>Overwrite</label>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkLabel</class>
-      <name>label-exists</name>
-      <label>Don't bother translating this string.  It's not used.</label>
-      <justify>GTK_JUSTIFY_CENTER</justify>
-      <wrap>False</wrap>
-      <xalign>0.5</xalign>
-      <yalign>0.5</yalign>
-      <xpad>0</xpad>
-      <ypad>0</ypad>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-      </child>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-editor/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade
deleted file mode 100644
index 432e081c60..0000000000
--- a/addressbook/gui/contact-editor/fulladdr.glade
+++ /dev/null
@@ -1,707 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>fulladdr</name>
-  <program_name>fulladdr</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-checkaddress</name>
-  <visible>False</visible>
-  <title>Check Address</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox-container</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-checkaddress</name>
-      <border_width>8</border_width>
-      <rows>4</rows>
-      <columns>4</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>6</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>_Address:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-street</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<label>_City:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-city</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-city</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-ext</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label8</name>
-	<label>_PO Box:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-po</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>Address _2:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-ext</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-po</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-street</name>
-	<can_focus>True</can_focus>
-	<has_focus>True</has_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label5</name>
-	<label>_State/Province:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-region</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-region</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>combo-country</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>United States
-Afghanistan
-Albania
-Algeria
-American Samoa
-Andorra
-Angola
-Anguilla
-Antarctica
-Antigua And Barbuda
-Argentina
-Armenia
-Aruba
-Australia
-Austria
-Azerbaijan
-Bahamas
-Bahrain
-Bangladesh
-Barbados
-Belarus
-Belgium
-Belize
-Benin
-Bermuda
-Bhutan
-Bolivia
-Bosnia And Herzegowina
-Botswana
-Bouvet Island
-Brazil
-British Indian Ocean Territory
-Brunei Darussalam
-Bulgaria
-Burkina Faso
-Burundi
-Cambodia
-Cameroon
-Canada
-Cape Verde
-Cayman Islands
-Central African Republic
-Chad
-Chile
-China
-Christmas Island
-Cocos (Keeling) Islands
-Colombia
-Comoros
-Congo
-Congo
-Cook Islands
-Costa Rica
-Cote d'Ivoire
-Croatia
-Cuba
-Cyprus
-Czech Republic
-Denmark
-Djibouti
-Dominica
-Dominican Republic
-East Timor
-Ecuador
-Egypt
-El Salvador
-Equatorial Guinea
-Eritrea
-Estonia
-Ethiopia
-Falkland Islands
-Faroe Islands
-Fiji
-Finland
-France
-French Guiana
-French Polynesia
-French Southern Territories
-Gabon
-Gambia
-Georgia
-Germany
-Ghana
-Gibraltar
-Greece
-Greenland
-Grenada
-Guadeloupe
-Guam
-Guatemala
-Guinea
-Guinea-bissau
-Guyana
-Haiti
-Heard And McDonald Islands
-Holy See
-Honduras
-Hong Kong
-Hungary
-Iceland
-India
-Indonesia
-Ireland
-Israel
-Italy
-Jamaica
-Japan
-Jordan
-Kazakhstan
-Kenya
-Kiribati
-Republic Of Korea
-Kuwait
-Kyrgyzstan
-Laos
-Latvia
-Lebanon
-Lesotho
-Liberia
-Liechtenstein
-Lithuania
-Luxembourg
-Macau
-Macedonia
-Madagascar
-Malawi
-Malaysia
-Maldives
-Mali
-Malta
-Marshall Islands
-Martinique
-Mauritania
-Mauritius
-Mayotte
-Mexico
-Micronesia
-Republic Of Moldova
-Monaco
-Mongolia
-Montserrat
-Morocco
-Mozambique
-Myanmar
-Namibia
-Nauru
-Nepal
-Netherlands
-Netherlands Antilles
-New Caledonia
-New Zealand
-Nicaragua
-Niger
-Nigeria
-Niue
-Norfolk Island
-Northern Mariana Islands
-Norway
-Oman
-Pakistan
-Palau
-Palestinian Territory
-Panama
-Papua New Guinea
-Paraguay
-Peru
-Philippines
-Pitcairn
-Poland
-Portugal
-Puerto Rico
-Qatar
-Reunion
-Romania
-Russian Federation
-Rwanda
-Saint Kitts And Nevis
-Saint Lucia
-Saint Vincent And The Grena-dines
-Samoa
-San Marino
-Sao Tome And Principe
-Saudi Arabia
-Senegal
-Seychelles
-Sierra Leone
-Singapore
-Slovakia
-Slovenia
-Solomon Islands
-Somalia
-South Africa
-South Georgia And The South Sandwich Islands
-Spain
-Sri Lanka
-St. Helena
-St. Pierre And Miquelon
-Sudan
-Suriname
-Svalbard And Jan Mayen Islands
-Swaziland
-Sweden
-Switzerland
-Taiwan
-Tajikistan
-United Republic Of Tanzania
-Thailand
-Togo
-Tokelau
-Tonga
-Trinidad And Tobago
-Tunisia
-Turkey
-Turkmenistan
-Turks And Caicos Islands
-Tuvalu
-Uganda
-Ukraine
-United Arab Emirates
-United Kingdom
-United States Minor Outlying Islands
-Uruguay
-Uzbekistan
-Vanuatu
-Venezuela
-Viet Nam
-British Virgin Islands
-U.S. Virgin Islands
-Wallis And Futuna Islands
-Western Sahara
-Yemen
-Yugoslavia
-Zambia
-Zimbabwe
-</items>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>entry-country</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-code</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label6</name>
-	<label>_ZIP Code:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-code</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label7</name>
-	<label>Countr_y:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-country</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-editor/fullname.glade b/addressbook/gui/contact-editor/fullname.glade
deleted file mode 100644
index 17be70647c..0000000000
--- a/addressbook/gui/contact-editor/fullname.glade
+++ /dev/null
@@ -1,389 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>fullname</name>
-  <program_name>fullname</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-checkfullname</name>
-  <visible>False</visible>
-  <title>Check Full Name</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <allow_shrink>True</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox-container</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-checkfullname</name>
-      <border_width>8</border_width>
-      <rows>5</rows>
-      <columns>3</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>21</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>combo-title</name>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>
-Mr.
-Mrs.
-Ms.
-Miss
-Dr.
-</items>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>entry-title</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>combo-suffix</name>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>
-Sr.
-Jr.
-I
-II
-III
-Esq.
-</items>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>4</top_attach>
-	  <bottom_attach>5</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>entry-suffix</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-first</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-middle</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-last</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>_First:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-first</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>_Title:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-title</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>_Middle:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-middle</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label5</name>
-	<label>_Last:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-last</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<label>_Suffix:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-suffix</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>4</top_attach>
-	  <bottom_attach>5</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
deleted file mode 100644
index e6b46adb83..0000000000
--- a/addressbook/gui/contact-editor/test-editor.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * test-editor.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <gtk/gtkmain.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-init.h>
-#include <glade/glade.h>
-#include "e-contact-editor.h"
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@ximian.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
-
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-
-/* Callback used when a contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	static int count = 2;
-
-	count--;
-	gtk_object_unref (GTK_OBJECT (ce));
-
-	if (count == 0)
-		exit (0);
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Contact Editor Test" ), VERSION,
-		      _( "Copyright (C) 2000, Ximian, Inc." ),
-		      authors,
-		      _( "This should test the contact editor canvas item" ),
-		      NULL);
-  gtk_widget_show (about);
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-	char *cardstr;
-	EContactEditor *ce;
-
-	/*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-	    textdomain (PACKAGE);*/
-
-	gnome_init( "Contact Editor Test", VERSION, argc, argv);
-
-	glade_gnome_init ();
-
-	cardstr = NULL;
-	if (argc == 2)
-		cardstr = read_file (argv [1]);
-
-	if (cardstr == NULL)
-		cardstr = TEST_VCARD;
-
-	ce = e_contact_editor_new (e_card_new_with_default_charset (cardstr, "ISO-8859-1"), TRUE, NULL, FALSE);
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	ce = e_contact_editor_new (e_card_new_with_default_charset (cardstr, "ISO-8859-1"), TRUE, NULL, FALSE);
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	gtk_main();
-
-	/* Not reached. */
-	return 0;
-}
diff --git a/addressbook/gui/contact-list-editor/.cvsignore b/addressbook/gui/contact-list-editor/.cvsignore
deleted file mode 100644
index e440fafdac..0000000000
--- a/addressbook/gui/contact-list-editor/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile.in
-Makefile
-.deps
diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am
deleted file mode 100644
index 1164f2c594..0000000000
--- a/addressbook/gui/contact-list-editor/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-INCLUDES =					\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)			\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook/		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_srcdir)/addressbook/gui/merging	\
-	-I$(top_srcdir)/addressbook/gui/contact-editor	\
-	-I$(top_builddir)/shell			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
-	-DDATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\
-	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\
-	-DG_LOG_DOMAIN=\"contact-list-editor\"
-
-noinst_LIBRARIES =				\
-	libecontactlisteditor.a
-
-libecontactlisteditor_a_SOURCES = 		\
-	e-contact-list-editor.c			\
-	e-contact-list-editor.h			\
-	e-contact-list-model.c			\
-	e-contact-list-model.h
-
-gladedir   = $(datadir)/evolution/glade
-
-glade_DATA = 					\
-	contact-list-editor.glade
-
-EXTRA_DIST = $(glade_DATA)
diff --git a/addressbook/gui/contact-list-editor/contact-list-editor.glade b/addressbook/gui/contact-list-editor/contact-list-editor.glade
deleted file mode 100644
index 92c6aa013f..0000000000
--- a/addressbook/gui/contact-list-editor/contact-list-editor.glade
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>contact-list-editor</name>
-  <program_name>contact-list-editor</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GnomeApp</class>
-  <name>contact list editor</name>
-  <title>contact-list-editor</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <default_width>426</default_width>
-  <default_height>304</default_height>
-  <allow_shrink>True</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <enable_layout_config>True</enable_layout_config>
-
-  <widget>
-    <class>GnomeDock</class>
-    <child_name>GnomeApp:dock</child_name>
-    <name>dock1</name>
-    <allow_floating>True</allow_floating>
-    <child>
-      <padding>0</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkVBox</class>
-      <child_name>GnomeDock:contents</child_name>
-      <name>vbox8</name>
-      <border_width>3</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox6</name>
-	<border_width>3</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>3</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label10</name>
-	  <label>List _name:</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <default_focus_target>list-name-entry</default_focus_target>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>list-name-entry</name>
-	  <can_focus>True</can_focus>
-	  <has_focus>True</has_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom7</name>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>evolution-contacts-plain.png</string1>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Sat, 23 Jun 2001 05:59:21 GMT</last_modification_time>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frame3</name>
-	<border_width>3</border_width>
-	<label>Members</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox7</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox9</name>
-	    <border_width>3</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>3</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label11</name>
-	      <label>Type an email address or drag a contact into the list below:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <name>email-entry</name>
-	      <can_focus>True</can_focus>
-	      <editable>True</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text></text>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>contact-list-table</name>
-	      <creation_function>e_contact_list_editor_create_table</creation_function>
-	      <string1></string1>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Sat, 23 Jun 2001 06:00:16 GMT</last_modification_time>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>visible-addrs-checkbutton</name>
-	      <can_focus>True</can_focus>
-	      <label>_Hide addresses when sending mail to this list</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox10</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label12</name>
-	      <label>
-</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkVButtonBox</class>
-	      <name>vbuttonbox4</name>
-	      <layout_style>GTK_BUTTONBOX_START</layout_style>
-	      <spacing>0</spacing>
-	      <child_min_width>85</child_min_width>
-	      <child_min_height>27</child_min_height>
-	      <child_ipad_x>7</child_ipad_x>
-	      <child_ipad_y>0</child_ipad_y>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkButton</class>
-		<name>add-email-button</name>
-		<can_default>True</can_default>
-		<can_focus>True</can_focus>
-		<label>_Add</label>
-		<relief>GTK_RELIEF_NORMAL</relief>
-	      </widget>
-
-	      <widget>
-		<class>GtkButton</class>
-		<name>remove-button</name>
-		<can_default>True</can_default>
-		<can_focus>True</can_focus>
-		<label>_Remove</label>
-		<relief>GTK_RELIEF_NORMAL</relief>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
deleted file mode 100644
index a5676e1f19..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ /dev/null
@@ -1,980 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-list-editor.c
- * Copyright (C) 2001  Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include "e-contact-list-editor.h"
-
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <bonobo/bonobo-ui-container.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/widgets/e-unicode.h>
-#include "shell/evolution-shell-component-utils.h"
-
-#include "addressbook/gui/widgets/e-addressbook-util.h"
-
-#include "e-contact-editor.h"
-#include "e-contact-save-as.h"
-#include "e-contact-list-model.h"
-
-/* Signal IDs */
-enum {
-	LIST_ADDED,
-	LIST_MODIFIED,
-	LIST_DELETED,
-	EDITOR_CLOSED,
-	LAST_SIGNAL
-};
-
-static void e_contact_list_editor_init		(EContactListEditor		 *editor);
-static void e_contact_list_editor_class_init	(EContactListEditorClass	 *klass);
-static void e_contact_list_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_list_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_list_editor_destroy (GtkObject *object);
-
-static void create_ui (EContactListEditor *ce);
-static void set_editable (EContactListEditor *editor);
-static void command_state_changed (EContactListEditor *editor);
-static void close_dialog (EContactListEditor *cle);
-static void extract_info(EContactListEditor *editor);
-static void fill_in_info(EContactListEditor *editor);
-
-static void add_email_cb (GtkWidget *w, EContactListEditor *editor);
-static void remove_entry_cb (GtkWidget *w, EContactListEditor *editor);
-static void list_name_changed_cb (GtkWidget *w, EContactListEditor *editor);
-static void visible_addrs_toggled_cb (GtkWidget *w, EContactListEditor *editor);
-
-static gint app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data);
-static gboolean table_drag_drop_cb (ETable *table, int row, int col, GdkDragContext *context,
-				    gint x, gint y, guint time, EContactListEditor *editor);
-static gboolean table_drag_motion_cb (ETable *table, int row, int col, GdkDragContext *context,
-				      gint x, gint y, guint time, EContactListEditor *editor);
-static void table_drag_data_received_cb (ETable *table, int row, int col,
-					 GdkDragContext *context,
-					 gint x, gint y,
-					 GtkSelectionData *selection_data, guint info, guint time,
-					 EContactListEditor *editor);
-
-static GtkObjectClass *parent_class = NULL;
-
-static guint contact_list_editor_signals[LAST_SIGNAL];
-
-enum DndTargetType {
-	DND_TARGET_TYPE_VCARD,
-};
-#define VCARD_TYPE "text/x-vcard"
-static GtkTargetEntry drag_types[] = {
-	{ VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD },
-};
-static const int num_drag_types = sizeof (drag_types) / sizeof (drag_types[0]);
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_CARD,
-	ARG_IS_NEW_LIST,
-	ARG_EDITABLE
-};
-
-GtkType
-e_contact_list_editor_get_type (void)
-{
-  static GtkType contact_list_editor_type = 0;
-
-  if (!contact_list_editor_type)
-    {
-      static const GtkTypeInfo contact_list_editor_info =
-      {
-        "EContactListEditor",
-        sizeof (EContactListEditor),
-        sizeof (EContactListEditorClass),
-        (GtkClassInitFunc) e_contact_list_editor_class_init,
-        (GtkObjectInitFunc) e_contact_list_editor_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      contact_list_editor_type = gtk_type_unique (GTK_TYPE_OBJECT, &contact_list_editor_info);
-    }
-
-  return contact_list_editor_type;
-}
-
-
-typedef void (*GtkSignal_NONE__INT_OBJECT) (GtkObject * object,
-					    gint arg1,
-					    GtkObject *arg2,
-					    gpointer user_data);
-
-static void
-e_marshal_NONE__INT_OBJECT (GtkObject * object,
-			    GtkSignalFunc func,
-			    gpointer func_data, GtkArg * args)
-{
-	GtkSignal_NONE__INT_OBJECT rfunc;
-	rfunc = (GtkSignal_NONE__INT_OBJECT) func;
-	(*rfunc) (object,
-		  GTK_VALUE_INT (args[0]),
-		  GTK_VALUE_OBJECT (args[1]),
-		  func_data);
-}
-
-static void
-e_contact_list_editor_class_init (EContactListEditorClass *klass)
-{
-  GtkObjectClass *object_class;
-
-  object_class = (GtkObjectClass*) klass;
-
-  parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-  gtk_object_add_arg_type ("EContactListEditor::book", GTK_TYPE_OBJECT, 
-			   GTK_ARG_READWRITE, ARG_BOOK);
-  gtk_object_add_arg_type ("EContactListEditor::card", GTK_TYPE_OBJECT, 
-			   GTK_ARG_READWRITE, ARG_CARD);
-  gtk_object_add_arg_type ("EContactListEditor::is_new_list", GTK_TYPE_BOOL,
-			   GTK_ARG_READWRITE, ARG_IS_NEW_LIST);
-  gtk_object_add_arg_type ("EContactListEditor::editable", GTK_TYPE_BOOL,
-			   GTK_ARG_READWRITE, ARG_EDITABLE);
-
-  contact_list_editor_signals[LIST_ADDED] =
-	  gtk_signal_new ("list_added",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactListEditorClass, list_added),
-			  e_marshal_NONE__INT_OBJECT,
-			  GTK_TYPE_NONE, 2,
-			  GTK_TYPE_INT, GTK_TYPE_OBJECT);
-
-  contact_list_editor_signals[LIST_MODIFIED] =
-	  gtk_signal_new ("list_modified",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactListEditorClass, list_modified),
-			  e_marshal_NONE__INT_OBJECT,
-			  GTK_TYPE_NONE, 2,
-			  GTK_TYPE_INT, GTK_TYPE_OBJECT);
-
-  contact_list_editor_signals[LIST_DELETED] =
-	  gtk_signal_new ("list_deleted",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactListEditorClass, list_deleted),
-			  e_marshal_NONE__INT_OBJECT,
-			  GTK_TYPE_NONE, 2,
-			  GTK_TYPE_INT, GTK_TYPE_OBJECT);
-
-  contact_list_editor_signals[EDITOR_CLOSED] =
-	  gtk_signal_new ("editor_closed",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactListEditorClass, editor_closed),
-			  gtk_marshal_NONE__NONE,
-			  GTK_TYPE_NONE, 0);
-
-  gtk_object_class_add_signals (object_class, contact_list_editor_signals, LAST_SIGNAL);
- 
-  object_class->set_arg = e_contact_list_editor_set_arg;
-  object_class->get_arg = e_contact_list_editor_get_arg;
-  object_class->destroy = e_contact_list_editor_destroy;
-}
-
-static void
-e_contact_list_editor_init (EContactListEditor *editor)
-{
-	GladeXML *gui;
-	GtkWidget *bonobo_win;
-	BonoboUIContainer *container;
-
-	editor->card = NULL;
-	editor->changed = FALSE;
-	editor->editable = TRUE;
-	editor->in_async_call = FALSE;
-	editor->is_new_list = FALSE;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/contact-list-editor.glade", NULL);
-	editor->gui = gui;
-
-	editor->app = glade_xml_get_widget (gui, "contact list editor");
-
-	editor->table = glade_xml_get_widget (gui, "contact-list-table");
-	editor->model = gtk_object_get_data (GTK_OBJECT(editor->table), "model");
-
-	editor->add_button = glade_xml_get_widget (editor->gui, "add-email-button");
-	editor->remove_button = glade_xml_get_widget (editor->gui, "remove-button");
-
-	editor->email_entry = glade_xml_get_widget (gui, "email-entry");
-	editor->list_name_entry = glade_xml_get_widget (gui, "list-name-entry");
-
-	editor->visible_addrs_checkbutton = glade_xml_get_widget (gui, "visible-addrs-checkbutton");
-
-	/* Construct the app */
-	bonobo_win = bonobo_window_new ("contact-list-editor", _("Contact List Editor"));
-
-	/* FIXME: The sucking bit */
-	{
-		GtkWidget *contents;
-
-		contents = gnome_dock_get_client_area (
-			GNOME_DOCK (GNOME_APP (editor->app)->dock));
-		if (!contents) {
-			g_message ("contact_list_editor_construct(): Could not get contents");
-			return;
-		}
-		gtk_widget_ref (contents);
-		gtk_container_remove (GTK_CONTAINER (contents->parent), contents);
-		bonobo_window_set_contents (BONOBO_WINDOW (bonobo_win), contents);
-		gtk_widget_destroy (editor->app);
-		editor->app = bonobo_win;
-	}
-
-	/* Build the menu and toolbar */
-
-	container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (editor->app));
-
-	editor->uic = bonobo_ui_component_new_default ();
-	if (!editor->uic) {
-		g_message ("e_contact_list_editor_init(): eeeeek, could not create the UI handler!");
-		return;
-	}
-	bonobo_ui_component_set_container (editor->uic,
-					   bonobo_object_corba_objref (
-								       BONOBO_OBJECT (container)));
-
-	create_ui (editor);
-
-	/* connect signals */
-	gtk_signal_connect (GTK_OBJECT(editor->add_button),
-			    "clicked", GTK_SIGNAL_FUNC(add_email_cb), editor);
-	gtk_signal_connect (GTK_OBJECT(editor->email_entry),
-			    "activate", GTK_SIGNAL_FUNC(add_email_cb), editor);
-	gtk_signal_connect (GTK_OBJECT(editor->remove_button),
-			    "clicked", GTK_SIGNAL_FUNC(remove_entry_cb), editor);
-	gtk_signal_connect (GTK_OBJECT(editor->list_name_entry),
-			    "changed", GTK_SIGNAL_FUNC(list_name_changed_cb), editor);
-	gtk_signal_connect (GTK_OBJECT(editor->visible_addrs_checkbutton),
-			    "toggled", GTK_SIGNAL_FUNC(visible_addrs_toggled_cb), editor);
-
-	e_table_drag_dest_set (e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table)),
-			       0, drag_types, num_drag_types, GDK_ACTION_LINK);
-
-	gtk_signal_connect (GTK_OBJECT(e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table))),
-			    "table_drag_motion", GTK_SIGNAL_FUNC(table_drag_motion_cb), editor);
-	gtk_signal_connect (GTK_OBJECT(e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table))),
-			    "table_drag_drop", GTK_SIGNAL_FUNC(table_drag_drop_cb), editor);
-	gtk_signal_connect (GTK_OBJECT(e_table_scrolled_get_table (E_TABLE_SCROLLED (editor->table))),
-			    "table_drag_data_received", GTK_SIGNAL_FUNC(table_drag_data_received_cb), editor);
-
-	command_state_changed (editor);
-
-	/* Connect to the deletion of the dialog */
-
-	gtk_signal_connect (GTK_OBJECT (editor->app), "delete_event",
-			    GTK_SIGNAL_FUNC (app_delete_event_cb), editor);
-}
-
-static void
-e_contact_list_editor_destroy (GtkObject *object)
-{
-}
-
-typedef struct {
-	EContactListEditor *cle;
-	gboolean should_close;
-} EditorCloseStruct;
-
-static void
-list_added_cb (EBook *book, EBookStatus status, const char *id, EditorCloseStruct *ecs)
-{
-	EContactListEditor *cle = ecs->cle;
-	gboolean should_close = ecs->should_close;
-
-	if (cle->app)
-		gtk_widget_set_sensitive (cle->app, TRUE);
-	cle->in_async_call = FALSE;
-
-	e_card_set_id (cle->card, id);
-
-	gtk_signal_emit (GTK_OBJECT (cle), contact_list_editor_signals[LIST_ADDED],
-			 status, cle->card);
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		cle->is_new_list = FALSE;
-
-		if (should_close)
-			close_dialog (cle);
-		else
-			command_state_changed (cle);
-	}
-
-	gtk_object_unref (GTK_OBJECT (cle));
-	g_free (ecs);
-}
-
-static void
-list_modified_cb (EBook *book, EBookStatus status, EditorCloseStruct *ecs)
-{
-	EContactListEditor *cle = ecs->cle;
-	gboolean should_close = ecs->should_close;
-
-	if (cle->app)
-		gtk_widget_set_sensitive (cle->app, TRUE);
-	cle->in_async_call = FALSE;
-
-	gtk_signal_emit (GTK_OBJECT (cle), contact_list_editor_signals[LIST_MODIFIED],
-			 status, cle->card);
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		if (should_close)
-			close_dialog (cle);
-	}
-
-	gtk_object_unref (GTK_OBJECT (cle)); /* release ref held for ebook callback */
-	g_free (ecs);
-}
-
-static void
-save_card (EContactListEditor *cle, gboolean should_close)
-{
-	extract_info (cle);
-
-	if (cle->book) {
-		EditorCloseStruct *ecs = g_new(EditorCloseStruct, 1);
-		
-		ecs->cle = cle;
-		gtk_object_ref (GTK_OBJECT (cle));
-		ecs->should_close = should_close;
-
-		if (cle->app)
-			gtk_widget_set_sensitive (cle->app, FALSE);
-		cle->in_async_call = TRUE;
-
-		if (cle->is_new_list)
-			e_book_add_card (cle->book, cle->card, GTK_SIGNAL_FUNC(list_added_cb), ecs);
-		else
-			e_book_commit_card (cle->book, cle->card, GTK_SIGNAL_FUNC(list_modified_cb), ecs);
-
-		cle->changed = FALSE;
-	}
-}
-
-static gboolean
-prompt_to_save_changes (EContactListEditor *editor)
-{
-	if (!editor->changed)
-		return TRUE;
-
-	switch (e_addressbook_prompt_save_dialog (GTK_WINDOW(editor->app))) {
-	case 0: /* Save */
-		save_card (editor, FALSE);
-		return TRUE;
-	case 1: /* Discard */
-		return TRUE;
-	case 2: /* Cancel */
-	default:
-		return FALSE;
-	}
-}
-
-static void
-file_close_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-
-	if (!prompt_to_save_changes (cle))
-		return;
-
-	close_dialog (cle);
-}
-
-static void
-file_save_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-
-	save_card (cle, FALSE);
-}
-
-static void
-file_save_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-
-	extract_info (cle);
-
-	e_contact_save_as(_("Save List as VCard"), cle->card);
-}
-
-static void
-file_send_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-
-	extract_info (cle);
-
-	e_card_send(cle->card, E_CARD_DISPOSITION_AS_ATTACHMENT);
-}
-
-static void
-file_send_to_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-
-	extract_info (cle);
-
-	e_card_send(cle->card, E_CARD_DISPOSITION_AS_TO);
-}
-
-static void
-tb_save_and_close_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-	save_card (cle, TRUE);
-}
-
-static void
-list_deleted_cb (EBook *book, EBookStatus status, EContactListEditor *cle)
-{
-	if (cle->app)
-		gtk_widget_set_sensitive (cle->app, TRUE);
-	cle->in_async_call = FALSE;
-
-	gtk_signal_emit (GTK_OBJECT (cle), contact_list_editor_signals[LIST_DELETED],
-			 status, cle->card);
-
-	/* always close the dialog after we successfully delete a list */
-	if (status == E_BOOK_STATUS_SUCCESS)
-		close_dialog (cle);
-
-	gtk_object_unref (GTK_OBJECT (cle)); /* release reference held for callback */
-}
-
-static void
-delete_cb (GtkWidget *widget, gpointer data)
-{
-	EContactListEditor *cle = E_CONTACT_LIST_EDITOR (data);
-	ECard *card = cle->card;
-
-	gtk_object_ref(GTK_OBJECT(card));
-
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(cle->app))) {
-
-		extract_info (cle);
-		
-		if (!cle->is_new_list) {
-			gtk_widget_set_sensitive (cle->app, FALSE);
-			cle->in_async_call = TRUE;
-			
-			gtk_object_ref (GTK_OBJECT (cle)); /* hold reference for callback */
-			e_book_remove_card (cle->book, card, GTK_SIGNAL_FUNC(list_deleted_cb), cle);
-		}
-	}
-
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static
-BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSave", file_save_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorSaveClose", tb_save_and_close_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorDelete", delete_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveAs", file_save_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSendAs", file_send_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSendTo", file_send_to_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactListEditorClose", file_close_cb),
-	BONOBO_UI_VERB_END
-};
-
-static EPixmap pixmaps[] = {
-	E_PIXMAP ("/commands/ContactListEditorSave", "save-16.png"),
-	E_PIXMAP ("/commands/ContactListEditorSaveClose", "save-16.png"),
-	E_PIXMAP ("/commands/ContactListEditorSaveAs", "save-as-16.png"),
-
-	E_PIXMAP ("/commands/ContactListEditorDelete", "evolution-trash-mini.png"),
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-	E_PIXMAP ("/commands/ContactListEditorPrint", "print.xpm"),
-	E_PIXMAP ("/commands/ContactListEditorPrintEnvelope", "print.xpm"),
-#endif
-	E_PIXMAP ("/Toolbar/ContactListEditorSaveClose", "buttons/save-24.png"),
-	E_PIXMAP ("/Toolbar/ContactListEditorDelete", "buttons/delete-message.png"),
-	E_PIXMAP ("/Toolbar/ContactListEditorPrint", "buttons/print.png"),
-
-	E_PIXMAP_END
-};
-
-static void
-create_ui (EContactListEditor *ce)
-{
-	bonobo_ui_component_add_verb_list_with_data (
-		ce->uic, verbs, ce);
-
-	bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR,
-			       "evolution-contact-list-editor.xml",
-			       "evolution-contact-list-editor");
-
-	e_pixmaps_update (ce->uic, pixmaps);
-}
-
-EContactListEditor *
-e_contact_list_editor_new (EBook *book,
-			   ECard *list_card,
-			   gboolean is_new_list,
-			   gboolean editable)
-{
-	EContactListEditor *ce;
-
-	ce = E_CONTACT_LIST_EDITOR (gtk_type_new (E_CONTACT_LIST_EDITOR_TYPE));
-
-	gtk_object_set (GTK_OBJECT (ce),
-			"book", book,
-			"card", list_card,
-			"is_new_list", is_new_list,
-			"editable", editable,
-			NULL);
-
-	return ce;
-}
-
-static void
-e_contact_list_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactListEditor *editor;
-
-	editor = E_CONTACT_LIST_EDITOR (o);
-	
-	switch (arg_id){
-	case ARG_BOOK:
-		if (editor->book)
-			gtk_object_unref(GTK_OBJECT(editor->book));
-		editor->book = E_BOOK(GTK_VALUE_OBJECT (*arg));
-		gtk_object_ref (GTK_OBJECT (editor->book));
-		/* XXX more here about editable/etc. */
-		break;
-	case ARG_CARD:
-		if (editor->card)
-			gtk_object_unref(GTK_OBJECT(editor->card));
-		editor->card = e_card_duplicate(E_CARD(GTK_VALUE_OBJECT (*arg)));
-		fill_in_info(editor);
-		editor->changed = FALSE;
-		command_state_changed (editor);
-		break;
-
-	case ARG_IS_NEW_LIST: {
-		gboolean new_value = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		gboolean changed = (editor->is_new_list != new_value);
-
-		editor->is_new_list = new_value;
-
-		if (changed)
-			command_state_changed (editor);
-		break;
-	}
-
-	case ARG_EDITABLE: {
-		gboolean new_value = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		gboolean changed = (editor->editable != new_value);
-
-		editor->editable = new_value;
-
-		if (changed) {
-			set_editable (editor);
-			command_state_changed (editor);
-		}
-		break;
-	}
-
-	}
-}
-
-static void
-e_contact_list_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactListEditor *editor;
-
-	editor = E_CONTACT_LIST_EDITOR (object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(editor->book);
-		break;
-
-	case ARG_CARD:
-		extract_info(editor);
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(editor->card);
-		break;
-
-	case ARG_IS_NEW_LIST:
-		GTK_VALUE_BOOL (*arg) = editor->is_new_list ? TRUE : FALSE;
-		break;
-
-	case ARG_EDITABLE:
-		GTK_VALUE_BOOL (*arg) = editor->editable ? TRUE : FALSE;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-void
-e_contact_list_editor_show (EContactListEditor *editor)
-{
-	gtk_widget_show (editor->app);
-}
-
-void
-e_contact_list_editor_raise (EContactListEditor *editor)
-{
-	gdk_window_raise (GTK_WIDGET (editor->app)->window);
-}
-
-#define SPEC "<ETableSpecification no-headers=\"true\" cursor-mode=\"line\" selection-mode=\"single\"> \
- <ETableColumn model_col= \"0\" _title=\"Contact\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\" /> \
-	<ETableState>                   			       \
-		<column source=\"0\"/>     			       \
-	        <grouping> </grouping>				       \
-	</ETableState>                  			       \
-</ETableSpecification>"
-
-GtkWidget *
-e_contact_list_editor_create_table(gchar *name,
-				   gchar *string1, gchar *string2,
-				   gint int1, gint int2);
-
-GtkWidget *
-e_contact_list_editor_create_table(gchar *name,
-				   gchar *string1, gchar *string2,
-				   gint int1, gint int2)
-{
-	
-	ETableModel *model;
-	GtkWidget *table;
-
-	model = e_contact_list_model_new ();
-
-	table = e_table_scrolled_new (model, NULL, SPEC, NULL);
-
-	gtk_object_set_data(GTK_OBJECT(table), "model", model);
-
-	return table;
-}
-
-static void
-add_email_cb (GtkWidget *w, EContactListEditor *editor)
-{
-	GtkAdjustment *adj = e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (editor->table));
-	char *text = gtk_entry_get_text (GTK_ENTRY(editor->email_entry));
-
-	if (text && *text) {
-		e_contact_list_model_add_email (E_CONTACT_LIST_MODEL(editor->model), text);
-
-		/* Skip to the end of the list */
-		if (adj->upper - adj->lower > adj->page_size)
-			gtk_adjustment_set_value (adj, adj->upper);
-	}
-
-	gtk_entry_set_text (GTK_ENTRY(editor->email_entry), "");
-
-	if (!editor->changed) {
-		editor->changed = TRUE;
-		command_state_changed (editor);
-	}
-}
-
-static void
-remove_row (int model_row, EContactListEditor *editor)
-{
-	e_contact_list_model_remove_row (E_CONTACT_LIST_MODEL (editor->model), model_row);
-}
-
-static void
-remove_entry_cb (GtkWidget *w, EContactListEditor *editor)
-{
-	e_table_selected_row_foreach (e_table_scrolled_get_table(E_TABLE_SCROLLED(editor->table)),
-				      (EForeachFunc)remove_row, editor);
-	if (!editor->changed) {
-		editor->changed = TRUE;
-		command_state_changed (editor);
-	}
-}
-
-static void
-list_name_changed_cb (GtkWidget *w, EContactListEditor *editor)
-{
-	if (!editor->changed) {
-		editor->changed = TRUE;
-		command_state_changed (editor);
-	}
-}
-
-static void
-visible_addrs_toggled_cb (GtkWidget *w, EContactListEditor *editor)
-{
-	if (!editor->changed) {
-		editor->changed = TRUE;
-		command_state_changed (editor);
-	}
-}
-
-static void
-set_editable (EContactListEditor *editor)
-{
-	gtk_widget_set_sensitive (editor->email_entry, editor->editable);
-	gtk_widget_set_sensitive (editor->list_name_entry, editor->editable);
-	gtk_widget_set_sensitive (editor->add_button, editor->editable);
-	gtk_widget_set_sensitive (editor->remove_button, editor->editable);
-	gtk_widget_set_sensitive (editor->table, editor->editable);
-}
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (EContactListEditor *cle)
-{
-	g_assert (cle->app != NULL);
-
-	gtk_widget_destroy (cle->app);
-	cle->app = NULL;
-
-	gtk_signal_emit (GTK_OBJECT (cle), contact_list_editor_signals[EDITOR_CLOSED]);
-}
-
-/* Callback used when the editor is destroyed */
-static gint
-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	EContactListEditor *ce;
-
-	ce = E_CONTACT_LIST_EDITOR (data);
-
-	/* if we're in an async call, don't allow the dialog to close */
-	if (ce->in_async_call)
-		return TRUE;
-
-	if (!prompt_to_save_changes (ce))
-		return TRUE;
-
-	close_dialog (ce);
-	return TRUE;
-}
-
-static gboolean
-table_drag_motion_cb (ETable *table, int row, int col,
-		      GdkDragContext *context,
-		      gint x, gint y, guint time, EContactListEditor *editor)
-{
-	GList *p;
-
-	for (p = context->targets; p != NULL; p = p->next) {
-		char *possible_type;
-
-		possible_type = gdk_atom_name ((GdkAtom) p->data);
-		if (!strcmp (possible_type, VCARD_TYPE)) {
-			g_free (possible_type);
-			gdk_drag_status (context, GDK_ACTION_LINK, time);
-			return TRUE;
-		}
-
-		g_free (possible_type);
-	}
-
-	return FALSE;
-}
-
-static gboolean
-table_drag_drop_cb (ETable *table, int row, int col,
-		    GdkDragContext *context,
-		    gint x, gint y, guint time, EContactListEditor *editor)
-{
-	if (context->targets != NULL) {
-		gtk_drag_get_data (GTK_WIDGET (table), context,
-				   GPOINTER_TO_INT (context->targets->data),
-				   time);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static void
-table_drag_data_received_cb (ETable *table, int row, int col,
-			     GdkDragContext *context,
-			     gint x, gint y,
-			     GtkSelectionData *selection_data,
-			     guint info, guint time, EContactListEditor *editor)
-{
-	GtkAdjustment *adj = e_scroll_frame_get_vadjustment (E_SCROLL_FRAME (editor->table));
-	char *target_type;
-	gboolean changed = FALSE;
-
-	target_type = gdk_atom_name (selection_data->target);
-
-	if (!strcmp (target_type, VCARD_TYPE)) {
-
-		GList *card_list = e_card_load_cards_from_string_with_default_charset (selection_data->data, "ISO-8859-1");
-		GList *c;
-
-		for (c = card_list; c; c = c->next) {
-			ECard *ecard = c->data;
-
-			if (!e_card_evolution_list (ecard)) {
-				ECardSimple *simple = e_card_simple_new (ecard);
-
-				e_contact_list_model_add_card (E_CONTACT_LIST_MODEL (editor->model),
-							       simple);
-
-				gtk_object_unref (GTK_OBJECT (simple));
-
-				changed = TRUE;
-			}
-		}
-		g_list_foreach (card_list, (GFunc)gtk_object_unref, NULL);
-		g_list_free (card_list);
-
-		/* Skip to the end of the list */
-		if (adj->upper - adj->lower > adj->page_size)
-			gtk_adjustment_set_value (adj, adj->upper);
-	}
-
-	if (changed && !editor->changed) {
-		editor->changed = TRUE;
-		command_state_changed (editor);
-	}
-}
-
-static void
-command_state_changed (EContactListEditor *editor)
-{
-	bonobo_ui_component_set_prop (editor->uic,
-				      "/commands/ContactListEditorSaveClose",
-				      "sensitive",
-				      editor->changed && editor->editable ? "1" : "0", NULL);
-
-	bonobo_ui_component_set_prop (editor->uic,
-				      "/commands/ContactListEditorSave",
-				      "sensitive",
-				      editor->changed && editor->editable ? "1" : "0", NULL);
-
-	bonobo_ui_component_set_prop (editor->uic,
-				      "/commands/ContactListEditorDelete",
-				      "sensitive",
-				      editor->editable && !editor->is_new_list ? "1" : "0", NULL);
-}
-
-static void
-extract_info(EContactListEditor *editor)
-{
-	ECard *card = editor->card;
-	if (card) {
-		int i;
-		EList *email_list;
-		EIterator *email_iter;
-		char *string = e_utf8_gtk_editable_get_chars(GTK_EDITABLE (editor->list_name_entry), 0, -1);
-
-		if (string && *string)
-			gtk_object_set(GTK_OBJECT(card),
-				       "file_as", string,
-				       "full_name", string,
-				       NULL);
-
-		g_free (string);
-
-		
-		gtk_object_set (GTK_OBJECT(card),
-				"list", GINT_TO_POINTER (TRUE),
-				"list_show_addresses",
-				GINT_TO_POINTER (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(editor->visible_addrs_checkbutton))),
-				NULL);
-
-		gtk_object_get (GTK_OBJECT(card),
-				"email", &email_list,
-				NULL);
-
-		/* clear the email list */
-		email_iter = e_list_get_iterator (email_list);
-		e_iterator_last (email_iter);
-		while (e_iterator_is_valid (E_ITERATOR (email_iter))) {
-			e_iterator_delete (E_ITERATOR (email_iter));
-		}
-		gtk_object_unref (GTK_OBJECT (email_iter));
-
-		/* then refill it from the contact list model */
-		for (i = 0; i < e_table_model_row_count (editor->model); i ++) {
-			const EDestination *dest = e_contact_list_model_get_destination (E_CONTACT_LIST_MODEL (editor->model), i);
-			gchar *dest_xml = e_destination_export (dest);
-			if (dest_xml) {
-				e_list_append (email_list, dest_xml);
-			}
-			g_free (dest_xml);
-		}
-	}
-}
-
-static void
-fill_in_info(EContactListEditor *editor)
-{
-	if (editor->card) {
-		char *file_as;
-		gboolean show_addresses = FALSE;
-		gboolean is_evolution_list = FALSE;
-		EList *email_list;
-		EIterator *email_iter;
-
-		gtk_object_get (GTK_OBJECT (editor->card),
-				"file_as", &file_as,
-				"email", &email_list,
-				"list", &is_evolution_list,
-				"list_show_addresses", &show_addresses,
-				NULL);
-
-		gtk_editable_delete_text (GTK_EDITABLE (editor->list_name_entry), 0, -1);
-		if (file_as) {
-			int position = 0;
-			gchar *u = e_utf8_to_gtk_string (editor->list_name_entry, file_as);
-			gtk_editable_insert_text (GTK_EDITABLE (editor->list_name_entry), u, strlen (u), &position);
-			g_free (u);
-		}
-
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(editor->visible_addrs_checkbutton), !show_addresses);
-
-		e_contact_list_model_remove_all (E_CONTACT_LIST_MODEL (editor->model));
-
-		email_iter = e_list_get_iterator (email_list);
-		
-		while (e_iterator_is_valid (email_iter)) {
-			const char *dest_xml = e_iterator_get (email_iter);
-			EDestination *dest;
-
-			/* g_message ("incoming xml: [%s]", dest_xml); */
-			dest = e_destination_import (dest_xml);
-
-			if (dest != NULL) {
-				e_contact_list_model_add_destination (E_CONTACT_LIST_MODEL (editor->model), dest);
-			}
-
-			e_iterator_next (email_iter);
-		}
-	}
-}
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.h b/addressbook/gui/contact-list-editor/e-contact-list-editor.h
deleted file mode 100644
index 37f54df170..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-list-editor.h
- * Copyright (C) 2001  Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_LIST_EDITOR_H__
-#define __E_CONTACT_LIST_EDITOR_H__
-
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-app-helper.h>
-#include <bonobo/bonobo-ui-component.h>
-#include <glade/glade.h>
-#include <gal/e-table/e-table-model.h>
-
-#include "addressbook/backend/ebook/e-book.h"
-#include "addressbook/backend/ebook/e-card.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_CONTACT_LIST_EDITOR_TYPE			(e_contact_list_editor_get_type ())
-#define E_CONTACT_LIST_EDITOR(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_LIST_EDITOR_TYPE, EContactListEditor))
-#define E_CONTACT_LIST_EDITOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_LIST_EDITOR_TYPE, EContactListEditorClass))
-#define E_IS_CONTACT_LIST_EDITOR(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_LIST_EDITOR_TYPE))
-#define E_IS_CONTACT_LIST_EDITOR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_LIST_EDITOR_TYPE))
-
-
-typedef struct _EContactListEditor       EContactListEditor;
-typedef struct _EContactListEditorClass  EContactListEditorClass;
-
-struct _EContactListEditor
-{
-	GtkObject object;
-
-	/* item specific fields */
-	EBook *book;
-	ECard *card;
-
-	/* UI handler */
-	BonoboUIComponent *uic;
-
-	GladeXML *gui;
-	GtkWidget *app;
-
-	GtkWidget *table;
-	ETableModel *model;
-	GtkWidget *email_entry;
-	GtkWidget *list_name_entry;
-	GtkWidget *add_button;
-	GtkWidget *remove_button;
-	GtkWidget *visible_addrs_checkbutton;
-
-	/* Whether we are editing a new card or an existing one */
-	guint is_new_list : 1;
-
-	/* Whether the card has been changed since bringing up the contact editor */
-	guint changed : 1;
-
-	/* Whether the contact editor will accept modifications */
-	guint editable : 1;
-
-	/* Whether an async wombat call is in progress */
-	guint in_async_call : 1;
-};
-
-struct _EContactListEditorClass
-{
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* list_added)    (EContactListEditor *cle, EBookStatus status, ECard *card);
-	void (* list_modified) (EContactListEditor *cle, EBookStatus status, ECard *card);
-	void (* list_deleted)  (EContactListEditor *cle, EBookStatus status, ECard *card);
-	void (* editor_closed) (EContactListEditor *cle);
-};
-
-EContactListEditor *e_contact_list_editor_new             (EBook *book,
-							   ECard *list_card,
-							   gboolean is_new_list,
-							   gboolean editable);
-GtkType             e_contact_list_editor_get_type        (void);
-void                e_contact_list_editor_show            (EContactListEditor *editor);
-void                e_contact_list_editor_raise           (EContactListEditor *editor);
-
-gboolean            e_contact_list_editor_confirm_delete  (GtkWindow      *parent);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_LIST_EDITOR_H__ */
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c
deleted file mode 100644
index c4321c2820..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-#include "e-contact-list-model.h"
-
-#define PARENT_TYPE e_table_model_get_type()
-static ETableModelClass *parent_class;
-
-#define COLS 1
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-contact_list_col_count (ETableModel *etc)
-{
-	return COLS;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-contact_list_row_count (ETableModel *etc)
-{
-	EContactListModel *model = E_CONTACT_LIST_MODEL (etc);
-	return model->data_count;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-contact_list_value_at (ETableModel *etc, int col, int row)
-{
-	EContactListModel *model = E_CONTACT_LIST_MODEL (etc);
-
-	return (void *) e_destination_get_address (model->data[row]);
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-contact_list_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-	/* nothing */
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-contact_list_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	return FALSE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-contact_list_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-contact_list_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-contact_list_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-contact_list_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-contact_list_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-static void
-contact_list_model_destroy (GtkObject *o)
-{
-	EContactListModel *model = E_CONTACT_LIST_MODEL (o);
-	int i;
-
-	for (i = 0; i < model->data_count; i ++) {
-		gtk_object_unref (GTK_OBJECT (model->data[i]));
-	}
-	g_free (model->data);
-
-	model->data_count = 0;
-	model->data_alloc = 0;
-}
-
-static void
-e_contact_list_model_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = contact_list_model_destroy;
-
-	model_class->column_count = contact_list_col_count;
-	model_class->row_count = contact_list_row_count;
-	model_class->value_at = contact_list_value_at;
-	model_class->set_value_at = contact_list_set_value_at;
-	model_class->is_cell_editable = contact_list_is_cell_editable;
-	model_class->duplicate_value = contact_list_duplicate_value;
-	model_class->free_value = contact_list_free_value;
-	model_class->initialize_value = contact_list_initialize_value;
-	model_class->value_is_empty = contact_list_value_is_empty;
-	model_class->value_to_string = contact_list_value_to_string;
-}
-
-static void
-e_contact_list_model_init (GtkObject *object)
-{
-	EContactListModel *model = E_CONTACT_LIST_MODEL(object);
-
-	model->data_alloc = 10;
-	model->data_count = 0;
-	model->data = g_new (EDestination*, model->data_alloc);
-}
-
-GtkType
-e_contact_list_model_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"EContactListModel",
-			sizeof (EContactListModel),
-			sizeof (EContactListModelClass),
-			(GtkClassInitFunc) e_contact_list_model_class_init,
-			(GtkObjectInitFunc) e_contact_list_model_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-void
-e_contact_list_model_construct (EContactListModel *model)
-{
-}
-
-ETableModel *
-e_contact_list_model_new ()
-{
-	EContactListModel *model;
-
-	model = gtk_type_new (e_contact_list_model_get_type ());
-
-	e_contact_list_model_construct (model);
-
-	return E_TABLE_MODEL(model);
-}
-
-void
-e_contact_list_model_add_destination (EContactListModel *model, EDestination *dest)
-{
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-	g_return_if_fail (E_IS_DESTINATION (dest));
-
-	if (model->data_count + 1 >= model->data_alloc) {
-		model->data_alloc *= 2;
-		model->data = g_renew (EDestination*, model->data, model->data_alloc);
-	}
-
-	model->data[model->data_count ++] = dest;
-	gtk_object_ref (GTK_OBJECT (dest));
-	gtk_object_sink (GTK_OBJECT (dest));
-
-	e_table_model_changed (E_TABLE_MODEL (model));
-}
-
-void
-e_contact_list_model_add_email (EContactListModel *model,
-				const char *email)
-{
-	EDestination *new_dest;
-
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-	g_return_if_fail (email != NULL);
-
-	new_dest = e_destination_new ();
-	e_destination_set_email (new_dest, email);
-
-	e_contact_list_model_add_destination (model, new_dest);
-}
-
-void
-e_contact_list_model_add_card (EContactListModel *model,
-			       ECardSimple *simple)
-{
-	EDestination *new_dest;
-
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-	g_return_if_fail (E_IS_CARD_SIMPLE (simple));
-
-	new_dest = e_destination_new ();
-	e_destination_set_card (new_dest, simple->card, 0); /* Hard-wired for default e-mail */
-
-	e_contact_list_model_add_destination (model, new_dest);
-}
-
-void
-e_contact_list_model_remove_row (EContactListModel *model, int row)
-{
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-	g_return_if_fail (0 <= row && row < model->data_count);
-
-	gtk_object_unref (GTK_OBJECT (model->data[row]));
-	memmove (model->data + row, model->data + row + 1, sizeof (EDestination*) * (model->data_count - row - 1));
-	model->data_count --;
-
-	e_table_model_changed (E_TABLE_MODEL (model));
-}
-
-void
-e_contact_list_model_remove_all (EContactListModel *model)
-{
-	int i;
-
-	g_return_if_fail (E_IS_CONTACT_LIST_MODEL (model));
-
-	for (i = 0; i < model->data_count; i ++) {
-		gtk_object_unref (GTK_OBJECT (model->data[i]));
-		model->data[i] = NULL;
-	}
-
-	model->data_count = 0;
-
-	e_table_model_changed (E_TABLE_MODEL (model));
-}
-
-
-const EDestination *
-e_contact_list_model_get_destination (EContactListModel *model, int row)
-{
-	g_return_val_if_fail (E_IS_CONTACT_LIST_MODEL (model), NULL);
-	g_return_val_if_fail (0 <= row && row < model->data_count, NULL);
-
-	return model->data[row];
-}
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.h b/addressbook/gui/contact-list-editor/e-contact-list-model.h
deleted file mode 100644
index 1c2d6ac8d0..0000000000
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_CONTACT_LIST_MODEL_H_
-#define _E_CONTACT_LIST_MODEL_H_
-
-#include <gal/e-table/e-table-model.h>
-#include "addressbook/backend/ebook/e-book.h"
-#include "addressbook/backend/ebook/e-book-view.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-#include "addressbook/backend/ebook/e-destination.h"
-
-#define E_CONTACT_LIST_MODEL_TYPE        (e_contact_list_model_get_type ())
-#define E_CONTACT_LIST_MODEL(o)          (GTK_CHECK_CAST ((o), E_CONTACT_LIST_MODEL_TYPE, EContactListModel))
-#define E_CONTACT_LIST_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CONTACT_LIST_MODEL_TYPE, EContactListModelClass))
-#define E_IS_CONTACT_LIST_MODEL(o)       (GTK_CHECK_TYPE ((o), E_CONTACT_LIST_MODEL_TYPE))
-#define E_IS_CONTACT_LIST_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CONTACT_LIST_MODEL_TYPE))
-
-typedef struct _EContactListModel EContactListModel;
-typedef struct _EContactListModelClass EContactListModelClass;
-
-struct _EContactListModel {
-	ETableModel parent;
-
-	EDestination **data;
-	int data_count;
-	int data_alloc;
-};
-
-
-struct _EContactListModelClass {
-	ETableModelClass parent_class;
-};
-
-
-GtkType      e_contact_list_model_get_type (void);
-void         e_contact_list_model_construct (EContactListModel *model);
-ETableModel *e_contact_list_model_new (void);
-
-void         e_contact_list_model_add_destination (EContactListModel *model, EDestination *dest);
-void         e_contact_list_model_add_email       (EContactListModel *model, const char *email);
-void         e_contact_list_model_add_card        (EContactListModel *model, ECardSimple *simple);
-
-void	     e_contact_list_model_remove_row (EContactListModel *model, int row);
-void         e_contact_list_model_remove_all (EContactListModel *model);
-
-const EDestination *e_contact_list_model_get_destination (EContactListModel *model, int row);
-
-#endif /* _E_CONTACT_LIST_MODEL_H_ */
diff --git a/addressbook/gui/merging/.cvsignore b/addressbook/gui/merging/.cvsignore
deleted file mode 100644
index 09980ae6ba..0000000000
--- a/addressbook/gui/merging/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am
deleted file mode 100644
index 5a00726f26..0000000000
--- a/addressbook/gui/merging/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"e-card-gui\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/backend/ebook	\
-	$(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-noinst_LIBRARIES =				\
-	libecardmerging.a
-
-libecardmerging_a_SOURCES =			\
-	e-card-merging.c			\
-	e-card-merging.h
-
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = 	e-card-duplicate-detected.glade	\
-		e-card-merging-book-commit-duplicate-detected.glade
-
-EXTRA_DIST = 			\
-	 $(glade_DATA)
diff --git a/addressbook/gui/merging/e-card-duplicate-detected.glade b/addressbook/gui/merging/e-card-duplicate-detected.glade
deleted file mode 100644
index bc6624e8fd..0000000000
--- a/addressbook/gui/merging/e-card-duplicate-detected.glade
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-card-duplicate-detected</name>
-  <program_name>e-card-duplicate-detected</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-duplicate-contact</name>
-  <title>Duplicate Contact Detected</title>
-  <type>GTK_WINDOW_POPUP</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<label>Add Anyway</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button4</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table1</name>
-      <rows>5</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>6</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>Custom</class>
-	<name>custom-old-card</name>
-	<creation_function>e_card_merging_create_old_card</creation_function>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Fri, 08 Jun 2001 01:33:22 GMT</last_modification_time>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>4</top_attach>
-	  <bottom_attach>5</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>The name or email address of this contact already exists
-in this folder.  Would you like to add it anyway?</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>Original Contact:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<label>New Contact:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>Custom</class>
-	<name>custom-new-card</name>
-	<creation_function>e_card_merging_create_old_card</creation_function>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Fri, 08 Jun 2001 01:33:22 GMT</last_modification_time>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkAlignment</class>
-	<name>alignment1</name>
-	<xalign>0.5</xalign>
-	<yalign>0</yalign>
-	<xscale>1</xscale>
-	<yscale>0</yscale>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>5</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom2</name>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>malehead.png</string1>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Fri, 08 Jun 2001 00:18:39 GMT</last_modification_time>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade b/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade
deleted file mode 100644
index 0bc60ba13a..0000000000
--- a/addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-card-merging-book-commit-duplicate-detected</name>
-  <program_name>e-card-merging-book-commit-duplicate-detected</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-duplicate-contact</name>
-  <title>Duplicate Contact Detected</title>
-  <type>GTK_WINDOW_POPUP</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<label>Change Anyway</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_ADD</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button4</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table1</name>
-      <rows>5</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>6</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>Custom</class>
-	<name>custom-old-card</name>
-	<creation_function>e_card_merging_create_old_card</creation_function>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Fri, 08 Jun 2001 01:33:22 GMT</last_modification_time>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>4</top_attach>
-	  <bottom_attach>5</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>The changed email or name of this contact already
-exists in this folder.  Would you like to add it anyway?</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>Conflicting Contact:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<label>Changed Contact:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>Custom</class>
-	<name>custom-new-card</name>
-	<creation_function>e_card_merging_create_old_card</creation_function>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Fri, 08 Jun 2001 01:33:22 GMT</last_modification_time>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>True</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkAlignment</class>
-	<name>alignment1</name>
-	<xalign>0.5</xalign>
-	<yalign>0</yalign>
-	<xscale>1</xscale>
-	<yscale>0</yscale>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>5</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom2</name>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>malehead.png</string1>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Fri, 08 Jun 2001 00:18:39 GMT</last_modification_time>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/merging/e-card-merging.c b/addressbook/gui/merging/e-card-merging.c
deleted file mode 100644
index b9aacabde7..0000000000
--- a/addressbook/gui/merging/e-card-merging.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Code for checking for duplicates when doing ECard work.
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- */
-
-#include <config.h>
-
-#include "e-card-merging.h"
-#include <libgnomeui/gnome-dialog.h>
-#include "e-card-compare.h"
-#include <glade/glade.h>
-#include <gtk/gtksignal.h>
-#include "addressbook/gui/widgets/e-minicard-widget.h"
-
-typedef enum {
-	E_CARD_MERGING_ADD,
-	E_CARD_MERGING_COMMIT
-} ECardMergingOpType;
-
-typedef struct {
-	ECardMergingOpType op;
-	EBook *book;
-	ECard *card;
-	EBookIdCallback id_cb;
-	EBookCallback   cb;
-	gpointer closure;
-} ECardMergingLookup;
-
-static void
-doit (ECardMergingLookup *lookup)
-{
-	if (lookup->op == E_CARD_MERGING_ADD)
-		e_book_add_card (lookup->book, lookup->card, lookup->id_cb, lookup->closure);
-	else if (lookup->op == E_CARD_MERGING_COMMIT)
-		e_book_commit_card (lookup->book, lookup->card, lookup->cb, lookup->closure);
-}
-
-static void
-cancelit (ECardMergingLookup *lookup)
-{
-	if (lookup->op == E_CARD_MERGING_ADD) {
-		if (lookup->id_cb)
-			lookup->id_cb (lookup->book, E_BOOK_STATUS_CANCELLED, NULL, lookup->closure);
-	} else if (lookup->op == E_CARD_MERGING_COMMIT) {
-		if (lookup->cb)
-			lookup->cb (lookup->book, E_BOOK_STATUS_CANCELLED, lookup->closure);
-	}
-}
-
-static void
-clicked (GnomeDialog *dialog, int button, ECardMergingLookup *lookup)
-{
-	switch (button) {
-	case 0:
-		doit (lookup);
-		break;
-	case 1:
-		cancelit (lookup);
-		break;
-	}
-	g_free (lookup);
-	gnome_dialog_close (dialog);
-}
-
-static void
-match_query_callback (ECard *card, ECard *match, ECardMatchType type, gpointer closure)
-{
-	ECardMergingLookup *lookup = closure;
-
-	if ((gint) type <= (gint) E_CARD_MATCH_VAGUE) {
-		doit (lookup);
-		g_free (lookup);
-	} else {
-		GladeXML *ui;
-		
-		GtkWidget *widget;
-
-		if (lookup->op == E_CARD_MERGING_ADD)
-			ui = glade_xml_new (EVOLUTION_GLADEDIR "/e-card-duplicate-detected.glade", NULL);
-		else if (lookup->op == E_CARD_MERGING_COMMIT)
-			ui = glade_xml_new (EVOLUTION_GLADEDIR "/e-card-merging-book-commit-duplicate-detected.glade", NULL);
-		else {
-			doit (lookup);
-			g_free (lookup);
-			return;
-		}
-
-		widget = glade_xml_get_widget (ui, "custom-old-card");
-		gtk_object_set (GTK_OBJECT (widget),
-				"card", match,
-				NULL);
-
-		widget = glade_xml_get_widget (ui, "custom-new-card");
-		gtk_object_set (GTK_OBJECT (widget),
-				"card", card,
-				NULL);
-
-		widget = glade_xml_get_widget (ui, "dialog-duplicate-contact");
-
-		gtk_signal_connect (GTK_OBJECT (widget), "clicked",
-				    GTK_SIGNAL_FUNC (clicked), lookup);
-	}
-}
-
-gboolean
-e_card_merging_book_add_card (EBook           *book,
-			      ECard           *card,
-			      EBookIdCallback  cb,
-			      gpointer         closure)
-{
-	ECardMergingLookup *lookup;
-
-	lookup = g_new (ECardMergingLookup, 1);
-
-	lookup->op = E_CARD_MERGING_ADD;
-	lookup->book = book;
-	lookup->card = card;
-	lookup->id_cb = cb;
-	lookup->closure = closure;
-
-	e_card_locate_match_full (book, card, NULL, match_query_callback, lookup);
-
-	return TRUE;
-}
-
-gboolean
-e_card_merging_book_commit_card (EBook                 *book,
-				 ECard                 *card,
-				 EBookCallback          cb,
-				 gpointer               closure)
-{
-	ECardMergingLookup *lookup;
-	GList *avoid;
-	
-	lookup = g_new (ECardMergingLookup, 1);
-
-	lookup->op = E_CARD_MERGING_COMMIT;
-	lookup->book = book;
-	lookup->card = card;
-	lookup->cb = cb;
-	lookup->closure = closure;
-
-	avoid = g_list_append (NULL, card);
-
-	e_card_locate_match_full (book, card, avoid, match_query_callback, lookup);
-
-	g_list_free (avoid);
-
-	return TRUE;
-}
-
-GtkWidget *
-e_card_merging_create_old_card(gchar *name,
-			       gchar *string1, gchar *string2,
-			       gint int1, gint int2);
-
-GtkWidget *
-e_card_merging_create_old_card(gchar *name,
-			     gchar *string1, gchar *string2,
-			     gint int1, gint int2)
-{
-	return e_minicard_widget_new ();
-}
diff --git a/addressbook/gui/merging/e-card-merging.h b/addressbook/gui/merging/e-card-merging.h
deleted file mode 100644
index c4d9483beb..0000000000
--- a/addressbook/gui/merging/e-card-merging.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright 2001, Ximian, Inc.
- */
-
-#ifndef __E_CARD_MERGING_H__
-#define __E_CARD_MERGING_H__
-
-#include <libgnome/gnome-defs.h>
-
-#include <addressbook/backend/ebook/e-book.h>
-
-BEGIN_GNOME_DECLS
-
-gboolean  e_card_merging_book_add_card     (EBook           *book,
-					    ECard           *card,
-					    EBookIdCallback  cb,
-					    gpointer         closure);
-gboolean  e_card_merging_book_commit_card  (EBook           *book,
-					    ECard           *card,
-					    EBookCallback    cb,
-					    gpointer         closure);
-
-END_GNOME_DECLS
-
-#endif /* ! __E_CARD_MERGING_H__ */
diff --git a/addressbook/gui/search/.cvsignore b/addressbook/gui/search/.cvsignore
deleted file mode 100644
index d6c55c7345..0000000000
--- a/addressbook/gui/search/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am
deleted file mode 100644
index d5f3602bbb..0000000000
--- a/addressbook/gui/search/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-ruledir = $(datadir)/evolution
-rule_DATA = addresstypes.xml
-
-EXTRA_DIST = addresstypes.xml
-
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"e-addressbook-search\"		\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_builddir)/shell				\
-	-DSEARCH_RULE_DIR=\"$(ruledir)\"		\
-	$(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-noinst_LIBRARIES =				\
-	libeaddressbooksearch.a
-
-libeaddressbooksearch_a_SOURCES =		\
-	e-addressbook-search-dialog.c		\
-	e-addressbook-search-dialog.h
diff --git a/addressbook/gui/search/addresstypes.xml b/addressbook/gui/search/addresstypes.xml
deleted file mode 100644
index 4ee23af613..0000000000
--- a/addressbook/gui/search/addresstypes.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<filterdescription>
-<partset>
- <part name="name">
-  <title>Name</title>
-   <input type="optionlist" name="name-type">
-    <option value="contains">
-        <title>contains</title>
-	<code>(contains "full_name" ${name})</code>
-    </option>
-    <option value="not contains">
-        <title>does not contain</title>
-	<code>(not (contains "full_name" ${name}))</code>
-    </option>
-    <option value="is">
-        <title>is</title>
-	<code>(is "full_name" ${name})))</code>
-    </option>
-    <option value="is not">
-        <title>is not</title>
-	<code>(not (is "full_name" ${name}))</code>
-    </option>
-    <option value="begin">
-        <title>begins with</title>
-	<code>(beginswith "full_name" ${name})</code>
-    </option>
-    <option value="end">
-        <title>ends in</title>
-	<code>(endswith "full_name" ${name})</code>
-    </option>
-   </input>
-   <input type="string" name="name"/>
- </part>
- <part name="email">
-  <title>Email</title>
-   <input type="optionlist" name="email-type">
-    <option value="contains">
-        <title>contains</title>
-	<code>(contains "email" ${email})</code>
-    </option>
-    <option value="not contains">
-        <title>does not contain</title>
-	<code>(not (contains "email" ${email}))</code>
-    </option>
-    <option value="is">
-        <title>is</title>
-	<code>(is "email" ${email})</code>
-    </option>
-    <option value="is not">
-        <title>is not</title>
-	<code>(not (is "email" ${email}))</code>
-    </option>
-   </input>
-   <input type="address" name="email"/>
- </part>
- <part name="category">
-  <title>Category</title>
-   <input type="optionlist" name="category-type">
-    <option value="contains">
-        <title>contains</title>
-	<code>(contains "category" ${category})</code>
-    </option>
-    <option value="not contains">
-        <title>does not contain</title>
-	<code>(not (contains "category" ${category}))</code>
-    </option>
-    <option value="is">
-        <title>is</title>
-	<code>(is "category" ${category})</code>
-    </option>
-    <option value="is not">
-        <title>is not</title>
-	<code>(not (is "category" ${category}))</code>
-    </option>
-   </input>
-   <input type="string" name="category"/>
- </part>
- <part name="sexp">
-   <title>Expression</title>
-   <input type="code" name="code"/>
-  </part>
-</partset>
-</filterdescription>
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.c b/addressbook/gui/search/e-addressbook-search-dialog.c
deleted file mode 100644
index 2dbe9b1e7a..0000000000
--- a/addressbook/gui/search/e-addressbook-search-dialog.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-addressbook-search-dialog.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <gtk/gtkbox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-stock.h>
-
-#include "e-addressbook-search-dialog.h"
-
-
-static void e_addressbook_search_dialog_init		 (EAddressbookSearchDialog		 *widget);
-static void e_addressbook_search_dialog_class_init	 (EAddressbookSearchDialogClass	 *klass);
-static void e_addressbook_search_dialog_destroy       (GtkObject *object);
-
-static GnomeDialog *parent_class = NULL;
-
-#define PARENT_TYPE (gnome_dialog_get_type())
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-};
-
-GtkType
-e_addressbook_search_dialog_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type)
-	{
-		static const GtkTypeInfo info =
-		{
-			"EAddressbookSearchDialog",
-			sizeof (EAddressbookSearchDialog),
-			sizeof (EAddressbookSearchDialogClass),
-			(GtkClassInitFunc) e_addressbook_search_dialog_class_init,
-			(GtkObjectInitFunc) e_addressbook_search_dialog_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-static void
-e_addressbook_search_dialog_class_init (EAddressbookSearchDialogClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass*) klass;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	gtk_object_add_arg_type ("EAddressbookSearchDialog::book", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_BOOK);
-
-	object_class->destroy       = e_addressbook_search_dialog_destroy;
-}
-
-static GtkWidget *
-get_widget (EAddressbookSearchDialog *view)
-{
-	FilterPart *part;
-
-	view->context = rule_context_new();
-	/* FIXME: hide this in a class */
-	rule_context_add_part_set(view->context, "partset", filter_part_get_type(),
-				  rule_context_add_part, rule_context_next_part);
-	rule_context_load(view->context, SEARCH_RULE_DIR "/addresstypes.xml", "");
-	view->rule = filter_rule_new();
-	part = rule_context_next_part(view->context, NULL);
-	if (part == NULL) {
-		g_warning("Problem loading search for addressbook no parts to load");
-		return gtk_entry_new();
-	} else {
-		filter_rule_add_part(view->rule, filter_part_clone(part));
-		return filter_rule_get_widget(view->rule, view->context);
-	}
-}
-
-static char *
-get_query (EAddressbookSearchDialog *view)
-{
-	GString *out = g_string_new("");
-	char *ret;
-
-	filter_rule_build_code(view->rule, out);
-	ret = out->str;
-	printf("Searching using %s\n", ret);
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-static void
-button_press (GtkWidget *widget, int button, EAddressbookSearchDialog *dialog)
-{
-	char *query;
-
-	if (button == 0) {
-		query = get_query(dialog);
-		gtk_object_set(GTK_OBJECT(dialog->view),
-			       "query", query,
-			       NULL);
-		g_free(query);
-	}
-
-	gnome_dialog_close(GNOME_DIALOG (dialog));
-}
-
-static void
-e_addressbook_search_dialog_init (EAddressbookSearchDialog *view)
-{
-	GnomeDialog *dialog = GNOME_DIALOG (view);
-
-	gtk_window_set_policy(GTK_WINDOW(view), FALSE, TRUE, FALSE);
-	gtk_window_set_default_size (GTK_WINDOW (view), 550, 400);
-	gtk_window_set_title(GTK_WINDOW(view), _("Advanced Search"));
-	view->search = get_widget(view);
-	gtk_box_pack_start(GTK_BOX(dialog->vbox), view->search, TRUE, TRUE, 0);
-	gtk_widget_show(view->search);
-
-	gnome_dialog_append_buttons(dialog,
-				    _("Search"),
-				    GNOME_STOCK_BUTTON_CLOSE, NULL);
-	
-	gnome_dialog_set_default(dialog, 0);
-
-	gtk_signal_connect(GTK_OBJECT(dialog), "clicked",
-			   GTK_SIGNAL_FUNC(button_press), view);
-}
-
-GtkWidget *
-e_addressbook_search_dialog_new (EAddressbookView *addr_view)
-{
-	EAddressbookSearchDialog *view = gtk_type_new (e_addressbook_search_dialog_get_type ());
-	view->view = addr_view;
-	return GTK_WIDGET(view);
-}
-
-static void
-e_addressbook_search_dialog_destroy (GtkObject *object)
-{
-	EAddressbookSearchDialog *view;
-
-	view = E_ADDRESSBOOK_SEARCH_DIALOG (object);
-
-	gtk_object_unref((GtkObject *)view->context);
-	gtk_object_unref((GtkObject *)view->rule);
-
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.h b/addressbook/gui/search/e-addressbook-search-dialog.h
deleted file mode 100644
index a8c4067d29..0000000000
--- a/addressbook/gui/search/e-addressbook-search-dialog.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view-widget.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_ADDRESSBOOK_SEARCH_DIALOG_H__
-#define __E_ADDRESSBOOK_SEARCH_DIALOG_H__
-
-#include <ebook/e-book.h>
-
-#include "addressbook/gui/widgets/e-addressbook-view.h"
-#include "filter/rule-context.h"
-#include "filter/filter-rule.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <libgnomeui/gnome-dialog.h>
-
-#define E_ADDRESSBOOK_SEARCH_DIALOG_TYPE			(e_addressbook_search_dialog_get_type ())
-#define E_ADDRESSBOOK_SEARCH_DIALOG(obj)			(GTK_CHECK_CAST ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE, EAddressbookSearchDialog))
-#define E_ADDRESSBOOK_SEARCH_DIALOG_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE, EAddressbookSearchDialogClass))
-#define E_IS_ADDRESSBOOK_SEARCH_DIALOG(obj) 		(GTK_CHECK_TYPE ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE))
-#define E_IS_ADDRESSBOOK_SEARCH_DIALOG_CLASS(klass) 	(GTK_CHECK_CLASS_TYPE ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE))
-
-
-typedef struct _EAddressbookSearchDialog       EAddressbookSearchDialog;
-typedef struct _EAddressbookSearchDialogClass  EAddressbookSearchDialogClass;
-
-struct _EAddressbookSearchDialog
-{
-	GnomeDialog parent;
-
-	GtkWidget *search;
-
-	EAddressbookView *view;
-
-	RuleContext *context;
-	FilterRule *rule;
-};
-
-struct _EAddressbookSearchDialogClass
-{
-	GnomeDialogClass parent_class;
-};
-
-GtkType    e_addressbook_search_dialog_get_type (void);
-
-GtkWidget *e_addressbook_search_dialog_new (EAddressbookView *view);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_ADDRESSBOOK_SEARCH_DIALOG_H__ */
diff --git a/addressbook/gui/widgets/.cvsignore b/addressbook/gui/widgets/.cvsignore
deleted file mode 100644
index 472fd2593f..0000000000
--- a/addressbook/gui/widgets/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-minicard-label-test
-minicard-test
-minicard-view-test
-minicard-widget-test
-reflow-test
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
deleted file mode 100644
index 7e1a72e56e..0000000000
--- a/addressbook/gui/widgets/Makefile.am
+++ /dev/null
@@ -1,141 +0,0 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"e-minicard\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" \
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_srcdir)/addressbook/gui/contact-editor	\
-	-I$(top_srcdir)/addressbook/gui/merging		\
-	-I$(top_srcdir)/addressbook/gui/component	\
-	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_builddir)/shell				\
-	$(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-noinst_LIBRARIES =				\
-	libeminicard.a
-
-libeminicard_a_SOURCES =			\
-	e-addressbook-reflow-adapter.c		\
-	e-addressbook-reflow-adapter.h		\
-	e-addressbook-table-adapter.c		\
-	e-addressbook-table-adapter.h		\
-	e-addressbook-model.c			\
-	e-addressbook-model.h			\
-	e-addressbook-util.c			\
-	e-addressbook-util.h			\
-	e-addressbook-view.c			\
-	e-addressbook-view.h			\
-	e-minicard-control.c			\
-	e-minicard-control.h			\
-	e-minicard-label.c			\
-	e-minicard-label.h			\
-	e-minicard-view-widget.c		\
-	e-minicard-view-widget.h		\
-	e-minicard-view.c			\
-	e-minicard-view.h			\
-	e-minicard-widget.c			\
-	e-minicard-widget.h			\
-	e-minicard.c				\
-	e-minicard.h				\
-	gal-view-factory-minicard.c		\
-	gal-view-factory-minicard.h		\
-	gal-view-minicard.c			\
-	gal-view-minicard.h
-
-#noinst_PROGRAMS =				\
-#	 minicard-widget-test			\
-#	 minicard-label-test			\
-#	 minicard-test
-##	reflow-test
-##	minicard-view-test
-#
-#minicard_label_test_SOURCES = 	\
-#	 test-minicard-label.c
-#
-#minicard_label_test_LDADD =				\
-#	 libeminicard.a					\
-#	 $(EXTRA_GNOME_LIBS)				\
-#	 $(BONOBO_GNOME_LIBS)				\
-#	 $(top_builddir)/e-util/libeutil.la
-#
-#minicard_test_SOURCES = 	\
-#	 test-minicard.c
-#
-#minicard_test_LDADD =							\
-#	 libeminicard.a							\
-#	 $(top_builddir)/addressbook/backend/ebook/libebook.la		\
-#	 $(top_builddir)/e-util/libeutil.la				\
-#	 $(top_builddir)/libversit/libversit.la				\
-#	 $(top_builddir)/e-util/ename/libename.la			\
-#	 $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a \
-#	 $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a \
-#	 $(top_builddir)/addressbook/printing/libecontactprint.a		\
-#	 $(top_builddir)/addressbook/gui/merging/libecardmerging.a	\
-#	 $(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-#	 $(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la	\
-#	 $(top_builddir)/e-util/libeutil.la				\
-#	 $(EXTRA_GNOME_LIBS)						\
-#	 $(BONOBO_GNOME_LIBS)						\
-#	 $(GNOME_PRINT_LIBS)						\
-#	 libeminicard.a
-#
-#reflow_test_SOURCES = 	\
-#	 test-reflow.c
-#
-#reflow_test_LDADD =							\
-#	 libeminicard.a							\
-#	 $(top_builddir)/addressbook/backend/ebook/libebook.la		\
-#	 $(top_builddir)/e-util/libeutil.la				\
-#	 $(top_builddir)/libversit/libversit.la				\
-#	 $(top_builddir)/e-util/ename/libename.la			\
-#	 $(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
-#	 $(top_builddir)/addressbook/printing/libecontactprint.a		\
-#	 $(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-#	 $(top_builddir)/e-util/libeutil.la				\
-#	 $(EXTRA_GNOME_LIBS)						\
-#	 $(BONOBO_GNOME_LIBS)						\
-#	 $(GNOME_PRINT_LIBS)
-
-#minicard_view_test_SOURCES = 	\
-#	test-minicard-view.c
-
-#minicard_view_test_LDADD =						\
-#	$(EXTRA_GNOME_LIBS)						\
-#	$(BONOBO_GNOME_LIBS)						\
-#	libeminicard.a							\
-#	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-#	$(top_builddir)/e-util/libeutil.la				\
-#	$(top_builddir)/libversit/libversit.la				\
-#	$(top_builddir)/addressbook/ename/libename.la			\
-#	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\
-#	$(top_builddir)/addressbook/printing/libecontactprint.a		\
-#	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-#	$(top_builddir)/e-util/libeutil.la
-#
-#minicard_widget_test_SOURCES = 	\
-#	 e-minicard-widget-test.c
-#
-#minicard_widget_test_LDADD =						\
-#	 libeminicard.a							\
-#	 $(top_builddir)/addressbook/backend/ebook/libebook.la		\
-#	 $(top_builddir)/e-util/libeutil.la				\
-#	 $(top_builddir)/libversit/libversit.la				\
-#	 $(top_builddir)/e-util/ename/libename.la			\
-#	 $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a \
-#	 $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a \
-#	 $(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la	\
-#	 $(top_builddir)/addressbook/printing/libecontactprint.a		\
-#	 $(top_builddir)/widgets/misc/libemiscwidgets.a 			\
-#	 $(top_builddir)/e-util/libeutil.la				\
-#	 $(top_builddir)/addressbook/gui/merging/libecardmerging.a	\
-#	 $(EXTRA_GNOME_LIBS)						\
-#	 $(BONOBO_GNOME_LIBS)						\
-#	 $(GNOME_PRINT_LIBS)
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = 
-
-EXTRA_DIST = 			\
-	$(glade_DATA)
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
deleted file mode 100644
index cd7688ba51..0000000000
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ /dev/null
@@ -1,578 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Christopher James Lahey <clahey@ximian.com>
- *
- * (C) 1999 Ximian, Inc.
- */
-
-#include <config.h>
-#include "e-addressbook-model.h"
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <gnome.h>
-
-#define PARENT_TYPE gtk_object_get_type()
-GtkObjectClass *parent_class;
-
-/*
- * EAddressbookModel callbacks
- * These are the callbacks that define the behavior of our custom model.
- */
-static void e_addressbook_model_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_addressbook_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_QUERY,
-	ARG_EDITABLE,
-};
-
-enum {
-	WRITABLE_STATUS,
-	STATUS_MESSAGE,
-	FOLDER_BAR_MESSAGE,
-	CARD_ADDED,
-	CARD_REMOVED,
-	CARD_CHANGED,
-	MODEL_CHANGED,
-	STOP_STATE_CHANGED,
-	LAST_SIGNAL
-};
-
-#define COLS (E_CARD_SIMPLE_FIELD_LAST)
-
-static guint e_addressbook_model_signals [LAST_SIGNAL] = {0, };
-
-static void
-remove_book_view(EAddressbookModel *model)
-{
-	if (model->book_view && model->create_card_id)
-		gtk_signal_disconnect(GTK_OBJECT (model->book_view),
-				      model->create_card_id);
-	if (model->book_view && model->remove_card_id)
-		gtk_signal_disconnect(GTK_OBJECT (model->book_view),
-				      model->remove_card_id);
-	if (model->book_view && model->modify_card_id)
-		gtk_signal_disconnect(GTK_OBJECT (model->book_view),
-				      model->modify_card_id);
-	if (model->book_view && model->status_message_id)
-		gtk_signal_disconnect(GTK_OBJECT (model->book_view),
-				      model->status_message_id);
-	if (model->book_view && model->sequence_complete_id)
-		gtk_signal_disconnect(GTK_OBJECT (model->book_view),
-				      model->sequence_complete_id);
-
-	model->create_card_id = 0;
-	model->remove_card_id = 0;
-	model->modify_card_id = 0;
-	model->status_message_id = 0;
-	model->sequence_complete_id = 0;
-
-	model->search_in_progress = FALSE;
-
-	if (model->book_view) {
-		gtk_object_unref(GTK_OBJECT(model->book_view));
-	}
-
-	model->book_view = NULL;
-}
-
-static void
-addressbook_destroy(GtkObject *object)
-{
-	EAddressbookModel *model = E_ADDRESSBOOK_MODEL(object);
-	int i;
-
-	if (model->get_view_idle) {
-		g_source_remove(model->get_view_idle);
-		model->get_view_idle = 0;
-	}
-
-	remove_book_view(model);
-
-	if (model->book) {
-		if (model->writable_status_id)
-			gtk_signal_disconnect(GTK_OBJECT (model->book),
-					      model->writable_status_id);
-
-		model->writable_status_id = 0;
-
-		gtk_object_unref(GTK_OBJECT(model->book));
-		model->book = NULL;
-	}
-
-	for ( i = 0; i < model->data_count; i++ ) {
-		gtk_object_unref(GTK_OBJECT(model->data[i]));
-	}
-
-	g_free(model->data);
-	model->data = NULL;
-}
-
-static void
-update_folder_bar_message (EAddressbookModel *model)
-{
-	int count;
-	char *message;
-
-	count = model->data_count;
-
-	switch (count) {
-	case 0:
-		message = g_strdup (_("No cards"));
-		break;
-	case 1:
-		message = g_strdup (_("1 card"));
-		break;
-	default:
-		message = g_strdup_printf (_("%d cards"), count);
-		break;
-	}
-
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_addressbook_model_signals [FOLDER_BAR_MESSAGE],
-			 message);
-
-	g_free (message);
-}
-
-static void
-create_card(EBookView *book_view,
-	    const GList *cards,
-	    EAddressbookModel *model)
-{
-	int old_count = model->data_count;
-	int length = g_list_length ((GList *)cards);
-
-	if (model->data_count + length > model->allocated_count) {
-		while (model->data_count + length > model->allocated_count)
-			model->allocated_count += 256;
-		model->data = g_renew(ECard *, model->data, model->allocated_count);
-	}
-
-	for ( ; cards; cards = cards->next) {
-		char *file_as;
-
-		model->data[model->data_count++] = cards->data;
-		gtk_object_ref (cards->data);
-		gtk_object_get (GTK_OBJECT (cards->data),
-				"file_as", &file_as,
-				NULL);
-	}
-
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_addressbook_model_signals [CARD_ADDED],
-			 old_count, model->data_count - old_count);
-
-	update_folder_bar_message (model);
-}
-
-static void
-remove_card(EBookView *book_view,
-	    const char *id,
-	    EAddressbookModel *model)
-{
-	int i;
-
-	for ( i = 0; i < model->data_count; i++) {
-		if ( !strcmp(e_card_get_id(model->data[i]), id) ) {
-			gtk_object_unref(GTK_OBJECT(model->data[i]));
-			memmove(model->data + i, model->data + i + 1, (model->data_count - i - 1) * sizeof (ECard *));
-			model->data_count--;
-
-			gtk_signal_emit (GTK_OBJECT (model),
-					 e_addressbook_model_signals [CARD_REMOVED],
-					 i);
-			update_folder_bar_message (model);
-			break;
-		}
-	}
-}
-
-static void
-modify_card(EBookView *book_view,
-	    const GList *cards,
-	    EAddressbookModel *model)
-{
-	for ( ; cards; cards = cards->next) {
-		int i;
-		for ( i = 0; i < model->data_count; i++) {
-			if ( !strcmp(e_card_get_id(model->data[i]), e_card_get_id(E_CARD(cards->data))) ) {
-				gtk_object_unref(GTK_OBJECT(model->data[i]));
-				model->data[i] = e_card_duplicate(E_CARD(cards->data));
-				gtk_signal_emit (GTK_OBJECT (model),
-						 e_addressbook_model_signals [CARD_CHANGED],
-						 i);
-				break;
-			}
-		}
-	}
-}
-
-static void
-status_message (EBookView *book_view,
-		char* status,
-		EAddressbookModel *model)
-{
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_addressbook_model_signals [STATUS_MESSAGE],
-			 status);
-}
-
-static void
-sequence_complete (EBookView *book_view,
-		   EAddressbookModel *model)
-{
-	model->search_in_progress = FALSE;
-	status_message (book_view, NULL, model);
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_addressbook_model_signals [STOP_STATE_CHANGED]);
-}
-
-static void
-writable_status (EBook *book,
-		 gboolean writable,
-		 EAddressbookModel *model)
-{
-	if (!model->editable_set) {
-		model->editable = writable;
-
-		gtk_signal_emit (GTK_OBJECT (model),
-				 e_addressbook_model_signals [WRITABLE_STATUS],
-				 writable);
-	}
-}
-
-static void
-e_addressbook_model_class_init (GtkObjectClass *object_class)
-{
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = addressbook_destroy;
-	object_class->set_arg   = e_addressbook_model_set_arg;
-	object_class->get_arg   = e_addressbook_model_get_arg;
-
-	gtk_object_add_arg_type ("EAddressbookModel::book", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_BOOK);
-	gtk_object_add_arg_type ("EAddressbookModel::query", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_QUERY);
-	gtk_object_add_arg_type ("EAddressbookModel::editable", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_EDITABLE);
-
-	e_addressbook_model_signals [WRITABLE_STATUS] =
-		gtk_signal_new ("writable_status",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, writable_status),
-				gtk_marshal_NONE__BOOL,
-				GTK_TYPE_NONE, 1, GTK_TYPE_BOOL);
-
-	e_addressbook_model_signals [STATUS_MESSAGE] =
-		gtk_signal_new ("status_message",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, status_message),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	e_addressbook_model_signals [FOLDER_BAR_MESSAGE] =
-		gtk_signal_new ("folder_bar_message",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, folder_bar_message),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	e_addressbook_model_signals [CARD_ADDED] =
-		gtk_signal_new ("card_added",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, card_added),
-				gtk_marshal_NONE__INT_INT,
-				GTK_TYPE_NONE, 2, GTK_TYPE_INT, GTK_TYPE_INT);
-
-	e_addressbook_model_signals [CARD_REMOVED] =
-		gtk_signal_new ("card_removed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, card_removed),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	e_addressbook_model_signals [CARD_CHANGED] =
-		gtk_signal_new ("card_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, card_changed),
-				gtk_marshal_NONE__INT,
-				GTK_TYPE_NONE, 1, GTK_TYPE_INT);
-
-	e_addressbook_model_signals [MODEL_CHANGED] =
-		gtk_signal_new ("model_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, model_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	e_addressbook_model_signals [STOP_STATE_CHANGED] =
-		gtk_signal_new ("stop_state_changed",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookModelClass, stop_state_changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_addressbook_model_signals, LAST_SIGNAL);
-}
-
-static void
-e_addressbook_model_init (GtkObject *object)
-{
-	EAddressbookModel *model = E_ADDRESSBOOK_MODEL(object);
-	model->book = NULL;
-	model->query = g_strdup("(contains \"x-evolution-any-field\" \"\")");
-	model->book_view = NULL;
-	model->get_view_idle = 0;
-	model->create_card_id = 0;
-	model->remove_card_id = 0;
-	model->modify_card_id = 0;
-	model->status_message_id = 0;
-	model->writable_status_id = 0;
-	model->sequence_complete_id = 0;
-	model->data = NULL;
-	model->data_count = 0;
-	model->allocated_count = 0;
-	model->search_in_progress = FALSE;
-	model->editable = FALSE;
-	model->editable_set = FALSE;
-	model->first_get_view = TRUE;
-}
-
-static void
-book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure)
-{
-	EAddressbookModel *model = closure;
-	int i;
-	remove_book_view(model);
-	model->book_view = book_view;
-	if (model->book_view)
-		gtk_object_ref(GTK_OBJECT(model->book_view));
-	model->create_card_id = gtk_signal_connect(GTK_OBJECT(model->book_view),
-						  "card_added",
-						  GTK_SIGNAL_FUNC(create_card),
-						  model);
-	model->remove_card_id = gtk_signal_connect(GTK_OBJECT(model->book_view),
-						  "card_removed",
-						  GTK_SIGNAL_FUNC(remove_card),
-						  model);
-	model->modify_card_id = gtk_signal_connect(GTK_OBJECT(model->book_view),
-						  "card_changed",
-						  GTK_SIGNAL_FUNC(modify_card),
-						  model);
-	model->status_message_id = gtk_signal_connect(GTK_OBJECT(model->book_view),
-						      "status_message",
-						      GTK_SIGNAL_FUNC(status_message),
-						      model);
-	model->sequence_complete_id = gtk_signal_connect(GTK_OBJECT(model->book_view),
-							 "sequence_complete",
-							 GTK_SIGNAL_FUNC(sequence_complete),
-							 model);
-
-	for ( i = 0; i < model->data_count; i++ ) {
-		gtk_object_unref(GTK_OBJECT(model->data[i]));
-	}
-
-	g_free(model->data);
-	model->data = NULL;
-	model->data_count = 0;
-	model->allocated_count = 0;
-	model->search_in_progress = TRUE;
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_addressbook_model_signals [MODEL_CHANGED]);
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_addressbook_model_signals [STOP_STATE_CHANGED]);
-}
-
-static gboolean
-get_view (EAddressbookModel *model)
-{
-	if (model->book && model->query) {
-		if (model->first_get_view) {
-			char *capabilities;
-			capabilities = e_book_get_static_capabilities (model->book);
-			if (capabilities && strstr (capabilities, "local")) {
-				e_book_get_book_view (model->book, model->query, book_view_loaded, model);
-			}
-			model->first_get_view = FALSE;
-			g_free (capabilities);
-		}
-		else
-			e_book_get_book_view (model->book, model->query, book_view_loaded, model);
-	}
-
-	model->get_view_idle = 0;
-	return FALSE;
-}
-
-ECard *
-e_addressbook_model_get_card(EAddressbookModel *model,
-			     int                row)
-{
-	if (model->data && 0 <= row && row < model->data_count) {
-		ECard *card;
-		card = e_card_duplicate (model->data[row]);
-		return card;
-	}
-	return NULL;
-}
-
-static void
-e_addressbook_model_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EAddressbookModel *model;
-
-	model = E_ADDRESSBOOK_MODEL (o);
-	
-	switch (arg_id){
-	case ARG_BOOK:
-		if (model->book) {
-			if (model->writable_status_id)
-				gtk_signal_disconnect(GTK_OBJECT (model->book),
-						      model->writable_status_id);
-
-			model->writable_status_id = 0;
-
-			gtk_object_unref(GTK_OBJECT(model->book));
-		}
-		model->book = E_BOOK(GTK_VALUE_OBJECT (*arg));
-		if (model->book) {
-			gtk_object_ref(GTK_OBJECT(model->book));
-			if (model->get_view_idle == 0)
-				model->get_view_idle = g_idle_add((GSourceFunc)get_view, model);
-			gtk_signal_connect (GTK_OBJECT(model->book),
-					    "writable_status",
-					    writable_status, model);
-		}
-		break;
-	case ARG_QUERY:
-		if (model->query)
-			g_free(model->query);
-		model->query = g_strdup(GTK_VALUE_STRING (*arg));
-		if (model->get_view_idle == 0)
-			model->get_view_idle = g_idle_add((GSourceFunc)get_view, model);
-		break;
-	case ARG_EDITABLE:
-		model->editable = GTK_VALUE_BOOL (*arg);
-		model->editable_set = TRUE;
-		break;
-	}
-}
-
-static void
-e_addressbook_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EAddressbookModel *e_addressbook_model;
-
-	e_addressbook_model = E_ADDRESSBOOK_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_addressbook_model->book);
-		break;
-	case ARG_QUERY:
-		GTK_VALUE_STRING (*arg) = g_strdup(e_addressbook_model->query);
-		break;
-	case ARG_EDITABLE:
-		GTK_VALUE_BOOL (*arg) = e_addressbook_model->editable;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-GtkType
-e_addressbook_model_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"EAddressbookModel",
-			sizeof (EAddressbookModel),
-			sizeof (EAddressbookModelClass),
-			(GtkClassInitFunc) e_addressbook_model_class_init,
-			(GtkObjectInitFunc) e_addressbook_model_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-EAddressbookModel*
-e_addressbook_model_new (void)
-{
-	EAddressbookModel *et;
-
-	et = gtk_type_new (e_addressbook_model_get_type ());
-	
-	return et;
-}
-
-void   e_addressbook_model_stop    (EAddressbookModel *model)
-{
-	remove_book_view(model);
-	model->search_in_progress = FALSE;
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_addressbook_model_signals [STOP_STATE_CHANGED]);
-	gtk_signal_emit (GTK_OBJECT (model),
-			 e_addressbook_model_signals [STATUS_MESSAGE],
-			 "Search Interrupted.");
-}
-
-gboolean
-e_addressbook_model_can_stop (EAddressbookModel *model)
-{
-	return model->search_in_progress;
-}
-
-void
-e_addressbook_model_force_folder_bar_message (EAddressbookModel *model)
-{
-	update_folder_bar_message (model);
-}
-
-int
-e_addressbook_model_card_count (EAddressbookModel *model)
-{
-	return model->data_count;
-}
-
-ECard *
-e_addressbook_model_card_at (EAddressbookModel *model, int index)
-{
-	return model->data[index];
-}
-
-gboolean
-e_addressbook_model_editable (EAddressbookModel *model)
-{
-	return model->editable;
-}
-
-EBook *
-e_addressbook_model_get_ebook (EAddressbookModel *model)
-{
-	return model->book;
-}
diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h
deleted file mode 100644
index 6482409075..0000000000
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_ADDRESSBOOK_MODEL_H_
-#define _E_ADDRESSBOOK_MODEL_H_
-
-#include "addressbook/backend/ebook/e-book.h"
-#include "addressbook/backend/ebook/e-book-view.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#define E_ADDRESSBOOK_MODEL_TYPE        (e_addressbook_model_get_type ())
-#define E_ADDRESSBOOK_MODEL(o)          (GTK_CHECK_CAST ((o), E_ADDRESSBOOK_MODEL_TYPE, EAddressbookModel))
-#define E_ADDRESSBOOK_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_ADDRESSBOOK_MODEL_TYPE, EAddressbookModelClass))
-#define E_IS_ADDRESSBOOK_MODEL(o)       (GTK_CHECK_TYPE ((o), E_ADDRESSBOOK_MODEL_TYPE))
-#define E_IS_ADDRESSBOOK_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESSBOOK_MODEL_TYPE))
-
-typedef struct _EAddressbookModel EAddressbookModel;
-typedef struct _EAddressbookModelClass EAddressbookModelClass;
-
-struct _EAddressbookModel {
-	GtkObject parent;
-
-	/* item specific fields */
-	EBook *book;
-	char *query;
-	EBookView *book_view;
-
-	int get_view_idle;
-
-	ECard **data;
-	int data_count;
-	int allocated_count;
-
-	int create_card_id, remove_card_id, modify_card_id, status_message_id, writable_status_id, sequence_complete_id;
-
-	guint search_in_progress : 1;
-	guint editable : 1;
-	guint editable_set : 1;
-	guint first_get_view : 1;
-};
-
-
-struct _EAddressbookModelClass {
-	GtkObjectClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	void (*writable_status)    (EAddressbookModel *model, gboolean writable);
-	void (*status_message)     (EAddressbookModel *model, const gchar *message);
-	void (*folder_bar_message) (EAddressbookModel *model, const gchar *message);
-	void (*card_added)         (EAddressbookModel *model, gint index, gint count);
-	void (*card_removed)       (EAddressbookModel *model, gint index);
-	void (*card_changed)       (EAddressbookModel *model, gint index);
-	void (*model_changed)      (EAddressbookModel *model);
-	void (*stop_state_changed) (EAddressbookModel *model);
-};
-
-
-GtkType            e_addressbook_model_get_type (void);
-EAddressbookModel *e_addressbook_model_new (void);
-
-/* Returns object with ref count of 1. */
-ECard *e_addressbook_model_get_card  (EAddressbookModel *model,
-				      int                row);
-EBook *e_addressbook_model_get_ebook (EAddressbookModel *model);
-
-void     e_addressbook_model_stop      (EAddressbookModel *model);
-gboolean e_addressbook_model_can_stop (EAddressbookModel *model);
-
-void e_addressbook_model_force_folder_bar_message (EAddressbookModel *model);
-
-int          e_addressbook_model_card_count (EAddressbookModel *model);
-ECard       *e_addressbook_model_card_at    (EAddressbookModel *model, int index);
-gboolean     e_addressbook_model_editable   (EAddressbookModel *model);
-
-#endif /* _E_ADDRESSBOOK_MODEL_H_ */
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
deleted file mode 100644
index 66f21dbc9d..0000000000
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ /dev/null
@@ -1,650 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-
-#include <config.h>
-
-#include "e-addressbook-reflow-adapter.h"
-#include "e-addressbook-model.h"
-#include "e-addressbook-util.h"
-
-#include <gal/util/e-i18n.h>
-
-#include "e-minicard.h"
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-font.h>
-#include <gal/widgets/e-popup-menu.h>
-#include <gal/unicode/gunicode.h>
-#include "e-contact-save-as.h"
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-
-
-struct _EAddressbookReflowAdapterPrivate {
-	EAddressbookModel *model;
-	
-	int create_card_id, remove_card_id, modify_card_id, model_changed_id;
-};
-
-#define PARENT_TYPE e_reflow_model_get_type()
-EReflowModel *parent_class;
-
-#define d(x)
-
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_QUERY,
-	ARG_EDITABLE,
-};
-
-enum {
-	DRAG_BEGIN,
-	LAST_SIGNAL
-};
-
-static guint e_addressbook_reflow_adapter_signals [LAST_SIGNAL] = {0, };
-
-static void
-unlink_model(EAddressbookReflowAdapter *adapter)
-{
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	gtk_signal_disconnect(GTK_OBJECT (priv->model),
-			      priv->create_card_id);
-	gtk_signal_disconnect(GTK_OBJECT (priv->model),
-			      priv->remove_card_id);
-	gtk_signal_disconnect(GTK_OBJECT (priv->model),
-			      priv->modify_card_id);
-
-	priv->create_card_id = 0;
-	priv->remove_card_id = 0;
-	priv->modify_card_id = 0;
-
-	gtk_object_unref(GTK_OBJECT(priv->model));
-
-	priv->model = NULL;
-}
-
-
-static int
-count_lines (const gchar *text)
-{
-	int num_lines = 1;
-	gunichar unival;
-
-	for (text = e_unicode_get_utf8 (text, &unival); (unival && text); text = e_unicode_get_utf8 (text, &unival)) {
-		if (unival == '\n') {
-			num_lines ++;
-		}
-	}
-
-	return num_lines;
-}
-
-static int
-text_height (GnomeCanvas *canvas, const gchar *text)
-{
-	EFont *font = e_font_from_gdk_font (((GtkWidget *) canvas)->style->font);
-	gint height = e_font_height (font) * count_lines (text) / canvas->pixels_per_unit;
-
-	e_font_unref (font);
-	return height;
-}
-
-typedef struct {
-	EAddressbookReflowAdapter *adapter;
-	ESelectionModel *selection;
-} ModelAndSelection;
-
-static void
-model_and_selection_free (ModelAndSelection *mns)
-{
-	gtk_object_unref(GTK_OBJECT(mns->adapter));
-	e_selection_model_right_click_up(mns->selection);
-	gtk_object_unref(GTK_OBJECT(mns->selection));
-	g_free(mns);
-}
-
-static void
-add_to_list (int model_row, gpointer closure)
-{
-	GList **list = closure;
-	*list = g_list_prepend (*list, GINT_TO_POINTER (model_row));
-}
-
-static GList *
-get_card_list (ModelAndSelection *mns)
-{
-	EAddressbookReflowAdapterPrivate *priv = mns->adapter->priv;
-	GList *list;
-	GList *iterator;
-
-	list = NULL;
-	e_selection_model_foreach (mns->selection, add_to_list, &list);
-
-	for (iterator = list; iterator; iterator = iterator->next) {
-		iterator->data = e_addressbook_model_card_at (priv->model, GPOINTER_TO_INT (iterator->data));
-	}
-	list = g_list_reverse (list);
-	return list;
-}
-
-static void
-save_as (GtkWidget *widget, ModelAndSelection *mns)
-{
-	GList *list;
-
-	list = get_card_list (mns);
-	if (list)
-		e_contact_list_save_as (_("Save as VCard"), list);
-	g_list_free (list);
-	model_and_selection_free (mns);
-}
-
-static void
-send_as (GtkWidget *widget, ModelAndSelection *mns)
-{
-	GList *list;
-
-	list = get_card_list (mns);
-	if (list)
-		e_card_list_send (list, E_CARD_DISPOSITION_AS_ATTACHMENT);
-	g_list_free (list);
-	model_and_selection_free (mns);
-}
-
-static void
-send_to (GtkWidget *widget, ModelAndSelection *mns)
-{
-	GList *list;
-
-	list = get_card_list (mns);
-	if (list)
-		e_card_list_send (list, E_CARD_DISPOSITION_AS_TO);
-	g_list_free (list);
-	model_and_selection_free (mns);
-}
-
-static void
-print (GtkWidget *widget, ModelAndSelection *mns)
-{
-	GList *list;
-
-	list = get_card_list (mns);
-	if (list)
-		gtk_widget_show (e_contact_print_card_list_dialog_new (list));
-	g_list_free (list);
-	model_and_selection_free (mns);
-}
-
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-static void
-print_envelope (GtkWidget *widget, ModelAndSelection *mns)
-{
-	GList *list;
-
-	list = get_card_list (mns);
-	if (list)
-		gtk_widget_show (e_contact_print_envelope_list_dialog_new (list));
-	g_list_free (list);
-	model_and_selection_free (mns);
-}
-#endif
-
-static void
-card_changed_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	d(g_print ("%s: %s(): a card was changed with status %d\n", __FILE__, __FUNCTION__, status));
-}
-
-static void
-delete (GtkWidget *widget, ModelAndSelection *mns)
-{
-	EAddressbookReflowAdapterPrivate *priv = mns->adapter->priv;
-	GList *list;
-
-	list = get_card_list (mns);
-	if (list) {
-
-		if (e_contact_editor_confirm_delete(NULL)) { /*FIXME: Give a GtkWindow here. */
-			GList *iterator;
-			EBook *book = e_addressbook_model_get_ebook(priv->model);
-
-			for (iterator = list; iterator; iterator = iterator->next) {
-				ECard *card = iterator->data;
-
-				gtk_object_ref(GTK_OBJECT(card));
-
-				e_book_remove_card (book,
-						    card,
-						    card_changed_cb,
-						    NULL);
-
-				gtk_object_unref(GTK_OBJECT(card));
-			}
-		}
-	}
-
-	g_list_free (list);
-	model_and_selection_free (mns);
-}
-
-static void
-open_card (GtkWidget *widget, ModelAndSelection *mns)
-{
-	EAddressbookReflowAdapterPrivate *priv = mns->adapter->priv;
-	GList *list;
-
-	list = get_card_list (mns);
-	if (list) {
-		GList *iterator;
-		EBook *book = e_addressbook_model_get_ebook(priv->model);
-
-		for (iterator = list; iterator; iterator = iterator->next) {
-			ECard *card = iterator->data;
-
-			if (e_card_evolution_list (card)) {
-				e_addressbook_show_contact_list_editor (book, card,
-									FALSE, e_addressbook_model_editable (priv->model));
-			}
-			else {
-				e_addressbook_show_contact_editor (book, card,
-								   FALSE, e_addressbook_model_editable (priv->model));
-			}
-		}
-	}
-
-	g_list_free (list);
-	model_and_selection_free (mns);
-}
-
-#define POPUP_READONLY_MASK 0x01
-gint
-e_addressbook_reflow_adapter_right_click (EAddressbookReflowAdapter *adapter, GdkEvent *event, ESelectionModel *selection)
-{
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-	ModelAndSelection *mns = g_new(ModelAndSelection, 1);
-	EPopupMenu menu[] = { {N_("Open"), NULL, GTK_SIGNAL_FUNC(open_card), NULL, 0},
-			      {N_("Save as VCard"), NULL, GTK_SIGNAL_FUNC(save_as), NULL, 0},
-			      {N_("Forward Contact"), NULL, GTK_SIGNAL_FUNC(send_as), NULL, 0},
-			      {N_("Send Message to Contact"), NULL, GTK_SIGNAL_FUNC(send_to), NULL, 0},
-			      {N_("Print"), NULL, GTK_SIGNAL_FUNC(print), NULL, 0},
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-			      {N_("Print Envelope"), NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, 0},
-#endif
-			      {N_("Delete"), NULL, GTK_SIGNAL_FUNC(delete), NULL, POPUP_READONLY_MASK},
-			      {NULL, NULL, NULL, 0}};
-
-	mns->adapter = adapter;
-	mns->selection = selection;
-	gtk_object_ref(GTK_OBJECT(mns->adapter));
-	gtk_object_ref(GTK_OBJECT(mns->selection));
-	e_popup_menu_run (menu, event, e_addressbook_model_editable(priv->model) ? 0 : POPUP_READONLY_MASK, 0, mns);
-	return TRUE;
-}
-
-static void
-addressbook_finalize(GtkObject *object)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(object);
-
-	unlink_model (adapter);
-}
-
-static void
-addressbook_set_width (EReflowModel *erm, int width)
-{
-}
-
-/* This function returns the number of items in our EReflowModel. */
-static int
-addressbook_count (EReflowModel *erm)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	return e_addressbook_model_card_count (priv->model);
-}
-
-/* This function returns the number of items in our EReflowModel. */
-static int
-addressbook_height (EReflowModel *erm, int i, GnomeCanvasGroup *parent)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-	/* FIXME */
-	ECardSimpleField field;
-	int count = 0;
-	int height;
-	char *string;
-	ECardSimple *simple = e_card_simple_new (e_addressbook_model_card_at (priv->model, i));
-
-	string = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FILE_AS);
-	height = text_height (GNOME_CANVAS_ITEM (parent)->canvas, string ? string : "") + 10.0;
-	g_free(string);
-
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING && count < 5; field++) {
-
-		if (field == E_CARD_SIMPLE_FIELD_FAMILY_NAME)
-			continue;
-
-		string = e_card_simple_get(simple, field);
-		if (string && *string) {
-			int this_height;
-			int field_text_height;
-
-			this_height = text_height (GNOME_CANVAS_ITEM (parent)->canvas, e_card_simple_get_name(simple, field));
-
-			field_text_height = text_height (GNOME_CANVAS_ITEM (parent)->canvas, string);
-			if (this_height < field_text_height)
-				this_height = field_text_height;
-
-			this_height += 3;
-
-			height += this_height;
-			count ++;
-		}
-		g_free (string);
-	}
-	height += 2;
-
-	gtk_object_unref (GTK_OBJECT (simple));
-
-	return height;
-}
-
-static int
-addressbook_compare (EReflowModel *erm, int n1, int n2)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-	ECard *card1, *card2;
-	
-	card1 = e_addressbook_model_card_at (priv->model, n1);
-	card2 = e_addressbook_model_card_at (priv->model, n2);
-
-	if (card1 && card2) {
-		char *file_as1, *file_as2;
-		file_as1 = card1->file_as;
-		file_as2 = card2->file_as;
-		if (file_as1 && file_as2)
-			return g_utf8_collate(file_as1, file_as2);
-		if (file_as1)
-			return -1;
-		if (file_as2)
-			return 1;
-		return strcmp(e_card_get_id(card1), e_card_get_id(card2));
-	}
-	if (card1)
-		return -1;
-	if (card2)
-		return 1;
-	return 0;
-}
-
-static int
-adapter_drag_begin (EMinicard *card, GdkEvent *event, EAddressbookReflowAdapter *adapter)
-{
-	gint ret_val = 0;
-
-	gtk_signal_emit (GTK_OBJECT(adapter),
-			 e_addressbook_reflow_adapter_signals[DRAG_BEGIN],
-			 event, &ret_val);
-
-	return ret_val;
-}
-
-static GnomeCanvasItem *
-addressbook_incarnate (EReflowModel *erm, int i, GnomeCanvasGroup *parent)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-	GnomeCanvasItem *item;
-
-	item = gnome_canvas_item_new(parent,
-				     e_minicard_get_type(),
-				     "card", e_addressbook_model_card_at (priv->model, i),
-				     "editable", e_addressbook_model_editable (priv->model),
-				     NULL);
-
-#if 0
-	gtk_signal_connect (GTK_OBJECT (item), "selected",
-			    GTK_SIGNAL_FUNC(card_selected), emvm);
-#endif
-
-	gtk_signal_connect (GTK_OBJECT (item), "drag_begin",
-			    GTK_SIGNAL_FUNC(adapter_drag_begin), adapter);
-
-	return item;
-}
-
-static void
-addressbook_reincarnate (EReflowModel *erm, int i, GnomeCanvasItem *item)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(erm);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	gnome_canvas_item_set(item,
-			      "card", e_addressbook_model_card_at (priv->model, i),
-			      NULL);
-}
-
-
-
-static void
-create_card(EAddressbookModel *model,
-	    gint index, gint count,
-	    EAddressbookReflowAdapter *adapter)
-{
-	e_reflow_model_items_inserted (E_REFLOW_MODEL (adapter),
-				       index,
-				       count);
-}
-
-static void
-remove_card(EAddressbookModel *model,
-	    gint index,
-	    EAddressbookReflowAdapter *adapter)
-{
-	e_reflow_model_changed (E_REFLOW_MODEL (adapter));
-}
-
-static void
-modify_card(EAddressbookModel *model,
-	    gint index,
-	    EAddressbookReflowAdapter *adapter)
-{
-	e_reflow_model_item_changed (E_REFLOW_MODEL (adapter), index);
-}
-
-static void
-model_changed(EAddressbookModel *model,
-	      EAddressbookReflowAdapter *adapter)
-{
-	e_reflow_model_changed (E_REFLOW_MODEL (adapter));
-}
-
-static void
-addressbook_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(o);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	switch (arg_id){
-	case ARG_BOOK:
-		gtk_object_set (GTK_OBJECT (priv->model),
-				"book", GTK_VALUE_OBJECT (*arg),
-				NULL);
-		break;
-	case ARG_QUERY:
-		gtk_object_set (GTK_OBJECT (priv->model),
-				"query", GTK_VALUE_STRING (*arg),
-				NULL);
-		break;
-	case ARG_EDITABLE:
-		gtk_object_set (GTK_OBJECT (priv->model),
-				"editable", GTK_VALUE_BOOL (*arg),
-				NULL);
-		break;
-	}
-}
-
-static void
-addressbook_get_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(o);
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	switch (arg_id) {
-	case ARG_BOOK: {
-		EBook *book;
-		gtk_object_get (GTK_OBJECT (priv->model),
-				"book", &book,
-				NULL);
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(book);
-		break;
-	}
-	case ARG_QUERY: {
-		char *query;
-		gtk_object_get (GTK_OBJECT (priv->model),
-				"query", &query,
-				NULL);
-		GTK_VALUE_STRING (*arg) = query;
-		break;
-	}
-	case ARG_EDITABLE: {
-		gboolean editable;
-		gtk_object_get (GTK_OBJECT (priv->model),
-				"editable", &editable,
-				NULL);
-		GTK_VALUE_BOOL (*arg) = editable;
-		break;
-	}
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_addressbook_reflow_adapter_class_init (GtkObjectClass *object_class)
-{
-	EReflowModelClass *model_class = (EReflowModelClass *) object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->set_arg = addressbook_set_arg;
-	object_class->get_arg = addressbook_get_arg;
-	object_class->finalize = addressbook_finalize;
-
-	gtk_object_add_arg_type ("EAddressbookReflowAdapter::book", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_BOOK);
-	gtk_object_add_arg_type ("EAddressbookReflowAdapter::query", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_QUERY);
-	gtk_object_add_arg_type ("EAddressbookReflowAdapter::editable", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_EDITABLE);
-
-	e_addressbook_reflow_adapter_signals [DRAG_BEGIN] =
-		gtk_signal_new ("drag_begin",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookReflowAdapterClass, drag_begin),
-				gtk_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
-
-
-	gtk_object_class_add_signals (object_class, e_addressbook_reflow_adapter_signals, LAST_SIGNAL);
-
-	model_class->set_width = addressbook_set_width;
-	model_class->count = addressbook_count;
-	model_class->height = addressbook_height;
-	model_class->compare = addressbook_compare;
-	model_class->incarnate = addressbook_incarnate;
-	model_class->reincarnate = addressbook_reincarnate;
-}
-
-static void
-e_addressbook_reflow_adapter_init (GtkObject *object)
-{
-	EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(object);
-	EAddressbookReflowAdapterPrivate *priv;
-
-	priv = adapter->priv = g_new0 (EAddressbookReflowAdapterPrivate, 1);
-
-	priv->create_card_id = 0;
-	priv->remove_card_id = 0;
-	priv->modify_card_id = 0;
-	priv->model_changed_id = 0;
-}
-
-GtkType
-e_addressbook_reflow_adapter_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"EAddressbookReflowAdapter",
-			sizeof (EAddressbookReflowAdapter),
-			sizeof (EAddressbookReflowAdapterClass),
-			(GtkClassInitFunc) e_addressbook_reflow_adapter_class_init,
-			(GtkObjectInitFunc) e_addressbook_reflow_adapter_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-void
-e_addressbook_reflow_adapter_construct (EAddressbookReflowAdapter *adapter,
-					EAddressbookModel *model)
-{
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	priv->model = model;
-	gtk_object_ref (GTK_OBJECT (priv->model));
-
-	priv->create_card_id = gtk_signal_connect(GTK_OBJECT(priv->model),
-						  "card_added",
-						  GTK_SIGNAL_FUNC(create_card),
-						  adapter);
-	priv->remove_card_id = gtk_signal_connect(GTK_OBJECT(priv->model),
-						  "card_removed",
-						  GTK_SIGNAL_FUNC(remove_card),
-						  adapter);
-	priv->modify_card_id = gtk_signal_connect(GTK_OBJECT(priv->model),
-						  "card_changed",
-						  GTK_SIGNAL_FUNC(modify_card),
-						  adapter);
-	priv->model_changed_id = gtk_signal_connect(GTK_OBJECT(priv->model),
-						    "model_changed",
-						    GTK_SIGNAL_FUNC(model_changed),
-						    adapter);
-}
-
-EReflowModel *
-e_addressbook_reflow_adapter_new (EAddressbookModel *model)
-{
-	EAddressbookReflowAdapter *et;
-
-	et = gtk_type_new (e_addressbook_reflow_adapter_get_type ());
-
-	e_addressbook_reflow_adapter_construct (et, model);
-
-	return E_REFLOW_MODEL(et);
-}
-
-
-ECard *
-e_addressbook_reflow_adapter_get_card (EAddressbookReflowAdapter *adapter,
-				       int index)
-{
-	EAddressbookReflowAdapterPrivate *priv = adapter->priv;
-
-	return e_addressbook_model_get_card (priv->model, index);
-}
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
deleted file mode 100644
index 1614a65064..0000000000
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
-#define _E_ADDRESSBOOK_REFLOW_ADAPTER_H_
-
-#include <gal/widgets/e-reflow-model.h>
-#include <gal/widgets/e-selection-model.h>
-#include "e-addressbook-model.h"
-#include "addressbook/backend/ebook/e-book.h"
-#include "addressbook/backend/ebook/e-book-view.h"
-#include "addressbook/backend/ebook/e-card.h"
-
-#define E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE        (e_addressbook_reflow_adapter_get_type ())
-#define E_ADDRESSBOOK_REFLOW_ADAPTER(o)          (GTK_CHECK_CAST ((o), E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE, EAddressbookReflowAdapter))
-#define E_ADDRESSBOOK_REFLOW_ADAPTER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE, EAddressbookReflowAdapterClass))
-#define E_IS_ADDRESSBOOK_REFLOW_ADAPTER(o)       (GTK_CHECK_TYPE ((o), E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE))
-#define E_IS_ADDRESSBOOK_REFLOW_ADAPTER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESSBOOK_REFLOW_ADAPTER_TYPE))
-
-typedef struct _EAddressbookReflowAdapter EAddressbookReflowAdapter;
-typedef struct _EAddressbookReflowAdapterPrivate EAddressbookReflowAdapterPrivate;
-typedef struct _EAddressbookReflowAdapterClass EAddressbookReflowAdapterClass;
-
-struct _EAddressbookReflowAdapter {
-	EReflowModel parent;
-
-	EAddressbookReflowAdapterPrivate *priv;
-};
-
-
-struct _EAddressbookReflowAdapterClass {
-	EReflowModelClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	gint (* drag_begin) (EAddressbookReflowAdapter *adapter, GdkEvent *event);
-};
-
-
-GtkType       e_addressbook_reflow_adapter_get_type     (void);
-void          e_addressbook_reflow_adapter_construct    (EAddressbookReflowAdapter *adapter,
-							 EAddressbookModel *model);
-EReflowModel *e_addressbook_reflow_adapter_new          (EAddressbookModel *model);
-
-/* Returns object with ref count of 1. */
-ECard        *e_addressbook_reflow_adapter_get_card     (EAddressbookReflowAdapter *adapter,
-							 int                 index);
-gint          e_addressbook_reflow_adapter_right_click  (EAddressbookReflowAdapter *emvm,
-							 GdkEvent           *event,
-							 ESelectionModel    *selection);
-
-#endif /* _E_ADDRESSBOOK_REFLOW_ADAPTER_H_ */
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
deleted file mode 100644
index 08c03863aa..0000000000
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ /dev/null
@@ -1,406 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-#include "e-addressbook-model.h"
-#include "e-addressbook-table-adapter.h"
-#include "e-card-merging.h"
-#include "e-addressbook-util.h"
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <gnome.h>
-
-struct _EAddressbookTableAdapterPrivate {
-	EAddressbookModel *model;
-
-	ECardSimple **simples;
-	int count;
-
-	int create_card_id, remove_card_id, modify_card_id, model_changed_id;
-};
-
-#define PARENT_TYPE e_table_model_get_type()
-ETableModelClass *parent_class;
-
-#define COLS (E_CARD_SIMPLE_FIELD_LAST)
-
-static void
-unlink_model(EAddressbookTableAdapter *adapter)
-{
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	int i;
-
-	gtk_signal_disconnect(GTK_OBJECT (priv->model),
-			      priv->create_card_id);
-	gtk_signal_disconnect(GTK_OBJECT (priv->model),
-			      priv->remove_card_id);
-	gtk_signal_disconnect(GTK_OBJECT (priv->model),
-			      priv->modify_card_id);
-	gtk_signal_disconnect(GTK_OBJECT (priv->model),
-			      priv->model_changed_id);
-
-	priv->create_card_id = 0;
-	priv->remove_card_id = 0;
-	priv->modify_card_id = 0;
-	priv->model_changed_id = 0;
-
-	/* free up the existing mapping if there is one */
-	if (priv->simples) {
-		for (i = 0; i < priv->count; i ++)
-			gtk_object_unref (GTK_OBJECT (priv->simples[i]));
-		g_free (priv->simples);
-		priv->simples = NULL;
-	}
-
-	gtk_object_unref(GTK_OBJECT(priv->model));
-
-	priv->model = NULL;
-}
-
-static void
-build_simple_mapping(EAddressbookTableAdapter *adapter)
-{
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	int i;
-
-	/* free up the existing mapping if there is one */
-	if (priv->simples) {
-		for (i = 0; i < priv->count; i ++)
-			gtk_object_unref (GTK_OBJECT (priv->simples[i]));
-		g_free (priv->simples);
-	}
-
-	/* build up our mapping to ECardSimple*'s */
-	priv->count = e_addressbook_model_card_count (priv->model);
-	priv->simples = g_new (ECardSimple*, priv->count);
-	for (i = 0; i < priv->count; i ++) {
-		priv->simples[i] = e_card_simple_new (e_addressbook_model_card_at (priv->model, i));
-		gtk_object_ref (GTK_OBJECT (priv->simples[i]));
-	}
-}
-
-static void
-addressbook_destroy(GtkObject *object)
-{
-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(object);
-
-	unlink_model(adapter);
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-addressbook_col_count (ETableModel *etc)
-{
-	return COLS;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-addressbook_row_count (ETableModel *etc)
-{
-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-
-	return e_addressbook_model_card_count (priv->model);
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-addressbook_value_at (ETableModel *etc, int col, int row)
-{
-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	const char *value;
-
-	if ( col >= COLS || row >= e_addressbook_model_card_count (priv->model) )
-		return NULL;
-
-	value = e_card_simple_get_const(priv->simples[row], col);
-
-	if (value && !strncmp (value, "<?xml", 5)) {
-		EDestination *dest = e_destination_import (value);
-		if (dest) {
-			g_free ((gchar *) value);
-			value = g_strdup (e_destination_get_address (dest));
-			gtk_object_unref (GTK_OBJECT (dest));
-		}
-	}
-
-
-	return (void *)(value ? value : "");
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-card_modified_cb (EBook* book, EBookStatus status,
-		  gpointer user_data)
-{
-	/* g_print ("%s: %s(): a card was modified\n", __FILE__, __FUNCTION__); */
-	if (status != E_BOOK_STATUS_SUCCESS)
-		e_addressbook_error_dialog (_("Error modifying card"), status);
-}
-static void
-addressbook_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	if (e_addressbook_model_editable (priv->model)) {
-		ECard *card;
-
-		if ( col >= COLS|| row >= e_addressbook_model_card_count (priv->model) )
-			return;
-
-		e_table_model_pre_change(etc);
-
-		e_card_simple_set(priv->simples[row],
-				  col,
-				  val);
-		gtk_object_get(GTK_OBJECT(priv->simples[row]),
-			       "card", &card,
-			       NULL);
-
-		e_card_merging_book_commit_card(e_addressbook_model_get_ebook(priv->model),
-						card, card_modified_cb, NULL);
-
-		/* XXX do we need this?  shouldn't the commit_card generate a changed signal? */
-		e_table_model_cell_changed(etc, col, row);
-	}
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-addressbook_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etc);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	ECard *card;
-
-	if (row >= 0 && row < e_addressbook_model_card_count (priv->model))
-		card = e_addressbook_model_card_at (priv->model, row);
-	else
-		card = NULL;
-
-	if (!e_addressbook_model_editable(priv->model))
-		return FALSE;
-	else if (card && e_card_evolution_list (card))
-		/* we only allow editing of the name and file as for
-                   lists */
-		return col == E_CARD_SIMPLE_FIELD_FULL_NAME || col == E_CARD_SIMPLE_FIELD_FILE_AS; 
-	else
-		return col < E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING;
-}
-
-static void
-addressbook_append_row (ETableModel *etm, ETableModel *source, gint row)
-{
-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(etm);
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	ECard *card;
-	ECardSimple *simple;
-	int col;
-
-	card = e_card_new("");
-	simple = e_card_simple_new(card);
-
-	for (col = 0; col < E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING; col++) {
-		const void *val = e_table_model_value_at(source, col, row);
-		e_card_simple_set(simple, col, val);
-	}
-	e_card_simple_sync_card(simple);
-	e_card_merging_book_add_card (e_addressbook_model_get_ebook (priv->model), card, NULL, NULL);
-	gtk_object_unref(GTK_OBJECT(simple));
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-addressbook_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-addressbook_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-addressbook_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-addressbook_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-addressbook_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-static void
-e_addressbook_table_adapter_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-
-	parent_class = gtk_type_class (PARENT_TYPE);
-
-	object_class->destroy = addressbook_destroy;
-
-	model_class->column_count = addressbook_col_count;
-	model_class->row_count = addressbook_row_count;
-	model_class->value_at = addressbook_value_at;
-	model_class->set_value_at = addressbook_set_value_at;
-	model_class->is_cell_editable = addressbook_is_cell_editable;
-	model_class->append_row = addressbook_append_row;
-	model_class->duplicate_value = addressbook_duplicate_value;
-	model_class->free_value = addressbook_free_value;
-	model_class->initialize_value = addressbook_initialize_value;
-	model_class->value_is_empty = addressbook_value_is_empty;
-	model_class->value_to_string = addressbook_value_to_string;
-}
-
-static void
-e_addressbook_table_adapter_init (GtkObject *object)
-{
-	EAddressbookTableAdapter *adapter = E_ADDRESSBOOK_TABLE_ADAPTER(object);
-	EAddressbookTableAdapterPrivate *priv;
-
-	priv = adapter->priv = g_new0 (EAddressbookTableAdapterPrivate, 1);
-
-	priv->create_card_id = 0;
-	priv->remove_card_id = 0;
-	priv->modify_card_id = 0;
-	priv->model_changed_id = 0;
-	priv->simples = NULL;
-	priv->count = 0;
-}
-
-
-static void
-create_card (EAddressbookModel *model,
-	     gint index, gint count,
-	     EAddressbookTableAdapter *adapter)
-{
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-	int i;
-
-	priv->count += count;
-	priv->simples = g_renew(ECardSimple *, priv->simples, priv->count);
-	memmove (priv->simples + index + count, priv->simples + index, (priv->count - index - count) * sizeof (ECardSimple *));
-
-	e_table_model_pre_change (E_TABLE_MODEL (adapter));
-	for (i = 0; i < count; i ++) {
-		priv->simples[index + i] = e_card_simple_new (e_addressbook_model_card_at (priv->model, index + i));
-	}
-	e_table_model_rows_inserted (E_TABLE_MODEL (adapter), index, count);
-}
-
-static void
-remove_card (EAddressbookModel *model,
-	     gint index,
-	     EAddressbookTableAdapter *adapter)
-{
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-
-	e_table_model_pre_change (E_TABLE_MODEL (adapter));
-
-	gtk_object_unref (GTK_OBJECT (priv->simples[index]));
-	memmove (priv->simples + index, priv->simples + index + 1, (priv->count - index - 1) * sizeof (ECardSimple *));
-	priv->count --;
-	e_table_model_rows_deleted (E_TABLE_MODEL (adapter), index, 1);
-}
-
-static void
-modify_card (EAddressbookModel *model,
-	     gint index,
-	     EAddressbookTableAdapter *adapter)
-{
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-
-	e_table_model_pre_change (E_TABLE_MODEL (adapter));
-
-	gtk_object_unref (GTK_OBJECT (priv->simples[index]));
-	priv->simples[index] = e_card_simple_new (e_addressbook_model_card_at (priv->model, index));
-	gtk_object_ref (GTK_OBJECT (priv->simples[index]));
-	e_table_model_row_changed (E_TABLE_MODEL (adapter), index);
-}
-
-static void
-model_changed (EAddressbookModel *model,
-	       EAddressbookTableAdapter *adapter)
-{
-	e_table_model_pre_change (E_TABLE_MODEL (adapter));
-	build_simple_mapping (adapter);
-	e_table_model_changed (E_TABLE_MODEL (adapter));
-}
-
-GtkType
-e_addressbook_table_adapter_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"EAddressbookTableAdapter",
-			sizeof (EAddressbookTableAdapter),
-			sizeof (EAddressbookTableAdapterClass),
-			(GtkClassInitFunc) e_addressbook_table_adapter_class_init,
-			(GtkObjectInitFunc) e_addressbook_table_adapter_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-void
-e_addressbook_table_adapter_construct (EAddressbookTableAdapter *adapter,
-				       EAddressbookModel *model)
-{
-	EAddressbookTableAdapterPrivate *priv = adapter->priv;
-
-	priv->model = model;
-	gtk_object_ref (GTK_OBJECT (priv->model));
-
-	priv->create_card_id = gtk_signal_connect(GTK_OBJECT(priv->model),
-						  "card_added",
-						  GTK_SIGNAL_FUNC(create_card),
-						  adapter);
-	priv->remove_card_id = gtk_signal_connect(GTK_OBJECT(priv->model),
-						  "card_removed",
-						  GTK_SIGNAL_FUNC(remove_card),
-						  adapter);
-	priv->modify_card_id = gtk_signal_connect(GTK_OBJECT(priv->model),
-						  "card_changed",
-						  GTK_SIGNAL_FUNC(modify_card),
-						  adapter);
-	priv->model_changed_id = gtk_signal_connect(GTK_OBJECT(priv->model),
-						    "model_changed",
-						    GTK_SIGNAL_FUNC(model_changed),
-						    adapter);
-
-	build_simple_mapping (adapter);
-}
-
-ETableModel *
-e_addressbook_table_adapter_new (EAddressbookModel *model)
-{
-	EAddressbookTableAdapter *et;
-
-	et = gtk_type_new (e_addressbook_table_adapter_get_type ());
-
-	e_addressbook_table_adapter_construct (et, model);
-
-	return E_TABLE_MODEL(et);
-}
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.h b/addressbook/gui/widgets/e-addressbook-table-adapter.h
deleted file mode 100644
index d76434e80a..0000000000
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_ADDRESSBOOK_TABLE_ADAPTER_H_
-#define _E_ADDRESSBOOK_TABLE_ADAPTER_H_
-
-#include <gal/e-table/e-table-model.h>
-#include "addressbook/backend/ebook/e-book.h"
-#include "addressbook/backend/ebook/e-book-view.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#define E_ADDRESSBOOK_TABLE_ADAPTER_TYPE        (e_addressbook_table_adapter_get_type ())
-#define E_ADDRESSBOOK_TABLE_ADAPTER(o)          (GTK_CHECK_CAST ((o), E_ADDRESSBOOK_TABLE_ADAPTER_TYPE, EAddressbookTableAdapter))
-#define E_ADDRESSBOOK_TABLE_ADAPTER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_ADDRESSBOOK_TABLE_ADAPTER_TYPE, EAddressbookTableAdapterClass))
-#define E_IS_ADDRESSBOOK_TABLE_ADAPTER(o)       (GTK_CHECK_TYPE ((o), E_ADDRESSBOOK_TABLE_ADAPTER_TYPE))
-#define E_IS_ADDRESSBOOK_TABLE_ADAPTER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESSBOOK_TABLE_ADAPTER_TYPE))
-
-/* Virtual Column list:
-   0   Email
-   1   Full Name
-   2   Street
-   3   Phone
-*/
-
-typedef struct _EAddressbookTableAdapter EAddressbookTableAdapter;
-typedef struct _EAddressbookTableAdapterPrivate EAddressbookTableAdapterPrivate;
-typedef struct _EAddressbookTableAdapterClass EAddressbookTableAdapterClass;
-
-struct _EAddressbookTableAdapter {
-	ETableModel parent;
-
-	EAddressbookTableAdapterPrivate *priv;
-};
-
-
-struct _EAddressbookTableAdapterClass {
-	ETableModelClass parent_class;
-};
-
-
-GtkType      e_addressbook_table_adapter_get_type (void);
-void         e_addressbook_table_adapter_construct (EAddressbookTableAdapter *adapter,
-						    EAddressbookModel *model);
-ETableModel *e_addressbook_table_adapter_new (EAddressbookModel *model);
-
-#endif /* _E_ADDRESSBOOK_TABLE_ADAPTER_H_ */
diff --git a/addressbook/gui/widgets/e-addressbook-util.c b/addressbook/gui/widgets/e-addressbook-util.c
deleted file mode 100644
index fa29b61bba..0000000000
--- a/addressbook/gui/widgets/e-addressbook-util.c
+++ /dev/null
@@ -1,148 +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 <gnome.h>
-
-#include "e-addressbook-util.h"
-#include "e-card-merging.h"
-
-void
-e_addressbook_error_dialog (const gchar *msg, EBookStatus status)
-{
-	static char *status_to_string[] = {
-		N_("Success"),
-		N_("Unknown error"),
-		N_("Repository offline"),
-		N_("Permission denied"),
-		N_("Card not found"),
-		N_("Card ID already exists"),
-		N_("Protocol not supported"),
-		N_("Cancelled"),
-		N_("Other error")
-	};
-	char *error_msg;
-
-	error_msg = g_strdup_printf ("%s: %s", msg, _(status_to_string [status]));
-
-	gtk_widget_show (gnome_error_dialog (error_msg));
-
-	g_free (error_msg);
-}
-
-gint
-e_addressbook_prompt_save_dialog (GtkWindow *parent)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("Do you want to save changes?"),
-					GNOME_MESSAGE_BOX_QUESTION,
-					GNOME_STOCK_BUTTON_YES,
-					GNOME_STOCK_BUTTON_NO,
-					GNOME_STOCK_BUTTON_CANCEL,
-					NULL);
-
-	gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);
-	gnome_dialog_grab_focus (GNOME_DIALOG (dialog), 0);
-	gnome_dialog_set_parent (GNOME_DIALOG (dialog), parent);
-
-	return gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-}
-
-static void
-added_cb (EBook* book, EBookStatus status, const char *id,
-	  gboolean is_list)
-{
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		e_addressbook_error_dialog (is_list ? _("Error adding list") : _("Error adding card"), status);
-	}
-}
-
-static void
-modified_cb (EBook* book, EBookStatus status,
-	     gboolean is_list)
-{
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		e_addressbook_error_dialog (is_list ? _("Error modifying list") : _("Error modifying card"),
-					    status);
-	}
-}
-
-static void
-deleted_cb (EBook* book, EBookStatus status,
-	    gboolean is_list)
-{
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		e_addressbook_error_dialog (is_list ? _("Error removing list") : _("Error removing card"),
-					    status);
-	}
-}
-
-static void
-editor_closed_cb (GtkObject *editor, gpointer data)
-{
-	gtk_object_unref (editor);
-}
-
-EContactEditor *
-e_addressbook_show_contact_editor (EBook *book, ECard *card,
-				   gboolean is_new_card,
-				   gboolean editable)
-{
-	EContactEditor *ce;
-
-	ce = e_contact_editor_new (book, card, is_new_card, editable);
-
-	gtk_signal_connect (GTK_OBJECT (ce), "card_added",
-			    GTK_SIGNAL_FUNC (added_cb), GINT_TO_POINTER (FALSE));
-	gtk_signal_connect (GTK_OBJECT (ce), "card_modified",
-			    GTK_SIGNAL_FUNC (modified_cb), GINT_TO_POINTER (FALSE));
-	gtk_signal_connect (GTK_OBJECT (ce), "card_deleted",
-			    GTK_SIGNAL_FUNC (deleted_cb), GINT_TO_POINTER (FALSE));
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	return ce;
-}
-
-EContactListEditor *
-e_addressbook_show_contact_list_editor (EBook *book, ECard *card,
-					gboolean is_new_card,
-					gboolean editable)
-{
-	EContactListEditor *ce;
-
-	ce = e_contact_list_editor_new (book, card, is_new_card, editable);
-
-	gtk_signal_connect (GTK_OBJECT (ce), "list_added",
-			    GTK_SIGNAL_FUNC (added_cb), GINT_TO_POINTER (TRUE));
-	gtk_signal_connect (GTK_OBJECT (ce), "list_modified",
-			    GTK_SIGNAL_FUNC (modified_cb), GINT_TO_POINTER (TRUE));
-	gtk_signal_connect (GTK_OBJECT (ce), "list_deleted",
-			    GTK_SIGNAL_FUNC (deleted_cb), GINT_TO_POINTER (TRUE));
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), GINT_TO_POINTER (TRUE));
-
-	e_contact_list_editor_show (ce);
-
-	return ce;
-}
diff --git a/addressbook/gui/widgets/e-addressbook-util.h b/addressbook/gui/widgets/e-addressbook-util.h
deleted file mode 100644
index 3eff236654..0000000000
--- a/addressbook/gui/widgets/e-addressbook-util.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-addressbook-util.h
- * Copyright (C) 2001  Ximian, Inc.
- * Author: Chris Toshok <toshok@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_ADDRESSBOOK_UTIL_H__
-#define __E_ADDRESSBOOK_UTIL_H__
-
-#include "addressbook/backend/ebook/e-book.h"
-#include "addressbook/gui/contact-editor/e-contact-editor.h"
-#include "addressbook/gui/contact-list-editor/e-contact-list-editor.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-void            e_addressbook_error_dialog (const gchar *msg,
-					    EBookStatus status);
-gint            e_addressbook_prompt_save_dialog (GtkWindow *parent);
-EContactEditor* e_addressbook_show_contact_editor (EBook *book, ECard *card,
-						   gboolean is_new_card,
-						   gboolean editable);
-EContactListEditor * e_addressbook_show_contact_list_editor (EBook *book, ECard *card,
-							     gboolean is_new_card,
-							     gboolean editable);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_ADDRESSBOOK_UTIL_H__ */
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
deleted file mode 100644
index f52dd321e5..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ /dev/null
@@ -1,1552 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-field-chooser.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <gtk/gtkinvisible.h>
-
-#include <libgnome/gnome-paper.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/e-table/e-table-model.h>
-#include <gal/widgets/e-scroll-frame.h>
-#include <gal/widgets/e-popup-menu.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/menus/gal-view-factory-etable.h>
-#include <gal/menus/gal-view-etable.h>
-#include <gal/util/e-unicode-i18n.h>
-#include <gal/unicode/gunicode.h>
-#include <libgnomeui/gnome-dialog-util.h>
-
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-dialog.h>
-#include <libgnomeprint/gnome-print-master.h>
-#include <libgnomeprint/gnome-print-master-preview.h>
-
-#include "addressbook/printing/e-contact-print.h"
-#include "addressbook/printing/e-contact-print-envelope.h"
-
-#include "gal-view-factory-minicard.h"
-#include "gal-view-minicard.h"
-
-#include "e-addressbook-view.h"
-#include "e-addressbook-model.h"
-#include "e-addressbook-util.h"
-#include "e-addressbook-table-adapter.h"
-#include "e-addressbook-reflow-adapter.h"
-#include "e-minicard-view-widget.h"
-#include "e-contact-save-as.h"
-#include "e-card-merging.h"
-
-#include "e-contact-editor.h"
-#include <gdk/gdkkeysyms.h>
-#include <ctype.h>
-
-static void e_addressbook_view_init		(EAddressbookView		 *card);
-static void e_addressbook_view_class_init	(EAddressbookViewClass	 *klass);
-static void e_addressbook_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_addressbook_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_addressbook_view_destroy (GtkObject *object);
-static void change_view_type (EAddressbookView *view, EAddressbookViewType view_type);
-
-static void status_message     (GtkObject *object, const gchar *status, EAddressbookView *eav);
-static void folder_bar_message (GtkObject *object, const gchar *status, EAddressbookView *eav);
-static void stop_state_changed (GtkObject *object, EAddressbookView *eav);
-static void writable_status (GtkObject *object, gboolean writable, EAddressbookView *eav);
-static void command_state_change (EAddressbookView *eav);
-
-static void selection_clear_event (GtkWidget *invisible, GdkEventSelection *event,
-				   EAddressbookView *view);
-static void selection_received (GtkWidget *invisible, GtkSelectionData *selection_data,
-				guint time, EAddressbookView *view);
-static void selection_get (GtkWidget *invisible, GtkSelectionData *selection_data,
-			   guint info, guint time_stamp, EAddressbookView *view);
-static void invisible_destroyed (GtkWidget *invisible, EAddressbookView *view);
-
-static GtkTableClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_QUERY,
-	ARG_TYPE,
-};
-
-enum {
-	STATUS_MESSAGE,
-	FOLDER_BAR_MESSAGE,
-	COMMAND_STATE_CHANGE,
-	LAST_SIGNAL
-};
-
-enum DndTargetType {
-	DND_TARGET_TYPE_VCARD,
-};
-#define VCARD_TYPE "text/x-vcard"
-static GtkTargetEntry drag_types[] = {
-	{ VCARD_TYPE, 0, DND_TARGET_TYPE_VCARD },
-};
-static const int num_drag_types = sizeof (drag_types) / sizeof (drag_types[0]);
-
-static guint e_addressbook_view_signals [LAST_SIGNAL] = {0, };
-
-static GdkAtom clipboard_atom = GDK_NONE;
-
-GtkType
-e_addressbook_view_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info =
-		{
-			"EAddressbookView",
-			sizeof (EAddressbookView),
-			sizeof (EAddressbookViewClass),
-			(GtkClassInitFunc) e_addressbook_view_class_init,
-			(GtkObjectInitFunc) e_addressbook_view_init,
-			/* reserved_1 */ NULL,
-		       	/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (gtk_table_get_type (), &info);
-	}
-
-	return type;
-}
-
-static void
-e_addressbook_view_class_init (EAddressbookViewClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	widget_class = GTK_WIDGET_CLASS(klass);
-
-	parent_class = gtk_type_class (gtk_table_get_type ());
-
-	object_class->set_arg = e_addressbook_view_set_arg;
-	object_class->get_arg = e_addressbook_view_get_arg;
-	object_class->destroy = e_addressbook_view_destroy;
-
-	gtk_object_add_arg_type ("EAddressbookView::book", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_BOOK);
-	gtk_object_add_arg_type ("EAddressbookView::query", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_QUERY);
-	gtk_object_add_arg_type ("EAddressbookView::type", GTK_TYPE_ENUM,
-				 GTK_ARG_READWRITE, ARG_TYPE);
-
-	e_addressbook_view_signals [STATUS_MESSAGE] =
-		gtk_signal_new ("status_message",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookViewClass, status_message),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	e_addressbook_view_signals [FOLDER_BAR_MESSAGE] =
-		gtk_signal_new ("folder_bar_message",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookViewClass, folder_bar_message),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	e_addressbook_view_signals [COMMAND_STATE_CHANGE] =
-		gtk_signal_new ("command_state_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EAddressbookViewClass, command_state_change),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_addressbook_view_signals, LAST_SIGNAL);
-
-	if (!clipboard_atom)
-		clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
-}
-
-static void
-e_addressbook_view_init (EAddressbookView *eav)
-{
-	eav->view_type = E_ADDRESSBOOK_VIEW_NONE;
-
-	eav->model = e_addressbook_model_new ();
-
-	gtk_signal_connect (GTK_OBJECT(eav->model),
-			    "status_message",
-			    GTK_SIGNAL_FUNC (status_message),
-			    eav);
-
-	gtk_signal_connect (GTK_OBJECT(eav->model),
-			    "folder_bar_message",
-			    GTK_SIGNAL_FUNC (folder_bar_message),
-			    eav);
-
-	gtk_signal_connect (GTK_OBJECT(eav->model),
-			    "stop_state_changed",
-			    GTK_SIGNAL_FUNC (stop_state_changed),
-			    eav);
-
-	gtk_signal_connect (GTK_OBJECT(eav->model),
-			    "writable_status",
-			    GTK_SIGNAL_FUNC (writable_status),
-			    eav);
-
-	eav->editable = FALSE;
-	eav->book = NULL;
-	eav->query = g_strdup("(contains \"x-evolution-any-field\" \"\")");
-
-	eav->object = NULL;
-	eav->widget = NULL;
-
-	eav->view_collection = NULL;
-	eav->view_menus = NULL;
-
-	eav->invisible = gtk_invisible_new ();
-
-	gtk_selection_add_target (eav->invisible,
-				  clipboard_atom,
-				  GDK_SELECTION_TYPE_STRING,
-				  0);
-		
-	gtk_signal_connect (GTK_OBJECT(eav->invisible), "selection_get",
-			    GTK_SIGNAL_FUNC (selection_get), 
-			    eav);
-	gtk_signal_connect (GTK_OBJECT(eav->invisible), "selection_clear_event",
-			    GTK_SIGNAL_FUNC (selection_clear_event),
-			    eav);
-	gtk_signal_connect (GTK_OBJECT(eav->invisible), "selection_received",
-			    GTK_SIGNAL_FUNC (selection_received),
-			    eav);
-	gtk_signal_connect (GTK_OBJECT(eav->invisible), "destroy",
-			    GTK_SIGNAL_FUNC (invisible_destroyed),
-			    eav);
-}
-
-static void
-e_addressbook_view_destroy (GtkObject *object)
-{
-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);
-
-	if (eav->model) {
-		gtk_object_unref(GTK_OBJECT(eav->model));
-		eav->model = NULL;
-	}
-
-	if (eav->book) {
-		gtk_object_unref(GTK_OBJECT(eav->book));
-		eav->book = NULL;
-	}
-
-	g_free(eav->query);
-	eav->query = NULL;
-
-	if (eav->view_collection) {
-		gtk_object_unref (GTK_OBJECT (eav->view_collection));
-		eav->view_collection = NULL;
-	}
-
-	if (eav->view_menus) {
-		gtk_object_unref (GTK_OBJECT (eav->view_menus));
-		eav->view_menus = NULL;
-	}
-
-	if (eav->clipboard_cards) {
-		g_list_foreach (eav->clipboard_cards, (GFunc)gtk_object_unref, NULL);
-		g_list_free (eav->clipboard_cards);
-		eav->clipboard_cards = NULL;
-	}
-		
-	if (eav->invisible) {
-		gtk_widget_destroy (eav->invisible);
-		eav->invisible = NULL;
-	}
-
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		GTK_OBJECT_CLASS(parent_class)->destroy(object);
-}
-
-GtkWidget*
-e_addressbook_view_new (void)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_addressbook_view_get_type ()));
-	return widget;
-}
-
-static void
-book_writable_cb (EBook *book, gboolean writable, EAddressbookView *eav)
-{
-	eav->editable = writable;
-	gtk_object_set (GTK_OBJECT (eav->model),
-			"editable", eav->editable,
-			NULL);
-	writable_status (GTK_OBJECT(book), writable, eav);
-}
-
-static void
-e_addressbook_view_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);
-
-	switch (arg_id){
-	case ARG_BOOK:
-		if (eav->book) {
-			gtk_object_unref(GTK_OBJECT(eav->book));
-		}
-		if (GTK_VALUE_OBJECT(*arg)) {
-			eav->book = E_BOOK(GTK_VALUE_OBJECT(*arg));
-			gtk_object_ref(GTK_OBJECT(eav->book));
-			gtk_signal_connect (GTK_OBJECT (eav->book),
-					    "writable_status",
-					    book_writable_cb, eav);
-		}
-		else
-			eav->book = NULL;
-		gtk_object_set(GTK_OBJECT(eav->model),
-			       "book", eav->book,
-			       NULL);
-
-		break;
-	case ARG_QUERY:
-		g_free(eav->query);
-		eav->query = g_strdup(GTK_VALUE_STRING(*arg));
-		if (!eav->query)
-			eav->query = g_strdup("(contains \"x-evolution-any-field\" \"\")");
-		gtk_object_set(GTK_OBJECT(eav->model),
-			       "query", eav->query,
-			       NULL);
-		break;
-	case ARG_TYPE:
-		change_view_type(eav, GTK_VALUE_ENUM(*arg));
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-e_addressbook_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		if (eav->book)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(eav->book);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		break;
-	case ARG_QUERY:
-		GTK_VALUE_STRING (*arg) = eav->query;
-		break;
-	case ARG_TYPE:
-		GTK_VALUE_ENUM (*arg) = eav->view_type;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-
-/* Translators: put here a list of labels you want to see on buttons in
-   addressbook. You may use any character to separate labels but it must
-   also be placed at the begining ot the string */
-const char *button_labels = N_(",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z");
-/* Translators: put here a list of characters that correspond to buttons
-   in addressbook. You may use any character to separate labels but it
-   must also be placed at the begining ot the string.
-   Use lower case letters if possible. */
-const char *button_letters = N_(",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z");
-
-typedef struct {
-	EAddressbookView *view;
-	gunichar letter;
-} LetterClosure;
-
-static char **
-e_utf8_split (const char *utf8_str, gunichar delim)
-{
-	GSList *str_list = NULL, *sl;
-	int n = 0;
-	const char *str, *s;
-	char **str_array;
-
-	g_return_val_if_fail (utf8_str != NULL, NULL);
-
-	str = utf8_str;
-	while (*str != '\0') {
-		int len;
-		char *new_str;
-
-		for (s = str; *s != '\0' && g_utf8_get_char (s) != delim; s = g_utf8_next_char (s))
-			;
-		len = s - str;
-		new_str = g_new (char, len + 1);
-		if (len > 0) {
-			memcpy (new_str, str, len);
-		}
-		new_str[len] = '\0';
-		str_list = g_slist_prepend (str_list, new_str);
-		n++;
-		if (*s != '\0') {
-			str = g_utf8_next_char (s);
-		} else {
-			str = s;
-		}		
-	}
-
-	str_array = g_new (char *, n + 1);
-	str_array[n--] = NULL;
-	for (sl = str_list; sl != NULL; sl = sl->next) {
-		str_array[n--] = sl->data;
-	}
-	g_slist_free (str_list);
-
-	return str_array;
-}
-
-static void
-jump_to_letter(GtkWidget *button, LetterClosure *closure)
-{
-	char *query;
-
-	if (g_unichar_isdigit (closure->letter)) {
-		const char *letters = U_(button_letters);
-		char **letter_v;
-		GString *gstr;
-		char **p;
-
-		letter_v = e_utf8_split (g_utf8_next_char (letters),
-		                         g_utf8_get_char (letters));
-		g_assert (letter_v != NULL && letter_v[0] != NULL);
-		gstr = g_string_new ("(not (or ");
-		for (p = letter_v + 1; *p != NULL; p++) {
-			char s[7];
-
-			g_string_sprintfa (gstr, "(beginswith \"file_as\" \"%s\")", *p);
-			s[g_unichar_to_utf8 (g_unichar_toupper (g_utf8_get_char (*p)), s)] = '\0';
-			g_string_sprintfa (gstr, "(beginswith \"file_as\" \"%s\")", s);
-		}
-		g_string_append (gstr, "))");
-		query = gstr->str;
-		g_strfreev (letter_v);
-		g_string_free (gstr, FALSE);
-	} else {
-		char s1[6 + 1], s2[6 + 1];
-
-		s1 [g_unichar_to_utf8 (closure->letter, s1)] = '\0';
-		s2 [g_unichar_to_utf8 (g_unichar_toupper (closure->letter), s2)] = '\0';
-		query = g_strdup_printf ("(or "
-		                         "(beginswith \"file_as\" \"%s\")"
-		                         "(beginswith \"file_as\" \"%s\")"
-		                         ")", s1, s2);
-	}
-	gtk_object_set (GTK_OBJECT (closure->view),
-			"query", query,
-			NULL);
-	g_free (query);
-}
-
-static void
-free_closure(GtkWidget *button, LetterClosure *closure)
-{
-	g_free(closure);
-}
-
-static GtkWidget *
-create_alphabet (EAddressbookView *view)
-{
-	GtkWidget *widget, *viewport, *vbox;
-	const char *labels, *letters;
-	char **label_v, **letter_v;
-	char **pl, **pc;
-	gunichar sep;
-
-	widget = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (widget),
-	                                GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-
-	viewport = gtk_viewport_new (NULL, NULL);
-	gtk_container_add (GTK_CONTAINER (widget), viewport);
-	gtk_container_set_border_width (GTK_CONTAINER (viewport), 4);
-	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
-
-	vbox = gtk_vbox_new (FALSE, 4);
-	gtk_container_add (GTK_CONTAINER (viewport), vbox);
-	gtk_widget_set_usize (vbox, 27, 0);
-
-	labels = U_(button_labels);
-	sep = g_utf8_get_char (labels);
-	label_v = e_utf8_split (g_utf8_next_char (labels), sep);
-	letters = U_(button_letters);
-	sep = g_utf8_get_char (letters);
-	letter_v = e_utf8_split (g_utf8_next_char (letters), sep);
-	g_assert (label_v != NULL && letter_v != NULL);
-	for (pl = label_v, pc = letter_v; *pl != NULL && *pc != NULL; pl++, pc++) {
-		GtkWidget *button;
-		LetterClosure *closure;
-		char *label;
-
-		label = e_utf8_to_locale_string (*pl);
-		button = gtk_button_new_with_label (label);
-		g_free (label);
-		gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
-		closure = g_new (LetterClosure, 1);
-		closure->view = view;
-		closure->letter = g_utf8_get_char (*pc);
-		gtk_signal_connect(GTK_OBJECT(button), "clicked",
-		                   GTK_SIGNAL_FUNC (jump_to_letter), closure);
-		gtk_signal_connect(GTK_OBJECT(button), "destroy",
-		                   GTK_SIGNAL_FUNC (free_closure), closure);
-
-	}
-	g_strfreev (label_v);
-	g_strfreev (letter_v);
-
-	gtk_widget_show_all (widget);
-
-	return widget;
-}
-
-static void
-minicard_selection_change (EMinicardViewWidget *widget, EAddressbookView *view)
-{
-	command_state_change (view);
-}
-
-static void
-create_minicard_view (EAddressbookView *view)
-{
-	GtkWidget *scrollframe;
-	GtkWidget *alphabet;
-	GtkWidget *minicard_view;
-	GtkWidget *minicard_hbox;
-	EAddressbookReflowAdapter *adapter;
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	minicard_hbox = gtk_hbox_new(FALSE, 0);
-
-	adapter = E_ADDRESSBOOK_REFLOW_ADAPTER(e_addressbook_reflow_adapter_new (view->model));
-	minicard_view = e_minicard_view_widget_new(adapter);
-
-	gtk_signal_connect(GTK_OBJECT(minicard_view), "selection_change",
-			   GTK_SIGNAL_FUNC(minicard_selection_change), view);
-
-
-	view->object = GTK_OBJECT(minicard_view);
-	view->widget = minicard_hbox;
-
-	scrollframe = e_scroll_frame_new (NULL, NULL);
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (scrollframe),
-				   GTK_POLICY_AUTOMATIC,
-				   GTK_POLICY_AUTOMATIC);
-
-	gtk_container_add (GTK_CONTAINER (scrollframe), minicard_view);
-
-
-	gtk_box_pack_start(GTK_BOX(minicard_hbox), scrollframe, TRUE, TRUE, 0);
-
-	alphabet = create_alphabet(view);
-	if (alphabet) {
-		gtk_object_ref(GTK_OBJECT(alphabet));
-		gtk_widget_unparent(alphabet);
-		gtk_box_pack_start(GTK_BOX(minicard_hbox), alphabet, FALSE, FALSE, 0);
-		gtk_object_unref(GTK_OBJECT(alphabet));
-	}
-
-	gtk_table_attach(GTK_TABLE(view), minicard_hbox,
-			 0, 1,
-			 0, 1,
-			 GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
-			 0, 0);
-
-	gtk_widget_show_all( GTK_WIDGET(minicard_hbox) );
-
-	gtk_widget_pop_visual ();
-	gtk_widget_pop_colormap ();
-
-	e_reflow_model_changed (E_REFLOW_MODEL (adapter));
-
-	gtk_object_unref (GTK_OBJECT (adapter));
-}
-
-static void
-table_double_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EAddressbookView *view)
-{
-	if (E_IS_ADDRESSBOOK_TABLE_ADAPTER(view->object)) {
-		EAddressbookModel *model = view->model;
-		ECard *card = e_addressbook_model_get_card(model, row);
-		EBook *book;
-
-		gtk_object_get(GTK_OBJECT(model),
-			       "book", &book,
-			       NULL);
-		
-		g_assert (E_IS_BOOK (book));
-
-		if (e_card_evolution_list (card))
-			e_addressbook_show_contact_list_editor (book, card, FALSE, view->editable);
-		else
-			e_addressbook_show_contact_editor (book, card, FALSE, view->editable);
-	}
-}
-
-typedef struct {
-	EBook *book;
-	ECard *card;
-	EAddressbookView *view;
-	GtkWidget *widget;
-	gpointer closure;
-} CardAndBook;
-
-static void
-card_and_book_free (CardAndBook *card_and_book)
-{
-	gtk_object_unref(GTK_OBJECT(card_and_book->card));
-	gtk_object_unref(GTK_OBJECT(card_and_book->book));
-	gtk_object_unref(GTK_OBJECT(card_and_book->view));
-}
-
-static void
-get_card_list_1(gint model_row,
-	      gpointer closure)
-{
-	CardAndBook *card_and_book;
-	GList **list;
-	EAddressbookView *view;
-	ECard *card;
-
-	card_and_book = closure;
-	list = card_and_book->closure;
-	view = card_and_book->view;
-
-	card = e_addressbook_model_get_card(view->model, model_row);
-	*list = g_list_prepend(*list, card);
-}
-
-static GList *
-get_card_list (CardAndBook *card_and_book)
-{
-	GList *list = NULL;
-	ETable *table;
-
-	table = E_TABLE(card_and_book->widget);
-	card_and_book->closure = &list;
-	e_table_selected_row_foreach(table,
-				     get_card_list_1,
-				     card_and_book);
-	return list;
-}
-
-static void
-save_as (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	e_contact_save_as(_("Save as VCard"), card_and_book->card);
-	card_and_book_free(card_and_book);
-}
-
-static void
-send_as (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	e_card_send(card_and_book->card, E_CARD_DISPOSITION_AS_ATTACHMENT);
-	card_and_book_free(card_and_book);
-}
-
-static void
-send_to (GtkWidget *widget, CardAndBook *card_and_book)
-
-{
-	e_card_send(card_and_book->card, E_CARD_DISPOSITION_AS_TO);
-	card_and_book_free(card_and_book);
-}
-
-static void
-print (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	gtk_widget_show(e_contact_print_card_dialog_new(card_and_book->card));
-	card_and_book_free(card_and_book);
-}
-
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-static void
-print_envelope (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	gtk_widget_show(e_contact_print_envelope_dialog_new(card_and_book->card));
-	card_and_book_free(card_and_book);
-}
-#endif
-
-static void
-delete (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(card_and_book->widget)))) {
-		GList *list = get_card_list(card_and_book);
-		GList *iterator;
-		for (iterator = list; iterator; iterator = iterator->next) {
-			ECard *card = iterator->data;
-			/* Add the card in the contact editor to our ebook */
-			e_book_remove_card (card_and_book->book,
-					    card,
-					    NULL,
-					    NULL);
-		}
-		e_free_object_list(list);
-	}
-	card_and_book_free(card_and_book);
-}
-
-static gint
-table_right_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EAddressbookView *view)
-{
-	if (E_IS_ADDRESSBOOK_TABLE_ADAPTER(view->object)) {
-		EAddressbookModel *model = view->model;
-		CardAndBook *card_and_book;
-
-		EPopupMenu menu[] = {
-			{N_("Save as VCard"), NULL, GTK_SIGNAL_FUNC(save_as), NULL, 0}, 
-			{N_("Forward Contact"), NULL, GTK_SIGNAL_FUNC(send_as), NULL, 0},
-			{N_("Send Message to Contact"), NULL, GTK_SIGNAL_FUNC(send_to), NULL, 0},
-			{N_("Print"), NULL, GTK_SIGNAL_FUNC(print), NULL, 0},
-#if 0 /* Envelope printing is disabled for Evolution 1.0. */
-			{N_("Print Envelope"), NULL, GTK_SIGNAL_FUNC(print_envelope), NULL, 0},
-#endif
-			{N_("Delete"), NULL, GTK_SIGNAL_FUNC(delete), NULL, 0},
-			{NULL, NULL, NULL, NULL, 0}
-		};
-
-		card_and_book = g_new(CardAndBook, 1);
-		card_and_book->card = e_addressbook_model_get_card(model, row);
-		card_and_book->widget = GTK_WIDGET(table);
-		card_and_book->view = view;
-		gtk_object_get(GTK_OBJECT(model),
-			       "book", &(card_and_book->book),
-			       NULL);
-
-		gtk_object_ref(GTK_OBJECT(card_and_book->book));
-		gtk_object_ref(GTK_OBJECT(card_and_book->view));
-
-		e_popup_menu_run (menu, event, 0, 0, card_and_book);
-		return TRUE;
-	} else
-		return FALSE;
-}
-
-static void
-table_selection_change(ETableScrolled *table, EAddressbookView *view)
-{
-	command_state_change (view);
-}
-
-static void
-table_drag_data_get (ETable             *table,
-		     int                 row,
-		     int                 col,
-		     GdkDragContext     *context,
-		     GtkSelectionData   *selection_data,
-		     guint               info,
-		     guint               time,
-		     gpointer            user_data)
-{
-	EAddressbookView *view = user_data;
-
-	if (!E_IS_ADDRESSBOOK_TABLE_ADAPTER(view->object))
-		return;
-
-	switch (info) {
-	case DND_TARGET_TYPE_VCARD: {
-		char *value;
-
-		row = e_table_view_to_model_row (table, row);
-		value = e_card_get_vcard(view->model->data[row]);
-
-		gtk_selection_data_set (selection_data,
-					selection_data->target,
-					8,
-					value, strlen (value));
-		break;
-	}
-	}
-}
-
-static void
-emit_status_message (EAddressbookView *eav, const gchar *status)
-{
-	gtk_signal_emit (GTK_OBJECT (eav),
-			 e_addressbook_view_signals [STATUS_MESSAGE],
-			 status);
-}
-
-static void
-emit_folder_bar_message (EAddressbookView *eav, const gchar *message)
-{
-	gtk_signal_emit (GTK_OBJECT (eav),
-			 e_addressbook_view_signals [FOLDER_BAR_MESSAGE],
-			 message);
-}
-
-static void
-status_message (GtkObject *object, const gchar *status, EAddressbookView *eav)
-{
-	emit_status_message (eav, status);
-}
-
-static void
-folder_bar_message (GtkObject *object, const gchar *status, EAddressbookView *eav)
-{
-	emit_folder_bar_message (eav, status);
-}
-
-static void
-stop_state_changed (GtkObject *object, EAddressbookView *eav)
-{
-	command_state_change (eav);
-}
-
-static void
-writable_status (GtkObject *object, gboolean writable, EAddressbookView *eav)
-{
-	command_state_change (eav);
-}
-
-static void
-command_state_change (EAddressbookView *eav)
-{
-	gtk_object_ref (GTK_OBJECT (eav)); /* who knows what might happen during this emission? */
-	gtk_signal_emit (GTK_OBJECT (eav), e_addressbook_view_signals [COMMAND_STATE_CHANGE]);
-	gtk_object_unref (GTK_OBJECT (eav));
-}
-
-#ifdef JUST_FOR_TRANSLATORS
-static char *list [] = {
-	N_("* Click here to add a contact *"),
-	N_("File As"),
-	N_("Full Name"),
-	N_("Email"),
-	N_("Primary Phone"),
-	N_("Assistant Phone"),
-	N_("Business Phone"),
-	N_("Callback Phone"),
-	N_("Company Phone"),
-	N_("Home Phone"),
-	N_("Organization"),
-	N_("Business Address"),
-	N_("Home Address"),
-	N_("Mobile Phone"),
-	N_("Car Phone"),
-	N_("Business Fax"),
-	N_("Home Fax"),
-	N_("Business Phone 2"),
-	N_("Home Phone 2"),
-	N_("ISDN"),
-	N_("Other Phone"),
-	N_("Other Fax"),
-	N_("Pager"),
-	N_("Radio"),
-	N_("Telex"),
-	N_("TTY"),
-	N_("Other Address"),
-	N_("Email 2"),
-	N_("Email 3"),
-	N_("Web Site"),
-	N_("Department"),
-	N_("Office"),
-	N_("Title"),
-	N_("Profession"),
-	N_("Manager"),
-	N_("Assistant"),
-	N_("Nickname"),
-	N_("Spouse"),
-	N_("Note"),
-	N_("Free-busy URL"),
-};
-#endif
-
-#define SPEC "<?xml version=\"1.0\"?>      \
-<ETableSpecification click-to-add=\"true\" draw-grid=\"true\" _click-to-add-message=\"* Click here to add a contact *\">   \
-  <ETableColumn model_col= \"0\" _title=\"File As\"          expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"1\" _title=\"Full Name\"        expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"2\" _title=\"Email\"            expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"3\" _title=\"Primary Phone\"    expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"4\" _title=\"Assistant Phone\"  expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"5\" _title=\"Business Phone\"   expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"6\" _title=\"Callback Phone\"   expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"7\" _title=\"Company Phone\"    expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"8\" _title=\"Home Phone\"       expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col= \"9\" _title=\"Organization\"     expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"10\" _title=\"Business Address\" expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"11\" _title=\"Home Address\"     expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"12\" _title=\"Mobile Phone\"     expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"13\" _title=\"Car Phone\"        expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"14\" _title=\"Business Fax\"     expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"15\" _title=\"Home Fax\"         expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"16\" _title=\"Business Phone 2\" expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"17\" _title=\"Home Phone 2\"     expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"18\" _title=\"ISDN\"             expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"19\" _title=\"Other Phone\"      expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"20\" _title=\"Other Fax\"        expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"21\" _title=\"Pager\"            expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"22\" _title=\"Radio\"            expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"23\" _title=\"Telex\"            expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"24\" _title=\"TTY\"              expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"25\" _title=\"Other Address\"    expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"26\" _title=\"Email 2\"          expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"27\" _title=\"Email 3\"          expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"28\" _title=\"Web Site\"         expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"29\" _title=\"Department\"       expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"30\" _title=\"Office\"           expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"31\" _title=\"Title\"            expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"32\" _title=\"Profession\"       expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"33\" _title=\"Manager\"          expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"34\" _title=\"Assistant\"        expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"35\" _title=\"Nickname\"         expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"36\" _title=\"Spouse\"           expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"37\" _title=\"Note\"             expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableColumn model_col=\"38\" _title=\"Free-busy URL\"    expansion=\"1.0\" minimum_width=\"75\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-  <ETableState>                            \
-    <column source=\"0\"/>                 \
-    <column source=\"1\"/>                 \
-    <column source=\"5\"/>                 \
-    <column source=\"2\"/>                 \
-    <column source=\"3\"/>                 \
-    <grouping>                             \
-      <leaf column=\"0\" ascending=\"true\"/> \
-    </grouping>                            \
-  </ETableState>                           \
-</ETableSpecification>"
-
-static void
-create_table_view (EAddressbookView *view)
-{
-	ETableModel *adapter;
-	ECardSimple *simple;
-	GtkWidget *table;
-	
-	simple = e_card_simple_new(NULL);
-
-	adapter = e_addressbook_table_adapter_new(view->model);
-
-	/* Here we create the table.  We give it the three pieces of
-	   the table we've created, the header, the model, and the
-	   initial layout.  It does the rest.  */
-	table = e_table_scrolled_new (adapter, NULL, SPEC, NULL);
-
-	view->object = GTK_OBJECT(adapter);
-	view->widget = table;
-
-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(table))), "double_click",
-			   GTK_SIGNAL_FUNC(table_double_click), view);
-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(table))), "right_click",
-			   GTK_SIGNAL_FUNC(table_right_click), view);
-	gtk_signal_connect(GTK_OBJECT(e_table_scrolled_get_table(E_TABLE_SCROLLED(table))), "selection_change",
-			   GTK_SIGNAL_FUNC(table_selection_change), view);
-
-	/* drag & drop signals */
-	e_table_drag_source_set (E_TABLE(E_TABLE_SCROLLED(table)->table), GDK_BUTTON1_MASK,
-				 drag_types, num_drag_types, GDK_ACTION_MOVE);
-	
-	gtk_signal_connect (GTK_OBJECT (E_TABLE_SCROLLED(table)->table),
-			    "table_drag_data_get",
-			    GTK_SIGNAL_FUNC (table_drag_data_get),
-			    view);
-
-	gtk_table_attach(GTK_TABLE(view), table,
-			 0, 1,
-			 0, 1,
-			 GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
-			 0, 0);
-
-	gtk_widget_show( GTK_WIDGET(table) );
-
-	gtk_object_unref(GTK_OBJECT(simple));
-}
-
-
-static void
-change_view_type (EAddressbookView *view, EAddressbookViewType view_type)
-{
-	if (view_type == view->view_type)
-		return;
-
-	if (view->widget) {
-		gtk_widget_destroy (view->widget);
-		view->widget = NULL;
-	}
-	view->object = NULL;
-
-	switch (view_type) {
-	case E_ADDRESSBOOK_VIEW_MINICARD:
-		create_minicard_view (view);
-		break;
-	case E_ADDRESSBOOK_VIEW_TABLE:
-		create_table_view (view);
-		break;
-	default:
-		g_warning ("view_type must be either TABLE or MINICARD\n");
-		return;
-	}
-
-	view->view_type = view_type;
-
-	command_state_change (view);
-}
-
-static void
-e_contact_print_destroy(GnomeDialog *dialog, gpointer data)
-{
-	ETableScrolled *table = gtk_object_get_data(GTK_OBJECT(dialog), "table");
-	EPrintable *printable = gtk_object_get_data(GTK_OBJECT(dialog), "printable");
-	gtk_object_unref(GTK_OBJECT(printable));
-	gtk_object_unref(GTK_OBJECT(table));
-}
-
-static void
-e_contact_print_button(GnomeDialog *dialog, gint button, gpointer data)
-{
-	GnomePrintMaster *master;
-	GnomePrintContext *pc;
-	EPrintable *printable = gtk_object_get_data(GTK_OBJECT(dialog), "printable");
-	GtkWidget *preview;
-	switch( button ) {
-	case GNOME_PRINT_PRINT:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-		e_printable_reset(printable);
-		while (e_printable_data_left(printable)) {
-			if (gnome_print_gsave(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_translate(pc, 72, 72) == -1)
-				/* FIXME */;
-			e_printable_print_page(printable,
-					       pc,
-					       6.5 * 72,
-					       5 * 72,
-					       TRUE);
-			if (gnome_print_grestore(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_showpage(pc) == -1)
-				/* FIXME */;
-		}
-		gnome_print_master_close(master);
-		gnome_print_master_print(master);
-		gtk_object_unref(GTK_OBJECT(master));
-		gnome_dialog_close(dialog);
-		break;
-	case GNOME_PRINT_PREVIEW:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-		e_printable_reset(printable);
-		while (e_printable_data_left(printable)) {
-			if (gnome_print_gsave(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_translate(pc, 72, 72) == -1)
-				/* FIXME */;
-			e_printable_print_page(printable,
-					       pc,
-					       6.5 * 72,
-					       9 * 72,
-					       TRUE);
-			if (gnome_print_grestore(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_showpage(pc) == -1)
-				/* FIXME */;
-		}
-		gnome_print_master_close(master);
-		preview = GTK_WIDGET(gnome_print_master_preview_new(master, "Print Preview"));
-		gtk_widget_show_all(preview);
-		gtk_object_unref(GTK_OBJECT(master));
-		break;
-	case GNOME_PRINT_CANCEL:
-		gnome_dialog_close(dialog);
-		break;
-	}
-}
-
-static void
-display_view(GalViewCollection *collection,
-	     GalView *view,
-	     gpointer data)
-{
-	EAddressbookView *address_view = data;
-	if (GAL_IS_VIEW_ETABLE(view)) {
-		change_view_type (address_view, E_ADDRESSBOOK_VIEW_TABLE);
-		e_table_set_state_object(e_table_scrolled_get_table(E_TABLE_SCROLLED(address_view->widget)), GAL_VIEW_ETABLE(view)->state);
-	} else if (GAL_IS_VIEW_MINICARD(view)) {
-		change_view_type (address_view, E_ADDRESSBOOK_VIEW_MINICARD);
-	}
-}
-
-void
-e_addressbook_view_setup_menus (EAddressbookView *view,
-				BonoboUIComponent *uic)
-{
-	GalViewFactory *factory;
-	ETableSpecification *spec;
-	char *galview;
-
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (E_IS_ADDRESSBOOK_VIEW (view));
-	g_return_if_fail (uic != NULL);
-	g_return_if_fail (BONOBO_IS_UI_COMPONENT (uic));
-	g_return_if_fail (view->view_collection == NULL);
-
-	g_assert (view->view_collection == NULL);
-	g_assert (view->view_menus == NULL);
-
-	view->view_collection = gal_view_collection_new();
-
-	galview = gnome_util_prepend_user_home("/evolution/views/addressbook/");
-	gal_view_collection_set_storage_directories(view->view_collection,
-						    EVOLUTION_DATADIR "/evolution/views/addressbook/",
-						    galview);
-	g_free(galview);
-
-	spec = e_table_specification_new();
-	e_table_specification_load_from_string(spec, SPEC);
-
-	factory = gal_view_factory_etable_new (spec);
-	gtk_object_unref (GTK_OBJECT (spec));
-	gal_view_collection_add_factory (view->view_collection, factory);
-	gtk_object_unref (GTK_OBJECT (factory));
-
-	factory = gal_view_factory_minicard_new ();
-	gal_view_collection_add_factory (view->view_collection, factory);
-	gtk_object_unref (GTK_OBJECT (factory));
-
-	gal_view_collection_load(view->view_collection);
-
-	view->view_menus = gal_view_menus_new(view->view_collection);
-	gal_view_menus_apply(view->view_menus, uic, NULL);
-	gtk_signal_connect(GTK_OBJECT(view->view_collection), "display_view",
-			   display_view, view);
-}
-
-/**
- * e_addressbook_view_discard_menus:
- * @view: An addressbook view.
- * 
- * Makes an addressbook view discard its GAL view menus and its views collection
- * objects.  This should be called when the corresponding Bonobo component is
- * deactivated.
- **/
-void
-e_addressbook_view_discard_menus (EAddressbookView *view)
-{
-	g_return_if_fail (view != NULL);
-	g_return_if_fail (E_IS_ADDRESSBOOK_VIEW (view));
-	g_return_if_fail (view->view_collection);
-
-	g_assert (view->view_collection != NULL);
-	g_assert (view->view_menus != NULL);
-
-	gtk_object_unref (GTK_OBJECT (view->view_collection));
-	view->view_collection = NULL;
-
-	gtk_object_unref (GTK_OBJECT (view->view_menus));
-	view->view_menus = NULL;
-}
-
-static ESelectionModel*
-get_selection_model (EAddressbookView *view)
-{
-	if (view->view_type == E_ADDRESSBOOK_VIEW_MINICARD)
-		return e_minicard_view_widget_get_selection_model (E_MINICARD_VIEW_WIDGET(view->object));
-	else
-		return E_SELECTION_MODEL(E_TABLE_SCROLLED(view->widget)->table->selection);
-}
-
-void
-e_addressbook_view_print(EAddressbookView *view)
-{
-	if (view->view_type == E_ADDRESSBOOK_VIEW_MINICARD) {
-		char *query;
-		EBook *book;
-		GtkWidget *print;
-
-		gtk_object_get (GTK_OBJECT(view->model),
-				"query", &query,
-				"book", &book,
-				NULL);
-		print = e_contact_print_dialog_new(book, query);
-		g_free(query);
-		gtk_widget_show_all(print);
-	} else if (view->view_type == E_ADDRESSBOOK_VIEW_TABLE) {
-		GtkWidget *dialog;
-		EPrintable *printable;
-		ETable *etable;
-
-		dialog = gnome_print_dialog_new("Print cards", GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);
-		gnome_print_dialog_construct_range_any(GNOME_PRINT_DIALOG(dialog), GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_SELECTION,
-						       NULL, NULL, NULL);
-
-		gtk_object_get(GTK_OBJECT(view->widget), "table", &etable, NULL);
-		printable = e_table_get_printable(etable);
-
-		gtk_object_ref(GTK_OBJECT(view->widget));
-
-		gtk_object_set_data(GTK_OBJECT(dialog), "table", view->widget);
-		gtk_object_set_data(GTK_OBJECT(dialog), "printable", printable);
-		
-		gtk_signal_connect(GTK_OBJECT(dialog),
-				   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);
-		gtk_signal_connect(GTK_OBJECT(dialog),
-				   "destroy", GTK_SIGNAL_FUNC(e_contact_print_destroy), NULL);
-		gtk_widget_show(dialog);
-	}
-}
-
-void
-e_addressbook_view_print_preview(EAddressbookView *view)
-{
-	if (view->view_type == E_ADDRESSBOOK_VIEW_MINICARD) {
-		char *query;
-		EBook *book;
-
-		gtk_object_get (GTK_OBJECT(view->model),
-				"query", &query,
-				"book", &book,
-				NULL);
-		e_contact_print_preview(book, query);
-		g_free(query);
-	} else if (view->view_type == E_ADDRESSBOOK_VIEW_TABLE) {
-		EPrintable *printable;
-		ETable *etable;
-		GnomePrintMaster *master;
-		GnomePrintContext *pc;
-		GtkWidget *preview;
-
-		gtk_object_get(GTK_OBJECT(view->widget), "table", &etable, NULL);
-		printable = e_table_get_printable(etable);
-
-		master = gnome_print_master_new();
-		gnome_print_master_set_copies (master, 1, FALSE);
-		pc = gnome_print_master_get_context( master );
-		e_printable_reset(printable);
-		while (e_printable_data_left(printable)) {
-			if (gnome_print_gsave(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_translate(pc, 72, 72) == -1)
-				/* FIXME */;
-			e_printable_print_page(printable,
-					       pc,
-					       6.5 * 72,
-					       9 * 72,
-					       TRUE);
-			if (gnome_print_grestore(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_showpage(pc) == -1)
-				/* FIXME */;
-		}
-		gnome_print_master_close(master);
-		preview = GTK_WIDGET(gnome_print_master_preview_new(master, "Print Preview"));
-		gtk_widget_show_all(preview);
-		gtk_object_unref(GTK_OBJECT(master));
-		gtk_object_unref(GTK_OBJECT(printable));
-	}
-}
-
-static void
-card_deleted_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	if (status != E_BOOK_STATUS_SUCCESS) {
-		e_addressbook_error_dialog (_("Error removing card"), status);
-	}
-}
-
-static void
-do_remove (int i, gpointer user_data)
-{
-	EBook *book;
-	ECard *card;
-	EAddressbookView *view = user_data;
-
-	gtk_object_get (GTK_OBJECT(view->model),
-			"book", &book,
-			NULL);
-
-	card = e_addressbook_model_get_card (view->model, i);
-
-	e_book_remove_card(book, card, card_deleted_cb, view);
-
-	gtk_object_unref (GTK_OBJECT (card));
-}
-
-void
-e_addressbook_view_delete_selection(EAddressbookView *view)
-{
-	ESelectionModel *model = get_selection_model (view);
-
-	g_return_if_fail (model);
-
-	e_selection_model_foreach (model,
-				   do_remove,
-				   view);
-}
-
-static void
-invisible_destroyed (GtkWidget *invisible, EAddressbookView *view)
-{
-	view->invisible = NULL;
-}
-
-static void
-selection_get (GtkWidget *invisible,
-	       GtkSelectionData *selection_data,
-	       guint info,
-	       guint time_stamp,
-	       EAddressbookView *view)
-{
-	char *value;
-
-	value = e_card_list_get_vcard(view->clipboard_cards);
-
-	gtk_selection_data_set (selection_data, GDK_SELECTION_TYPE_STRING,
-				8, value, strlen (value));
-				
-}
-
-static void
-selection_clear_event (GtkWidget *invisible,
-		       GdkEventSelection *event,
-		       EAddressbookView *view)
-{
-	if (view->clipboard_cards) {
-		g_list_foreach (view->clipboard_cards, (GFunc)gtk_object_unref, NULL);
-		g_list_free (view->clipboard_cards);
-		view->clipboard_cards = NULL;
-	}
-}
-
-static void
-selection_received (GtkWidget *invisible,
-		    GtkSelectionData *selection_data,
-		    guint time,
-		    EAddressbookView *view)
-{
-	if (selection_data->length < 0 || selection_data->type != GDK_SELECTION_TYPE_STRING) {
-		return;
-	}
-	else {
-		/* XXX make sure selection_data->data = \0 terminated */
-		GList *card_list = e_card_load_cards_from_string_with_default_charset (selection_data->data, "ISO-8859-1");
-		GList *l;
-		
-		if (!card_list /* it wasn't a vcard list */)
-			return;
-
-		for (l = card_list; l; l = l->next) {
-			ECard *card = l->data;
-
-			e_card_merging_book_add_card (view->book, card, NULL /* XXX */, NULL);
-		}
-
-		g_list_foreach (card_list, (GFunc)gtk_object_unref, NULL);
-		g_list_free (card_list);
-	}
-}
-
-static void
-add_to_list (int model_row, gpointer closure)
-{
-	GList **list = closure;
-	*list = g_list_prepend (*list, GINT_TO_POINTER (model_row));
-}
-
-static GList *
-get_selected_cards (EAddressbookView *view)
-{
-	GList *list;
-	GList *iterator;
-	ESelectionModel *selection = get_selection_model (view);
-
-	list = NULL;
-	e_selection_model_foreach (selection, add_to_list, &list);
-
-	for (iterator = list; iterator; iterator = iterator->next) {
-		iterator->data = e_addressbook_model_card_at (view->model, GPOINTER_TO_INT (iterator->data));
-		if (iterator->data)
-			gtk_object_ref (iterator->data);
-	}
-	list = g_list_reverse (list);
-	return list;
-}
-
-void
-e_addressbook_view_save_as (EAddressbookView *view)
-{
-	GList *list = get_selected_cards (view);
-	if (list)
-		e_contact_list_save_as (_("Save as VCard"), list);
-	g_list_free (list);
-}
-
-void
-e_addressbook_view_send (EAddressbookView *view)
-{
-	GList *list = get_selected_cards (view);
-	if (list)
-		e_card_list_send (list, E_CARD_DISPOSITION_AS_ATTACHMENT);
-	g_list_free (list);
-}
-
-void
-e_addressbook_view_send_to (EAddressbookView *view)
-{
-	GList *list = get_selected_cards (view);
-	if (list)
-		e_card_list_send (list, E_CARD_DISPOSITION_AS_TO);
-	g_list_free (list);
-}
-
-void
-e_addressbook_view_cut (EAddressbookView *view)
-{
-	e_addressbook_view_copy (view);
-	e_addressbook_view_delete_selection (view);
-}
-
-void
-e_addressbook_view_copy (EAddressbookView *view)
-{
-	view->clipboard_cards = get_selected_cards (view);
-
-	gtk_selection_owner_set (view->invisible, clipboard_atom, GDK_CURRENT_TIME);
-}
-
-void
-e_addressbook_view_paste (EAddressbookView *view)
-{
-	gtk_selection_convert (view->invisible, clipboard_atom,
-			       GDK_SELECTION_TYPE_STRING,
-			       GDK_CURRENT_TIME);
-}
-
-void
-e_addressbook_view_select_all (EAddressbookView *view)
-{
-	ESelectionModel *model = get_selection_model (view);
-
-	g_return_if_fail (model);
-
-	e_selection_model_select_all (model);
-}
-
-void
-e_addressbook_view_show_all(EAddressbookView *view)
-{
-	gtk_object_set(GTK_OBJECT(view),
-		       "query", NULL,
-		       NULL);
-}
-
-void
-e_addressbook_view_stop(EAddressbookView *view)
-{
-	if (view)
-		e_addressbook_model_stop (view->model);
-}
-
-static gboolean
-e_addressbook_view_selection_nonempty (EAddressbookView  *view)
-{
-	ESelectionModel *selection_model;
-
-	selection_model = get_selection_model (view);
-	if (selection_model == NULL)
-		return FALSE;
-
-	return e_selection_model_selected_count (selection_model) != 0;
-}
-
-gboolean
-e_addressbook_view_can_create (EAddressbookView  *view)
-{
-	return view ? e_addressbook_model_editable (view->model) : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_print (EAddressbookView  *view)
-{
-	return view && view->model ? e_addressbook_model_card_count (view->model) : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_save_as (EAddressbookView  *view)
-{
-	return view ? e_addressbook_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean 
-e_addressbook_view_can_send (EAddressbookView  *view)
-{
-	return view ? e_addressbook_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean   
-e_addressbook_view_can_send_to (EAddressbookView  *view)
-{
-	return view ? e_addressbook_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_delete (EAddressbookView  *view)
-{
-	return view ? e_addressbook_view_selection_nonempty (view) && e_addressbook_model_editable (view->model) : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_cut (EAddressbookView *view)
-{
-	return view ? e_addressbook_view_selection_nonempty (view) && e_addressbook_model_editable (view->model) : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_copy (EAddressbookView *view)
-{
-	return view ? e_addressbook_view_selection_nonempty (view) : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_paste (EAddressbookView *view)
-{
-	return view ? e_addressbook_model_editable (view->model) : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_select_all (EAddressbookView *view)
-{
-	return view ? e_addressbook_model_card_count (view->model) != 0 : FALSE;
-}
-
-gboolean
-e_addressbook_view_can_stop (EAddressbookView  *view)
-{
-	return view ? e_addressbook_model_can_stop (view->model) : FALSE;
-}
-
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
deleted file mode 100644
index bc3c66c612..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-addressbook-view.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_ADDRESSBOOK_VIEW_H__
-#define __E_ADDRESSBOOK_VIEW_H__
-
-#include <gtk/gtktable.h>
-#include <bonobo/bonobo-ui-component.h>
-#include <gal/menus/gal-view-collection.h>
-#include "e-addressbook-model.h"
-#include "widgets/menus/gal-view-menus.h"
-#include "addressbook/backend/ebook/e-book.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EAddressbookView - A card displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_ADDRESSBOOK_VIEW_TYPE			(e_addressbook_view_get_type ())
-#define E_ADDRESSBOOK_VIEW(obj)			(GTK_CHECK_CAST ((obj), E_ADDRESSBOOK_VIEW_TYPE, EAddressbookView))
-#define E_ADDRESSBOOK_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_ADDRESSBOOK_VIEW_TYPE, EAddressbookViewClass))
-#define E_IS_ADDRESSBOOK_VIEW(obj)		(GTK_CHECK_TYPE ((obj), E_ADDRESSBOOK_VIEW_TYPE))
-#define E_IS_ADDRESSBOOK_VIEW_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_ADDRESSBOOK_VIEW_TYPE))
-
-typedef enum {
-	E_ADDRESSBOOK_VIEW_NONE, /* initialized to this */
-	E_ADDRESSBOOK_VIEW_TABLE,
-	E_ADDRESSBOOK_VIEW_MINICARD
-} EAddressbookViewType;
-
-
-typedef struct _EAddressbookView       EAddressbookView;
-typedef struct _EAddressbookViewClass  EAddressbookViewClass;
-
-struct _EAddressbookView
-{
-	GtkTable parent;
-	
-	/* item specific fields */
-	EAddressbookViewType view_type;
-
-	EAddressbookModel   *model;
-
-	GtkWidget *invisible;
-	GList *clipboard_cards;
-
-	EBook *book;
-	char  *query;
-	guint editable : 1;
-
-	GtkObject *object;
-	GtkWidget *widget;
-
-	GtkWidget *vbox;
-
-	/* Menus handler and the view collection */
-	GalViewCollection *view_collection;
-	GalViewMenus *view_menus;
-};
-
-struct _EAddressbookViewClass
-{
-	GtkTableClass parent_class;
-
-	/*
-	 * Signals
-	 */
-	void (*status_message)       (EAddressbookView *view, const gchar *message);
-	void (*folder_bar_message)   (EAddressbookView *view, const gchar *message);
-	void (*command_state_change) (EAddressbookView *view);
-};
-
-GtkWidget *e_addressbook_view_new               (void);
-GtkType    e_addressbook_view_get_type          (void);
-
-void       e_addressbook_view_setup_menus       (EAddressbookView  *view,
-						 BonoboUIComponent *uic);
-void       e_addressbook_view_discard_menus     (EAddressbookView  *view);
-
-void       e_addressbook_view_save_as           (EAddressbookView  *view);
-void       e_addressbook_view_send              (EAddressbookView  *view);
-void       e_addressbook_view_send_to           (EAddressbookView  *view);
-void       e_addressbook_view_print             (EAddressbookView  *view);
-void       e_addressbook_view_print_preview     (EAddressbookView  *view);
-void       e_addressbook_view_delete_selection  (EAddressbookView  *view);
-void       e_addressbook_view_cut               (EAddressbookView  *view);
-void       e_addressbook_view_copy              (EAddressbookView  *view);
-void       e_addressbook_view_paste             (EAddressbookView  *view);
-void       e_addressbook_view_select_all        (EAddressbookView  *view);
-void       e_addressbook_view_show_all          (EAddressbookView  *view);
-void       e_addressbook_view_stop              (EAddressbookView  *view);
-
-gboolean   e_addressbook_view_can_create        (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_print         (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_save_as       (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_send          (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_send_to       (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_delete        (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_cut           (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_copy          (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_paste         (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_select_all    (EAddressbookView  *view);
-gboolean   e_addressbook_view_can_stop          (EAddressbookView  *view);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_ADDRESSBOOK_VIEW_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-control.c b/addressbook/gui/widgets/e-minicard-control.c
deleted file mode 100644
index 73417af78c..0000000000
--- a/addressbook/gui/widgets/e-minicard-control.c
+++ /dev/null
@@ -1,373 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-minicard-control.c
- *
- * Authors:
- *    Chris Lahey <clahey@ximian.com>
- *
- * Copyright 1999, 2000, Ximian, Inc.
- */
-
-#include <config.h>
-
-#include <bonobo/bonobo-generic-factory.h>
-#include <bonobo/bonobo-persist.h>
-#include <bonobo/bonobo-persist-stream.h>
-#include <bonobo/bonobo-stream-client.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/backend/ebook/e-book-util.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <gal/util/e-util.h>
-
-#include <addressbook/gui/component/addressbook.h>
-
-#include "e-minicard-control.h"
-#include "e-minicard-widget.h"
-#include "e-card-merging.h"
-
-typedef struct {
-	EMinicardWidget *minicard;
-	GList *card_list;
-	GtkWidget *label;
-} EMinicardControl;
-
-#if 0
-enum {
-	PROP_RUNNING
-} MyArgs;
-
-#define RUNNING_KEY  "Clock::Running"
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  gpointer           user_data)
-{
-	GtkObject *clock = user_data;
-
-	switch (arg_id) {
-
-	case PROP_RUNNING:
-	{
-		gboolean b = GPOINTER_TO_UINT (gtk_object_get_data (clock, RUNNING_KEY));
-		BONOBO_ARG_SET_BOOLEAN (arg, b);
-		break;
-	}
-
-	default:
-		g_warning ("Unhandled arg %d", arg_id);
-		break;
-	}
-}
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg   *arg,
-	  guint              arg_id,
-	  CORBA_Environment *ev,
-	  gpointer           user_data)
-{
-	GtkClock *clock = user_data;
-
-	switch (arg_id) {
-
-	case PROP_RUNNING:
-	{
-		guint i;
-
-		i = BONOBO_ARG_GET_BOOLEAN (arg);
-
-		if (i)
-			gtk_clock_start (clock);
-		else
-			gtk_clock_stop (clock);
-
-		gtk_object_set_data (GTK_OBJECT (clock), RUNNING_KEY,
-				     GUINT_TO_POINTER (i));
-		break;
-	}
-
-	default:
-		g_warning ("Unhandled arg %d", arg_id);
-		break;
-	}
-}
-#endif
-
-/*
- * Bonobo::PersistStream
- *
- * These two functions implement the Bonobo::PersistStream load and
- * save methods which allow data to be loaded into and out of the
- * BonoboObject.
- */
-static char *
-stream_read (Bonobo_Stream stream)
-{
-	Bonobo_Stream_iobuf *buffer;
-	CORBA_Environment    ev;
-	char *data = NULL;
-	gint length = 0;
-
-	CORBA_exception_init (&ev);
-	do {
-#define READ_CHUNK_SIZE 65536
-		Bonobo_Stream_read (stream, READ_CHUNK_SIZE,
-				    &buffer, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			CORBA_exception_free (&ev);
-			return NULL;
-		}
-
-		if (buffer->_length <= 0)
-			break;
-
-		data = g_realloc (data, length + buffer->_length + 1);
-
-		memcpy (data + length, buffer->_buffer, buffer->_length);
-
-		length += buffer->_length;
-
-		CORBA_free (buffer);
-	} while (1);
-
-	CORBA_free (buffer);
-	CORBA_exception_free (&ev);
-
-	if (data)
-		data[length] = '\0';
-	else
-		data = g_strdup("");
-
-	return data;
-} /* stream_read */
-
-/*
- * This function implements the Bonobo::PersistStream:load method.
- */
-static void
-pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	GList *list;
-	char *vcard;
-	EMinicardControl *minicard_control = data;
-
-	if (type && g_strcasecmp (type, "text/vCard") != 0 &&	    
-	    g_strcasecmp (type, "text/x-vCard") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	if ((vcard = stream_read (stream)) == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_FileNotFound, NULL);
-		return;
-	}
-
-	e_free_object_list (minicard_control->card_list);
-	list = e_card_load_cards_from_string_with_default_charset(vcard, "ISO-8859-1");
-	g_free(vcard);
-	minicard_control->card_list = list;
-	if (list)
-		gtk_object_set(GTK_OBJECT(minicard_control->minicard),
-			       "card", list->data,
-			       NULL);
-	if (list && list->next) {
-		char *message;
-		int length = g_list_length (list) - 1;
-		if (length > 1) {
-			message = g_strdup_printf (_("and %d other cards."), length);
-		} else {
-			message = g_strdup_printf (_("and one other card."));
-		}
-		gtk_label_set_text (GTK_LABEL (minicard_control->label), message);
-		g_free (message);
-		gtk_widget_show (minicard_control->label);
-	} else {
-		gtk_widget_hide (minicard_control->label);
-	}
-} /* pstream_load */
-
-/*
- * This function implements the Bonobo::PersistStream:save method.
- */
-static void
-pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	EMinicardControl *minicard_control = data;
-	char             *vcard;
-	int               length;
-
-	if (type && g_strcasecmp (type, "text/vCard") != 0 &&	    
-	    g_strcasecmp (type, "text/x-vCard") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	vcard = e_card_list_get_vcard(minicard_control->card_list);
-	length = strlen (vcard);
-	bonobo_stream_client_write (stream, vcard, length, ev);
-	g_free (vcard);
-} /* pstream_save */
-
-static CORBA_long
-pstream_get_max_size (BonoboPersistStream *ps, void *data,
-		      CORBA_Environment *ev)
-{
-	EMinicardControl *minicard_control = data;
-	char *vcard;
-	gint length;
-
-	vcard = e_card_list_get_vcard(minicard_control->card_list);
-	length = strlen (vcard);
-	g_free (vcard);
-
-	return length;
-}
-
-static Bonobo_Persist_ContentTypeList *
-pstream_get_content_types (BonoboPersistStream *ps, void *closure,
-			   CORBA_Environment *ev)
-{
-	return bonobo_persist_generate_content_types (2, "text/vCard", "text/x-vCard");
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	GList *list = closure;
-	if (book) {
-		GList *p;
-		for (p = list; p; p = p->next) {
-			e_card_merging_book_add_card(book, p->data, NULL, NULL);
-		}
-		gtk_object_unref (GTK_OBJECT (book));
-	}
-	e_free_object_list (list);
-}
-
-static void
-save_in_addressbook(GtkWidget *button, gpointer data)
-{
-	EMinicardControl *minicard_control = data;
-	GList *list, *p;
-	EBook *book;
-
-	book = e_book_new ();
-
-	list = g_list_copy (minicard_control->card_list);
-
-	for (p = list; p; p = p->next)
-		gtk_object_ref (GTK_OBJECT (p->data));
-
-	if (!addressbook_load_default_book (book, book_open_cb, list)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		book_open_cb (NULL, E_BOOK_STATUS_OTHER_ERROR, list);
-	}
-}
-
-static void
-free_struct (GtkWidget *control, gpointer data)
-{
-	EMinicardControl *minicard_control = data;
-	e_free_object_list (minicard_control->card_list);
-	g_free (minicard_control);
-}
-
-static BonoboObject *
-e_minicard_control_factory (BonoboGenericFactory *Factory, void *closure)
-{
-#if 0
-	BonoboPropertyBag  *pb;
-#endif
-	BonoboControl       *control;
-	BonoboPersistStream *stream;
-	GtkWidget	    *minicard;
-	GtkWidget           *button;
-	GtkWidget           *label;
-	GtkWidget           *vbox;
-
-	EMinicardControl    *minicard_control = g_new (EMinicardControl, 1);
-
-
-	minicard_control->card_list = NULL;
-	minicard_control->minicard = NULL;
-	minicard_control->label = NULL;
-
-	/* Create the control. */
-
-	minicard = e_minicard_widget_new ();
-	gtk_widget_show (minicard);
-	minicard_control->minicard = E_MINICARD_WIDGET (minicard);
-
-	/* This is intentionally not shown. */
-	label = gtk_label_new ("");
-	minicard_control->label = label;
-
-	button = gtk_button_new_with_label(_("Save in addressbook"));
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   save_in_addressbook, minicard_control);
-	gtk_widget_show (button);
-
-	vbox = gtk_vbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), minicard, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
-	gtk_widget_show (vbox);
-
-	control = bonobo_control_new (vbox);
-
-	gtk_signal_connect (GTK_OBJECT (control), "destroy",
-			    free_struct, minicard_control);
-
-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,
-					    pstream_get_max_size,
-					    pstream_get_content_types,
-					    minicard_control);
-
-#if 0
-	/* Create the properties. */
-	pb = bonobo_property_bag_new (get_prop, set_prop, clock);
-	bonobo_control_set_properties (control, pb);
-
-	bonobo_property_bag_add (pb, "running", PROP_RUNNING,
-				 BONOBO_ARG_BOOLEAN, NULL,
-				 "Whether or not the clock is running", 0);
-#endif
-
-	if (stream == NULL) {
-		bonobo_object_unref (BONOBO_OBJECT (control));
-		return NULL;
-	}
-
-	bonobo_object_add_interface (BONOBO_OBJECT (control),
-				    BONOBO_OBJECT (stream));
-
-	return BONOBO_OBJECT (control);
-}
-
-void
-e_minicard_control_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	factory =
-		bonobo_generic_factory_new (
-		        "OAFIID:GNOME_Evolution_Addressbook_MiniCard_ControlFactory",
-			e_minicard_control_factory, NULL);
-
-	if (factory == NULL)
-		g_error ("I could not register a EMinicard control factory.");
-}
diff --git a/addressbook/gui/widgets/e-minicard-control.h b/addressbook/gui/widgets/e-minicard-control.h
deleted file mode 100644
index 4a0da88435..0000000000
--- a/addressbook/gui/widgets/e-minicard-control.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __E_MINICARD_CONTROL_H__
-#define __E_MINICARD_CONTROL_H__
-
-#include <bonobo/bonobo-control.h>
-
-void             e_minicard_control_factory_init (void);
-
-#endif /* __E_MINICARD_CONTROL_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
deleted file mode 100644
index b59ff46ae3..0000000000
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ /dev/null
@@ -1,470 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-label.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include "e-minicard-label.h"
-
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <gal/util/e-util.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include <gdk/gdkkeysyms.h>
-
-static void e_minicard_label_init		(EMinicardLabel		 *card);
-static void e_minicard_label_class_init	(EMinicardLabelClass	 *klass);
-static void e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_minicard_label_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static gboolean e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event);
-static void e_minicard_label_realize (GnomeCanvasItem *item);
-static void e_minicard_label_unrealize (GnomeCanvasItem *item);
-static void e_minicard_label_reflow(GnomeCanvasItem *item, int flags);
-
-static void e_minicard_label_resize_children( EMinicardLabel *e_minicard_label );
-
-static GnomeCanvasGroupClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_WIDTH,
-	ARG_HEIGHT,
-	ARG_HAS_FOCUS,
-	ARG_FIELD,
-	ARG_FIELDNAME,
-	ARG_TEXT_MODEL,
-	ARG_MAX_FIELD_NAME_WIDTH,
-	ARG_EDITABLE
-};
-
-GtkType
-e_minicard_label_get_type (void)
-{
-  static GtkType minicard_label_type = 0;
-
-  if (!minicard_label_type)
-    {
-      static const GtkTypeInfo minicard_label_info =
-      {
-        "EMinicardLabel",
-        sizeof (EMinicardLabel),
-        sizeof (EMinicardLabelClass),
-        (GtkClassInitFunc) e_minicard_label_class_init,
-        (GtkObjectInitFunc) e_minicard_label_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      minicard_label_type = gtk_type_unique (gnome_canvas_group_get_type (), &minicard_label_info);
-    }
-
-  return minicard_label_type;
-}
-
-static void
-e_minicard_label_class_init (EMinicardLabelClass *klass)
-{
-  GtkObjectClass *object_class;
-  GnomeCanvasItemClass *item_class;
-
-  object_class = (GtkObjectClass*) klass;
-  item_class = (GnomeCanvasItemClass *) klass;
-
-  parent_class = gtk_type_class (gnome_canvas_group_get_type ());
-  
-  gtk_object_add_arg_type ("EMinicardLabel::width", GTK_TYPE_DOUBLE, 
-			   GTK_ARG_READWRITE, ARG_WIDTH); 
-  gtk_object_add_arg_type ("EMinicardLabel::height", GTK_TYPE_DOUBLE, 
-			   GTK_ARG_READABLE, ARG_HEIGHT);
-  gtk_object_add_arg_type ("EMinicardLabel::has_focus", GTK_TYPE_BOOL, 
-			   GTK_ARG_READWRITE, ARG_HAS_FOCUS);
-  gtk_object_add_arg_type ("EMinicardLabel::field", GTK_TYPE_STRING, 
-			   GTK_ARG_READWRITE, ARG_FIELD);
-  gtk_object_add_arg_type ("EMinicardLabel::fieldname", GTK_TYPE_STRING, 
-			   GTK_ARG_READWRITE, ARG_FIELDNAME);
-  gtk_object_add_arg_type ("EMinicardLabel::text_model", GTK_TYPE_OBJECT,
-			   GTK_ARG_READWRITE, ARG_TEXT_MODEL);
-  gtk_object_add_arg_type ("EMinicardLabel::max_field_name_length", GTK_TYPE_DOUBLE,
-			   GTK_ARG_READWRITE, ARG_MAX_FIELD_NAME_WIDTH);
-  gtk_object_add_arg_type ("EMinicardLabel::editable", GTK_TYPE_BOOL, 
-			   GTK_ARG_READWRITE, ARG_EDITABLE);
- 
-  object_class->set_arg = e_minicard_label_set_arg;
-  object_class->get_arg = e_minicard_label_get_arg;
-  /*  object_class->destroy = e_minicard_label_destroy; */
-  
-  /* GnomeCanvasItem method overrides */
-  item_class->realize     = e_minicard_label_realize;
-  item_class->unrealize   = e_minicard_label_unrealize;
-  item_class->event       = e_minicard_label_event;
-}
-
-static void
-e_minicard_label_init (EMinicardLabel *minicard_label)
-{
-  minicard_label->width = 10;
-  minicard_label->height = 10;
-  minicard_label->rect = NULL;
-  minicard_label->fieldname = NULL;
-  minicard_label->field = NULL;
-
-  minicard_label->max_field_name_length = -1;
-
-  e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard_label), e_minicard_label_reflow);
-}
-
-static void
-e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EMinicardLabel *e_minicard_label;
-
-	item = GNOME_CANVAS_ITEM (o);
-	e_minicard_label = E_MINICARD_LABEL (o);
-	
-	switch (arg_id){
-	case ARG_WIDTH:
-		e_minicard_label->width = GTK_VALUE_DOUBLE (*arg);
-		e_minicard_label_resize_children(e_minicard_label);
-		e_canvas_item_request_reflow (item);
-		break;
-	case ARG_HAS_FOCUS:
-		if (e_minicard_label->field && (GTK_VALUE_ENUM(*arg) != E_FOCUS_NONE))
-			e_canvas_item_grab_focus(e_minicard_label->field, FALSE);
-		break;
-	case ARG_FIELD:
-		gnome_canvas_item_set( e_minicard_label->field, "text", GTK_VALUE_STRING (*arg), NULL );
-		break;
-	case ARG_FIELDNAME:
-		gnome_canvas_item_set( e_minicard_label->fieldname, "text", GTK_VALUE_STRING (*arg), NULL );
-		break;
-	case ARG_TEXT_MODEL:
-		gnome_canvas_item_set( e_minicard_label->field, "model", GTK_VALUE_OBJECT (*arg), NULL);
-		break;
-	case ARG_MAX_FIELD_NAME_WIDTH:
-		e_minicard_label->max_field_name_length = GTK_VALUE_DOUBLE (*arg);
-		break;
-	case ARG_EDITABLE:
-		e_minicard_label->editable = GTK_VALUE_BOOL (*arg);
-		gtk_object_set (GTK_OBJECT (e_minicard_label->field), "editable", e_minicard_label->editable, NULL);
-		break;
-	}
-}
-
-static void
-e_minicard_label_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicardLabel *e_minicard_label;
-	char *temp;
-	ETextModel *tempmodel;
-
-	e_minicard_label = E_MINICARD_LABEL (object);
-
-	switch (arg_id) {
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = e_minicard_label->width;
-		break;
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = e_minicard_label->height;
-		break;
-	case ARG_HAS_FOCUS:
-		GTK_VALUE_ENUM (*arg) = e_minicard_label->has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE;
-		break;
-	case ARG_FIELD:
-		gtk_object_get( GTK_OBJECT( e_minicard_label->field ), "text", &temp, NULL );
-		GTK_VALUE_STRING (*arg) = temp;
-		break;
-	case ARG_FIELDNAME:
-		gtk_object_get( GTK_OBJECT( e_minicard_label->fieldname ), "text", &temp, NULL );
-		GTK_VALUE_STRING (*arg) = temp;
-		break;
-	case ARG_TEXT_MODEL:
-		gtk_object_get( GTK_OBJECT( e_minicard_label->field ), "model", &tempmodel, NULL );
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(tempmodel);
-		break;
-	case ARG_MAX_FIELD_NAME_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = e_minicard_label->max_field_name_length;
-		break;
-	case ARG_EDITABLE:
-		GTK_VALUE_BOOL (*arg) = e_minicard_label->editable;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_minicard_label_realize (GnomeCanvasItem *item)
-{
-	if (GNOME_CANVAS_ITEM_CLASS( parent_class )->realize)
-	  (* GNOME_CANVAS_ITEM_CLASS( parent_class )->realize) (item);
-
-	e_canvas_item_request_reflow(item);
-	
-	if (!item->canvas->aa)
-	  {
-	  }
-}
-
-void
-e_minicard_label_construct (GnomeCanvasItem *item)
-{
-	EMinicardLabel *e_minicard_label;
-	GnomeCanvasGroup *group;
-	GdkFont *font;
-
-	font = ((GtkWidget *) item->canvas)->style->font;
-
-	e_minicard_label = E_MINICARD_LABEL (item);
-	group = GNOME_CANVAS_GROUP( item );
-
-	e_minicard_label->rect =
-	  gnome_canvas_item_new( group,
-				 gnome_canvas_rect_get_type(),
-				 "x1", (double) 0,
-				 "y1", (double) 0,
-				 "x2", (double) e_minicard_label->width - 1,
-				 "y2", (double) e_minicard_label->height - 1,
-				 "outline_color", NULL,
-				 NULL );
-	e_minicard_label->fieldname =
-	  gnome_canvas_item_new( group,
-				 e_text_get_type(),
-				 "anchor", GTK_ANCHOR_NW,
-				 "clip_width", (double) ( e_minicard_label->width / 2 - 4 ),
-				 "clip", TRUE,
-				 "use_ellipsis", TRUE,
-				 "font_gdk", font,
-				 "fill_color", "black",
-				 "draw_background", FALSE,
-				 NULL );
-	e_canvas_item_move_absolute(e_minicard_label->fieldname, 2, 1);
-
-	e_minicard_label->field =
-	  gnome_canvas_item_new( group,
-				 e_text_get_type(),
-				 "anchor", GTK_ANCHOR_NW,
-				 "clip_width", (double) ( ( e_minicard_label->width + 1 ) / 2 - 4 ),
-				 "clip", TRUE,
-				 "use_ellipsis", TRUE,
-				 "font_gdk", font,
-				 "fill_color", "black",
-				 "editable", e_minicard_label->editable,
-				 "draw_background", FALSE,
-				 NULL );
-	e_canvas_item_move_absolute(e_minicard_label->field, ( e_minicard_label->width / 2 + 2), 1);
-
-	e_canvas_item_request_reflow(item);
-}
-
-static void
-e_minicard_label_unrealize (GnomeCanvasItem *item)
-{
-  EMinicardLabel *e_minicard_label;
-
-  e_minicard_label = E_MINICARD_LABEL (item);
-
-  if (!item->canvas->aa)
-    {
-    }
-
-  if (GNOME_CANVAS_ITEM_CLASS( parent_class )->unrealize)
-    (* GNOME_CANVAS_ITEM_CLASS( parent_class )->unrealize) (item);
-}
-
-static gboolean
-e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-  EMinicardLabel *e_minicard_label;
- 
-  e_minicard_label = E_MINICARD_LABEL (item);
-
-  switch( event->type )
-    {
-    case GDK_KEY_PRESS:
-	    if (event->key.keyval == GDK_Escape) {
-		    GnomeCanvasItem *parent;
-
-		    e_text_cancel_editing (E_TEXT (e_minicard_label->field));
-
-		    parent = GNOME_CANVAS_ITEM (e_minicard_label)->parent;
-		    if (parent)
-			    e_canvas_item_grab_focus(parent, FALSE);
-	    }
-	    break;
-    case GDK_FOCUS_CHANGE:
-      {
-	GdkEventFocus *focus_event = (GdkEventFocus *) event;
-	if ( focus_event->in )
-	  {
-	    gnome_canvas_item_set( e_minicard_label->rect, 
-				   "outline_color", "grey50", 
-				   "fill_color", "grey90",
-				   NULL );
-	    e_minicard_label->has_focus = TRUE;
-	  }
-	else
-	  {
-	    gnome_canvas_item_set( e_minicard_label->rect, 
-				   "outline_color", NULL, 
-				   "fill_color", NULL,
-				   NULL );
-	    e_minicard_label->has_focus = FALSE;
-	  }
-      }
-      break;
-    case GDK_BUTTON_PRESS:
-    case GDK_BUTTON_RELEASE: 
-    case GDK_MOTION_NOTIFY:
-    case GDK_ENTER_NOTIFY:
-    case GDK_LEAVE_NOTIFY: {
-	    gboolean return_val;
-#if 0
-	    GnomeCanvasItem *field;
-	    ArtPoint p;
-	    double inv[6], affine[6];
-	    
-	    field = e_minicard_label->field;
-	    art_affine_identity (affine);
-	    
-	    if (field->xform != NULL) {
-		    if (field->object.flags & GNOME_CANVAS_ITEM_AFFINE_FULL) {
-			    art_affine_multiply (affine, affine, field->xform);
-		    } else {
-			    affine[4] += field->xform[0];
-			    affine[5] += field->xform[1];
-		    }
-	    }
-	    
-	    art_affine_invert (inv, affine);
-	    switch(event->type) {
-	    case GDK_MOTION_NOTIFY:
-		    p.x = event->motion.x;
-		    p.y = event->motion.y;
-		    art_affine_point (&p, &p, inv);
-		    event->motion.x = p.x;
-		    event->motion.y = p.y;
-		    break;
-	    case GDK_BUTTON_PRESS:
-	    case GDK_BUTTON_RELEASE:
-		    p.x = event->button.x;
-		    p.y = event->button.y;
-		    art_affine_point (&p, &p, inv);
-		    event->button.x = p.x;
-		    event->button.y = p.y;
-		    break;
-	    case GDK_ENTER_NOTIFY:
-	    case GDK_LEAVE_NOTIFY:
-		    p.x = event->crossing.x;
-		    p.y = event->crossing.y;
-		    art_affine_point (&p, &p, inv);
-		    event->crossing.x = p.x;
-		    event->crossing.y = p.y;
-		    break;
-	    default:
-		    break;
-	    }
-#endif	    
-	    gtk_signal_emit_by_name(GTK_OBJECT(e_minicard_label->field), "event", event, &return_val);
-	    return return_val;
-	    break;
-    }
-    default:
-	    break;
-    }
-  
-  if (GNOME_CANVAS_ITEM_CLASS( parent_class )->event)
-    return (* GNOME_CANVAS_ITEM_CLASS( parent_class )->event) (item, event);
-  else
-    return 0;
-}
-
-static void
-e_minicard_label_resize_children(EMinicardLabel *e_minicard_label)
-{
-	double left_width;
-	if (e_minicard_label->max_field_name_length != -1 && ((e_minicard_label->width / 2) - 4 > e_minicard_label->max_field_name_length))
-		left_width = e_minicard_label->max_field_name_length;
-	else
-		left_width = e_minicard_label->width / 2 - 4;
-
-	gnome_canvas_item_set( e_minicard_label->fieldname,
-			       "clip_width", (double) ( left_width ),
-			       NULL );
-	gnome_canvas_item_set( e_minicard_label->field,
-			       "clip_width", (double) ( e_minicard_label->width - 8 - left_width ),
-			       NULL );
-}
-
-static void
-e_minicard_label_reflow(GnomeCanvasItem *item, int flags)
-{
-	EMinicardLabel *e_minicard_label = E_MINICARD_LABEL(item);
-	
-	gint old_height;
-	gdouble text_height;
-	gdouble left_width;
-
-	old_height = e_minicard_label->height;
-
-	gtk_object_get(GTK_OBJECT(e_minicard_label->fieldname), 
-		       "text_height", &text_height,
-		       NULL);
-
-	e_minicard_label->height = text_height;
-
-
-	gtk_object_get(GTK_OBJECT(e_minicard_label->field), 
-		       "text_height", &text_height,
-		       NULL);
-
-	if (e_minicard_label->height < text_height)
-		e_minicard_label->height = text_height;
-	e_minicard_label->height += 3;
-
-	gnome_canvas_item_set( e_minicard_label->rect,
-			       "x2", (double) e_minicard_label->width - 1,
-			       "y2", (double) e_minicard_label->height - 1,
-			       NULL );
-
-	if (e_minicard_label->max_field_name_length != -1 && ((e_minicard_label->width / 2) - 4 > e_minicard_label->max_field_name_length))
-		left_width = e_minicard_label->max_field_name_length;
-	else
-		left_width = e_minicard_label->width / 2 - 4;
-
-	e_canvas_item_move_absolute(e_minicard_label->field, left_width + 6, 1);
-
-	if (old_height != e_minicard_label->height)
-		e_canvas_item_request_parent_reflow(item);
-}
-
-GnomeCanvasItem *
-e_minicard_label_new(GnomeCanvasGroup *parent)
-{
-	GnomeCanvasItem *item = gnome_canvas_item_new(parent, e_minicard_label_get_type(), NULL);
-	e_minicard_label_construct(item);
-	return item;
-}
-
diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h
deleted file mode 100644
index 32792991a7..0000000000
--- a/addressbook/gui/widgets/e-minicard-label.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-label.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_LABEL_H__
-#define __E_MINICARD_LABEL_H__
-
-#include <glib.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EMinicardLabel - A label doing focus with non-marching ants.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * width        double          RW              width of the label
- * height       double          R               height of the label
- * field        string          RW              text in the field label
- * fieldname    string          RW              text in the fieldname label
- */
-
-#define E_MINICARD_LABEL_TYPE			(e_minicard_label_get_type ())
-#define E_MINICARD_LABEL(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_LABEL_TYPE, EMinicardLabel))
-#define E_MINICARD_LABEL_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_LABEL_TYPE, EMiniCardLabelClass))
-#define E_IS_MINICARD_LABEL(obj)		(GTK_CHECK_TYPE ((obj), E_MINICARD_LABEL_TYPE))
-#define E_IS_MINICARD_LABEL_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_LABEL_TYPE))
-
-
-typedef struct _EMinicardLabel       EMinicardLabel;
-typedef struct _EMinicardLabelClass  EMinicardLabelClass;
-
-struct _EMinicardLabel
-{
-	GnomeCanvasGroup parent;
-	
-	/* item specific fields */
-	double width;
-	double height;
-	double max_field_name_length;
-	guint editable : 1;
-	GnomeCanvasItem *fieldname;
-	GnomeCanvasItem *field;
-	GnomeCanvasItem *rect;
-
-	gboolean has_focus;
-};
-
-struct _EMinicardLabelClass
-{
-	GnomeCanvasGroupClass parent_class;
-};
-
-
-GtkType    e_minicard_label_get_type (void);
-GnomeCanvasItem *e_minicard_label_new(GnomeCanvasGroup *parent);
-void e_minicard_label_construct (GnomeCanvasItem *item);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_MINICARD_LABEL_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
deleted file mode 100644
index 5dd8393ca0..0000000000
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ /dev/null
@@ -1,343 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-view-widget.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <gal/widgets/e-canvas.h>
-
-#include "e-minicard-view-widget.h"
-
-static void e_minicard_view_widget_init		 (EMinicardViewWidget		 *widget);
-static void e_minicard_view_widget_class_init	 (EMinicardViewWidgetClass	 *klass);
-static void e_minicard_view_widget_set_arg       (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_minicard_view_widget_get_arg       (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_minicard_view_widget_destroy       (GtkObject *object);
-static void e_minicard_view_widget_reflow        (ECanvas *canvas);
-static void e_minicard_view_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static void e_minicard_view_widget_realize       (GtkWidget *widget);
-
-static void selection_change                     (ESelectionModel *esm, EMinicardViewWidget *widget);
-
-static ECanvasClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_QUERY,
-	ARG_EDITABLE
-};
-
-enum {
-	SELECTION_CHANGE,
-	LAST_SIGNAL
-};
-
-static guint e_minicard_view_widget_signals [LAST_SIGNAL] = {0, };
-
-GtkType
-e_minicard_view_widget_get_type (void)
-{
-  static GtkType type = 0;
-
-  if (!type)
-    {
-      static const GtkTypeInfo info =
-      {
-        "EMinicardViewWidget",
-        sizeof (EMinicardViewWidget),
-        sizeof (EMinicardViewWidgetClass),
-        (GtkClassInitFunc) e_minicard_view_widget_class_init,
-        (GtkObjectInitFunc) e_minicard_view_widget_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      type = gtk_type_unique (e_canvas_get_type (), &info);
-    }
-
-  return type;
-}
-
-static void
-e_minicard_view_widget_class_init (EMinicardViewWidgetClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	ECanvasClass *canvas_class;
-
-	object_class = (GtkObjectClass*) klass;
-	widget_class = GTK_WIDGET_CLASS (klass);
-	canvas_class = E_CANVAS_CLASS (klass);
-
-	parent_class = gtk_type_class (e_canvas_get_type ());
-
-	gtk_object_add_arg_type ("EMinicardViewWidget::book", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_BOOK);
-	gtk_object_add_arg_type ("EMinicardViewWidget::query", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_QUERY);
-	gtk_object_add_arg_type ("EMinicardViewWidget::editable", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_EDITABLE);
-
-	e_minicard_view_widget_signals [SELECTION_CHANGE] =
-		gtk_signal_new ("selection_change",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMinicardViewWidgetClass, selection_change),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, e_minicard_view_widget_signals, LAST_SIGNAL);
-
-	object_class->set_arg       = e_minicard_view_widget_set_arg;
-	object_class->get_arg       = e_minicard_view_widget_get_arg;
-	object_class->destroy       = e_minicard_view_widget_destroy;
-
-	widget_class->realize       = e_minicard_view_widget_realize;
-	widget_class->size_allocate = e_minicard_view_widget_size_allocate;
-
-	canvas_class->reflow        = e_minicard_view_widget_reflow;
-}
-
-static void
-e_minicard_view_widget_init (EMinicardViewWidget *view)
-{
-	view->emv = NULL;
-	view->rect = NULL;
-
-	view->book = NULL;
-	view->query = NULL;
-	view->editable = FALSE;
-}
-
-GtkWidget *
-e_minicard_view_widget_new (EAddressbookReflowAdapter *adapter)
-{
-	EMinicardViewWidget *widget = E_MINICARD_VIEW_WIDGET (gtk_type_new (e_minicard_view_widget_get_type ()));
-
-	widget->adapter = adapter;
-	gtk_object_ref (GTK_OBJECT (widget->adapter));
-
-	return GTK_WIDGET (widget);
-}
-
-static void
-e_minicard_view_widget_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EMinicardViewWidget *emvw;
-
-	emvw = E_MINICARD_VIEW_WIDGET (o);
-
-	switch (arg_id){
-	case ARG_BOOK:
-		if (emvw->book)
-			gtk_object_unref(GTK_OBJECT(emvw->book));
-		if (GTK_VALUE_OBJECT (*arg)) {
-			emvw->book = E_BOOK(GTK_VALUE_OBJECT (*arg));
-			if (emvw->book)
-				gtk_object_ref(GTK_OBJECT(emvw->book));
-		} else
-			emvw->book = NULL;
-		if (emvw->emv)
-			gtk_object_set(GTK_OBJECT(emvw->emv),
-				       "book", emvw->book,
-				       NULL);
-		break;
-	case ARG_QUERY:
-		emvw->query = g_strdup(GTK_VALUE_STRING (*arg));
-		if (emvw->emv)
-			gtk_object_set(GTK_OBJECT(emvw->emv),
-				       "query", emvw->query,
-				       NULL);
-		break;
-	case ARG_EDITABLE:
-		emvw->editable = GTK_VALUE_BOOL(*arg);
-		if (emvw->emv)
-		gtk_object_set (GTK_OBJECT(emvw->emv),
-				"editable", emvw->editable,
-				NULL);
-		break;
-	}
-}
-
-static void
-e_minicard_view_widget_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicardViewWidget *emvw;
-
-	emvw = E_MINICARD_VIEW_WIDGET (object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(emvw->book);
-		break;
-	case ARG_QUERY:
-		GTK_VALUE_STRING (*arg) = g_strdup(emvw->query);
-		break;
-	case ARG_EDITABLE:
-		GTK_VALUE_BOOL (*arg) = emvw->editable;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_minicard_view_widget_destroy (GtkObject *object)
-{
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(object);
-
-	if (view->book)
-		gtk_object_unref(GTK_OBJECT(view->book));
-	g_free(view->query);
-
-	gtk_object_unref (GTK_OBJECT (view->adapter));
-
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
-
-static void
-e_minicard_view_widget_realize (GtkWidget *widget)
-{
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);
-
-	view->rect = gnome_canvas_item_new(
-		gnome_canvas_root( GNOME_CANVAS(view) ),
-		gnome_canvas_rect_get_type(),
-		"x1", (double) 0,
-		"y1", (double) 0,
-		"x2", (double) 100,
-		"y2", (double) 100,
-		"fill_color", "white",
-		NULL );
-
-	view->emv = gnome_canvas_item_new(
-		gnome_canvas_root( GNOME_CANVAS(view) ),
-		e_minicard_view_get_type(),
-		"height", (double) 100,
-		"minimum_width", (double) 100,
-		NULL );
-
-	gtk_object_set(GTK_OBJECT(view->emv),
-		       "adapter", view->adapter,
-		       NULL);
-
-	gtk_signal_connect (GTK_OBJECT (E_REFLOW(view->emv)->selection),
-			    "selection_changed",
-			    selection_change, view);
-
-	if (GTK_WIDGET_CLASS(parent_class)->realize)
-		GTK_WIDGET_CLASS(parent_class)->realize (widget);
-}
-
-static void
-e_minicard_view_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
-{
-	if (GTK_WIDGET_CLASS(parent_class)->size_allocate)
-		GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation);
-	
-	if (GTK_WIDGET_REALIZED(widget)) {
-		double width;
-		EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);
-
-		gnome_canvas_item_set( view->emv,
-				       "height", (double) allocation->height,
-				       NULL );
-		gnome_canvas_item_set( view->emv,
-				       "minimum_width", (double) allocation->width,
-				       NULL );
-		gtk_object_get(GTK_OBJECT(view->emv),
-			       "width", &width,
-			       NULL);
-		width = MAX(width, allocation->width);
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (view), 0, 0, width - 1, allocation->height - 1);
-		gnome_canvas_item_set( view->rect,
-				       "x2", (double) width,
-				       "y2", (double) allocation->height,
-				       NULL );
-	}
-}
-
-static void
-e_minicard_view_widget_reflow(ECanvas *canvas)
-{
-	double width;
-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(canvas);
-
-	if (E_CANVAS_CLASS(parent_class)->reflow)
-		E_CANVAS_CLASS(parent_class)->reflow (canvas);
-
-	gtk_object_get(GTK_OBJECT(view->emv),
-		       "width", &width,
-		       NULL);
-	width = MAX(width, GTK_WIDGET(canvas)->allocation.width);
-	gnome_canvas_set_scroll_region(GNOME_CANVAS(canvas), 0, 0, width - 1, GTK_WIDGET(canvas)->allocation.height - 1);
-	gnome_canvas_item_set( view->rect,
-			       "x2", (double) width,
-			       "y2", (double) GTK_WIDGET(canvas)->allocation.height,
-			       NULL );	
-}
-
-static void
-selection_change (ESelectionModel *esm, EMinicardViewWidget *widget)
-{
-	gtk_signal_emit (GTK_OBJECT(widget),
-			 e_minicard_view_widget_signals [SELECTION_CHANGE], widget);
-}
-
-gint
-e_minicard_view_widget_selected_count   (EMinicardViewWidget *view)
-{
-	if (!view->emv)
-		return 0;
-	else
-		return e_selection_model_selected_count (E_REFLOW (view->emv)->selection);
-}
-
-void
-e_minicard_view_widget_remove_selection(EMinicardViewWidget *view,
-					EBookCallback  cb,
-					gpointer       closure)
-{
-	if (view->emv)
-		e_minicard_view_remove_selection(E_MINICARD_VIEW(view->emv), cb, closure);
-}
-
-void
-e_minicard_view_widget_jump_to_letter (EMinicardViewWidget *view,
-                                       gunichar letter)
-{
-	if (view->emv)
-		e_minicard_view_jump_to_letter(E_MINICARD_VIEW(view->emv), letter);
-}
-
-ESelectionModel *
-e_minicard_view_widget_get_selection_model (EMinicardViewWidget *view)
-{
-	if (view->emv)
-		return E_SELECTION_MODEL (E_REFLOW (view->emv)->selection);
-	else
-		return NULL;
-}
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
deleted file mode 100644
index 39fb929bea..0000000000
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view-widget.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_VIEW_WIDGET_H__
-#define __E_MINICARD_VIEW_WIDGET_H__
-
-#include <gal/widgets/e-canvas.h>
-#include <gal/unicode/gunicode.h>
-#include "addressbook/backend/ebook/e-book.h"
-#include "e-minicard-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_MINICARD_VIEW_WIDGET_TYPE			(e_minicard_view_widget_get_type ())
-#define E_MINICARD_VIEW_WIDGET(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_VIEW_WIDGET_TYPE, EMinicardViewWidget))
-#define E_MINICARD_VIEW_WIDGET_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_VIEW_WIDGET_TYPE, EMinicardViewWidgetClass))
-#define E_IS_MINICARD_VIEW_WIDGET(obj) 		(GTK_CHECK_TYPE ((obj), E_MINICARD_VIEW_WIDGET_TYPE))
-#define E_IS_MINICARD_VIEW_WIDGET_CLASS(klass) 	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_VIEW_WIDGET_TYPE))
-
-
-typedef struct _EMinicardViewWidget       EMinicardViewWidget;
-typedef struct _EMinicardViewWidgetClass  EMinicardViewWidgetClass;
-
-struct _EMinicardViewWidget
-{
-	ECanvas parent;
-
-	GnomeCanvasItem *rect;
-	GnomeCanvasItem *emv;
-
-	EAddressbookReflowAdapter *adapter;
-
-	EBook *book;
-	char *query;
-	guint editable : 1;
-};
-
-struct _EMinicardViewWidgetClass
-{
-	ECanvasClass parent_class;
-	void         (*selection_change) (EMinicardViewWidget*);
-};
-
-GtkType    e_minicard_view_widget_get_type (void);
-gint       e_minicard_view_widget_selected_count   (EMinicardViewWidget *view);
-void       e_minicard_view_widget_remove_selection (EMinicardViewWidget *view,
-						    EBookCallback  cb,
-						    gpointer       closure);
-void       e_minicard_view_widget_jump_to_letter   (EMinicardViewWidget *view,
-                                                    gunichar letter);
-GtkWidget *e_minicard_view_widget_new              (EAddressbookReflowAdapter *adapter);
-
-ESelectionModel *e_minicard_view_widget_get_selection_model (EMinicardViewWidget *view);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_MINICARD_VIEW_WIDGET_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
deleted file mode 100644
index 342e037337..0000000000
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ /dev/null
@@ -1,457 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-view.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include "e-minicard-view.h"
-
-#include "e-addressbook-util.h"
-
-#include <gtk/gtkselection.h>
-#include <gtk/gtkdnd.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-unicode.h>
-#include <libgnome/gnome-i18n.h>
-
-static void e_minicard_view_drag_data_get(GtkWidget *widget,
-					  GdkDragContext *context,
-					  GtkSelectionData *selection_data,
-					  guint info,
-					  guint time,
-					  EMinicardView *view);
-
-static EReflowClass *parent_class = NULL;
-#define PARENT_TYPE (E_REFLOW_TYPE)
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_ADAPTER,
-	ARG_BOOK,
-	ARG_QUERY,
-	ARG_EDITABLE
-};
-
-enum DndTargetType {
-	DND_TARGET_TYPE_VCARD_LIST,
-};
-#define VCARD_LIST_TYPE "text/x-vcard"
-static GtkTargetEntry drag_types[] = {
-	{ VCARD_LIST_TYPE, 0, DND_TARGET_TYPE_VCARD_LIST }
-};
-static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]);
-
-static void
-e_minicard_view_drag_data_get(GtkWidget *widget,
-			      GdkDragContext *context,
-			      GtkSelectionData *selection_data,
-			      guint info,
-			      guint time,
-			      EMinicardView *view)
-{
-	if (!E_IS_MINICARD_VIEW(view))
-		return;
-
-	switch (info) {
-	case DND_TARGET_TYPE_VCARD_LIST: {
-		char *value;
-		
-		value = e_card_list_get_vcard(view->drag_list);
-
-		gtk_selection_data_set (selection_data,
-					selection_data->target,
-					8,
-					value, strlen (value));
-		break;
-	}
-	}
-
-	g_list_foreach (view->drag_list, (GFunc)gtk_object_unref, NULL);
-	g_list_free (view->drag_list);
-	view->drag_list = NULL;
-}
-
-typedef struct {
-	GList *list;
-	EAddressbookReflowAdapter *adapter;
-} ModelAndList;
-
-static void
-add_to_list (int index, gpointer closure)
-{
-	ModelAndList *mal = closure;
-	mal->list = g_list_prepend (mal->list, e_addressbook_reflow_adapter_get_card (mal->adapter, index));
-}
-
-static GList *
-get_card_list (EAddressbookReflowAdapter *adapter, ESelectionModel *selection)
-{
-	ModelAndList mal;
-
-	mal.adapter = adapter;
-	mal.list = NULL;
-
-	e_selection_model_foreach (selection, add_to_list, &mal);
-
-	mal.list = g_list_reverse (mal.list);
-	return mal.list;
-}
-
-static int
-e_minicard_view_drag_begin (EAddressbookReflowAdapter *adapter, GdkEvent *event, EMinicardView *view)
-{
-	GdkDragContext *context;
-	GtkTargetList *target_list;
-	GdkDragAction actions = GDK_ACTION_MOVE;
-
-	view->drag_list = get_card_list (adapter, E_REFLOW (view)->selection);
-
-	g_print ("dragging %d card(s)\n", g_list_length (view->drag_list));
-
-	target_list = gtk_target_list_new (drag_types, num_drag_types);
-
-	context = gtk_drag_begin (GTK_WIDGET (GNOME_CANVAS_ITEM (view)->canvas),
-				  target_list, actions, 1/*XXX*/, event);
-
-	if (!view->canvas_drag_data_get_id)
-		view->canvas_drag_data_get_id = gtk_signal_connect (GTK_OBJECT (GNOME_CANVAS_ITEM (view)->canvas),
-								    "drag_data_get",
-								    GTK_SIGNAL_FUNC (e_minicard_view_drag_data_get),
-								    view);
-
-	gtk_drag_set_icon_default (context);
-
-	return TRUE;
-}
-
-static void
-adapter_changed (EMinicardView *view)
-{
-	char *empty_message;
-
-	empty_message = e_utf8_from_locale_string(_("\n\nThere are no items to show in this view\n\n"
-						    "Double-click here to create a new Contact."));
-	gtk_object_set (GTK_OBJECT(view),
-			"empty_message", empty_message,
-			NULL);
-
-	gtk_signal_connect (GTK_OBJECT (view->adapter), "drag_begin",
-			    GTK_SIGNAL_FUNC (e_minicard_view_drag_begin), view);
-
-	g_free (empty_message);
-}
-
-static void
-e_minicard_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EMinicardView *view;
-
-	item = GNOME_CANVAS_ITEM (o);
-	view = E_MINICARD_VIEW (o);
-	
-	switch (arg_id){
-	case ARG_ADAPTER:
-		if (view->adapter)
-			gtk_object_unref (GTK_OBJECT(view->adapter));
-		view->adapter = GTK_VALUE_POINTER (*arg);
-		gtk_object_ref (GTK_OBJECT (view->adapter));
-		adapter_changed (view);
-		gtk_object_set (GTK_OBJECT (view),
-				"model", view->adapter,
-				NULL);
-		break;
-	case ARG_BOOK:
-		gtk_object_set (GTK_OBJECT (view->adapter),
-					    "book", GTK_VALUE_OBJECT (*arg),
-					    NULL);
-		break;
-	case ARG_QUERY:
-		gtk_object_set (GTK_OBJECT (view->adapter),
-					    "query", GTK_VALUE_STRING (*arg),
-					    NULL);
-		break;
-	case ARG_EDITABLE:
-		gtk_object_set (GTK_OBJECT (view->adapter),
-					    "editable", GTK_VALUE_BOOL (*arg),
-					    NULL);
-		break;
-	}
-}
-
-static void
-e_minicard_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicardView *view;
-
-	view = E_MINICARD_VIEW (object);
-
-	switch (arg_id) {
-	case ARG_ADAPTER:
-		GTK_VALUE_POINTER (*arg) = view->adapter;
-		break;
-	case ARG_BOOK:
-		gtk_object_get (GTK_OBJECT (view->adapter),
-					    "book", &GTK_VALUE_OBJECT (*arg),
-					    NULL);
-		break;
-	case ARG_QUERY:
-		gtk_object_get (GTK_OBJECT (view->adapter),
-					    "query", &GTK_VALUE_STRING (*arg),
-					    NULL);
-		break;
-	case ARG_EDITABLE:
-		gtk_object_get (GTK_OBJECT (view->adapter),
-					    "editable", &GTK_VALUE_BOOL (*arg),
-					    NULL);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_minicard_view_destroy (GtkObject *object)
-{
-	EMinicardView *view = E_MINICARD_VIEW(object);
-
-	if (view->canvas_drag_data_get_id) {
-		gtk_signal_disconnect (GTK_OBJECT (GNOME_CANVAS_ITEM (view)->canvas),
-				       view->canvas_drag_data_get_id);
-	}
-	gtk_object_unref (GTK_OBJECT (view->adapter));
-
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
-
-static gboolean
-e_minicard_view_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMinicardView *view;
- 
-	view = E_MINICARD_VIEW (item);
-
-	switch( event->type ) {
-	case GDK_2BUTTON_PRESS:
-		if (((GdkEventButton *)event)->button == 1)
-		{
-			EBook *book;
-			gboolean editable;
-
-			gtk_object_get(GTK_OBJECT(view), "book", &book, NULL);
-			gtk_object_get(GTK_OBJECT(view->adapter), "editable", &editable, NULL);
-
-			g_assert (E_IS_BOOK (book));
-
-			e_addressbook_show_contact_editor (book, e_card_new(""), TRUE, editable);
-		}
-		return TRUE;
-	default:
-		if (GNOME_CANVAS_ITEM_CLASS(parent_class)->event)
-			return GNOME_CANVAS_ITEM_CLASS(parent_class)->event(item, event);
-		else
-			return FALSE;
-		break;
-	}
-}
-
-static gint
-e_minicard_view_selection_event (EReflow *reflow, GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMinicardView *view;
-	int return_val = FALSE;
-
-	view = E_MINICARD_VIEW (reflow);
-	if (parent_class->selection_event) {
-		return_val = parent_class->selection_event (reflow, item, event);
-	}
-
-	switch (event->type) {
-	case GDK_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_addressbook_reflow_adapter_right_click (view->adapter, event, reflow->selection);
-			if (!return_val)
-				e_selection_model_right_click_up(E_SELECTION_MODEL (view->selection));
-		}
-		break;
-	default:
-		break;
-	}
-	return return_val;
-}
-
-typedef struct {
-	EMinicardView *view;
-	EBookCallback cb;
-	gpointer closure;
-} ViewCbClosure;
-
-static void
-do_remove (int i, gpointer user_data)
-{
-	EBook *book;
-	ECard *card;
-	ViewCbClosure *viewcbclosure = user_data;
-	EMinicardView *view = viewcbclosure->view;
-	EBookCallback cb = viewcbclosure->cb;
-	gpointer closure = viewcbclosure->closure;
-
-	gtk_object_get (GTK_OBJECT(view->adapter),
-			"book", &book,
-			NULL);
-
-	card = e_addressbook_reflow_adapter_get_card (view->adapter, i);
-
-	e_book_remove_card(book, card, cb, closure);
-
-	gtk_object_unref (GTK_OBJECT (card));
-}
-
-void
-e_minicard_view_remove_selection(EMinicardView *view,
-				 EBookCallback  cb,
-				 gpointer       closure)
-{
-	ViewCbClosure viewcbclosure;
-	viewcbclosure.view = view;
-	viewcbclosure.cb = cb;
-	viewcbclosure.closure = closure;
-
-	e_selection_model_foreach (E_REFLOW (view)->selection,
-				   do_remove,
-				   &viewcbclosure);
-}
-
-#if 0
-static int
-compare_to_utf_str (EMinicard *card, const char *utf_str)
-{
-	g_return_val_if_fail(card != NULL, 0);
-	g_return_val_if_fail(E_IS_MINICARD(card), 0);
-
-	if (g_unichar_isdigit (g_utf8_get_char (utf_str))) {
-		return 1;
-	}
-
-	if (card->card) {
-		char *file_as;
-		gtk_object_get(GTK_OBJECT(card->card),
-			       "file_as", &file_as,
-			       NULL);
-		if (file_as)
-			return g_utf8_strcasecmp (file_as, utf_str);
-		else
-			return 0;
-	} else {
-		return 0;
-	}
-}
-#endif
-
-
-
-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
-}
-
-static void
-e_minicard_view_class_init (EMinicardViewClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-	EReflowClass *reflow_class;
-	
-	object_class = (GtkObjectClass*) klass;
-	item_class = (GnomeCanvasItemClass *) klass;
-	reflow_class = (EReflowClass *) klass;
-	
-	parent_class = gtk_type_class (PARENT_TYPE);
-	
-	gtk_object_add_arg_type ("EMinicardView::adapter", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_ADAPTER);
-	gtk_object_add_arg_type ("EMinicardView::book", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_BOOK);
-	gtk_object_add_arg_type ("EMinicardView::query", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_QUERY);
-	gtk_object_add_arg_type ("EMinicardView::editable", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_EDITABLE);
-
-	object_class->set_arg         = e_minicard_view_set_arg;
-	object_class->get_arg         = e_minicard_view_get_arg;
-	object_class->destroy         = e_minicard_view_destroy;
-
-	item_class->event             = e_minicard_view_event;
-
-	reflow_class->selection_event = e_minicard_view_selection_event;
-	/* GnomeCanvasItem method overrides */
-}
-
-static void
-e_minicard_view_init (EMinicardView *view)
-{
-	view->adapter = NULL;
-	view->canvas_drag_data_get_id = 0;
-}
-
-GtkType
-e_minicard_view_get_type (void)
-{
-	static GtkType reflow_type = 0;
-
-	if (!reflow_type) {
-		static const GtkTypeInfo reflow_info = {
-			"EMinicardView",
-			sizeof (EMinicardView),
-			sizeof (EMinicardViewClass),
-			(GtkClassInitFunc) e_minicard_view_class_init,
-			(GtkObjectInitFunc) e_minicard_view_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-
-		reflow_type = gtk_type_unique (PARENT_TYPE, &reflow_info);
-	}
-
-	return reflow_type;
-}
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
deleted file mode 100644
index 1140965106..0000000000
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_VIEW_H__
-#define __E_MINICARD_VIEW_H__
-
-#include "e-minicard.h"
-
-#include <gal/widgets/e-reflow.h>
-#include <gal/widgets/e-selection-model-simple.h>
-#include <gal/unicode/gunicode.h>
-#include "addressbook/backend/ebook/e-book.h"
-#include "e-addressbook-reflow-adapter.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EMinicardView - A canvas item container.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * book         EBook           RW              book to query
- * query        string          RW              query string
- *
- * From EReflowSorted:   (you should really know what you're doing if you set these.)
- * compare_func  GCompareFunc   RW              compare function
- * string_func   EReflowStringFunc RW           string function
- *
- * From EReflow:
- * minimum_width double         RW              minimum width of the reflow.  width >= minimum_width
- * width        double          R               width of the reflow
- * height       double          RW              height of the reflow
- */
-
-#define E_MINICARD_VIEW_TYPE			(e_minicard_view_get_type ())
-#define E_MINICARD_VIEW(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_VIEW_TYPE, EMinicardView))
-#define E_MINICARD_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_VIEW_TYPE, EMinicardViewClass))
-#define E_IS_MINICARD_VIEW(obj) 		(GTK_CHECK_TYPE ((obj), E_MINICARD_VIEW_TYPE))
-#define E_IS_MINICARD_VIEW_CLASS(klass) 	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_VIEW_TYPE))
-
-
-typedef struct _EMinicardView       EMinicardView;
-typedef struct _EMinicardViewClass  EMinicardViewClass;
-
-struct _EMinicardView
-{
-	EReflow parent;
-
-	EAddressbookReflowAdapter *adapter;
-	
-	/* item specific fields */
-
-	ESelectionModelSimple *selection;
-
-	GList *drag_list;
-
-	int canvas_destroy_id;
-	int canvas_drag_data_get_id;
-
-	int status_message_id;
-};
-
-struct _EMinicardViewClass
-{
-	EReflowClass parent_class;
-};
-
-GtkType    e_minicard_view_get_type (void);
-void       e_minicard_view_remove_selection (EMinicardView *view,
-					     EBookCallback  cb,
-					     gpointer       closure);
-void       e_minicard_view_jump_to_letter   (EMinicardView *view,
-                                             gunichar letter);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_MINICARD_VIEW_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-widget-test.c b/addressbook/gui/widgets/e-minicard-widget-test.c
deleted file mode 100644
index 04ef2f0823..0000000000
--- a/addressbook/gui/widgets/e-minicard-widget-test.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-minicard.c
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"ORG:Ximian, Inc.
-"             \
-"TITLE:Head Geek
-"                  \
-"ROLE:Programmer/Executive
-"        \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@ximian.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
-
-#include "config.h"
-#include <gtk/gtkmain.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-init.h>
-#include "e-minicard-widget.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-  exit(0);
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Minicard Widget Test" ), VERSION,
-		      _( "Copyright (C) 2000, Ximian, Inc." ),
-		      authors,
-		      _( "This should test the minicard widget" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-  GtkWidget *minicard;
-  ECard *card;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Minicard Widget Test", VERSION, argc, argv);
-  app = gnome_app_new("Minicard Widget Test", NULL);
-
-  minicard = e_minicard_widget_new();
-  card = e_card_new(TEST_VCARD);
-  gtk_object_set(GTK_OBJECT(minicard),
-		 "card", card,
-		 NULL);
-
-  gnome_app_set_contents( GNOME_APP( app ), minicard );
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/gui/widgets/e-minicard-widget.c b/addressbook/gui/widgets/e-minicard-widget.c
deleted file mode 100644
index 566a43b087..0000000000
--- a/addressbook/gui/widgets/e-minicard-widget.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-field-chooser.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include "e-minicard-widget.h"
-#include "e-minicard.h"
-
-static void e_minicard_widget_init		(EMinicardWidget		 *card);
-static void e_minicard_widget_class_init	(EMinicardWidgetClass	 *klass);
-static void e_minicard_widget_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_minicard_widget_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_minicard_widget_destroy (GtkObject *object);
-static void e_minicard_widget_size_request	 (GtkWidget	    *widget, GtkRequisition    *requisition);
-static void e_minicard_widget_size_allocate	 (GtkWidget	    *widget, GtkAllocation     *allocation);
-static void e_minicard_widget_reflow             (ECanvas           *canvas);
-
-static ECanvasClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_CARD,
-};
-
-GtkType
-e_minicard_widget_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type)
-		{
-			static const GtkTypeInfo info =
-			{
-				"EMinicardWidget",
-				sizeof (EMinicardWidget),
-				sizeof (EMinicardWidgetClass),
-				(GtkClassInitFunc) e_minicard_widget_class_init,
-				(GtkObjectInitFunc) e_minicard_widget_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			type = gtk_type_unique (e_canvas_get_type (), &info);
-		}
-
-	return type;
-}
-
-static void
-e_minicard_widget_class_init (EMinicardWidgetClass *klass)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-	ECanvasClass   *ecanvas_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	widget_class = GTK_WIDGET_CLASS(klass);
-	ecanvas_class = E_CANVAS_CLASS(klass);
-
-	parent_class = gtk_type_class (e_canvas_get_type ());
-
-	object_class->set_arg = e_minicard_widget_set_arg;
-	object_class->get_arg = e_minicard_widget_get_arg;
-	object_class->destroy = e_minicard_widget_destroy;
-
-	widget_class->size_request  = e_minicard_widget_size_request;
-	widget_class->size_allocate = e_minicard_widget_size_allocate;
-
-	ecanvas_class->reflow = e_minicard_widget_reflow;
-
-	gtk_object_add_arg_type ("EMinicardWidget::card", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_CARD);
-}
-
-static void
-e_minicard_widget_size_request(GtkWidget *widget, GtkRequisition *requisition)
-{
-	double height;
-	EMinicardWidget *emw = E_MINICARD_WIDGET(widget);
-	gtk_object_get(GTK_OBJECT(emw->item),
-		       "height", &height,
-		       NULL);
-	if (height <= 0)
-		height = 1;
-	widget->requisition.height = height;
-	widget->requisition.width  = 200;
-	requisition->height = height;
-	requisition->width  = 200;
-}
-
-static void
-e_minicard_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
-{
-	double height;
-	EMinicardWidget *emw = E_MINICARD_WIDGET(widget);
-	gnome_canvas_item_set( emw->item,
-			       "width", (double) allocation->width,
-			       NULL );
-	gtk_object_get(GTK_OBJECT(emw->item),
-		       "height", &height,
-		       NULL);
-	height = MAX(height, allocation->height);
-	gnome_canvas_set_scroll_region(GNOME_CANVAS( emw ), 0, 0, allocation->width - 1, height - 1);
-	gnome_canvas_item_set( emw->rect,
-			       "x2", (double) allocation->width,
-			       "y2", (double) height,
-			       NULL );
-	if (GTK_WIDGET_CLASS(parent_class)->size_allocate)
-		GTK_WIDGET_CLASS(parent_class)->size_allocate(widget, allocation);
-}
-
-static void e_minicard_widget_reflow(ECanvas *canvas)
-{
-	double height;
-	EMinicardWidget *emw = E_MINICARD_WIDGET(canvas);
-	gtk_object_get(GTK_OBJECT(emw->item),
-		       "height", &height,
-		       NULL);
-
-	height = MAX(height, GTK_WIDGET(emw)->allocation.height);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS(emw), 0, 0, GTK_WIDGET(emw)->allocation.width - 1, height - 1);
-	gnome_canvas_item_set( emw->rect,
-			       "x2", (double) GTK_WIDGET(emw)->allocation.width,
-			       "y2", (double) height,
-			       NULL );	
-	
-	gtk_widget_queue_resize(GTK_WIDGET(canvas));
-}
-
-static void
-e_minicard_widget_init (EMinicardWidget *emw)
-{
-	emw->rect = gnome_canvas_item_new(gnome_canvas_root(GNOME_CANVAS(emw)),
-					   gnome_canvas_rect_get_type(),
-					   "x1", (double) 0,
-					   "y1", (double) 0,
-					   "x2", (double) 100,
-					   "y2", (double) 100,
-					   "fill_color", "white",
-					   NULL );
-
-	emw->item = gnome_canvas_item_new(gnome_canvas_root(GNOME_CANVAS(emw)),
-					  e_minicard_get_type(),
-					  "width", (double) 100,
-					  NULL );
-
-	gnome_canvas_set_scroll_region ( GNOME_CANVAS( emw ),
-					 0, 0,
-					 100, 100 );
-	
-	emw->card = NULL;
-}
-
-static void
-e_minicard_widget_destroy (GtkObject *object)
-{
-	EMinicardWidget *emw = E_MINICARD_WIDGET(object);
-
-	if (emw->card)
-		gtk_object_unref(GTK_OBJECT(emw->card));
-	
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		GTK_OBJECT_CLASS(parent_class)->destroy(object);
-}
-
-GtkWidget*
-e_minicard_widget_new (void)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_minicard_widget_get_type ()));
-	return widget;
-}
-
-static void
-e_minicard_widget_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicardWidget *emw = E_MINICARD_WIDGET(object);
-	gpointer ptr;
-
-	switch (arg_id){
-	case ARG_CARD:
-		ptr = GTK_VALUE_POINTER (*arg);
-		e_minicard_widget_set_card (emw, ptr ? E_CARD (ptr) : NULL);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-e_minicard_widget_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicardWidget *emw = E_MINICARD_WIDGET(object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		if (emw->card)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(emw->card);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-void
-e_minicard_widget_set_card (EMinicardWidget *emw, ECard *card)
-{
-	g_return_if_fail (emw && E_IS_MINICARD_WIDGET (emw));
-	g_return_if_fail (card == NULL || E_IS_CARD (card));
-
-	if (card != emw->card) {
-
-		if (emw->card)
-			gtk_object_unref (GTK_OBJECT (emw->card));
-
-		emw->card = card;
-
-		if (emw->card)
-			gtk_object_ref (GTK_OBJECT (emw->card));
-
-		if (emw->item)
-			gtk_object_set (GTK_OBJECT (emw->item),
-				       "card", emw->card,
-				       NULL);
-	}
-}
diff --git a/addressbook/gui/widgets/e-minicard-widget.h b/addressbook/gui/widgets/e-minicard-widget.h
deleted file mode 100644
index eaf0f8edb6..0000000000
--- a/addressbook/gui/widgets/e-minicard-widget.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-widget.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_WIDGET_H__
-#define __E_MINICARD_WIDGET_H__
-
-#include <gal/widgets/e-canvas.h>
-#include "addressbook/backend/ebook/e-card.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EMinicardWidget - A card displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
-
-#define E_MINICARD_WIDGET_TYPE			(e_minicard_widget_get_type ())
-#define E_MINICARD_WIDGET(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_WIDGET_TYPE, EMinicardWidget))
-#define E_MINICARD_WIDGET_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_WIDGET_TYPE, EMinicardWidgetClass))
-#define E_IS_MINICARD_WIDGET(obj)		(GTK_CHECK_TYPE ((obj), E_MINICARD_WIDGET_TYPE))
-#define E_IS_MINICARD_WIDGET_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_WIDGET_TYPE))
-
-
-typedef struct _EMinicardWidget       EMinicardWidget;
-typedef struct _EMinicardWidgetClass  EMinicardWidgetClass;
-
-struct _EMinicardWidget
-{
-	ECanvas parent;
-	
-	/* item specific fields */
-	GnomeCanvasItem *item;
-
-	GnomeCanvasItem *rect;
-	ECard *card;
-};
-
-struct _EMinicardWidgetClass
-{
-	ECanvasClass parent_class;
-};
-
-
-GtkWidget *e_minicard_widget_new(void);
-GtkType    e_minicard_widget_get_type (void);
-
-void e_minicard_widget_set_card (EMinicardWidget *, ECard *);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_MINICARD_WIDGET_H__ */
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
deleted file mode 100644
index d8e34577b2..0000000000
--- a/addressbook/gui/widgets/e-minicard.c
+++ /dev/null
@@ -1,996 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <glib.h>
-#include <gtk/gtkdnd.h>
-#include <gdk/gdkkeysyms.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include <gal/e-text/e-text.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-canvas-utils.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/unicode/gunicode.h>
-#include "addressbook/backend/ebook/e-book.h"
-#include "e-addressbook-util.h"
-#include "e-minicard.h"
-#include "e-minicard-label.h"
-#include "e-minicard-view.h"
-#include "e-contact-editor.h"
-#include "e-card-merging.h"
-
-static void e_minicard_init		(EMinicard		 *card);
-static void e_minicard_class_init	(EMinicardClass	 *klass);
-static void e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_minicard_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_minicard_destroy (GtkObject *object);
-static void e_minicard_finalize (GtkObject *object);
-static gboolean e_minicard_event (GnomeCanvasItem *item, GdkEvent *event);
-static void e_minicard_realize (GnomeCanvasItem *item);
-static void e_minicard_unrealize (GnomeCanvasItem *item);
-static void e_minicard_reflow ( GnomeCanvasItem *item, int flags );
-
-static void e_minicard_resize_children( EMinicard *e_minicard );
-static void remodel( EMinicard *e_minicard );
-
-static gint e_minicard_drag_begin (EMinicard *minicard, GdkEvent *event);
-
-static GnomeCanvasGroupClass *parent_class = NULL;
-
-typedef struct _EMinicardField EMinicardField;
-
-struct _EMinicardField {
-	ECardSimpleField field;
-	GnomeCanvasItem *label;
-};
-
-#define d(x)
-
-#define LIST_ICON_FILENAME "contact-is-a-list.png"
-
-#define E_MINICARD_FIELD(field) ((EMinicardField *)(field))
-
-static void
-e_minicard_field_destroy(EMinicardField *field)
-{
-	gtk_object_destroy(GTK_OBJECT(field->label));
-	g_free(field);
-}
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_WIDTH,
-	ARG_HEIGHT,
-	ARG_HAS_FOCUS,
-	ARG_SELECTED,
-	ARG_HAS_CURSOR,
-	ARG_EDITABLE,
-	ARG_CARD
-};
-
-enum {
-	SELECTED,
-	DRAG_BEGIN,
-	LAST_SIGNAL
-};
-
-static guint e_minicard_signals [LAST_SIGNAL] = {0, };
-
-GtkType
-e_minicard_get_type (void)
-{
-  static GtkType minicard_type = 0;
-
-  if (!minicard_type)
-    {
-      static const GtkTypeInfo minicard_info =
-      {
-        "EMinicard",
-        sizeof (EMinicard),
-        sizeof (EMinicardClass),
-        (GtkClassInitFunc) e_minicard_class_init,
-        (GtkObjectInitFunc) e_minicard_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      minicard_type = gtk_type_unique (gnome_canvas_group_get_type (), &minicard_info);
-    }
-
-  return minicard_type;
-}
-
-static void
-e_minicard_class_init (EMinicardClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	object_class = (GtkObjectClass*) klass;
-	item_class = (GnomeCanvasItemClass *) klass;
-
-	parent_class = gtk_type_class (gnome_canvas_group_get_type ());
-  
-	gtk_object_add_arg_type ("EMinicard::width", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READWRITE, ARG_WIDTH); 
-	gtk_object_add_arg_type ("EMinicard::height", GTK_TYPE_DOUBLE, 
-				 GTK_ARG_READABLE, ARG_HEIGHT);
-	gtk_object_add_arg_type ("EMinicard::has_focus", GTK_TYPE_ENUM,
-				 GTK_ARG_READWRITE, ARG_HAS_FOCUS);
-	gtk_object_add_arg_type ("EMinicard::selected", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_SELECTED);
-	gtk_object_add_arg_type ("EMinicard::has_cursor", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_HAS_CURSOR);
-	gtk_object_add_arg_type ("EMinicard::editable", GTK_TYPE_BOOL,
-				 GTK_ARG_READWRITE, ARG_EDITABLE);
-	gtk_object_add_arg_type ("EMinicard::card", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_CARD);
-
-	e_minicard_signals [SELECTED] =
-		gtk_signal_new ("selected",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMinicardClass, selected),
-				gtk_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
-
-	e_minicard_signals [DRAG_BEGIN] =
-		gtk_signal_new ("drag_begin",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (EMinicardClass, drag_begin),
-				gtk_marshal_INT__POINTER,
-				GTK_TYPE_INT, 1, GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, e_minicard_signals, LAST_SIGNAL);
- 
-	object_class->set_arg  = e_minicard_set_arg;
-	object_class->get_arg  = e_minicard_get_arg;
-	object_class->destroy  = e_minicard_destroy;
-	object_class->finalize = e_minicard_finalize;
-  
-	/* GnomeCanvasItem method overrides */
-	item_class->realize    = e_minicard_realize;
-	item_class->unrealize  = e_minicard_unrealize;
-	item_class->event      = e_minicard_event;
-
-	klass->selected        = NULL;
-}
-
-static void
-e_minicard_init (EMinicard *minicard)
-{
-	/*   minicard->card = NULL;*/
-	minicard->rect             = NULL;
-	minicard->fields           = NULL;
-	minicard->width            = 10;
-	minicard->height           = 10;
-	minicard->has_focus        = FALSE;
-	minicard->selected         = FALSE;
-	minicard->editable         = FALSE;
-	minicard->has_cursor       = FALSE;
-
-	minicard->card             = NULL;
-	minicard->simple           = e_card_simple_new(NULL);
-
-	minicard->list_icon_pixbuf = gdk_pixbuf_new_from_file (EVOLUTION_IMAGESDIR "/" LIST_ICON_FILENAME);
-	minicard->list_icon_size   = gdk_pixbuf_get_height (minicard->list_icon_pixbuf);
-
-	minicard->editor           = NULL;
-
-	minicard->changed          = FALSE;
-
-	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard), e_minicard_reflow);
-}
-
-static void
-set_selected (EMinicard *minicard, gboolean selected)
-{
-	GtkWidget *canvas = GTK_WIDGET(GNOME_CANVAS_ITEM(minicard)->canvas);
-	if (selected) {
-		gnome_canvas_item_set (minicard->rect, 
-				       "outline_color_gdk", &canvas->style->bg[GTK_STATE_NORMAL],
-				       NULL);
-		gnome_canvas_item_set (minicard->header_rect, 
-				       "fill_color_gdk", &canvas->style->bg[GTK_STATE_SELECTED],
-				       NULL);
-		gnome_canvas_item_set (minicard->header_text, 
-				       "fill_color_gdk", &canvas->style->text[GTK_STATE_SELECTED],
-				       NULL);
-	} else {
-		gnome_canvas_item_set (minicard->rect, 
-				       "outline_color", NULL, 
-				       NULL);
-		gnome_canvas_item_set (minicard->header_rect, 
-				       "fill_color_gdk", &canvas->style->bg[GTK_STATE_NORMAL],
-				       NULL);
-		gnome_canvas_item_set (minicard->header_text, 
-				       "fill_color_gdk", &canvas->style->fg[GTK_STATE_NORMAL],
-				       NULL);
-	}
-	minicard->selected = selected;
-}
-
-static void
-set_has_cursor (EMinicard *minicard, gboolean has_cursor)
-{
-	if (!minicard->has_focus && has_cursor)
-		e_canvas_item_grab_focus(GNOME_CANVAS_ITEM (minicard), FALSE);
-	minicard->has_cursor = has_cursor;
-}
-
-
-static void
-e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EMinicard *e_minicard;
-	GList *l;
-
-	item = GNOME_CANVAS_ITEM (o);
-	e_minicard = E_MINICARD (o);
-	
-	switch (arg_id){
-	case ARG_WIDTH:
-		if (e_minicard->width != GTK_VALUE_DOUBLE (*arg)) {
-			e_minicard->width = GTK_VALUE_DOUBLE (*arg);
-			e_minicard_resize_children(e_minicard);
-			if ( GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED )
-				e_canvas_item_request_reflow(item);
-		}
-	  break;
-	case ARG_HAS_FOCUS:
-		if (e_minicard->fields) {
-			if ( GTK_VALUE_ENUM(*arg) == E_FOCUS_START ||
-			     GTK_VALUE_ENUM(*arg) == E_FOCUS_CURRENT) {
-				gnome_canvas_item_set(E_MINICARD_FIELD(e_minicard->fields->data)->label,
-						      "has_focus", GTK_VALUE_ENUM(*arg),
-						      NULL);
-			} else if ( GTK_VALUE_ENUM(*arg) == E_FOCUS_END ) {
-				gnome_canvas_item_set(E_MINICARD_FIELD(g_list_last(e_minicard->fields)->data)->label,
-						      "has_focus", GTK_VALUE_ENUM(*arg),
-						      NULL);
-			}
-		}
-		else {
-			if (!e_minicard->has_focus)
-				e_canvas_item_grab_focus(item, FALSE);
-		}
-		break;
-	case ARG_SELECTED:
-		if (e_minicard->selected != GTK_VALUE_BOOL(*arg))
-			set_selected (e_minicard, GTK_VALUE_BOOL(*arg));
-		break;
-	case ARG_EDITABLE:
-		e_minicard->editable = GTK_VALUE_BOOL(*arg);
-		for (l = e_minicard->fields; l; l = l->next)
-			gtk_object_set (GTK_OBJECT (E_MINICARD_FIELD (l->data)->label),
-					"editable", e_minicard->editable,
-					NULL);
-		break;
-	case ARG_HAS_CURSOR:
-		d(g_print("%s: ARG_HAS_CURSOR\n", __FUNCTION__));
-		if (e_minicard->has_cursor != GTK_VALUE_BOOL(*arg))
-			set_has_cursor (e_minicard, GTK_VALUE_BOOL(*arg));
-		break;
-	case ARG_CARD:
-		if (e_minicard->card)
-			gtk_object_unref (GTK_OBJECT(e_minicard->card));
-		e_minicard->card = E_CARD(GTK_VALUE_OBJECT (*arg));
-		if (e_minicard->card)
-			gtk_object_ref (GTK_OBJECT(e_minicard->card));
-		gtk_object_set(GTK_OBJECT(e_minicard->simple),
-			       "card", e_minicard->card,
-			       NULL);
-		remodel(e_minicard);
-		e_canvas_item_request_reflow(item);
-		e_minicard->changed = FALSE;
-		break;
-	}
-}
-
-static void
-e_minicard_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicard *e_minicard;
-
-	e_minicard = E_MINICARD (object);
-
-	switch (arg_id) {
-	case ARG_WIDTH:
-	  GTK_VALUE_DOUBLE (*arg) = e_minicard->width;
-	  break;
-	case ARG_HEIGHT:
-	  GTK_VALUE_DOUBLE (*arg) = e_minicard->height;
-	  break;
-	case ARG_HAS_FOCUS:
-		GTK_VALUE_ENUM (*arg) = e_minicard->has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE;
-		break;
-	case ARG_SELECTED:
-		GTK_VALUE_BOOL (*arg) = e_minicard->selected;
-		break;
-	case ARG_HAS_CURSOR:
-		GTK_VALUE_BOOL (*arg) = e_minicard->has_cursor;
-		break;
-	case ARG_EDITABLE:
-		GTK_VALUE_BOOL (*arg) = e_minicard->editable;
-		break;
-	case ARG_CARD:
-		e_card_simple_sync_card(e_minicard->simple);
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_minicard->card);
-		break;
-	default:
-	  arg->type = GTK_TYPE_INVALID;
-	  break;
-	}
-}
-
-static void
-e_minicard_destroy (GtkObject *object)
-{
-	EMinicard *e_minicard;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_MINICARD (object));
-
-	e_minicard = E_MINICARD (object);
-	
-	g_list_foreach(e_minicard->fields, (GFunc) e_minicard_field_destroy, NULL);
-	g_list_free(e_minicard->fields);
-
-	gdk_pixbuf_unref (e_minicard->list_icon_pixbuf);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-static void
-e_minicard_finalize (GtkObject *object)
-{
-	EMinicard *e_minicard;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_MINICARD (object));
-
-	e_minicard = E_MINICARD (object);
-	
-	if (e_minicard->card)
-		gtk_object_unref (GTK_OBJECT(e_minicard->card));
-	if (e_minicard->simple)
-		gtk_object_unref (GTK_OBJECT(e_minicard->simple));
-
-	if (GTK_OBJECT_CLASS (parent_class)->finalize)
-		(* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-static void
-e_minicard_realize (GnomeCanvasItem *item)
-{
-	EMinicard *e_minicard;
-	GnomeCanvasGroup *group;
-	GtkWidget *canvas;
-
-	e_minicard = E_MINICARD (item);
-	group = GNOME_CANVAS_GROUP( item );
-	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (item)->canvas);
-
-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)->realize)
-		(* GNOME_CANVAS_ITEM_CLASS(parent_class)->realize) (item);
-	
-	e_minicard->rect =
-	  gnome_canvas_item_new( group,
-				 gnome_canvas_rect_get_type(),
-				 "x1", (double) 0,
-				 "y1", (double) 0,
-				 "x2", (double) e_minicard->width - 1,
-				 "y2", (double) e_minicard->height - 1,
-				 "outline_color", NULL,
-				 NULL );
-
-	e_minicard->header_rect =
-	  gnome_canvas_item_new( group,
-				 gnome_canvas_rect_get_type(),
-				 "x1", (double) 2,
-				 "y1", (double) 2,
-				 "x2", (double) e_minicard->width - 3,
-				 "y2", (double) e_minicard->height - 3,
-				 "fill_color_gdk", &canvas->style->bg[GTK_STATE_NORMAL],
-				 NULL );
-
-	e_minicard->header_text =
-	  gnome_canvas_item_new( group,
-				 e_text_get_type(),
-				 "anchor", GTK_ANCHOR_NW,
-				 "width", (double) ( e_minicard->width - 12 ),
-				 "clip", TRUE,
-				 "use_ellipsis", TRUE,
-#if 0
-				 "font", "fixed-bold-10",
-#endif
-				 "fill_color_gdk", &canvas->style->fg[GTK_STATE_NORMAL],
-				 "text", "",
-				 "draw_background", FALSE,
-				 NULL );
-
-	e_canvas_item_move_absolute(e_minicard->header_text, 6, 6);
-
-	e_minicard->list_icon = 
-		gnome_canvas_item_new ( group,
-					gnome_canvas_pixbuf_get_type(),
-					"pixbuf", e_minicard->list_icon_pixbuf,
-					NULL);
-
-	remodel(e_minicard);
-	e_canvas_item_request_reflow(item);
-
-	if (!item->canvas->aa) {
-	}
-}
-
-static void
-e_minicard_unrealize (GnomeCanvasItem *item)
-{
-  EMinicard *e_minicard;
-
-  e_minicard = E_MINICARD (item);
-
-  if (!item->canvas->aa)
-    {
-    }
-
-  if (GNOME_CANVAS_ITEM_CLASS(parent_class)->unrealize)
-    (* GNOME_CANVAS_ITEM_CLASS(parent_class)->unrealize) (item);
-}
-
-static void
-card_modified_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	d(g_print ("%s: %s(): a card was modified\n", __FILE__, __FUNCTION__));
-	if (status != E_BOOK_STATUS_SUCCESS)
-		e_addressbook_error_dialog (_("Error modifying card"), status);
-}
-
-/* Callback used when the contact editor is closed */
-static void
-editor_closed_cb (GtkObject *editor, gpointer data)
-{
-	EMinicard *minicard = data;
-	gtk_object_unref (GTK_OBJECT (editor));
-	minicard->editor = NULL;
-}
-
-static gboolean
-e_minicard_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMinicard *e_minicard;
-	GtkWidget *canvas;
-	
-	e_minicard = E_MINICARD (item);
-	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (item)->canvas);
-	
-	switch( event->type ) {
-	case GDK_FOCUS_CHANGE:
-		{
-			GdkEventFocus *focus_event = (GdkEventFocus *) event;
-			d(g_print("%s: GDK_FOCUS_CHANGE: %s\n", __FUNCTION__, focus_event->in?"in":"out"));
-			if (focus_event->in) {
-				/* Chris: When EMinicard gets the cursor, if it doesn't have the focus, it should take it.  */
-				e_minicard->has_focus = TRUE;
-				if (!e_minicard->selected) {
-					e_minicard_selected(e_minicard, event);
-				}
-			} else {
-				EBook *book = NULL;
-
-				if (e_minicard->changed) {
-				
-					e_card_simple_sync_card(e_minicard->simple);
-
-					if (E_IS_MINICARD_VIEW(GNOME_CANVAS_ITEM(e_minicard)->parent)) {
-					
-						gtk_object_get(GTK_OBJECT(GNOME_CANVAS_ITEM(e_minicard)->parent),
-							       "book", &book,
-							       NULL);
-					
-					}
-				
-					if (book) {
-					
-						/* Add the card in the contact editor to our ebook */
-						e_card_merging_book_commit_card (book,
-										 e_minicard->card,
-										 card_modified_cb,
-										 NULL);
-					} else {
-						remodel(e_minicard);
-						e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(e_minicard));
-					}
-					e_minicard->changed = FALSE;
-				}
-				e_minicard->has_focus = FALSE;
-			}
-		}
-		break;
-	case GDK_BUTTON_PRESS: {
-		if (1 <= event->button.button && event->button.button <= 2) {
-			int ret_val = e_minicard_selected(e_minicard, event);
-			GdkEventMask mask = ((1 << (4 + event->button.button)) |
-					     GDK_POINTER_MOTION_MASK |
-					     GDK_BUTTON_PRESS_MASK |
-					     GDK_BUTTON_RELEASE_MASK);
-			
-			e_canvas_item_grab_focus(item, TRUE);
-
-			if (gnome_canvas_item_grab (GNOME_CANVAS_ITEM (e_minicard),
-						    mask, NULL, event->button.time)) {
-				return FALSE;
-			}
-			gtk_grab_add (GTK_WIDGET (GNOME_CANVAS_ITEM (e_minicard)->canvas));
-			e_minicard->button_x = event->button.x;
-			e_minicard->button_y = event->button.y;
-			e_minicard->drag_button = event->button.button;
-			e_minicard->drag_button_down = TRUE;
-			return ret_val;
-		} else if (event->button.button == 3) {
-			int ret_val = e_minicard_selected(e_minicard, event);
-			if (ret_val != 0)
-				return ret_val;
-		}
-		break;
-	}
-	case GDK_BUTTON_RELEASE:
-		if (e_minicard->drag_button == event->button.button) {
-			e_minicard->drag_button = 0;
-			e_minicard->drag_button_down = FALSE;
-			e_minicard->button_x = -1;
-			e_minicard->button_y = -1;
-
-			if (GTK_WIDGET_HAS_GRAB (GNOME_CANVAS_ITEM (e_minicard)->canvas)) {
-				gtk_grab_remove (GTK_WIDGET (GNOME_CANVAS_ITEM (e_minicard)->canvas));
-				gnome_canvas_item_ungrab (GNOME_CANVAS_ITEM (e_minicard), event->button.time);
-			}
-		}
-		break;
-	case GDK_MOTION_NOTIFY:
-		if (e_minicard->drag_button_down && event->motion.state & GDK_BUTTON1_MASK) {
-			if (MAX (abs (e_minicard->button_x - event->motion.x),
-				 abs (e_minicard->button_y - event->motion.y)) > 3) {
-				gint ret_val;
-
-				ret_val = e_minicard_drag_begin(e_minicard, event);
-
-				e_minicard->drag_button_down = FALSE;
-
-				return ret_val;
-			}
-		}
-		break;
-	case GDK_2BUTTON_PRESS:
-		if (event->button.button == 1 && E_IS_MINICARD_VIEW(item->parent)) {
-			if (e_minicard->editor) {
-				if (e_card_evolution_list (e_minicard->card))
-					e_contact_list_editor_raise (E_CONTACT_LIST_EDITOR(e_minicard->editor));
-				else
-					e_contact_editor_raise(E_CONTACT_EDITOR(e_minicard->editor));
-			} else {
-				EBook *book = NULL;
-				if (E_IS_MINICARD_VIEW(item->parent)) {
-					gtk_object_get(GTK_OBJECT(item->parent),
-						       "book", &book,
-						       NULL);
-				}
-
-				if (book != NULL) {
-					if (e_card_evolution_list (e_minicard->card)) {
-						EContactListEditor *editor = e_addressbook_show_contact_list_editor (book, e_minicard->card,
-														     FALSE, e_minicard->editable);
-						e_minicard->editor = GTK_OBJECT (editor);
-					}
-					else {
-						EContactEditor *editor = e_addressbook_show_contact_editor (book, e_minicard->card,
-													    FALSE, e_minicard->editable);
-						e_minicard->editor = GTK_OBJECT (editor);
-					}
-					gtk_object_ref (e_minicard->editor);
-
-					gtk_signal_connect (e_minicard->editor, "editor_closed",
-							    GTK_SIGNAL_FUNC (editor_closed_cb), e_minicard);
-
-				}
-			}
-			return TRUE;
-		}
-		break;
-	case GDK_KEY_PRESS:
-		if (event->key.keyval == GDK_Tab || 
-		    event->key.keyval == GDK_KP_Tab || 
-		    event->key.keyval == GDK_ISO_Left_Tab) {
-			GList *list;
-			for (list = e_minicard->fields; list; list = list->next) {
-				EMinicardField *field = E_MINICARD_FIELD(list->data);
-				GnomeCanvasItem *item = field->label;
-				EFocus has_focus;
-				gtk_object_get(GTK_OBJECT(item),
-					       "has_focus", &has_focus,
-					       NULL);
-				if (has_focus != E_FOCUS_NONE) {
-					if (event->key.state & GDK_SHIFT_MASK)
-						list = list->prev;
-					else
-						list = list->next;
-					if (list) {
-						EMinicardField *field = E_MINICARD_FIELD(list->data);
-						GnomeCanvasItem *item = field->label;
-						gnome_canvas_item_set(item,
-								      "has_focus", (event->key.state & GDK_SHIFT_MASK) ? E_FOCUS_END : E_FOCUS_START,
-								      NULL);
-						return 1;
-					} else {
-						return 0;
-					}
-				}
-			}
-		}
-	default:
-		break;
-	}
-	
-	if (GNOME_CANVAS_ITEM_CLASS( parent_class )->event)
-		return (* GNOME_CANVAS_ITEM_CLASS( parent_class )->event) (item, event);
-	else
-		return 0;
-}
-
-static void
-e_minicard_resize_children( EMinicard *e_minicard )
-{
-	GList *list;
-	
-	if (e_minicard->header_text) {
-		gnome_canvas_item_set( e_minicard->header_text,
-				       "width", ((double) e_minicard->width - 12 
-						 - (e_card_evolution_list (e_minicard->card) ? e_minicard->list_icon_size : 0.0)),
-				       NULL );
-	}
-	if (e_minicard->list_icon) {
-		e_canvas_item_move_absolute(e_minicard->list_icon,
-					    e_minicard->width - e_minicard->list_icon_size - 3,
-					    3);
-	}
-	for ( list = e_minicard->fields; list; list = g_list_next( list ) ) {
-		gnome_canvas_item_set( E_MINICARD_FIELD( list->data )->label,
-				       "width", (double) e_minicard->width - 4.0,
-				       NULL );
-	}
-}
-
-static void
-field_changed (EText *text, EMinicard *e_minicard)
-{
-	ECardSimpleType type;
-	char *string;
-
-	type = GPOINTER_TO_INT
-		(gtk_object_get_data(GTK_OBJECT(text),
-				     "EMinicard:field"));
-	gtk_object_get(GTK_OBJECT(text),
-		       "text", &string,
-		       NULL);
-	e_card_simple_set(e_minicard->simple,
-			  type,
-			  string);
-	g_free(string);
-	e_minicard->changed = TRUE;
-}
-
-static void
-field_activated (EText *text, EMinicard *e_minicard)
-{
-	e_text_stop_editing (text);
-	e_canvas_item_grab_focus (GNOME_CANVAS_ITEM (e_minicard), FALSE);
-}
-
-static void
-add_field (EMinicard *e_minicard, ECardSimpleField field, gdouble left_width)
-{
-	GnomeCanvasItem *new_item;
-	GnomeCanvasGroup *group;
-	ECardSimpleType type;
-	EMinicardField *minicard_field;
-	char *name;
-	char *string;
-	
-	group = GNOME_CANVAS_GROUP( e_minicard );
-	
-	type = e_card_simple_type(e_minicard->simple, field);
-	name = g_strdup_printf("%s:", e_card_simple_get_name(e_minicard->simple, field));
-	string = e_card_simple_get(e_minicard->simple, field);
-
-	/* Magically convert embedded XML into an address. */
-	if (!strncmp (string, "<?xml", 5)) {
-		EDestination *dest = e_destination_import (string);
-		if (dest != NULL) {
-			gchar *new_string = g_strdup (e_destination_get_address (dest));
-			g_free (string);
-			string = new_string;
-			gtk_object_unref (GTK_OBJECT (dest));
-		}
-	}
-
-	new_item = e_minicard_label_new(group);
-	gnome_canvas_item_set( new_item,
-			       "width", e_minicard->width - 4.0,
-			       "fieldname", name,
-			       "field", string,
-			       "max_field_name_length", left_width,
-			       "editable", e_minicard->editable,
-			       NULL );
-	gtk_signal_connect(GTK_OBJECT(E_MINICARD_LABEL(new_item)->field),
-			   "changed", GTK_SIGNAL_FUNC(field_changed), e_minicard);
-	gtk_signal_connect(GTK_OBJECT(E_MINICARD_LABEL(new_item)->field),
-			   "activate", GTK_SIGNAL_FUNC(field_activated), e_minicard);
-	gtk_object_set(GTK_OBJECT(E_MINICARD_LABEL(new_item)->field),
-		       "allow_newlines", e_card_simple_get_allow_newlines (e_minicard->simple, field),
-		       NULL);
-	gtk_object_set_data(GTK_OBJECT(E_MINICARD_LABEL(new_item)->field),
-			    "EMinicard:field",
-			    GINT_TO_POINTER(field));
-
-	minicard_field = g_new(EMinicardField, 1);
-	minicard_field->field = field;
-	minicard_field->label = new_item;
-
-	e_minicard->fields = g_list_append( e_minicard->fields, minicard_field);
-	e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
-	g_free(name);
-	g_free(string);
-}
-
-static gdouble
-get_left_width(EMinicard *e_minicard)
-{
-	gchar *name;
-	ECardSimpleField field;
-	gdouble width = -1;
-	GdkFont *font;
-
-	font = ((GtkWidget *) ((GnomeCanvasItem *) e_minicard)->canvas)->style->font;
-
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {
-		gdouble this_width;
-		name = g_strdup_printf("%s:", e_card_simple_get_name(e_minicard->simple, field));
-		this_width = gdk_text_width(font, name, strlen(name));
-		if (width < this_width)
-			width = this_width;
-		g_free(name);
-	}
-	return width;
-}
-
-static void
-remodel( EMinicard *e_minicard )
-{
-	int count = 0;
-	if ( !(GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED) )
-		return;
-	if (e_minicard->simple) {
-		ECardSimpleField field;
-		GList *list;
-		char *file_as;
-		gdouble left_width = -1;
-
-		if (e_minicard->header_text) {
-			file_as = e_card_simple_get(e_minicard->simple, E_CARD_SIMPLE_FIELD_FILE_AS);
-			gnome_canvas_item_set( e_minicard->header_text,
-					       "text", file_as ? file_as : "",
-					       NULL );
-			g_free(file_as);
-		}
-
-		if (e_minicard->card && e_card_evolution_list (e_minicard->card) ) {
-			gnome_canvas_item_show (e_minicard->list_icon);
-		}
-		else {
-			gnome_canvas_item_hide (e_minicard->list_icon);
-		}
-
-		list = e_minicard->fields;
-		e_minicard->fields = NULL;
-
-		for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING && count < 5; field++) {
-			EMinicardField *minicard_field = NULL;
-
-			if (list)
-				minicard_field = list->data;
-			if (minicard_field && minicard_field->field == field) {
-				GList *this_list = list;
-				char *string;
-
-				string = e_card_simple_get(e_minicard->simple, field);
-				if (string && *string) {
-					/* Magically convert embedded XML into an address. */
-					if (!strncmp (string, "<?xml", 4)) {
-						EDestination *dest = e_destination_import (string);
-						if (dest != NULL) {
-							gchar *new_string = g_strdup (e_destination_get_address (dest));
-							g_free (string);
-							string = new_string;
-							gtk_object_unref (GTK_OBJECT (dest));
-						}
-					}
-
-					e_minicard->fields = g_list_append(e_minicard->fields, minicard_field);
-					gtk_object_set(GTK_OBJECT(minicard_field->label),
-						       "field", string,
-						       NULL);
-					count ++;
-				} else {
-					e_minicard_field_destroy(minicard_field);
-				}
-				list = g_list_remove_link(list, this_list);
-				g_list_free_1(this_list);
-				g_free(string);
-			} else {
-				char *string;
-				if (left_width == -1) {
-					left_width = get_left_width(e_minicard);
-				}
-
-				string = e_card_simple_get(e_minicard->simple, field);
-				if (string && *string) {
-					add_field(e_minicard, field, left_width);
-					count++;
-				}
-				g_free(string);
-			}
-		}
-
-		g_list_foreach(list, (GFunc) e_minicard_field_destroy, NULL);
-		g_list_free(list);
-	}
-}
-
-static void
-e_minicard_reflow( GnomeCanvasItem *item, int flags )
-{
-	EMinicard *e_minicard = E_MINICARD(item);
-	if ( GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED ) {
-		GList *list;
-		gdouble text_height;
-		gint old_height;
-		
-		old_height = e_minicard->height;
-
-		gtk_object_get( GTK_OBJECT( e_minicard->header_text ),
-				"text_height", &text_height,
-				NULL );
-		
-		e_minicard->height = text_height + 10.0;
-		
-		gnome_canvas_item_set( e_minicard->header_rect,
-				       "y2", text_height + 9.0,
-				       NULL );
-		
-		for(list = e_minicard->fields; list; list = g_list_next(list)) {
-			EMinicardField *field = E_MINICARD_FIELD(list->data);
-			GnomeCanvasItem *item = field->label;
-			gtk_object_get (GTK_OBJECT(item),
-					"height", &text_height,
-					NULL);
-			e_canvas_item_move_absolute(item, 2, e_minicard->height);
-			e_minicard->height += text_height;
-		}
-		e_minicard->height += 2;
-		
-		gnome_canvas_item_set( e_minicard->rect,
-				       "y2", (double) e_minicard->height - 1,
-				       NULL );
-		
-		gnome_canvas_item_set( e_minicard->rect,
-				       "x2", (double) e_minicard->width - 1.0,
-				       "y2", (double) e_minicard->height - 1.0,
-				       NULL );
-		gnome_canvas_item_set( e_minicard->header_rect,
-				       "x2", (double) e_minicard->width - 3.0,
-				       NULL );
-
-		if (old_height != e_minicard->height)
-			e_canvas_item_request_parent_reflow(item);
-	}
-}
-
-const char *
-e_minicard_get_card_id (EMinicard *minicard)
-{
-	g_return_val_if_fail(minicard != NULL, NULL);
-	g_return_val_if_fail(E_IS_MINICARD(minicard), NULL);
-
-	if (minicard->card) {
-		return e_card_get_id(minicard->card);
-	} else {
-		return "";
-	}
-}
-
-int
-e_minicard_compare (EMinicard *minicard1, EMinicard *minicard2)
-{
-	g_return_val_if_fail(minicard1 != NULL, 0);
-	g_return_val_if_fail(E_IS_MINICARD(minicard1), 0);
-	g_return_val_if_fail(minicard2 != NULL, 0);
-	g_return_val_if_fail(E_IS_MINICARD(minicard2), 0);
-
-	if (minicard1->card && minicard2->card) {
-		char *file_as1, *file_as2;
-		gtk_object_get(GTK_OBJECT(minicard1->card),
-			       "file_as", &file_as1,
-			       NULL);
-		gtk_object_get(GTK_OBJECT(minicard2->card),
-			       "file_as", &file_as2,
-			       NULL);
-		if (file_as1 && file_as2)
-			return g_utf8_collate(file_as1, file_as2);
-		if (file_as1)
-			return -1;
-		if (file_as2)
-			return 1;
-		return strcmp(e_minicard_get_card_id(minicard1), e_minicard_get_card_id(minicard2));
-	} else {
-		return 0;
-	}
-}
-
-int
-e_minicard_selected (EMinicard *minicard, GdkEvent *event)
-{
-	gint ret_val = 0;
-	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (minicard);
-	if (item->parent) {
-		guint signal_id = gtk_signal_lookup ("selection_event", GTK_OBJECT_TYPE (item->parent));
-		/* We should probably check the signature here, but I
-		 * don't think it's worth the time required to code
-		 * it.
-		 */
-		if (signal_id != 0) {
-			gtk_signal_emit(GTK_OBJECT(item->parent),
-					signal_id,
-					item, event, &ret_val);
-		}
-	}
-	return ret_val;
-}
-
-static gint
-e_minicard_drag_begin (EMinicard *minicard, GdkEvent *event)
-{
-	gint ret_val = 0;
-	gtk_signal_emit (GTK_OBJECT(minicard),
-			 e_minicard_signals[DRAG_BEGIN],
-			 event, &ret_val);
-	return ret_val;
-}
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
deleted file mode 100644
index bb6a3c072e..0000000000
--- a/addressbook/gui/widgets/e-minicard.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_H__
-#define __E_MINICARD_H__
-
-#include <libgnomeui/gnome-canvas.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include "addressbook/gui/contact-editor/e-contact-editor.h"
-#include "addressbook/backend/ebook/e-card.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EMinicard - A small card displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * width        double          RW              width of the card
- * height       double          R               height of the card
- * card		ECard*		RW		Pointer to the ECard
- */
-
-#define E_MINICARD_TYPE			(e_minicard_get_type ())
-#define E_MINICARD(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_TYPE, EMinicard))
-#define E_MINICARD_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_TYPE, EMinicardClass))
-#define E_IS_MINICARD(obj)		(GTK_CHECK_TYPE ((obj), E_MINICARD_TYPE))
-#define E_IS_MINICARD_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_TYPE))
-
-
-typedef struct _EMinicard       EMinicard;
-typedef struct _EMinicardClass  EMinicardClass;
-typedef enum _EMinicardFocusType EMinicardFocusType;
-
-enum _EMinicardFocusType {
-	E_MINICARD_FOCUS_TYPE_START,
-	E_MINICARD_FOCUS_TYPE_END
-};
-
-struct _EMinicard
-{
-	GnomeCanvasGroup parent;
-	
-	/* item specific fields */
-	ECard *card;
-	ECardSimple *simple;
-	
-	GnomeCanvasItem *rect;
-	GnomeCanvasItem *header_rect;
-	GnomeCanvasItem *header_text;
-	GnomeCanvasItem *list_icon;
-
-	GdkPixbuf *list_icon_pixbuf;
-	double list_icon_size;
-
-	GtkObject *editor;
-
-	GList *fields; /* Of type EMinicardField */
-	guint needs_remodeling : 1;
-
-	guint changed : 1;
-
-	guint selected : 1;
-	guint has_cursor : 1;
-
-	guint has_focus : 1;
-
-	guint editable : 1;
-
-	guint drag_button_down : 1;
-	gint drag_button;
-
-	gint button_x;
-	gint button_y;
-
-	double width;
-	double height;
-};
-
-struct _EMinicardClass
-{
-	GnomeCanvasGroupClass parent_class;
-
-	gint (* selected) (EMinicard *minicard, GdkEvent *event);
-	gint (* drag_begin) (EMinicard *minicard, GdkEvent *event);
-};
-
-
-GtkType     e_minicard_get_type     (void);
-const char *e_minicard_get_card_id  (EMinicard *minicard);
-int         e_minicard_compare      (EMinicard *minicard1,
-				     EMinicard *minicard2);
-
-int         e_minicard_selected     (EMinicard *minicard,
-				     GdkEvent  *event);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_MINICARD_H__ */
diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c
deleted file mode 100644
index 10e13d9bdf..0000000000
--- a/addressbook/gui/widgets/gal-view-factory-minicard.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-factory-minicard.c: A View Factory
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include "gal-view-factory-minicard.h"
-#include "gal-view-minicard.h"
-
-#define GVFE_CLASS(e) ((GalViewFactoryMinicardClass *)((GtkObject *)e)->klass)
-
-#define PARENT_TYPE gal_view_factory_get_type ()
-
-static GalViewFactoryClass *gal_view_factory_minicard_parent_class;
-
-static const char *
-gal_view_factory_minicard_get_title       (GalViewFactory *factory)
-{
-	return _("Card View");
-}
-
-static GalView *
-gal_view_factory_minicard_new_view        (GalViewFactory *factory,
-					   const char     *name)
-{
-	return gal_view_minicard_new(name);
-}
-
-static const char *
-gal_view_factory_minicard_get_type_code (GalViewFactory *factory)
-{
-	return "minicard";
-}
-
-static void
-gal_view_factory_minicard_destroy         (GtkObject *object)
-{
-#if 0
-	GalViewFactoryMinicard *factory = GAL_VIEW_FACTORY_MINICARD(object);
-#endif
-}
-
-static void
-gal_view_factory_minicard_class_init      (GtkObjectClass *object_class)
-{
-	GalViewFactoryClass *view_factory_class = GAL_VIEW_FACTORY_CLASS(object_class);
-	gal_view_factory_minicard_parent_class    = gtk_type_class (PARENT_TYPE);
-
-	view_factory_class->get_title           = gal_view_factory_minicard_get_title;
-	view_factory_class->new_view            = gal_view_factory_minicard_new_view;
-	view_factory_class->get_type_code       = gal_view_factory_minicard_get_type_code;
-
-	object_class->destroy                   = gal_view_factory_minicard_destroy;
-}
-
-static void
-gal_view_factory_minicard_init            (GalViewFactoryMinicard *factory)
-{
-}
-
-/**
- * gal_view_minicard_new
- *
- * A new GalViewFactory for creating Minicard views.  Create one of
- * these and pass it to GalViewCollection for use.
- *
- * Returns: The new GalViewFactoryMinicard.
- */
-GalViewFactory *
-gal_view_factory_minicard_new        (void)
-{
-	return gal_view_factory_minicard_construct (gtk_type_new (gal_view_factory_minicard_get_type ()));
-}
-
-/**
- * gal_view_minicard_construct
- * @factory: The factory to construct
- *
- * constructs the GalViewFactoryMinicard.  To be used by subclasses and
- * language bindings.
- *
- * Returns: The GalViewFactoryMinicard.
- */
-GalViewFactory *
-gal_view_factory_minicard_construct  (GalViewFactoryMinicard *factory)
-{
-	return GAL_VIEW_FACTORY(factory);
-}
-
-GtkType
-gal_view_factory_minicard_get_type  (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"GalViewFactoryMinicard",
-			sizeof (GalViewFactoryMinicard),
-			sizeof (GalViewFactoryMinicardClass),
-			(GtkClassInitFunc) gal_view_factory_minicard_class_init,
-			(GtkObjectInitFunc) gal_view_factory_minicard_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.h b/addressbook/gui/widgets/gal-view-factory-minicard.h
deleted file mode 100644
index 3816fdba46..0000000000
--- a/addressbook/gui/widgets/gal-view-factory-minicard.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-factory-minicard.c: A View Factory
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#ifndef _GAL_VIEW_FACTORY_MINICARD_H_
-#define _GAL_VIEW_FACTORY_MINICARD_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view-factory.h>
-
-#define GAL_VIEW_FACTORY_MINICARD_TYPE        (gal_view_factory_minicard_get_type ())
-#define GAL_VIEW_FACTORY_MINICARD(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_FACTORY_MINICARD_TYPE, GalViewFactoryMinicard))
-#define GAL_VIEW_FACTORY_MINICARD_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_FACTORY_MINICARD_TYPE, GalViewFactoryMinicardClass))
-#define GAL_IS_VIEW_FACTORY_MINICARD(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_FACTORY_MINICARD_TYPE))
-#define GAL_IS_VIEW_FACTORY_MINICARD_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_FACTORY_MINICARD_TYPE))
-
-typedef struct {
-	GalViewFactory base;
-} GalViewFactoryMinicard;
-
-typedef struct {
-	GalViewFactoryClass parent_class;
-} GalViewFactoryMinicardClass;
-
-/* Standard functions */
-GtkType         gal_view_factory_minicard_get_type   (void);
-GalViewFactory *gal_view_factory_minicard_new        (void);
-GalViewFactory *gal_view_factory_minicard_construct  (GalViewFactoryMinicard *factory);
-
-#endif /* _GAL_VIEW_FACTORY_MINICARD_H_ */
diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c
deleted file mode 100644
index 4cfa71f470..0000000000
--- a/addressbook/gui/widgets/gal-view-minicard.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-minicard.c: An Minicard View
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#include <config.h>
-#include "gal-view-minicard.h"
-
-#define PARENT_TYPE gal_view_get_type ()
-
-static GalViewClass *gal_view_minicard_parent_class;
-
-static void
-gal_view_minicard_edit            (GalView *view)
-{
-	/* GalViewMinicard *minicard_view = GAL_VIEW_MINICARD(view); */
-}
-
-static void  
-gal_view_minicard_load  (GalView *view,
-			 const char *filename)
-{
-}
-
-static void
-gal_view_minicard_save    (GalView *view,
-			 const char *filename)
-{
-}
-
-static const char *
-gal_view_minicard_get_title       (GalView *view)
-{
-	return GAL_VIEW_MINICARD(view)->title;
-}
-
-static void
-gal_view_minicard_set_title       (GalView *view,
-				 const char *title)
-{
-	g_free(GAL_VIEW_MINICARD(view)->title);
-	GAL_VIEW_MINICARD(view)->title = g_strdup(title);
-}
-
-static const char *
-gal_view_minicard_get_type_code (GalView *view)
-{
-	return "minicard";
-}
-
-static GalView *
-gal_view_minicard_clone       (GalView *view)
-{
-	GalViewMinicard *gve, *new;
-
-	gve = GAL_VIEW_MINICARD(view);
-
-	new        = gtk_type_new (gal_view_minicard_get_type ());
-	new->title = g_strdup (gve->title);
-
-	return GAL_VIEW(new);
-}
-
-static void
-gal_view_minicard_destroy         (GtkObject *object)
-{
-	GalViewMinicard *view = GAL_VIEW_MINICARD(object);
-	g_free(view->title);
-}
-
-static void
-gal_view_minicard_class_init      (GtkObjectClass *object_class)
-{
-	GalViewClass *gal_view_class  = GAL_VIEW_CLASS(object_class);
-	gal_view_minicard_parent_class  = gtk_type_class (PARENT_TYPE);
-
-	gal_view_class->edit          = gal_view_minicard_edit         ;
-	gal_view_class->load          = gal_view_minicard_load         ;
-	gal_view_class->save          = gal_view_minicard_save         ;
-	gal_view_class->get_title     = gal_view_minicard_get_title    ;
-	gal_view_class->set_title     = gal_view_minicard_set_title    ;
-	gal_view_class->get_type_code = gal_view_minicard_get_type_code;
-	gal_view_class->clone         = gal_view_minicard_clone        ;
-
-	object_class->destroy         = gal_view_minicard_destroy      ;
-}
-
-static void
-gal_view_minicard_init      (GalViewMinicard *gve)
-{
-	gve->title = NULL;
-}
-
-/**
- * gal_view_minicard_new
- * @title: The name of the new view.
- *
- * Returns a new GalViewMinicard.  This is primarily for use by
- * GalViewFactoryMinicard.
- *
- * Returns: The new GalViewMinicard.
- */
-GalView *
-gal_view_minicard_new (const gchar *title)
-{
-	return gal_view_minicard_construct (gtk_type_new (gal_view_minicard_get_type ()), title);
-}
-
-/**
- * gal_view_minicard_construct
- * @view: The view to construct.
- * @title: The name of the new view.
- *
- * constructs the GalViewMinicard.  To be used by subclasses and
- * language bindings.
- *
- * Returns: The GalViewMinicard.
- */
-GalView *
-gal_view_minicard_construct  (GalViewMinicard *view,
-			      const gchar *title)
-{
-	view->title = g_strdup(title);
-	return GAL_VIEW(view);
-}
-
-GtkType
-gal_view_minicard_get_type        (void)
-{
-	static guint type = 0;
-	
-	if (!type)
-	{
-		GtkTypeInfo info =
-		{
-			"GalViewMinicard",
-			sizeof (GalViewMinicard),
-			sizeof (GalViewMinicardClass),
-			(GtkClassInitFunc) gal_view_minicard_class_init,
-			(GtkObjectInitFunc) gal_view_minicard_init,
-			/* reserved_1 */ NULL,
-			/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h
deleted file mode 100644
index fef98141f3..0000000000
--- a/addressbook/gui/widgets/gal-view-minicard.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * gal-view-minicard.h: An Minicard View
- *
- * Authors:
- *   Chris Lahey <clahey@ximian.com>
- *
- * (C) 2000, 2001 Ximian, Inc.
- */
-#ifndef _GAL_VIEW_MINICARD_H_
-#define _GAL_VIEW_MINICARD_H_
-
-#include <gtk/gtkobject.h>
-#include <gal/menus/gal-view.h>
-
-#define GAL_VIEW_MINICARD_TYPE        (gal_view_minicard_get_type ())
-#define GAL_VIEW_MINICARD(o)          (GTK_CHECK_CAST ((o), GAL_VIEW_MINICARD_TYPE, GalViewMinicard))
-#define GAL_VIEW_MINICARD_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GAL_VIEW_MINICARD_TYPE, GalViewMinicardClass))
-#define GAL_IS_VIEW_MINICARD(o)       (GTK_CHECK_TYPE ((o), GAL_VIEW_MINICARD_TYPE))
-#define GAL_IS_VIEW_MINICARD_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GAL_VIEW_MINICARD_TYPE))
-
-typedef struct {
-	GalView base;
-
-	char                *title;
-} GalViewMinicard;
-
-typedef struct {
-	GalViewClass parent_class;
-} GalViewMinicardClass;
-
-/* Standard functions */
-GtkType  gal_view_minicard_get_type   (void);
-GalView *gal_view_minicard_new        (const gchar         *title);
-GalView *gal_view_minicard_construct  (GalViewMinicard       *view,
-				       const gchar         *title);
-
-#endif /* _GAL_VIEW_MINICARD_H_ */
diff --git a/addressbook/gui/widgets/test-minicard-label.c b/addressbook/gui/widgets/test-minicard-label.c
deleted file mode 100644
index 7b1919aef4..0000000000
--- a/addressbook/gui/widgets/test-minicard-label.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-minicard-label.c
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <gtk/gtkmain.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <libgnomeui/gnome-init.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-minicard-label.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-GnomeCanvasItem *label;
-GnomeCanvasItem *rect;
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-  exit(0);
-}
-
-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)
-{
-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, allocation->width, allocation->height );
-  gnome_canvas_item_set( label,
-			 "width", (double) allocation->width,
-			 "height", (double) allocation->height,
-			 NULL );
-  gnome_canvas_item_set( rect,
-			 "x2", (double) allocation->width,
-			 "y2", (double) allocation->height,
-			 NULL );
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Minicard Label Test" ), VERSION,
-		      _( "Copyright (C) 2000, Ximian, Inc." ),
-		      authors,
-		      _( "This should test the minicard label canvas item" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-static void button_press_callback( GtkWidget *widget, gpointer data )
-{
-  gnome_canvas_item_grab_focus( label );
-}
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-  GtkWidget *canvas;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Minicard Label Test", VERSION, argc, argv);
-  app = gnome_app_new("Minicard Label Test", NULL);
-
-  canvas = e_canvas_new();
-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				gnome_canvas_rect_get_type(),
-				"x1", (double) 0,
-				"y1", (double) 0,
-				"x2", (double) 100,
-				"y2", (double) 100,
-				"fill_color", "white",
-				NULL );
-  label = e_minicard_label_new(gnome_canvas_root( GNOME_CANVAS( canvas ) ));
-  gnome_canvas_item_set( label,
-			 "width", (double) 100,
-			 "height", (double) 100,
-			 "fieldname", "Full Name:",
-			 "field", "Christopher James Lahey",
-			 NULL );
-  gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),
-				   0, 0,
-				   100, 100 );
-
-  gnome_app_set_contents( GNOME_APP( app ), canvas );
-
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",
-		      GTK_SIGNAL_FUNC( allocate_callback ),
-		      ( gpointer ) app );
-
-  gtk_signal_connect( GTK_OBJECT( canvas ), "button_press_event",
-		      GTK_SIGNAL_FUNC( button_press_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/gui/widgets/test-minicard-view.c b/addressbook/gui/widgets/test-minicard-view.c
deleted file mode 100644
index caa9dac270..0000000000
--- a/addressbook/gui/widgets/test-minicard-view.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-reflow.c
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <libgnorba/gnorba.h>
-#include <e-util/e-canvas.h>
-#include "e-minicard-view.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-GnomeCanvasItem *reflow;
-GnomeCanvasItem *rect;
-GtkAllocation last_alloc;
-
-CORBA_Environment ev;
-CORBA_ORB orb;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-
-	gnome_CORBA_init_with_popt_table (
-		"Reflow Test", VERSION,
-		&argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
-
-	orb = gnome_CORBA_ORB ();
-
-	if (bonobo_init (orb, NULL, NULL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-
-}
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-  exit(0);
-}
-
-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)
-{
-  double width;
-  last_alloc = *allocation;
-  gnome_canvas_item_set( reflow,
-			 "height", (double) allocation->height,
-			 NULL );
-  gnome_canvas_item_set( reflow,
-			 "minimum_width", (double) allocation->width,
-			 NULL );
-  gtk_object_get(GTK_OBJECT(reflow),
-		 "width", &width,
-		 NULL);
-  width = MAX(width, allocation->width);
-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, width, allocation->height );
-  gnome_canvas_item_set( rect,
-			 "x2", (double) width,
-			 "y2", (double) allocation->height,
-			 NULL );
-}
-
-static void resize(GnomeCanvas *canvas, gpointer data)
-{
-	double width;
-	gtk_object_get(GTK_OBJECT(reflow),
-		       "width", &width,
-		       NULL);
-	width = MAX(width, last_alloc.width);
-	gnome_canvas_set_scroll_region(canvas , 0, 0, width, last_alloc.height );
-	gnome_canvas_item_set( rect,
-			       "x2", (double) width,
-			       "y2", (double) last_alloc.height,
-			       NULL );	
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Reflow Test" ), VERSION,
-		      _( "Copyright (C) 2000, Ximian, Inc." ),
-		      authors,
-		      _( "This should test the reflow canvas item" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	if (status == E_BOOK_STATUS_SUCCESS)
-		gnome_canvas_item_set(reflow,
-				      "book", book,
-				      NULL);
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return FALSE;
-	}
-	
-
-	if (! e_book_load_uri (book, "file:/tmp/test.db", book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-
-
-	return FALSE;
-}
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-  GtkWidget *canvas;
-  GtkWidget *vbox;
-  GtkWidget *scrollbar;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  CORBA_exception_init (&ev);
-  init_bonobo (argc, argv);
-
-  app = gnome_app_new("Reflow Test", NULL);
-
-  vbox = gtk_vbox_new(FALSE, 0);
-
-  canvas = e_canvas_new();
-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				gnome_canvas_rect_get_type(),
-				"x1", (double) 0,
-				"y1", (double) 0,
-				"x2", (double) 100,
-				"y2", (double) 100,
-				"fill_color", "white",
-				NULL );
-  reflow = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				  e_minicard_view_get_type(),
-				  "height", (double) 100,
-				  "minimum_width", (double) 100,
-				  NULL );
-  gtk_signal_connect( GTK_OBJECT( canvas ), "reflow",
-		      GTK_SIGNAL_FUNC( resize ),
-		      ( gpointer ) app);
-
-  gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),
-				   0, 0,
-				   100, 100 );
-
-  gtk_box_pack_start(GTK_BOX(vbox), canvas, TRUE, TRUE, 0);
-
-  scrollbar = gtk_hscrollbar_new(gtk_layout_get_hadjustment(GTK_LAYOUT(canvas)));
-
-  gtk_box_pack_start(GTK_BOX(vbox), scrollbar, FALSE, FALSE, 0);
-
-  gnome_app_set_contents( GNOME_APP( app ), vbox );
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",
-		      GTK_SIGNAL_FUNC( allocate_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-  gdk_window_set_back_pixmap( GTK_LAYOUT(canvas)->bin_window, NULL, FALSE);
-
-  gtk_idle_add ((GtkFunction) ebook_create, NULL);
-
-  bonobo_main ();
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/gui/widgets/test-minicard.c b/addressbook/gui/widgets/test-minicard.c
deleted file mode 100644
index b84a591bbb..0000000000
--- a/addressbook/gui/widgets/test-minicard.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-minicard.c
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#include "config.h"
-
-#include <gtk/gtkmain.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-init.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-
-#include "e-minicard.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-GnomeCanvasItem *card;
-GnomeCanvasItem *rect;
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-  exit(0);
-}
-
-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)
-{
-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, allocation->width, allocation->height );
-  gnome_canvas_item_set( card,
-			 "width", (double) allocation->width,
-			 NULL );
-  gnome_canvas_item_set( rect,
-			 "x2", (double) allocation->width,
-			 "y2", (double) allocation->height,
-			 NULL );
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Minicard Test" ), VERSION,
-		      _( "Copyright (C) 2000, Ximian, Inc." ),
-		      authors,
-		      _( "This should test the minicard canvas item" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-  GtkWidget *canvas;
-  int i;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Minicard Test", VERSION, argc, argv);
-  app = gnome_app_new("Minicard Test", NULL);
-
-  canvas = gnome_canvas_new();
-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				gnome_canvas_rect_get_type(),
-				"x1", (double) 0,
-				"y1", (double) 0,
-				"x2", (double) 100,
-				"y2", (double) 100,
-				"fill_color", "white",
-				NULL );
-  for ( i = 0; i < 1; i++ )
-    {
-      card = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				    e_minicard_get_type(),
-				    "width", (double) 100,
-				    NULL );
-    }
-  gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),
-				   0, 0,
-				   100, 100 );
-
-  gnome_app_set_contents( GNOME_APP( app ), canvas );
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",
-		      GTK_SIGNAL_FUNC( allocate_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c
deleted file mode 100644
index 14066c4cd0..0000000000
--- a/addressbook/gui/widgets/test-reflow.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-reflow.c
- *
- * Copyright (C) 2000 Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"TITLE:Head Geek
-"                  \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@ximian.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
-
-
-#include "config.h"
-
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <libgnomeui/gnome-init.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-reflow.h>
-#include <gal/widgets/e-scroll-frame.h>
-
-#include "e-minicard.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-GnomeCanvasItem *reflow;
-GnomeCanvasItem *rect;
-GtkAllocation last_alloc;
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-  exit(0);
-}
-
-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)
-{
-  double width;
-  last_alloc = *allocation;
-  gnome_canvas_item_set( reflow,
-			 "height", (double) allocation->height,
-			 NULL );
-  gnome_canvas_item_set( reflow,
-			 "minimum_width", (double) allocation->width,
-			 NULL );
-  gtk_object_get(GTK_OBJECT(reflow),
-		 "width", &width,
-		 NULL);
-  width = MAX(width, allocation->width);
-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, width - 1, allocation->height - 1);
-  gnome_canvas_item_set( rect,
-			 "x2", (double) width,
-			 "y2", (double) allocation->height,
-			 NULL );
-}
-
-static void resize(GnomeCanvas *canvas, gpointer data)
-{
-	double width;
-	gtk_object_get(GTK_OBJECT(reflow),
-		       "width", &width,
-		       NULL);
-	width = MAX(width, last_alloc.width);
-	gnome_canvas_set_scroll_region(canvas , 0, 0, width - 1, last_alloc.height - 1);
-	gnome_canvas_item_set( rect,
-			       "x2", (double) width,
-			       "y2", (double) last_alloc.height,
-			       NULL );	
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Reflow Test" ), VERSION,
-		      _( "Copyright (C) 2000, Ximian, Inc." ),
-		      authors,
-		      _( "This should test the reflow canvas item" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-  GtkWidget *canvas;
-  GtkWidget *vbox;
-  GtkWidget *scrollframe;
-  int i;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Reflow Test", VERSION, argc, argv);
-  app = gnome_app_new("Reflow Test", NULL);
-
-  vbox = gtk_vbox_new(FALSE, 0);
-
-  canvas = e_canvas_new();
-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				gnome_canvas_rect_get_type(),
-				"x1", (double) 0,
-				"y1", (double) 0,
-				"x2", (double) 100,
-				"y2", (double) 100,
-				"fill_color", "white",
-				NULL );
-  reflow = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),
-				  e_reflow_get_type(),
-				  "height", (double) 100,
-				  "minimum_width", (double) 100,
-				  NULL );
-  gtk_signal_connect( GTK_OBJECT( canvas ), "reflow",
-		      GTK_SIGNAL_FUNC( resize ),
-		      ( gpointer ) app);
-  for ( i = 0; i < 200; i++ )
-    {
-      GnomeCanvasItem *item;
-      ECard *card = e_card_new (TEST_VCARD);
-      item = gnome_canvas_item_new( GNOME_CANVAS_GROUP(reflow),
-				    e_minicard_get_type(),
-				    "card", card,
-				    NULL);
-      e_reflow_add_item(E_REFLOW(reflow), item, NULL);
-    }
-  gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),
-				   0, 0,
-				   100, 100 );
-
-  scrollframe = e_scroll_frame_new (gtk_layout_get_hadjustment(GTK_LAYOUT(canvas)),
-				    gtk_layout_get_vadjustment(GTK_LAYOUT(canvas)));
-  e_scroll_frame_set_policy (E_SCROLL_FRAME (scrollframe),
-			     GTK_POLICY_AUTOMATIC,
-			     GTK_POLICY_NEVER);
-  
-  gtk_container_add (GTK_CONTAINER (scrollframe), canvas);
-
-  gnome_app_set_contents( GNOME_APP( app ), scrollframe );
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",
-		      GTK_SIGNAL_FUNC( allocate_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-  gdk_window_set_back_pixmap( GTK_LAYOUT(canvas)->bin_window, NULL, FALSE);
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/printing/.cvsignore b/addressbook/printing/.cvsignore
deleted file mode 100644
index 96194f7fd7..0000000000
--- a/addressbook/printing/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-contact-print-test
-contact-print-style-editor-test
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
deleted file mode 100644
index dc1fb510a7..0000000000
--- a/addressbook/printing/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-ecpsdir    = $(datadir)/evolution/ecps
-
-ecps_DATA  =				\
-	smallbook.ecps			\
-	medbook.ecps			\
-	phonelist.ecps
-
-gladedir   = $(datadir)/evolution/glade
-
-glade_DATA = 				\
-	e-contact-print.glade
-
-INCLUDES =					\
-	$(GNOME_INCLUDEDIR)			\
-	-DG_LOG_DOMAIN=\"addressbook-printing\"	\
-	-I$(top_srcdir)/addressbook		\
-	-I$(top_srcdir)				\
-        -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\
-	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\
-	-DDATADIR=\""$(datadir)"\"		\
-	$(GNOME_PRINT_CFLAGS)			\
-        $(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)
-
-noinst_LIBRARIES =				\
-	libecontactprint.a
-
-libecontactprint_a_SOURCES = 			\
-	e-contact-print-envelope.c		\
-	e-contact-print-envelope.h		\
-	e-contact-print-style-editor.c		\
-	e-contact-print-style-editor.h		\
-	e-contact-print-types.h			\
-	e-contact-print.c			\
-	e-contact-print.h
-
-noinst_PROGRAMS =	\
-	contact-print-test	\
-	contact-print-style-editor-test
-
-contact_print_test_SOURCES = 	\
-	test-print.c
-
-contact_print_test_LDADD =	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/camel/libcamel.la				\
-	$(top_builddir)/libibex/libibex.la				\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	libecontactprint.a	\
-	$(BONOBO_CONF_LIBS)	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(BONOBO_GNOME_LIBS)    \
-	$(GNOME_PRINT_LIBS) 
-
-contact_print_style_editor_test_SOURCES = 	\
-	test-contact-print-style-editor.c
-
-contact_print_style_editor_test_LDADD =	\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/camel/libcamel.la				\
-	$(top_builddir)/libibex/libibex.la				\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	libecontactprint.a	\
-	$(BONOBO_CONF_LIBS)	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(BONOBO_GNOME_LIBS)    \
-	$(GNOME_PRINT_LIBS)
-
-EXTRA_DIST = \
-	$(glade_DATA)	\
-	$(ecps_DATA)
diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c
deleted file mode 100644
index 2f65afa81b..0000000000
--- a/addressbook/printing/e-contact-print-envelope.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-envelope.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include "addressbook/printing/e-contact-print-envelope.h"
-#include <glib.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <time.h>
-#include <libgnome/gnome-paper.h>
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-dialog.h>
-#include <libgnomeprint/gnome-print-master.h>
-#include <libgnomeprint/gnome-print-master-preview.h>
-#include "addressbook/backend/ebook/e-card.h"
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-#define ENVELOPE_HEIGHT (72.0 * 4.0)
-#define ENVELOPE_WIDTH (72.0 * 9.5)
-
-typedef struct {
-	int start;
-	int length;
-} EcpeLine;
-
-static void
-startset(void *pointer, EcpeLine **iterator)
-{
-	(*iterator)--;
-	(*iterator)->start = GPOINTER_TO_INT(pointer);
-}
-
-static void
-lengthset(void *pointer, EcpeLine **iterator)
-{
-	(*iterator)--;
-	(*iterator)->length = GPOINTER_TO_INT(pointer);
-}
-
-static EcpeLine *
-ecpe_break(char *address)
-{
-	int i;
-	int length = 0;
-	int laststart = 0;
-	GList *startlist = NULL;
-	GList *lengthlist = NULL;
-	EcpeLine *ret_val;
-	EcpeLine *iterator;
-
-	for (i = 0; address[i]; i++) {
-		if (address[i] == '\n') {
-			startlist = g_list_prepend (startlist, GINT_TO_POINTER(laststart));
-			lengthlist = g_list_prepend (lengthlist, GINT_TO_POINTER(i - laststart));
-			length ++;
-			laststart = i + 1;
-		}
-	}
-	startlist = g_list_prepend (startlist, GINT_TO_POINTER(laststart));
-	lengthlist = g_list_prepend (lengthlist, GINT_TO_POINTER(i - laststart));
-	length ++;
-
-	ret_val = g_new(EcpeLine, length + 1);
-
-	iterator = ret_val + length;
-	g_list_foreach(startlist, (GFunc) startset, &iterator);
-	g_list_free(startlist);
-
-	iterator = ret_val + length;
-	g_list_foreach(lengthlist, (GFunc) lengthset, &iterator);
-	g_list_free(lengthlist);
-
-	ret_val[length].start = -1;
-	ret_val[length].length = -1;
-
-	return ret_val;
-}
-
-static void
-ecpe_linelist_dimensions(GnomeFont *font, char *address, EcpeLine *linelist, double *widthp, double *heightp)
-{
-	double width = 0;
-	int i;
-	if (widthp) {
-		for (i = 0; linelist[i].length != -1; i++) {
-			width = MAX(width, gnome_font_get_width_utf8_sized (font, address + linelist[i].start, linelist[i].length));
-		}
-		*widthp = width;
-	} else {
-		for (i = 0; linelist[i].length != -1; i++)
-			/* Intentionally empty */;
-	}
-	if (heightp) {
-		*heightp = gnome_font_get_size(font) * i;
-	}
-}
-
-static void
-ecpe_linelist_print(GnomePrintContext *pc, GnomeFont *font, char *address, EcpeLine *linelist, double x, double y)
-{
-	int i;
-	gnome_print_setfont(pc, font);
-	for (i = 0; linelist[i].length != -1; i++) {
-		gnome_print_moveto(pc, x, y + gnome_font_get_ascender(font));
-		gnome_print_show_sized (pc, address + linelist[i].start, linelist[i].length);
-		y -= gnome_font_get_size(font);
-	}
-}
-
-static gint
-e_contact_print_envelope_close(GnomeDialog *dialog, gpointer data)
-{
-	return FALSE;
-}
-
-static void
-ecpe_print(GnomePrintContext *pc, ECard *ecard, gboolean as_return)
-{
-	ECardSimple *card = e_card_simple_new(ecard);
-	char *address;
-	EcpeLine *linelist;
-	double x;
-	double y;
-	GnomeFont *font;
-	
-
-	gnome_print_rotate(pc, 90);
-	gnome_print_translate(pc, 72.0 * 11.0 - ENVELOPE_WIDTH, -72.0 * 8.5 + (72.0 * 8.5 - ENVELOPE_HEIGHT) / 2);
-
-	address = e_card_simple_get(card, E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS);
-	linelist = ecpe_break(address);
-	if (as_return)
-		font = gnome_font_new("Helvetica", 9);
-	else
-		font = gnome_font_new("Helvetica", 12);
-	ecpe_linelist_dimensions(font, address, linelist, NULL, &y);
-	if (as_return) {
-		x = 36;
-		y = ENVELOPE_HEIGHT - 36;
-	} else {
-		x = ENVELOPE_WIDTH / 2;
-		y = (ENVELOPE_HEIGHT - y) / 2;
-	}
-	ecpe_linelist_print(pc, font, address, linelist, x, y);
-	gtk_object_unref(GTK_OBJECT(font));
-	g_free(linelist);
-
-	g_free(address);
-
-	gnome_print_showpage(pc);
-	gnome_print_context_close(pc);
-
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-e_contact_print_envelope_button(GnomeDialog *dialog, gint button, gpointer data)
-{
-	GnomePrintMaster *master;
-	GnomePrintContext *pc;
-	ECard *card = NULL;
-	GtkWidget *preview;
-
-	card = gtk_object_get_data(GTK_OBJECT(dialog), "card");
-
-	switch( button ) {
-	case GNOME_PRINT_PRINT:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-
-		ecpe_print(pc, card, FALSE);
-		
-		gnome_print_master_print(master);
-		gnome_dialog_close(dialog);
-		break;
-	case GNOME_PRINT_PREVIEW:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-
-		ecpe_print(pc, card, FALSE);
-		
-		preview = GTK_WIDGET(gnome_print_master_preview_new(master, "Print Preview"));
-		gtk_widget_show_all(preview);
-		break;
-	case GNOME_PRINT_CANCEL:
-		gtk_object_unref(GTK_OBJECT(card));
-		gnome_dialog_close(dialog);
-		break;
-	}
-}
-
-GtkWidget *
-e_contact_print_envelope_dialog_new(ECard *card)
-{
-	GtkWidget *dialog;
-	
-	dialog = gnome_print_dialog_new(_("Print envelope"), GNOME_PRINT_DIALOG_COPIES);
-
-	card = e_card_duplicate(card);
-	gtk_object_set_data(GTK_OBJECT(dialog), "card", card);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_envelope_button), NULL);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "close", GTK_SIGNAL_FUNC(e_contact_print_envelope_close), NULL);
-	return dialog;
-}
-
-/* FIXME: Print all the contacts selected. */
-GtkWidget *
-e_contact_print_envelope_list_dialog_new(GList *list)
-{
-	GtkWidget *dialog;
-	ECard *card;
-
-	if (list == NULL)
-		return NULL;
-
-	dialog = gnome_print_dialog_new(_("Print envelope"), GNOME_PRINT_DIALOG_COPIES);
-
-	card = e_card_duplicate(list->data);
-	gtk_object_set_data(GTK_OBJECT(dialog), "card", card);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_envelope_button), NULL);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "close", GTK_SIGNAL_FUNC(e_contact_print_envelope_close), NULL);
-	return dialog;
-}
diff --git a/addressbook/printing/e-contact-print-envelope.h b/addressbook/printing/e-contact-print-envelope.h
deleted file mode 100644
index 4302c4c5d7..0000000000
--- a/addressbook/printing/e-contact-print-envelope.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-envelope.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CONTACT_PRINT_ENVELOPE_H
-#define E_CONTACT_PRINT_ENVELOPE_H
-
-#include <addressbook/backend/ebook/e-card.h>
-#include <gtk/gtkwidget.h>
-#include "e-contact-print-types.h"
-
-GtkWidget *e_contact_print_envelope_dialog_new(ECard *card);
-GtkWidget *e_contact_print_envelope_list_dialog_new(GList *list);
-
-#endif /* E_CONTACT_PRINT_ENVELOPE_H */
diff --git a/addressbook/printing/e-contact-print-style-editor.c b/addressbook/printing/e-contact-print-style-editor.c
deleted file mode 100644
index f05a508ed8..0000000000
--- a/addressbook/printing/e-contact-print-style-editor.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-style-editor.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "e-contact-print-style-editor.h"
-
-static void e_contact_print_style_editor_init		(EContactPrintStyleEditor		 *card);
-static void e_contact_print_style_editor_class_init	(EContactPrintStyleEditorClass	 *klass);
-static void e_contact_print_style_editor_set_arg        (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_print_style_editor_get_arg        (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_print_style_editor_destroy        (GtkObject *object);
-
-static GtkVBoxClass *parent_class = NULL;
-
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_CARD
-};
-
-GtkType
-e_contact_print_style_editor_get_type (void)
-{
-  static GtkType contact_print_style_editor_type = 0;
-
-  if (!contact_print_style_editor_type)
-    {
-      static const GtkTypeInfo contact_print_style_editor_info =
-      {
-        "EContactPrintStyleEditor",
-        sizeof (EContactPrintStyleEditor),
-        sizeof (EContactPrintStyleEditorClass),
-        (GtkClassInitFunc) e_contact_print_style_editor_class_init,
-        (GtkObjectInitFunc) e_contact_print_style_editor_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      contact_print_style_editor_type = gtk_type_unique (gtk_vbox_get_type (), &contact_print_style_editor_info);
-    }
-
-  return contact_print_style_editor_type;
-}
-
-static void
-e_contact_print_style_editor_class_init (EContactPrintStyleEditorClass *klass)
-{
-  GtkObjectClass *object_class;
-  GtkVBoxClass *vbox_class;
-
-  object_class = (GtkObjectClass*) klass;
-  vbox_class = (GtkVBoxClass *) klass;
-
-  parent_class = gtk_type_class (gtk_vbox_get_type ());
-  
-  object_class->set_arg = e_contact_print_style_editor_set_arg;
-  object_class->get_arg = e_contact_print_style_editor_get_arg;
-  object_class->destroy = e_contact_print_style_editor_destroy;
-}
-
-#if 0
-static void
-_add_image(GtkTable *table, gchar *image, int left, int right, int top, int bottom)
-{
-	gtk_table_attach(table,
-			 gtk_widget_new(gtk_alignment_get_type(),
-					"child", gnome_pixmap_new_from_file(image),
-					"xalign", (double) 0,
-					"yalign", (double) 0,
-					"xscale", (double) 0,
-					"yscale", (double) 0,
-					NULL),
-			 left, right, top, bottom,
-			 GTK_FILL, GTK_FILL,
-			 0, 0);
-}
-#endif
-
-static void
-e_contact_print_style_editor_init (EContactPrintStyleEditor *e_contact_print_style_editor)
-{
-	GladeXML *gui;
-
-	/*   e_contact_print_style_editor->card = NULL;*/
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/e-contact-print.glade", NULL);
-	e_contact_print_style_editor->gui = gui;
-	gtk_widget_reparent(glade_xml_get_widget(gui, "vbox-contact-print-style-editor"),
-			    GTK_WIDGET(e_contact_print_style_editor));
-}
-
-void
-e_contact_print_style_editor_destroy (GtkObject *object)
-{
-	EContactPrintStyleEditor *e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR(object);
-	gtk_object_unref(GTK_OBJECT(e_contact_print_style_editor->gui));
-}
-
-GtkWidget*
-e_contact_print_style_editor_new (char *filename)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_print_style_editor_get_type ()));
-	return widget;
-}
-
-static void
-e_contact_print_style_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactPrintStyleEditor *e_contact_print_style_editor;
-
-	e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR (o);
-	
-	switch (arg_id){
-	default:
-		break;
-	}
-}
-
-static void
-e_contact_print_style_editor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactPrintStyleEditor *e_contact_print_style_editor;
-
-	e_contact_print_style_editor = E_CONTACT_PRINT_STYLE_EDITOR (object);
-
-	switch (arg_id) {
-	default:
-	  arg->type = GTK_TYPE_INVALID;
-	  break;
-	}
-}
diff --git a/addressbook/printing/e-contact-print-style-editor.h b/addressbook/printing/e-contact-print-style-editor.h
deleted file mode 100644
index e4604d551c..0000000000
--- a/addressbook/printing/e-contact-print-style-editor.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-print-style-editor.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_CONTACT_PRINT_STYLE_EDITOR_H__
-#define __E_CONTACT_PRINT_STYLE_EDITOR_H__
-
-#include <gtk/gtkvbox.h>
-#include <glade/glade.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactPrintStyleEditor - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- * card         ECard *         R               The card currently being edited
- */
-
-#define E_CONTACT_PRINT_STYLE_EDITOR_TYPE			(e_contact_print_style_editor_get_type ())
-#define E_CONTACT_PRINT_STYLE_EDITOR(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE, EContactPrintStyleEditor))
-#define E_CONTACT_PRINT_STYLE_EDITOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_PRINT_STYLE_EDITOR_TYPE, EContactPrintStyleEditorClass))
-#define E_IS_MINICARD(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE))
-#define E_IS_MINICARD_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_PRINT_STYLE_EDITOR_TYPE))
-
-
-typedef struct _EContactPrintStyleEditor       EContactPrintStyleEditor;
-typedef struct _EContactPrintStyleEditorClass  EContactPrintStyleEditorClass;
-
-struct _EContactPrintStyleEditor
-{
-	GtkVBox parent;
-	
-	/* item specific fields */
-	GladeXML *gui;
-};
-
-struct _EContactPrintStyleEditorClass
-{
-	GtkVBoxClass parent_class;
-};
-
-
-GtkWidget *e_contact_print_style_editor_new(char *filename);
-GtkType    e_contact_print_style_editor_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_PRINT_STYLE_EDITOR_H__ */
diff --git a/addressbook/printing/e-contact-print-types.h b/addressbook/printing/e-contact-print-types.h
deleted file mode 100644
index b7082b41f6..0000000000
--- a/addressbook/printing/e-contact-print-types.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-types.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CONTACT_PRINT_TYPES_H
-#define E_CONTACT_PRINT_TYPES_H
-
-#include <glib.h>
-#include <libgnomeprint/gnome-font.h>
-
-typedef struct _EContactPrintStyle EContactPrintStyle;
-typedef enum _EContactPrintType EContactPrintType;
-
-enum _EContactPrintType {
-	E_CONTACT_PRINT_TYPE_CARDS,
-	E_CONTACT_PRINT_TYPE_MEMO_STYLE,
-	E_CONTACT_PRINT_TYPE_PHONE_LIST
-};
-
-struct _EContactPrintStyle
-{
-	gchar *title;
-	EContactPrintType type;
-	gboolean sections_start_new_page;
-	guint num_columns;
-	guint blank_forms;
-	gboolean letter_tabs;
-	gboolean letter_headings;
-	GnomeFont *headings_font;
-	GnomeFont *body_font;
-	gboolean print_using_grey;
-	gint paper_type;
-	gdouble paper_width;
-	gdouble paper_height;
-	gint paper_source;
-	gdouble top_margin;
-	gdouble left_margin;
-	gdouble bottom_margin;
-	gdouble right_margin;
-	gint page_size;
-	gdouble page_width;
-	gdouble page_height;
-	gboolean orientation_portrait;
-	GnomeFont *header_font;
-	gchar *left_header;
-	gchar *center_header;
-	gchar *right_header;
-	GnomeFont *footer_font;
-	gchar *left_footer;
-	gchar *center_footer;
-	gchar *right_footer;
-	gboolean reverse_on_even_pages;
-};
-
-#endif /* E_CONTACT_PRINT_TYPES_H */
-
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
deleted file mode 100644
index 458b854c77..0000000000
--- a/addressbook/printing/e-contact-print.c
+++ /dev/null
@@ -1,1203 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include "e-contact-print.h"
-
-#include <ctype.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-paper.h>
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-dialog.h>
-#include <libgnomeprint/gnome-print-master.h>
-#include <libgnomeprint/gnome-print-master-preview.h>
-#include <libgnomeprint/gnome-print-multipage.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/unicode/gunicode.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-simple.h>
-#include <addressbook/backend/ebook/e-destination.h>
-
-#define SCALE 5
-#define HYPHEN_PIXELS 20
-#define HYPHEN_PENALTY ( (SCALE) * (SCALE) * (HYPHEN_PIXELS) * (HYPHEN_PIXELS) )
-
-typedef struct _EContactPrintContext EContactPrintContext;
-
-struct _EContactPrintContext
-{
-	GnomePrintContext *pc;
-	GnomePrintMaster *master;
-	gdouble x;
-	gdouble y;
-	gint column;
-	EContactPrintStyle *style;
-	gboolean first_section;
-	gchar first_char_on_page;
-	gchar last_char_on_page;
-	GnomeFont *letter_heading_font;
-	GnomeFont *letter_tab_font;
-	char *character;
-	gboolean first_contact;
-
-	gboolean uses_book;
-	int type;
-	EBook *book;
-	gchar *query;
-
-	GList *cards;
-};
-
-static gint
-e_contact_divide_text(GnomePrintContext *pc, GnomeFont *font, double width, const gchar *text, GList **return_val /* Of type char[] */)
-{
-	if ( width == -1 || gnome_font_get_width_utf8(font, text) <= width ) {
-		if ( return_val ) {
-			*return_val = g_list_append(*return_val, g_strdup(text));
-		}
-		return 1;
-	} else {
-#if 1
-		int i, l;
-		double x = 0;
-		int lastend = 0;
-		int linestart = 0;
-		int firstword = 1;
-		int linecount = 0;
-		l = strlen(text);
-		for ( i = 0; i < l; i++ ) {
-			if ( text[i] == ' ' ) {
-				if ( (!firstword) && x + gnome_font_get_width_utf8_sized(font, text + lastend, i - lastend) > width ) {
-					if (return_val) {
-						*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-					}
-					x = gnome_font_get_width_utf8(font, "    ");
-					linestart = lastend + 1;
-					x += gnome_font_get_width_utf8_sized(font, text + linestart, i - linestart);
-					lastend = i;
-					linecount ++;
-				} else {
-					x += gnome_font_get_width_utf8_sized(font, text + lastend, i - lastend);
-					lastend = i;
-				}
-				firstword = 0;
-			} else if ( text[i] == '\n' ) {
-				if ( (!firstword) && x + gnome_font_get_width_utf8_sized(font, text + lastend, i - lastend) > width ) {
-					if (return_val) {
-						*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-					}
-					linestart = lastend + 1;
-					lastend = i;
-					linecount ++;
-				}
-				if (return_val) {
-					*return_val = g_list_append(*return_val, g_strndup(text + linestart, i - linestart));
-				}
-				linestart = i + 1;
-				lastend = i + 1;
-				linecount ++;
-				x = gnome_font_get_width_utf8(font, "    ");
-
-				firstword = 1;
-			}
-		}
-		if ( (!firstword) && x + gnome_font_get_width_utf8_sized(font, text + lastend, i - lastend) > width ) {
-			if (return_val) {
-				*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-			}
-			linestart = lastend + 1;
-			lastend = i;
-			linecount ++;
-		}
-		if (return_val) {
-			*return_val = g_list_append(*return_val, g_strndup(text + linestart, i - linestart));
-		}
-		linecount ++;
-		return(linecount);
-#else
-		HnjBreak *breaks;
-		gint *result;
-		gint *is;
-		gint n_breaks = 0, n_actual_breaks = 0;
-		gint i;
-		gint l;
-		gchar *hyphenation;
-		double x = - gnome_font_get_width_utf8(font, "    ") * SCALE;
-		HnjParams hnjparams;
-
-		hnjparams.set_width = width * SCALE + x;
-		hnjparams.max_neg_space = 0;
-		hnjparams.tab_width = 0;
-
-		l = strlen(text);
-	
-		/* find possible line breaks. */
-		for (i = 0; i < l; i++) {
-			if (text[i] == '-')
-				n_breaks++;
-			else if (text[i] == ' ')
-				n_breaks++;
-#if 0
- 			else if (hyphenation[i] & 1)
-				n_breaks++;
-#endif
-		}
-
-		breaks = g_new( HnjBreak, n_breaks + 1 );
-		result = g_new( gint, n_breaks + 1 );
-		is = g_new( gint, n_breaks + 1 );
-		n_breaks = 0;
-		/* find possible line breaks. */
-	
-		for (i = 0; i < l; i++) {
-			if ( text[i] == '-' ) {
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-				breaks[n_breaks].x0 = x;
-				breaks[n_breaks].x1 = x;
-				breaks[n_breaks].penalty = HYPHEN_PENALTY;
-				breaks[n_breaks].flags = HNJ_JUST_FLAG_ISHYPHEN;
-				is[n_breaks] = i + 1;
-				n_breaks++;
-			} else if ( text[i] == ' ' ) {
-				breaks[ n_breaks ].x0 = x;
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-				breaks[ n_breaks ].x1 = x;
-				breaks[ n_breaks ].penalty = 0;
-				breaks[ n_breaks ].flags = HNJ_JUST_FLAG_ISSPACE;
-				is[ n_breaks ] = i + 1;
-				n_breaks++;
-#if 0
-			} else if (word->hyphenation[i] & 1) {
-				breaks[n_breaks].x0 = x + gnome_font_get_width(font, '-') * SCALE;
-				breaks[n_breaks].x1 = x;
-				breaks[n_breaks].penalty = HYPHEN_PENALTY;
-				breaks[n_breaks].flags = HNJ_JUST_FLAG_ISHYPHEN;
-				is[n_breaks] = i + 1;
-				n_breaks++;
-#endif
-			} else
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-
-		}
-		is[n_breaks] = i;
-		breaks[n_breaks].flags = 0;
-		n_breaks++;
-
-		/* Calculate optimal line breaks. */
-		n_actual_breaks = hnj_hs_just (breaks, n_breaks,
-					       &hnjparams, result);
-
-		if ( return_val ) {
-			gchar *next_val;
-			if ( breaks[result[0]].flags == HNJ_JUST_FLAG_ISHYPHEN && text[is[result[0]]] != '-' ) {
-				next_val = g_new(gchar, is[result[0]] + 2);
-				strncpy(next_val, text, is[result[0]]);
-				next_val[is[result[0]]] = 0;
-				strcat(next_val, "-");
-			} else {
-				next_val = g_new(gchar, is[result[0]] + 1);
-				strncpy(next_val, text, is[result[0]]);
-				next_val[is[result[0]]] = 0;
-			}
-			*return_val = g_list_append(*return_val, next_val);
-			
-			for ( i = 1; i < n_actual_breaks; i++ ) {
-				if ( (breaks[result[i]].flags & HNJ_JUST_FLAG_ISHYPHEN) && (text[is[result[i]]] != '-') ) {
-					next_val = g_new(gchar, is[result[i]] - is[result[i - 1]] + 2);
-					strncpy(next_val, text + is[result[i - 1]], is[result[i]] - is[result[i - 1]]);
-					next_val[is[result[i]] - is[result[i - 1]]] = 0;
-					strcat(next_val, "-");
-				} else {
-					next_val = g_new(gchar, is[result[i]] - is[result[i - 1]] + 1);
-					strncpy(next_val, text + is[result[i - 1]], is[result[i]] - is[result[i - 1]]);
-					next_val[is[result[i]] - is[result[i - 1]]] = 0;
-				}
-				*return_val = g_list_append(*return_val, next_val);
-			}
-		}
-		
-		g_free (breaks);
-		g_free (result);
-		g_free (is);
-		return n_actual_breaks;
-#endif
-	}
-}
-
-static void
-e_contact_output(GnomePrintContext *pc, GnomeFont *font, double x, double y, double width, const gchar *text)
-{
-	GList *list = NULL, *list_start;
-	int first_line = 1;
-	gnome_print_gsave(pc);
-	gnome_print_setfont(pc, font);
-	e_contact_divide_text(pc, font, width, text, &list);
-	for ( list_start = list; list; list = g_list_next(list)) {
-		y -= gnome_font_get_ascender(font);
-		gnome_print_moveto(pc, x, y);
-		gnome_print_show(pc, (char *)list->data);
-		y -= gnome_font_get_descender(font);
-		y -= .2 * gnome_font_get_size (font);
-		if ( first_line ) {
-			x += gnome_font_get_width_utf8(font, "    ");
-			first_line = 0;
-		}
-	}
-	g_list_foreach( list_start, (GFunc) g_free, NULL );
-	g_list_free( list_start );
-	gnome_print_grestore(pc);
-}
-
-static gdouble
-e_contact_text_height(GnomePrintContext *pc, GnomeFont *font, double width, gchar *text)
-{
-	int line_count = e_contact_divide_text(pc, font, width, text, NULL);
-	return line_count * (gnome_font_get_ascender(font) + gnome_font_get_descender(font)) +
-		(line_count - 1) * .2 * gnome_font_get_size (font);
-}
-
-#if 0
-static void
-e_contact_output_and_advance(EContactPrintContext *ctxt, GnomeFont *font, double x, double width, gchar *text)
-{
-	ctxt->y -= .1 * gnome_font_get_size (font);
-	e_contact_output(ctxt->pc, font, x, ctxt->y, width, text);
-	ctxt->y -= e_contact_text_height(ctxt->pc, font, width, text);
-	ctxt->y -= .1 * gnome_font_get_size (font);
-}
-#endif
-
-static void
-e_contact_rectangle(GnomePrintContext *pc, 
-		   gdouble x0,
-		   gdouble y0,
-		   gdouble x1,
-		   gdouble y1,
-		   gdouble r,
-		   gdouble g,
-		   gdouble b)
-{
-	gnome_print_gsave(pc);
-	gnome_print_setrgbcolor(pc, r, g, b);
-	gnome_print_moveto(pc, x0, y0);
-	gnome_print_lineto(pc, x1, y0);
-	gnome_print_lineto(pc, x1, y1);
-	gnome_print_lineto(pc, x0, y1);
-	gnome_print_lineto(pc, x0, y0);
-	gnome_print_fill(pc);
-	gnome_print_grestore(pc);
-}
-
-static double
-e_contact_get_letter_tab_width (EContactPrintContext *ctxt)
-{
-	return gnome_font_get_width_utf8(ctxt->letter_tab_font, "123") + 4 + 18;
-}
-
-static double
-e_contact_print_letter_tab (EContactPrintContext *ctxt)
-{
-	unsigned char character;
-	gdouble x, y;
-	gdouble page_width = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble tab_height, tab_width;
-	gdouble font_size;
-	tab_height = 72 * (ctxt->style->page_height - ctxt->style->top_margin - ctxt->style->bottom_margin) / 27.0;
-	font_size = tab_height / 2;
-	tab_width = e_contact_get_letter_tab_width(ctxt) - 18;
-	x = page_width + 72 * (ctxt->style->left_margin) - tab_width;
-	y = 72 * (ctxt->style->page_height - ctxt->style->top_margin);
-
-
-	gnome_print_gsave( ctxt->pc );
-	if ( ctxt->style->print_using_grey )
-		e_contact_rectangle( ctxt->pc, x, 72 * (ctxt->style->page_height - ctxt->style->top_margin), x + tab_width, ctxt->style->bottom_margin * 72, .85, .85, .85 );
-	for ( character = 'A' - 1; character <= 'Z'; character ++ ) {
-		char string[] = "123";
-		if ( character >= 'A' ) {
-			string[0] = tolower(character);
-			string[1] = 0;
-		}
-		if ( character >= ctxt->first_char_on_page && character <= ctxt->last_char_on_page ) {
-			e_contact_rectangle( ctxt->pc, x + 1, y - 1, x + tab_width - 1, y - (tab_height - 1), 0, 0, 0 );
-			gnome_print_setrgbcolor( ctxt->pc, 1, 1, 1 );
-			e_contact_output( ctxt->pc, ctxt->letter_tab_font, x + tab_width / 2 - gnome_font_get_width_utf8(ctxt->letter_tab_font, string) / 2, y - (tab_height - font_size) / 2, -1, string );
-		} else {
-			gnome_print_setrgbcolor( ctxt->pc, 0, 0, 0 );
-			e_contact_output( ctxt->pc, ctxt->letter_tab_font, x + tab_width / 2 - gnome_font_get_width_utf8(ctxt->letter_tab_font, string) / 2, y - (tab_height - font_size) / 2, -1, string );
-		}
-		y -= tab_height;
-	}
-	gnome_print_grestore( ctxt->pc );
-	return gnome_font_get_width_utf8(ctxt->style->body_font, "123") + gnome_font_get_size (ctxt->style->body_font) / 5;
-}
-
-static double
-e_contact_get_letter_heading_height (EContactPrintContext *ctxt)
-{
-	gdouble ascender, descender;
-	ascender = gnome_font_get_ascender(ctxt->letter_heading_font);
-	descender = gnome_font_get_descender(ctxt->letter_heading_font);
-	return ascender + descender + 9;
-}
-
-static void
-e_contact_print_letter_heading (EContactPrintContext *ctxt, gchar *character)
-{
-	gdouble ascender, descender;
-	gdouble width;
-
-	width = gnome_font_get_width_utf8(ctxt->letter_heading_font, "m") * 1.7;
-	ascender = gnome_font_get_ascender(ctxt->letter_heading_font);
-	descender = gnome_font_get_descender(ctxt->letter_heading_font);
-	gnome_print_gsave( ctxt->pc );
-	e_contact_rectangle( ctxt->pc, ctxt->x, ctxt->y, ctxt->x + width, ctxt->y - (ascender + descender + 6), 0, 0, 0);
-	gnome_print_setrgbcolor(ctxt->pc, 1, 1, 1);
-	ctxt->y -= 4;
-	e_contact_output(ctxt->pc, ctxt->letter_heading_font, ctxt->x + (width - gnome_font_get_width_utf8(ctxt->letter_heading_font, character))/ 2, ctxt->y, -1, character);
-	ctxt->y -= ascender + descender;
-	ctxt->y -= 2;
-	ctxt->y -= 3;
-	gnome_print_grestore( ctxt->pc );
-}
-
-static void
-e_contact_start_new_page(EContactPrintContext *ctxt)
-{
-	ctxt->x = ctxt->style->left_margin * 72;
-	ctxt->y = (ctxt->style->page_height - ctxt->style->top_margin) * 72;
-	ctxt->column = 0;
-	if ( ctxt->style->letter_tabs )
-		e_contact_print_letter_tab(ctxt);
-	gnome_print_showpage(ctxt->pc);
-
-	ctxt->first_char_on_page = ctxt->last_char_on_page + 1;
-}
-
-static double
-e_contact_get_card_size(ECardSimple *simple, EContactPrintContext *ctxt)
-{
-	gdouble height = 0;
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	char *file_as;
-	gint field;
-	if ( ctxt->style->letter_tabs )
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	gtk_object_get(GTK_OBJECT(simple->card),
-		       "file_as", &file_as,
-		       NULL);
-	height += e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as);
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-	
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING; field++) {
-		char *string;
-		string = e_card_simple_get(simple, field);
-		if (string && *string) {
-			double xoff = 0;
-			xoff += gnome_font_get_width_utf8(ctxt->style->body_font, e_card_simple_get_name(simple, field));
-			xoff += gnome_font_get_width_utf8(ctxt->style->body_font, ":  ");
-			height += e_contact_text_height(ctxt->pc, ctxt->style->body_font, column_width - xoff, string);
-			height += .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-		g_free(string);
-	}
-	height += gnome_font_get_size (ctxt->style->headings_font) * .4;
-
-	/* g_message ("%s %g", e_card_simple_get (simple, E_CARD_SIMPLE_FIELD_FILE_AS), height); */
-	return height;
-}
-
-
-static void
-e_contact_print_card (ECardSimple *simple, EContactPrintContext *ctxt)
-{
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	char *file_as;
-	int field;
-
-	if ( ctxt->style->letter_tabs )
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-
-	gnome_print_gsave(ctxt->pc);
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	gtk_object_get(GTK_OBJECT(simple->card),
-		       "file_as", &file_as,
-		       NULL);
-	if (ctxt->style->print_using_grey)
-		e_contact_rectangle(ctxt->pc, ctxt->x, ctxt->y + gnome_font_get_size (ctxt->style->headings_font) * .3, ctxt->x + column_width, ctxt->y - e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as) - gnome_font_get_size (ctxt->style->headings_font) * .3, .85, .85, .85);
-	e_contact_output(ctxt->pc, ctxt->style->headings_font, ctxt->x + 2, ctxt->y, column_width - 4, file_as);
-	ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as);
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-	
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING; field++) {
-		char *string;
-		string = e_card_simple_get(simple, field);
-
-		if (string && !strncmp (string, "<?xml", 4)) {
-			EDestination *dest = e_destination_import (string);
-			if (dest != NULL) {
-				gchar *new_string = g_strdup (e_destination_get_address (dest));
-				g_free (string);
-				string = new_string;
-				gtk_object_unref (GTK_OBJECT (dest));
-			}
-		}
-
-		if (string && *string) {
-			double xoff = 0;
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, e_card_simple_get_name(simple, field));
-			xoff += gnome_font_get_width_utf8(ctxt->style->body_font, e_card_simple_get_name(simple, field));
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, ":  ");
-			xoff += gnome_font_get_width_utf8(ctxt->style->body_font, ":  ");
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, column_width - xoff, string);
-			ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->body_font, column_width - xoff, string);
-			ctxt->y -= .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-		g_free(string);
-	}
-	
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .4;
-	gnome_print_grestore(ctxt->pc);
-}
-
-static void
-e_contact_start_new_column (EContactPrintContext *ctxt)
-{
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_offset;
-	if ( ctxt->style->letter_tabs ) 
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_offset = (page_width + 18) / ctxt->style->num_columns;
-	ctxt->column ++;
-	if (ctxt->column >= ctxt->style->num_columns) {
-		e_contact_start_new_page(ctxt);
-		ctxt->column = 0;
-	}
-	ctxt->x = (72 * ctxt->style->left_margin) + column_offset * ctxt->column;
-	ctxt->y = 72 * (ctxt->style->page_height - ctxt->style->top_margin);
-}
-
-static void
-complete_sequence(EBookView *book_view, EContactPrintContext *ctxt)
-{
-	GList *cards = ctxt->cards;
-
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-
-	ctxt->first_contact = TRUE;
-	ctxt->character = NULL;
-	ctxt->y = (ctxt->style->page_height - ctxt->style->top_margin) * 72;
-	ctxt->x = (ctxt->style->left_margin) * 72;
-	if ( ctxt->style->letter_tabs ) 
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	
-	ctxt->first_char_on_page = 'A' - 1;
-
-	for(; cards; cards = cards->next) {
-		ECard *card = cards->data;
-		ECardSimple *simple = e_card_simple_new(card);
-		guchar *file_as;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "file_as", &file_as,
-			       NULL);
-		if ( file_as && (!ctxt->character || *ctxt->character != tolower(*file_as)) ) {
-			if (ctxt->style->sections_start_new_page && ! ctxt->first_contact) {
-				e_contact_start_new_page(ctxt);
-			}
-			else if ((!ctxt->first_contact) && (ctxt->y - e_contact_get_letter_heading_height(ctxt) - e_contact_get_card_size(simple, ctxt) < ctxt->style->bottom_margin * 72))
-				e_contact_start_new_column(ctxt);
-			if (!ctxt->character)
-				ctxt->character = g_strdup(" ");
-			*ctxt->character = tolower(*file_as);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, ctxt->character);
-			ctxt->first_section = FALSE;
-		} 
-		else if ( (!ctxt->first_contact) && (ctxt->y - e_contact_get_card_size(simple, ctxt) < ctxt->style->bottom_margin * 72)) {
-			e_contact_start_new_column(ctxt);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, ctxt->character);
-		}
-		ctxt->last_char_on_page = toupper(*file_as);
-		if ( ctxt->last_char_on_page < ctxt->first_char_on_page )
-			ctxt->first_char_on_page = ctxt->last_char_on_page;
-		e_contact_print_card(simple, ctxt);
-		ctxt->first_contact = FALSE;
-		gtk_object_unref(GTK_OBJECT(simple));
-	}
-	ctxt->last_char_on_page = 'Z';
-	if ( ctxt->style->letter_tabs )
-		e_contact_print_letter_tab(ctxt);
-	gnome_print_showpage(ctxt->pc);
-	gnome_print_context_close(ctxt->pc);
-	g_free(ctxt->character);
-	if (book_view)
-		gtk_object_unref(GTK_OBJECT(book_view));
-	if (ctxt->type == GNOME_PRINT_PREVIEW) {
-		GtkWidget *preview;
-		preview = GTK_WIDGET(gnome_print_master_preview_new(ctxt->master, "Print Preview"));
-		gtk_widget_show_all(preview);
-	} else {
-		gnome_print_master_print(ctxt->master);
-	}
-	gtk_object_unref(GTK_OBJECT(ctxt->pc));
-	gtk_object_unref(GTK_OBJECT(ctxt->master));
-	if (ctxt->book)
-		gtk_object_unref(GTK_OBJECT(ctxt->book));
-	g_free(ctxt->query);
-	g_list_foreach(ctxt->cards, (GFunc) gtk_object_unref, NULL);
-	g_list_free(ctxt->cards);
-	gtk_object_unref(GTK_OBJECT(ctxt->style->headings_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->style->body_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->style->header_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->style->footer_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->letter_heading_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->letter_tab_font));
-	g_free(ctxt->style);
-	g_free(ctxt);
-}
-
-static int
-card_compare (ECard *card1, ECard *card2) {
-	if (card1 && card2) {
-		char *file_as1, *file_as2;
-		gtk_object_get(GTK_OBJECT(card1),
-			       "file_as", &file_as1,
-			       NULL);
-		gtk_object_get(GTK_OBJECT(card2),
-			       "file_as", &file_as2,
-			       NULL);
-		if (file_as1 && file_as2)
-			return g_utf8_collate(file_as1, file_as2);
-		if (file_as1)
-			return -1;
-		if (file_as2)
-			return 1;
-		return strcmp(e_card_get_id(card1), e_card_get_id(card2));
-	} else {
-		return 0;
-	}
-}
-
-static void
-create_card(EBookView *book_view, const GList *cards, EContactPrintContext *ctxt)
-{
-	for(; cards; cards = cards->next) {
-		ECard *card = cards->data;
-		gtk_object_ref(GTK_OBJECT(card));
-		ctxt->cards = g_list_insert_sorted(ctxt->cards, card, (GCompareFunc) card_compare);
-	}
-}
-
-static void
-book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, EContactPrintContext *ctxt)
-{
-	gtk_object_ref(GTK_OBJECT(book_view));
-
-	gtk_signal_connect(GTK_OBJECT(book_view),
-			   "card_added",
-			   GTK_SIGNAL_FUNC(create_card),
-			   ctxt);
-
-	gtk_signal_connect(GTK_OBJECT(book_view),
-			   "sequence_complete",
-			   GTK_SIGNAL_FUNC(complete_sequence),
-			   ctxt);
-}
-
-static void
-e_contact_do_print_cards (EBook *book, char *query, EContactPrintContext *ctxt)
-{
-	e_book_get_book_view(book, query, (EBookBookViewCallback) book_view_loaded, ctxt);
-}
-
-#if 0
-static double
-e_contact_get_phone_list_size(ECardSimple *simple, EContactPrintContext *ctxt)
-{
-	double height = 0;
-	int field;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-	
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST_SIMPLE_STRING; field++) {
-		char *string;
-		string = e_card_simple_get(simple, field);
-		if (string && *string) {
-			if ( 1 ) /* field is a phone field. */ {
-				gchar *field = string;
-				height += e_contact_text_height(ctxt->pc, ctxt->style->body_font, 100, field);
-				height += .2 * gnome_font_get_size (ctxt->style->body_font);
-			}
-		}
-		g_free(string);
-	}
-	height += gnome_font_get_size (ctxt->style->headings_font) * .4;
-	return height;
-}
-
-
-static void
-e_contact_print_phone_list (ECard *card, EContactPrintContext *ctxt)
-{
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	double xoff, dotwidth;
-	int dotcount;
-	char *dots;
-	int i;
-	char *file_as;
-	if ( ctxt->style->letter_tabs )
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-
-	gnome_print_gsave(ctxt->pc);
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x, ctxt->y, -1, e_card_get_string_fileas(card));
-	
-	xoff = column_width - 9 * gnome_font_get_size (ctxt->style->body_font);
-	dotwidth = xoff - 
-		gnome_font_get_width_utf8(ctxt->style->body_font, e_card_get_string_fileas(card)) - 
-		gnome_font_get_width_utf8(ctxt->style->body_font, " ");
-	dotcount = dotwidth / gnome_font_get_width(ctxt->style->body_font, '.');
-	dots = g_new(gchar, dotcount + 1);
-	for (i = 0; i < dotcount; i++)
-		dots[i] = '.';
-	dots[dotcount] = 0;
-	e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff - dotcount * gnome_font_get_width(ctxt->style->body_font, '.'), ctxt->y, -1, dots);
-	g_free(dots);
-		
-	for(; shown_fields; shown_fields = g_list_next(shown_fields)) {
-		if ( 1 ) /* field is a phone field. */ {
-			gchar *field = e_card_get_string(card, shown_fields->data);
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, shown_fields->data);
-			e_contact_output(ctxt->pc, ctxt->style->body_font, 
-					 ctxt->x + column_width - gnome_font_get_width_utf8(ctxt->style->body_font, 
-											      field),
-					 ctxt->y,
-					 -1,
-					 field);
-			ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->body_font, 100, field);
-			ctxt->y -= .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-	}
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .4;
-	gnome_print_grestore(ctxt->pc);
-}
-
-static void
-e_contact_do_print_phone_list (EBook *book, char *query, EContactPrintContext *ctxt)
-{
-	ECard *card = NULL;
-	int i;
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	ctxt->first_contact = TRUE;
-	ctxt->character = NULL;
-	ctxt->y = (ctxt->style->page_height - ctxt->style->top_margin) * 72;
-	ctxt->x = (ctxt->style->left_margin) * 72;
-	if ( ctxt->style->letter_tabs ) 
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	
-	ctxt->first_char_on_page = 'A' - 1;
-
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-	/*
-	for(card = e_book_get_first(book); card; card = e_book_get_next(book)) {
-	*/
-	for (i=0; i < 30; i++) {
-		guchar *file_as = e_card_get_string_fileas(card);
-		if ( file_as && (!character || *character != tolower(*file_as)) ) {
-			if (ctxt->style->sections_start_new_page && ! first_contact) {
-				e_contact_start_new_page(ctxt);
-			}
-			else if ((!first_contact) && (ctxt->y - e_contact_get_letter_heading_height(ctxt) - e_contact_get_phone_list_size(card, ctxt, shown_fields) < ctxt->style->bottom_margin * 72))
-				e_contact_start_new_column(ctxt);
-			if (!character)
-				character = g_strdup(" ");
-			*character = tolower(*file_as);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, character);
-			ctxt->first_section = FALSE;
-		} 
-		else if ( (!first_contact) && (ctxt->y - e_contact_get_card_size(card, ctxt, shown_fields) < ctxt->style->bottom_margin * 72)) {
-			e_contact_start_new_column(ctxt);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, character);
-		}
-		ctxt->last_char_on_page = toupper(*file_as);
-		if ( ctxt->last_char_on_page < ctxt->first_char_on_page )
-			ctxt->first_char_on_page = ctxt->last_char_on_page;
-		e_contact_print_phone_list(card, ctxt, shown_fields);
-		first_contact = FALSE;
-	}
-	ctxt->last_char_on_page = 'Z';
-	if ( ctxt->style->letter_tabs )
-		e_contact_print_letter_tab(ctxt);
-	gnome_print_showpage(ctxt->pc);
-	gnome_print_context_close(ctxt->pc);
-	g_free(character);
-}
-#endif
-
-static void
-e_contact_do_print (EBook *book, char *query, EContactPrintContext *ctxt)
-{
-	switch ( ctxt->style->type ) {
-	case E_CONTACT_PRINT_TYPE_CARDS:
-		e_contact_do_print_cards( book, query, ctxt);
-		break;
-#if 0
-	case E_CONTACT_PRINT_TYPE_PHONE_LIST:
-		e_contact_do_print_phone_list( book, query, ctxt );
-		break;
-#endif
-	default:
-		break;
-	}
-}
-
-static void lowify( char *data )
-{
-	for ( ; *data; data++ )
-		*data = tolower((unsigned char) *data);
-}
-
-static gboolean get_bool( char *data )
-{
-	if ( data ) {
-		lowify ( data );
-		return ! strcmp(data, "true");
-	} else
-		return FALSE;
-}
-
-static void get_string( char *data, char **variable )
-{
-	g_free ( *variable );
-	if ( data )
-		*variable = g_strdup( data );
-	else
-		*variable = g_strdup( "" );
-}
-
-static int get_integer( char *data )
-{
-	if ( data )
-		return atoi(data);
-	else 
-		return 0;
-}
-
-static double get_float( char *data )
-{
-	if ( data )
-		return atof(data);
-	else 
-		return 0;
-}
-
-static void get_font( char *data, GnomeFont **variable )
-{
-	if ( data ) {
-		GnomeFont *font = gnome_font_new_from_full_name( data );
-		if ( font ) {
-			gtk_object_unref( GTK_OBJECT(*variable) );
-			*variable = font;
-		}
-	}
-}
-
-
-static void
-e_contact_build_style(EContactPrintStyle *style)
-{
-	xmlDocPtr styledoc;
-	gchar *filename;
-	style->title = g_strdup("");
-	style->type = E_CONTACT_PRINT_TYPE_CARDS;
-	style->sections_start_new_page = TRUE;
-	style->num_columns = 2;
-	style->blank_forms = 2;
-	style->letter_tabs = TRUE;
-	style->letter_headings = FALSE;
-
-	style->headings_font = gnome_font_new_closest("Helvetica", GNOME_FONT_BOLD, FALSE, 8);
-	style->body_font = gnome_font_new_closest("Helvetica", GNOME_FONT_BOOK, FALSE, 6);
-
-	style->print_using_grey = TRUE;
-	style->paper_type = 0;
-	style->paper_width = 8.5;
-	style->paper_height = 11;
-	style->paper_source = 0;
-	style->top_margin = .5;
-	style->left_margin = .5;
-	style->bottom_margin = .5;
-	style->right_margin = .5;
-	style->page_size = 0;
-	style->page_width = 2.75;
-	style->page_height = 4.25;
-#if 0
-	style->page_width = 4.25;
-	style->page_height = 5.5;
-#endif
-#if 0
-	style->page_width = 5.5;
-	style->page_height = 8.5;
-#endif
-	style->orientation_portrait = FALSE;
-
-	style->header_font = gnome_font_new_closest("Helvetica", GNOME_FONT_BOOK, FALSE, 6);
-
-	style->left_header = g_strdup("");
-	style->center_header = g_strdup("");
-	style->right_header = g_strdup("");
-
-	style->footer_font = gnome_font_new_closest("Helvetica", GNOME_FONT_BOOK, FALSE, 6);
-
-	style->left_footer = g_strdup("");
-	style->center_footer = g_strdup("");
-	style->right_footer = g_strdup("");
-	style->reverse_on_even_pages = FALSE;
-	filename = g_concat_dir_and_file(EVOLUTION_ECPSDIR, "medbook.ecps");
-	styledoc = xmlParseFile(filename);
-	g_free(filename);
-	if (styledoc) {
-		xmlNodePtr stylenode = xmlDocGetRootElement(styledoc);
-		xmlNodePtr node;
-		for (node = stylenode->childs; node; node = node->next) {
-			char *data = xmlNodeGetContent ( node );
-			if ( !strcmp( node->name, "title" ) ) {
-				get_string(data, &(style->title));
-			} else if ( !strcmp( node->name, "type" ) ) {
-				lowify( data );
-				if ( !strcmp( data, "cards" ) )
-					style->type = E_CONTACT_PRINT_TYPE_CARDS;
-				else if ( !strcmp( data, "memo_style" ) )
-					style->type = E_CONTACT_PRINT_TYPE_MEMO_STYLE;
-				else if ( !strcmp( data, "phone_list" ) )
-					style->type = E_CONTACT_PRINT_TYPE_PHONE_LIST;
-			} else if ( !strcmp( node->name, "sections_start_new_page" ) ) {
-				style->sections_start_new_page = get_bool(data);
-			} else if ( !strcmp( node->name, "num_columns" ) ) {
-				style->num_columns = get_integer(data);
-			} else if ( !strcmp( node->name, "blank_forms" ) ) {
-				style->blank_forms = get_integer(data);
-			} else if ( !strcmp( node->name, "letter_tabs" ) ) {
-				style->letter_tabs = get_bool(data);
-			} else if ( !strcmp( node->name, "letter_headings" ) ) {
-				style->letter_headings = get_bool(data);
-			} else if ( !strcmp( node->name, "headings_font" ) ) {
-				get_font( data, &(style->headings_font) );
-			} else if ( !strcmp( node->name, "body_font" ) ) {
-				get_font( data, &(style->body_font) );
-			} else if ( !strcmp( node->name, "print_using_grey" ) ) {
-				style->print_using_grey = get_bool(data);
-			} else if ( !strcmp( node->name, "paper_width" ) ) {
-				style->paper_width = get_float(data);
-			} else if ( !strcmp( node->name, "paper_height" ) ) {
-				style->paper_height = get_float(data);
-			} else if ( !strcmp( node->name, "top_margin" ) ) {
-				style->top_margin = get_float(data);
-			} else if ( !strcmp( node->name, "left_margin" ) ) {
-				style->left_margin = get_float(data);
-			} else if ( !strcmp( node->name, "bottom_margin" ) ) {
-				style->bottom_margin = get_float(data);
-			} else if ( !strcmp( node->name, "right_margin" ) ) {
-				style->right_margin = get_float(data);
-			} else if ( !strcmp( node->name, "page_width" ) ) {
-				style->page_width = get_float(data);
-			} else if ( !strcmp( node->name, "page_height" ) ) {
-				style->page_height = get_float(data);
-			} else if ( !strcmp( node->name, "orientation" ) ) {
-				if ( data ) {
-					lowify(data);
-					style->orientation_portrait = strcmp(data, "landscape");
-				} else {
-					style->orientation_portrait = TRUE;
-				}
-			} else if ( !strcmp( node->name, "header_font" ) ) {
-				get_font( data, &(style->header_font) );
-			} else if ( !strcmp( node->name, "left_header" ) ) {
-				get_string(data, &(style->left_header));
-			} else if ( !strcmp( node->name, "center_header" ) ) {
-				get_string(data, &(style->center_header));
-			} else if ( !strcmp( node->name, "right_header" ) ) {
-				get_string(data, &(style->right_header));
-			} else if ( !strcmp( node->name, "footer_font" ) ) {
-				get_font( data, &(style->footer_font) );
-			} else if ( !strcmp( node->name, "left_footer" ) ) {
-				get_string(data, &(style->left_footer));
-			} else if ( !strcmp( node->name, "center_footer" ) ) {
-				get_string(data, &(style->center_footer));
-			} else if ( !strcmp( node->name, "right_footer" ) ) {
-				get_string(data, &(style->right_footer));
-			} else if ( !strcmp( node->name, "reverse_on_even_pages" ) ) {
-				style->reverse_on_even_pages = get_bool(data);
-			}
-			if ( data )
-				xmlFree (data);
-		}
-		xmlFreeDoc(styledoc);
-	}
-}
-
-static gint
-e_contact_print_close(GnomeDialog *dialog, gpointer data)
-{
-	return FALSE;
-}
-
-static void
-e_contact_print_button(GnomeDialog *dialog, gint button, gpointer data)
-{
-	EContactPrintContext *ctxt = g_new(EContactPrintContext, 1);
-	EContactPrintStyle *style = g_new(EContactPrintStyle, 1);
-	GnomePrintMaster *master;
-	GnomePrintContext *pc;
-	gboolean uses_book = (gint) gtk_object_get_data(GTK_OBJECT(dialog), "uses_book");
-	EBook *book = NULL;
-	char *query = NULL;
-	ECard *card = NULL;
-	gdouble font_size;
-	if (uses_book) {
-		book = gtk_object_get_data(GTK_OBJECT(dialog), "book");
-		query = gtk_object_get_data(GTK_OBJECT(dialog), "query");
-	} else {
-		card = gtk_object_get_data(GTK_OBJECT(dialog), "card");
-	}
-	switch( button ) {
-	case GNOME_PRINT_PRINT:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-		e_contact_build_style(style);
-		
-		ctxt->x = 0;
-		ctxt->y = 0;
-		ctxt->column = 0;
-		ctxt->style = style;
-		ctxt->master = master;
-		ctxt->first_section = TRUE;
-		ctxt->first_char_on_page = 'A' - 1;
-		ctxt->type = GNOME_PRINT_PRINT;
-
-		font_size = 72 * ctxt->style->page_height / 27.0 / 2.0;
-		ctxt->letter_heading_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), gnome_font_get_size (ctxt->style->headings_font) * 1.5);
-		ctxt->letter_tab_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), font_size);
-	
-		ctxt->pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, 
-										   72 * style->paper_width, 
-										   72 * style->paper_height,
-										   72 * style->page_width,
-										   72 * style->page_height));
-		
-		ctxt->book = book;
-		ctxt->query = query;
-		if (uses_book) {
-			ctxt->cards = NULL;
-			e_contact_do_print(book, ctxt->query, ctxt);
-		} else {
-			ctxt->cards = g_list_append(NULL, card);
-			complete_sequence(NULL, ctxt);
-		}
-		gnome_dialog_close(dialog);
-		break;
-	case GNOME_PRINT_PREVIEW:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-		e_contact_build_style(style);
-		
-		ctxt->x = 0;
-		ctxt->y = 0;
-		ctxt->column = 0;
-		ctxt->style = style;
-		ctxt->master = master;
-		ctxt->first_section = TRUE;
-		ctxt->first_char_on_page = 'A' - 1;
-		ctxt->type = GNOME_PRINT_PREVIEW;
-
-		font_size = 72 * ctxt->style->page_height / 27.0 / 2.0;
-		ctxt->letter_heading_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), gnome_font_get_size (ctxt->style->headings_font) * 1.5);
-		ctxt->letter_tab_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), font_size);
-		
-		ctxt->pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, 
-										   72 * style->paper_width, 
-										   72 * style->paper_height,
-										   72 * style->page_width,
-										   72 * style->page_height));
-		
-		ctxt->book = book;
-		ctxt->query = g_strdup(query);
-		if (uses_book) {
-			ctxt->cards = NULL;
-			gtk_object_ref(GTK_OBJECT(book));
-			e_contact_do_print(book, ctxt->query, ctxt);
-		} else {
-			ctxt->cards = g_list_append(NULL, card);
-			gtk_object_ref(GTK_OBJECT(card));
-			complete_sequence(NULL, ctxt);
-		}
-		break;
-	case GNOME_PRINT_CANCEL:
-		if (uses_book)
-			gtk_object_unref(GTK_OBJECT(book));
-		else
-			gtk_object_unref(GTK_OBJECT(card));
-		g_free(query);
-		gnome_dialog_close(dialog);
-		g_free(style);
-		g_free(ctxt);
-		break;
-	}
-}
-
-GtkWidget *
-e_contact_print_dialog_new(EBook *book, char *query)
-{
-	GtkWidget *dialog;
-	
-	
-	dialog = gnome_print_dialog_new(_("Print cards"), GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);
-	gnome_print_dialog_construct_range_any(GNOME_PRINT_DIALOG(dialog), GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_SELECTION,
-					       NULL, NULL, NULL);
-
-	gtk_object_ref(GTK_OBJECT(book));
-	gtk_object_set_data(GTK_OBJECT(dialog), "uses_book", (void *) 1);
-	gtk_object_set_data(GTK_OBJECT(dialog), "book", book);
-	gtk_object_set_data(GTK_OBJECT(dialog), "query", g_strdup(query));
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "close", GTK_SIGNAL_FUNC(e_contact_print_close), NULL);
-	return dialog;
-}
-
-void
-e_contact_print_preview(EBook *book, char *query)
-{
-	EContactPrintContext *ctxt = g_new(EContactPrintContext, 1);
-	EContactPrintStyle *style = g_new(EContactPrintStyle, 1);
-	GnomePrintMaster *master;
-	GnomePrintContext *pc;
-	gdouble font_size;
-
-	master = gnome_print_master_new();
-	gnome_print_master_set_copies (master, 1, FALSE);
-	pc = gnome_print_master_get_context (master);
-	e_contact_build_style (style);
-
-	ctxt->x = 0;
-	ctxt->y = 0;
-	ctxt->column = 0;
-	ctxt->style = style;
-	ctxt->master = master;
-	ctxt->first_section = TRUE;
-	ctxt->first_char_on_page = 'A' - 1;
-	ctxt->type = GNOME_PRINT_PREVIEW;
-
-	font_size = 72 * ctxt->style->page_height / 27.0 / 2.0;
-	ctxt->letter_heading_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), gnome_font_get_size (ctxt->style->headings_font) * 1.5);
-	ctxt->letter_tab_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), font_size);
-
-	ctxt->pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, 
-									    72 * style->paper_width, 
-									    72 * style->paper_height,
-									    72 * style->page_width,
-									    72 * style->page_height));
-
-	ctxt->book = book;
-	ctxt->query = g_strdup(query);
-	ctxt->cards = NULL;
-	gtk_object_ref(GTK_OBJECT(book));
-	e_contact_do_print(book, ctxt->query, ctxt);
-}
-
-GtkWidget *
-e_contact_print_card_dialog_new(ECard *card)
-{
-	GtkWidget *dialog;
-	
-	dialog = gnome_print_dialog_new(_("Print card"), GNOME_PRINT_DIALOG_COPIES);
-
-	card = e_card_duplicate(card);
-	gtk_object_set_data(GTK_OBJECT(dialog), "card", card);
-	gtk_object_set_data(GTK_OBJECT(dialog), "uses_book", (void *) 0);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "close", GTK_SIGNAL_FUNC(e_contact_print_close), NULL);
-	return dialog;
-}
-
-/* FIXME: Print all the contacts selected. */
-GtkWidget *
-e_contact_print_card_list_dialog_new(GList *list)
-{
-	GtkWidget *dialog;
-	ECard *card;
-
-	if (list == NULL)
-		return NULL;
-	
-	dialog = gnome_print_dialog_new(_("Print card"), GNOME_PRINT_DIALOG_COPIES);
-
-	card = e_card_duplicate(list->data);
-	gtk_object_set_data(GTK_OBJECT(dialog), "card", card);
-	gtk_object_set_data(GTK_OBJECT(dialog), "uses_book", (void *) 0);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "close", GTK_SIGNAL_FUNC(e_contact_print_close), NULL);
-	return dialog;
-}
diff --git a/addressbook/printing/e-contact-print.glade b/addressbook/printing/e-contact-print.glade
deleted file mode 100644
index 292fc8cc85..0000000000
--- a/addressbook/printing/e-contact-print.glade
+++ /dev/null
@@ -1,2003 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Printing</name>
-  <program_name>printing</program_name>
-  <directory></directory>
-  <source_directory></source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>False</gnome_support>
-  <gettext_support>False</gettext_support>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>print-edit-style</name>
-  <visible>False</visible>
-  <title>Page Setup:</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox-contact-print-style-editor</name>
-      <homogeneous>False</homogeneous>
-      <spacing>5</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox2</name>
-	<border_width>5</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>16</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label8</name>
-	  <label>Style name:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>label-style-name</name>
-	  <can_focus>True</can_focus>
-	  <editable>False</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkNotebook</class>
-	<name>notebook1</name>
-	<can_focus>True</can_focus>
-	<show_tabs>True</show_tabs>
-	<show_border>True</show_border>
-	<tab_pos>GTK_POS_TOP</tab_pos>
-	<scrollable>False</scrollable>
-	<tab_hborder>2</tab_hborder>
-	<tab_vborder>2</tab_vborder>
-	<popup_enable>False</popup_enable>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox2</name>
-	  <border_width>5</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>5</spacing>
-
-	  <widget>
-	    <class>GtkAlignment</class>
-	    <name>alignment1</name>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xscale>0</xscale>
-	    <yscale>0</yscale>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame5</name>
-	      <label>Preview:</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox1</name>
-	    <homogeneous>True</homogeneous>
-	    <spacing>7</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame6</name>
-	      <label>Options</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkAlignment</class>
-		<name>alignment4</name>
-		<xalign>0</xalign>
-		<yalign>0</yalign>
-		<xscale>0</xscale>
-		<yscale>0</yscale>
-
-		<widget>
-		  <class>GtkTable</class>
-		  <name>table1</name>
-		  <border_width>8</border_width>
-		  <rows>6</rows>
-		  <columns>5</columns>
-		  <homogeneous>False</homogeneous>
-		  <row_spacing>0</row_spacing>
-		  <column_spacing>0</column_spacing>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label5</name>
-		    <label>Include:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>1</right_attach>
-		      <top_attach>4</top_attach>
-		      <bottom_attach>5</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label4</name>
-		    <label>Sections:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>1</right_attach>
-		      <top_attach>0</top_attach>
-		      <bottom_attach>1</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment2</name>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xscale>0</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>5</right_attach>
-		      <top_attach>0</top_attach>
-		      <bottom_attach>1</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkRadioButton</class>
-		      <name>radiobutton1</name>
-		      <can_focus>True</can_focus>
-		      <label>Immediately follow each other</label>
-		      <active>True</active>
-		      <draw_indicator>True</draw_indicator>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>checkbutton1</name>
-		    <can_focus>True</can_focus>
-		    <label>Letter tabs on side</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>5</right_attach>
-		      <top_attach>4</top_attach>
-		      <bottom_attach>5</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>checkbutton2</name>
-		    <can_focus>True</can_focus>
-		    <label>Headings for each letter</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>5</right_attach>
-		      <top_attach>5</top_attach>
-		      <bottom_attach>6</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment3</name>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xscale>0</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>5</right_attach>
-		      <top_attach>1</top_attach>
-		      <bottom_attach>2</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkRadioButton</class>
-		      <name>radiobutton2</name>
-		      <can_focus>True</can_focus>
-		      <label>Start on a new page</label>
-		      <active>False</active>
-		      <draw_indicator>True</draw_indicator>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label6</name>
-		    <label>Number of columns:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>3</right_attach>
-		      <top_attach>2</top_attach>
-		      <bottom_attach>3</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>2</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label7</name>
-		    <label>Blank forms at end:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>3</right_attach>
-		      <top_attach>3</top_attach>
-		      <bottom_attach>4</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>2</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment6</name>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xscale>0</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <left_attach>3</left_attach>
-		      <right_attach>4</right_attach>
-		      <top_attach>3</top_attach>
-		      <bottom_attach>4</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>2</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkSpinButton</class>
-		      <name>spinbutton2</name>
-		      <can_focus>True</can_focus>
-		      <climb_rate>1</climb_rate>
-		      <digits>0</digits>
-		      <numeric>False</numeric>
-		      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		      <snap>False</snap>
-		      <wrap>False</wrap>
-		      <value>2</value>
-		      <lower>0</lower>
-		      <upper>100</upper>
-		      <step>1</step>
-		      <page>10</page>
-		      <page_size>10</page_size>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment5</name>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xscale>0</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <left_attach>3</left_attach>
-		      <right_attach>4</right_attach>
-		      <top_attach>2</top_attach>
-		      <bottom_attach>3</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>2</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkSpinButton</class>
-		      <name>spinbutton1</name>
-		      <width>45</width>
-		      <can_focus>True</can_focus>
-		      <climb_rate>1</climb_rate>
-		      <digits>0</digits>
-		      <numeric>False</numeric>
-		      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		      <snap>False</snap>
-		      <wrap>False</wrap>
-		      <value>1</value>
-		      <lower>0</lower>
-		      <upper>100</upper>
-		      <step>1</step>
-		      <page>10</page>
-		      <page_size>10</page_size>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox3</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>8</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkFrame</class>
-		<name>frame7</name>
-		<label>Fonts</label>
-		<label_xalign>0</label_xalign>
-		<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-
-		<widget>
-		  <class>GtkTable</class>
-		  <name>table2</name>
-		  <border_width>8</border_width>
-		  <rows>2</rows>
-		  <columns>2</columns>
-		  <homogeneous>False</homogeneous>
-		  <row_spacing>13</row_spacing>
-		  <column_spacing>8</column_spacing>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment7</name>
-		    <xalign>0.5</xalign>
-		    <yalign>1</yalign>
-		    <xscale>1</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>2</right_attach>
-		      <top_attach>1</top_attach>
-		      <bottom_attach>2</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkButton</class>
-		      <name>button6</name>
-		      <can_focus>True</can_focus>
-		      <label>F_ont...</label>
-		      <relief>GTK_RELIEF_NORMAL</relief>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment8</name>
-		    <xalign>0.5</xalign>
-		    <yalign>1</yalign>
-		    <xscale>1</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <left_attach>1</left_attach>
-		      <right_attach>2</right_attach>
-		      <top_attach>0</top_attach>
-		      <bottom_attach>1</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>False</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkButton</class>
-		      <name>button5</name>
-		      <width>90</width>
-		      <can_focus>True</can_focus>
-		      <label>_Font...</label>
-		      <relief>GTK_RELIEF_NORMAL</relief>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkVBox</class>
-		    <name>vbox4</name>
-		    <homogeneous>False</homogeneous>
-		    <spacing>0</spacing>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>1</right_attach>
-		      <top_attach>0</top_attach>
-		      <bottom_attach>1</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>True</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label10</name>
-		      <label>Headings</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <name>entry3</name>
-		      <width>100</width>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text>10 pt. Tahoma</text>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkVBox</class>
-		    <name>vbox5</name>
-		    <homogeneous>False</homogeneous>
-		    <spacing>0</spacing>
-		    <child>
-		      <left_attach>0</left_attach>
-		      <right_attach>1</right_attach>
-		      <top_attach>1</top_attach>
-		      <bottom_attach>2</bottom_attach>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <xexpand>True</xexpand>
-		      <yexpand>False</yexpand>
-		      <xshrink>False</xshrink>
-		      <yshrink>False</yshrink>
-		      <xfill>True</xfill>
-		      <yfill>True</yfill>
-		    </child>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label9</name>
-		      <label>Body</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <name>entry2</name>
-		      <width>100</width>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text>8 pt. Tahoma</text>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkFrame</class>
-		<name>frame8</name>
-		<label>Shading</label>
-		<label_xalign>0</label_xalign>
-		<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-
-		<widget>
-		  <class>GtkCheckButton</class>
-		  <name>checkbutton3</name>
-		  <can_focus>True</can_focus>
-		  <label>Print using gray shading</label>
-		  <active>False</active>
-		  <draw_indicator>True</draw_indicator>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>Notebook:tab</child_name>
-	  <name>label1</name>
-	  <label>Format</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox3</name>
-	  <homogeneous>True</homogeneous>
-	  <spacing>0</spacing>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox6</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame9</name>
-	      <label>Paper</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox16</name>
-		<border_width>10</border_width>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox17</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label21</name>
-		    <label>Type:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkScrolledWindow</class>
-		    <name>scrolledwindow1</name>
-		    <hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
-		    <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-		    <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-		    <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkCList</class>
-		      <name>clist1</name>
-		      <can_focus>True</can_focus>
-		      <columns>1</columns>
-		      <column_widths>80</column_widths>
-		      <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-		      <show_titles>False</show_titles>
-		      <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-		      <widget>
-			<class>GtkLabel</class>
-			<child_name>CList:title</child_name>
-			<name>label26</name>
-			<label>label26</label>
-			<justify>GTK_JUSTIFY_CENTER</justify>
-			<wrap>False</wrap>
-			<xalign>0.5</xalign>
-			<yalign>0.5</yalign>
-			<xpad>0</xpad>
-			<ypad>0</ypad>
-		      </widget>
-		    </widget>
-		  </widget>
-		</widget>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox18</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label24</name>
-		    <label>Dimensions:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkHBox</class>
-		    <name>hbox5</name>
-		    <homogeneous>True</homogeneous>
-		    <spacing>0</spacing>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label27</name>
-		      <label>Width:</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0.5</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <name>entry9</name>
-		      <width>1</width>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text></text>
-		      <child>
-			<padding>0</padding>
-			<expand>True</expand>
-			<fill>True</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label28</name>
-		      <label>Height:</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0.5</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <name>entry10</name>
-		      <width>1</width>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text></text>
-		      <child>
-			<padding>0</padding>
-			<expand>True</expand>
-			<fill>True</fill>
-		      </child>
-		    </widget>
-		  </widget>
-		</widget>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox19</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label25</name>
-		    <label>Paper source:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCombo</class>
-		    <name>combo1</name>
-		    <value_in_list>False</value_in_list>
-		    <ok_if_empty>True</ok_if_empty>
-		    <case_sensitive>False</case_sensitive>
-		    <use_arrows>True</use_arrows>
-		    <use_arrows_always>False</use_arrows_always>
-		    <items></items>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <child_name>GtkCombo:entry</child_name>
-		      <name>combo-entry1</name>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text></text>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame10</name>
-	      <label>Margins</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkTable</class>
-		<name>table4</name>
-		<border_width>15</border_width>
-		<rows>2</rows>
-		<columns>4</columns>
-		<homogeneous>True</homogeneous>
-		<row_spacing>6</row_spacing>
-		<column_spacing>9</column_spacing>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label29</name>
-		  <label>Top:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>0</left_attach>
-		    <right_attach>1</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>True</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>True</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label30</name>
-		  <label>Bottom:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>0</left_attach>
-		    <right_attach>1</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>True</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>True</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label31</name>
-		  <label>Left:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>2</left_attach>
-		    <right_attach>3</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>True</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>True</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>entry11</name>
-		  <width>1</width>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <left_attach>1</left_attach>
-		    <right_attach>2</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>entry12</name>
-		  <width>1</width>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <left_attach>3</left_attach>
-		    <right_attach>4</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>entry13</name>
-		  <width>1</width>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <left_attach>3</left_attach>
-		    <right_attach>4</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>entry14</name>
-		  <width>1</width>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <left_attach>1</left_attach>
-		    <right_attach>2</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label32</name>
-		  <label>Right:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>2</left_attach>
-		    <right_attach>3</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>True</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>True</yfill>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox7</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame11</name>
-	      <label>Page</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox8</name>
-		<border_width>10</border_width>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox20</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label33</name>
-		    <label>Size:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkScrolledWindow</class>
-		    <name>scrolledwindow2</name>
-		    <hscrollbar_policy>GTK_POLICY_ALWAYS</hscrollbar_policy>
-		    <vscrollbar_policy>GTK_POLICY_ALWAYS</vscrollbar_policy>
-		    <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-		    <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkCList</class>
-		      <name>clist2</name>
-		      <can_focus>True</can_focus>
-		      <columns>1</columns>
-		      <column_widths>80</column_widths>
-		      <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
-		      <show_titles>False</show_titles>
-		      <shadow_type>GTK_SHADOW_IN</shadow_type>
-
-		      <widget>
-			<class>GtkLabel</class>
-			<child_name>CList:title</child_name>
-			<name>label35</name>
-			<label>label26</label>
-			<justify>GTK_JUSTIFY_CENTER</justify>
-			<wrap>False</wrap>
-			<xalign>0.5</xalign>
-			<yalign>0.5</yalign>
-			<xpad>0</xpad>
-			<ypad>0</ypad>
-		      </widget>
-		    </widget>
-		  </widget>
-		</widget>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox21</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label34</name>
-		    <label>Dimensions:</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkHBox</class>
-		    <name>hbox6</name>
-		    <homogeneous>True</homogeneous>
-		    <spacing>0</spacing>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label36</name>
-		      <label>Width:</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0.5</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <name>entry15</name>
-		      <width>1</width>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text></text>
-		      <child>
-			<padding>0</padding>
-			<expand>True</expand>
-			<fill>True</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label37</name>
-		      <label>Height:</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0.5</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkEntry</class>
-		      <name>entry16</name>
-		      <width>1</width>
-		      <can_focus>True</can_focus>
-		      <editable>True</editable>
-		      <text_visible>True</text_visible>
-		      <text_max_length>0</text_max_length>
-		      <text></text>
-		      <child>
-			<padding>0</padding>
-			<expand>True</expand>
-			<fill>True</fill>
-		      </child>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkFrame</class>
-	      <name>frame12</name>
-	      <label>Orientation</label>
-	      <label_xalign>0</label_xalign>
-	      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>hbox4</name>
-		<homogeneous>False</homogeneous>
-		<spacing>10</spacing>
-
-		<widget>
-		  <class>Placeholder</class>
-		</widget>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox9</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>5</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>True</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment9</name>
-		    <xalign>0</xalign>
-		    <yalign>1</yalign>
-		    <xscale>0</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkRadioButton</class>
-		      <name>radiobutton3</name>
-		      <can_focus>True</can_focus>
-		      <label>Portrait</label>
-		      <active>False</active>
-		      <draw_indicator>True</draw_indicator>
-		    </widget>
-		  </widget>
-
-		  <widget>
-		    <class>GtkAlignment</class>
-		    <name>alignment10</name>
-		    <xalign>0</xalign>
-		    <yalign>0</yalign>
-		    <xscale>0</xscale>
-		    <yscale>0</yscale>
-		    <child>
-		      <padding>0</padding>
-		      <expand>True</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkRadioButton</class>
-		      <name>radiobutton4</name>
-		      <can_focus>True</can_focus>
-		      <label>Landscape</label>
-		      <active>False</active>
-		      <draw_indicator>True</draw_indicator>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>Notebook:tab</child_name>
-	  <name>label2</name>
-	  <label>Paper</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox10</name>
-	  <border_width>8</border_width>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table5</name>
-	    <rows>4</rows>
-	    <columns>3</columns>
-	    <homogeneous>True</homogeneous>
-	    <row_spacing>4</row_spacing>
-	    <column_spacing>4</column_spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment15</name>
-	      <xalign>0</xalign>
-	      <yalign>1</yalign>
-	      <xscale>0</xscale>
-	      <yscale>0</yscale>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkButton</class>
-		<name>button11</name>
-		<can_focus>True</can_focus>
-		<label>F_ont...</label>
-		<relief>GTK_RELIEF_NORMAL</relief>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>text10</name>
-	      <height>50</height>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>True</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>text11</name>
-	      <height>50</height>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	      <child>
-		<left_attach>2</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>text12</name>
-	      <height>50</height>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>text13</name>
-	      <height>50</height>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>True</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>text14</name>
-	      <height>5</height>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkText</class>
-	      <name>text15</name>
-	      <height>50</height>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text></text>
-	      <child>
-		<left_attach>2</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment16</name>
-	      <xalign>0.5</xalign>
-	      <yalign>1</yalign>
-	      <xscale>1</xscale>
-	      <yscale>0</yscale>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox14</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label14</name>
-		  <label>Header</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>entry7</name>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment17</name>
-	      <xalign>0.5</xalign>
-	      <yalign>1</yalign>
-	      <xscale>1</xscale>
-	      <yscale>0</yscale>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox15</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label15</name>
-		  <label>Footer:</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkEntry</class>
-		  <name>entry8</name>
-		  <can_focus>True</can_focus>
-		  <editable>True</editable>
-		  <text_visible>True</text_visible>
-		  <text_max_length>0</text_max_length>
-		  <text></text>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment14</name>
-	      <xalign>0</xalign>
-	      <yalign>1</yalign>
-	      <xscale>0</xscale>
-	      <yscale>0</yscale>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkButton</class>
-		<name>button10</name>
-		<can_focus>True</can_focus>
-		<label>_Font...</label>
-		<relief>GTK_RELIEF_NORMAL</relief>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox7</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkToolbar</class>
-	      <name>toolbar1</name>
-	      <orientation>GTK_ORIENTATION_HORIZONTAL</orientation>
-	      <type>GTK_TOOLBAR_ICONS</type>
-	      <space_size>5</space_size>
-	      <space_style>GTK_TOOLBAR_SPACE_EMPTY</space_style>
-	      <relief>GTK_RELIEF_NORMAL</relief>
-	      <tooltips>True</tooltips>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-
-	      <widget>
-		<class>Placeholder</class>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton4</name>
-	    <can_focus>True</can_focus>
-	    <label>Reverse on even pages</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <child_name>Notebook:tab</child_name>
-	  <name>label3</name>
-	  <label>Header/Footer</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h
deleted file mode 100644
index 12f13f4573..0000000000
--- a/addressbook/printing/e-contact-print.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print.h
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CONTACT_PRINT_H
-#define E_CONTACT_PRINT_H
-
-#include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include "e-contact-print-types.h"
-
-GtkWidget *e_contact_print_dialog_new(EBook *book, char *query);
-void e_contact_print_preview(EBook *book, char *query);
-GtkWidget *e_contact_print_card_dialog_new(ECard *card);
-GtkWidget *e_contact_print_card_list_dialog_new(GList *list);
-
-#endif /* E_CONTACT_PRINT_H */
diff --git a/addressbook/printing/medbook.ecps b/addressbook/printing/medbook.ecps
deleted file mode 100644
index ef76c0b46e..0000000000
--- a/addressbook/printing/medbook.ecps
+++ /dev/null
@@ -1,30 +0,0 @@
-<style>
-<title/>
-<type>cards</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>2</num_columns>
-<blank_forms>2</blank_forms>
-<letter_tabs>TRUE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica Bold 12</headings_font>
-<body_font>Helvetica 8</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>8.5</page_width>
-<page_height>11</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 8</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 8</footer_font>
-<left_footer/>
-<center_footer>[Page #]</center_footer>
-<right_footer/>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/phonelist.ecps b/addressbook/printing/phonelist.ecps
deleted file mode 100644
index 980750a6b2..0000000000
--- a/addressbook/printing/phonelist.ecps
+++ /dev/null
@@ -1,29 +0,0 @@
-<style>
-<title/>
-<type>phone_list</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>2</num_columns>
-<letter_tabs>FALSE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica Bold 10</headings_font>
-<body_font>Helvetica 8</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>8.5</page_width>
-<page_height>11</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 8</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 8</footer_font>
-<left_footer>[User Name]</left_footer>
-<center_footer>[Page #]</center_footer>
-<right_footer>[Date Printed]</right_footer>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/smallbook.ecps b/addressbook/printing/smallbook.ecps
deleted file mode 100644
index 0bb19aa92e..0000000000
--- a/addressbook/printing/smallbook.ecps
+++ /dev/null
@@ -1,30 +0,0 @@
-<style>
-<title/>
-<type>cards</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>1</num_columns>
-<blank_forms>2</blank_forms>
-<letter_tabs>TRUE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica Bold 8</headings_font>
-<body_font>Helvetica 6</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>2.75</page_width>
-<page_height>4.25</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 6</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 6</footer_font>
-<left_footer/>
-<center_footer>[Page #]</center_footer>
-<right_footer/>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/test-contact-print-style-editor.c b/addressbook/printing/test-contact-print-style-editor.c
deleted file mode 100644
index 0ac169468c..0000000000
--- a/addressbook/printing/test-contact-print-style-editor.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * test-contact-print-style-editor.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <gtk/gtkmain.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-init.h>
-#include "e-contact-print-style-editor.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-GtkWidget *editor;
-
-static void destroy_callback(GtkWidget *app, gpointer data)
-{
-	static int count = 2;
-	count --;
-	if ( count <= 0 )
-		exit(0);
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Contact Print Style Editor Test" ), VERSION,
-		      _( "Copyright (C) 2000, Ximian, Inc." ),
-		      authors,
-		      _( "This should test the contact print style editor widget" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GtkWidget *app;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Contact Print Style Editor Test", VERSION, argc, argv);
-
-  glade_gnome_init ();
-
-  app = gnome_app_new("Contact Print Style Editor Test", NULL);
-
-  editor = e_contact_print_style_editor_new("");
-  
-  gnome_app_set_contents( GNOME_APP( app ), editor );
-
-  /* Connect the signals */
-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",
-		      GTK_SIGNAL_FUNC( destroy_callback ),
-		      ( gpointer ) app );
-
-  gtk_widget_show_all( app );
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c
deleted file mode 100644
index fc868318d8..0000000000
--- a/addressbook/printing/test-print.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * test-print.c
- * Copyright (C) 2000  Ximian, Inc.
- * Author: Chris Lahey <clahey@ximian.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <gtk/gtkmain.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-init.h>
-#include <glade/glade.h>
-#include "e-contact-print.h"
-
-/* This is a horrible thing to do, but it is just a test. */
-GtkWidget *print;
-
-static gint test_close(GnomeDialog *dialog, gpointer data)
-{
-	exit(0);
-	return 1;
-}
-
-#if 0
-static void about_callback( GtkWidget *widget, gpointer data )
-{
-  
-  const gchar *authors[] =
-  {
-    "Christopher James Lahey <clahey@umich.edu>",
-    NULL
-  };
-
-  GtkWidget *about =
-    gnome_about_new ( _( "Contact Print Test" ), VERSION,
-		      _( "Copyright (C) 2000, Ximian, Inc." ),
-		      authors,
-		      _( "This should test the contact print code" ),
-		      NULL);
-  gtk_widget_show (about);                                            
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-  GList *shown_fields = NULL;
-
-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-      textdomain (PACKAGE);*/
-
-  gnome_init( "Contact Print Test", VERSION, argc, argv);
-
-  glade_gnome_init ();
-  
-  shown_fields = g_list_append(shown_fields, "First field");
-  shown_fields = g_list_append(shown_fields, "Second field");
-  shown_fields = g_list_append(shown_fields, "Third field");
-  shown_fields = g_list_append(shown_fields, "Fourth field");
-
-  print = e_contact_print_dialog_new(NULL, NULL);
-  gtk_widget_show_all(print);
-  gtk_signal_connect(GTK_OBJECT(print), "close", GTK_SIGNAL_FUNC(test_close), NULL);
-
-  gtk_main(); 
-
-  /* Not reached. */
-  return 0;
-}
diff --git a/art/.cvsignore b/art/.cvsignore
deleted file mode 100644
index c038ed7864..0000000000
--- a/art/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
-\ No newline at end of file
diff --git a/art/16_copy.png b/art/16_copy.png
deleted file mode 100644
index 31ede839ea..0000000000
--- a/art/16_copy.png
+++ /dev/null
diff --git a/art/16_customize.png b/art/16_customize.png
deleted file mode 100644
index 1a0e15ad4e..0000000000
--- a/art/16_customize.png
+++ /dev/null
diff --git a/art/16_cut.png b/art/16_cut.png
deleted file mode 100644
index 5860a9c56f..0000000000
--- a/art/16_cut.png
+++ /dev/null
diff --git a/art/16_paste.png b/art/16_paste.png
deleted file mode 100644
index 56f15c5cc3..0000000000
--- a/art/16_paste.png
+++ /dev/null
diff --git a/art/ChangeLog b/art/ChangeLog
deleted file mode 100644
index 1e12af0338..0000000000
--- a/art/ChangeLog
+++ /dev/null
@@ -1,498 +0,0 @@
-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 334318a4af..0000000000
--- a/art/Makefile.am
+++ /dev/null
@@ -1,233 +0,0 @@
-imagesdir = $(datadir)/images/evolution
-images_DATA = \
-	16_copy.png			\
-	16_customize.png		\
-	16_cut.png			\
-	16_paste.png			\
-	about-box.png			\
-	apply-filters-16.xpm		\
-	bcg.png				\
-	configure_16_addressbook.xpm	\
-	configure_16_calendar.xpm	\
-	configure_16_folder.xpm		\
-	configure_16_mail.xpm		\
-	contact-is-a-list.png		\
-	copy_16_message.xpm		\
-	edit.xpm			\
-	empty.gif			\
-	encrypt.xpm			\
-	es-appointments.png		\
-	es-weather.png			\
-	folder.xpm			\
-	forward.xpm			\
-	goto-16.png			\
-	ico-calendar.png		\
-	ico-mail.png			\
-	ico-rdf.png			\
-	ico-weather.png			\
-	import.png			\
-	import.xpm			\
-	inbox-16.png			\
-	inbox-full-16.png		\
-	meeting-request.png 		\
-	alarm.png			\
-	meeting-request.png		\
-	move_message.xpm		\
-	offline.png			\
-	online.png			\
-	open-in-new-window-16.png 	\
-	outbox-16.png 			\
-	outbox-full-16.png 		\
-	pattern.png			\
-	pgp-signature-bad.png 		\
-	pgp-signature-nokey.png 	\
-	pgp-signature-ok.png 		\
-	print.xpm			\
-	print-preview.xpm		\
-	rdf.png				\
-	reply.xpm			\
-	reply_to_all.xpm		\
-	save.xpm			\
-	all_contacts.xpm		\
-	find_contact.xpm		\
-	find_message.xpm		\
-	briefcase.png       		\
-	butterfly.png			\
-	cellphone.png       		\
-	compose-message.png		\
-	envelope.png        		\
-	evolution-calendar-mini.png 	\
-	evolution-calendar.png 		\
-	evolution-contacts-mini.png 	\
-	evolution-contacts-plain.png 	\
-	evolution-contacts.png 		\
-	evolution-inbox-mini.png 	\
-	evolution-inbox.png 		\
-	evolution-notes-mini.png 	\
-	evolution-notes.png 		\
-	evolution-tasks-mini.png 	\
-	evolution-tasks.png 		\
-	evolution-today-mini.png	\
-	evolution-today.png 		\
-	evolution-trash-mini.png 	\
-	evolution-trash.png 		\
-	executive-summary-bg.png	\
-	executive-summary-curve.png	\
-	faq-16.png			\
-	fetch-mail.png			\
-	folder-copy-16.png		\
-	folder-move-16.png		\
-	globe.png           		\
-	hide_deleted_messages.xpm	\
-	hide_read_messages.xpm		\
-	hide_selected_messages.xpm	\
-	house.png           		\
-	ldap.png			\
-	ldap-mini.png			\
-	malehead.png			\
-	mail-config-druid.png		\
-	mail-config-druid-identity.png	\
-	mail-config-druid-receive.png	\
-	mail-config-druid-send.png	\
-	mail-config-druid-account-name.png \
-	mark-as-important-16.png	\
-	myevo-appointments.png		\
-	myevo-mail-summary.png		\
-	myevo-post-it.png		\
-	myweather-rain.png		\
-	myweather-snow.png		\
-	myweather-storm.png		\
-	myweather-fog.png		\
-	myweather-sun.png		\
-	myweather-suncloud.png		\
-	myweather-clouds.png		\
-	new_appointment.xpm		\
-	new_contact.xpm			\
-	new-message.xpm			\
-	new_task-16.png			\
-	save-16.png			\
-	save-as-16.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.png		\
-	service-down-disabled.png	\
-	service-left.png		\
-	service-left-disabled.png	\
-	service-right.png		\
-	service-right-disabled.png	\
-	service-up.png			\
-	service-up-disabled.png		\
-	show_all_messages.xpm		\
-	splash.png			\
-	talking-heads.png		\
-	task.xpm			\
-	task.png			\
-	thankyou.png			\
-	timezone-16.xpm			\
-	timezone-48.png 		\
-	undelete_message-16.png		\
-	wax-seal.png			\
-	wax-seal-broken.png		\
-	work_offline.xpm		\
-	work_online-16.png		\
-	world_map-960.png
-
-buttonsdir = $(datadir)/images/evolution/buttons
-buttons_DATA = 				\
-	arrow-right-24.png		\
-	arrow-left-24.png		\
-	add-attachment.png		\
-	add-service.png			\
-	compose-message.png		\
-	copy-message.png		\
-	copy.png			\
-	cut.png				\
-	dayview.xpm			\
-	delete-message.png		\
-	fetch-mail.png			\
-	forward.png			\
-	goto-24.png  			\
-	monthview.xpm  			\
-	move-message.png		\
-	next-message.png		\
-	new_appointment.png		\
-	new_task.png			\
-	paste.png			\
-	previous-message.png		\
-	print.png			\
-	print-preview-24.png		\
-	reply.png			\
-	reply-to-all.png		\
-	receive-24.png		\
-	save-24.png			\
-	send-24-receive.png		\
-	send-24.png		\
-	weekview.xpm  			\
-	workweekview.xpm		\
-	yearview.xpm
-
-gladedir = $(datadir)/evolution/glade
-glade_DATA = 					\
-	evolution.png				\
-	import.png				\
-	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		\
-	meeting_widget.png			\
-	thankyou.png				\
-	timezone-48.png
-
-conduitsdir = $(datadir)/images/evolution/conduits
-conduits_DATA =				\
-	evo-16-address-conduit.png   	\
-	evo-16-todo-conduit.png     	\
-	evo-16-calendar-conduit.png  	\
-	evo-48-calendar-conduit.png	\
-	evo-48-address-conduit.png  	\
-	evo-48-todo-conduit.png
-
-appicondir = $(datadir)/pixmaps
-appicon_DATA = evolution.png
-
-EXTRA_DIST = \
-	attachment.xpm			\
-	bell.xpm			\
-	check-filled.xpm		\
-	empty.xpm			\
-	jump.xpm			\
-	mail-need-reply.xpm		\
-	mail-new.xpm			\
-	mail-read.xpm			\
-	mail-replied.xpm		\
-	mark.xpm			\
-	meeting.xpm			\
-	priority-high.xpm		\
-	priority-low.xpm		\
-	recur.xpm			\
-	score-higher.xpm		\
-	score-highest.xpm		\
-	score-high.xpm			\
-	score-lower.xpm			\
-	score-lowest.xpm		\
-	score-low.xpm			\
-	score-normal.xpm		\
-	task-assigned-to.xpm		\
-	task-assigned.xpm		\
-	task-recurring.xpm		\
-	timezone-16.xpm			\
-	tree-expanded.xpm		\
-	tree-unexpanded.xpm		\
-	$(images_DATA)			\
-	$(buttons_DATA)			\
-	$(conduits_DATA)		\
-	$(glade_DATA)			\
-	$(appicon_DATA)
-
-
diff --git a/art/about-box.png b/art/about-box.png
deleted file mode 100644
index 6bbd104789..0000000000
--- a/art/about-box.png
+++ /dev/null
diff --git a/art/add-attachment.png b/art/add-attachment.png
deleted file mode 100644
index adbec9900b..0000000000
--- a/art/add-attachment.png
+++ /dev/null
diff --git a/art/add-nntp-folder-24.png b/art/add-nntp-folder-24.png
deleted file mode 100644
index 4941fe9250..0000000000
--- a/art/add-nntp-folder-24.png
+++ /dev/null
diff --git a/art/add-service.png b/art/add-service.png
deleted file mode 100644
index eb20f4e068..0000000000
--- a/art/add-service.png
+++ /dev/null
diff --git a/art/alarm.png b/art/alarm.png
deleted file mode 100644
index 71a9be8a48..0000000000
--- a/art/alarm.png
+++ /dev/null
diff --git a/art/all_contacts.xpm b/art/all_contacts.xpm
deleted file mode 100644
index 817bff7649..0000000000
--- a/art/all_contacts.xpm
+++ /dev/null
@@ -1,158 +0,0 @@
-/* XPM */
-static char * all_contacts_xpm[] = {
-"24 24 131 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #FDFDFD",
-"@ 	c #F5F5F5",
-"# 	c #F6F6F6",
-"$ 	c #D0D0D0",
-"% 	c #C1C1C1",
-"& 	c #C3C3C3",
-"* 	c #C6C6C6",
-"= 	c #C8C8C8",
-"- 	c #8D8D8D",
-"; 	c #CACACA",
-"> 	c #919191",
-", 	c #EFEFEF",
-"' 	c #878787",
-") 	c #8A8A8A",
-"! 	c #5C5C5C",
-"~ 	c #F8F8F8",
-"{ 	c #EAEAEA",
-"] 	c #CCCCCC",
-"^ 	c #CECECE",
-"/ 	c #979797",
-"( 	c #D2D2D2",
-"_ 	c #9A9A9A",
-": 	c #646464",
-"< 	c #939393",
-"[ 	c #9D9D9D",
-"} 	c #6B6B6B",
-"| 	c #BDBDBD",
-"1 	c #FFFFFF",
-"2 	c #A1A1A1",
-"3 	c #D9D9D9",
-"4 	c #E3E3E3",
-"5 	c #EDEDED",
-"6 	c #EEEEEE",
-"7 	c #C9B49B",
-"8 	c #8E7151",
-"9 	c #876E51",
-"0 	c #BAB1A5",
-"a 	c #FBFBFB",
-"b 	c #FEFEFE",
-"c 	c #DEDCD7",
-"d 	c #9E9E9E",
-"e 	c #BABABA",
-"f 	c #D1D1D1",
-"g 	c #A3A3A3",
-"h 	c #F3F3F3",
-"i 	c #A88D6E",
-"j 	c #DFD0BF",
-"k 	c #5E432B",
-"l 	c #7E6C5B",
-"m 	c #313131",
-"n 	c #575757",
-"o 	c #FCFCFC",
-"p 	c #555555",
-"q 	c #D5D3CF",
-"r 	c #868686",
-"s 	c #A6A6A6",
-"t 	c #CDCDCD",
-"u 	c #DBDBDB",
-"v 	c #EEDFCC",
-"w 	c #F4EEE6",
-"x 	c #765E45",
-"y 	c #736251",
-"z 	c #D9D7D2",
-"A 	c #606060",
-"B 	c #7D7D7D",
-"C 	c #9C9C9C",
-"D 	c #A5A5A5",
-"E 	c #7C7C7C",
-"F 	c #FAFAFA",
-"G 	c #7590AE",
-"H 	c #C1665A",
-"I 	c #445B71",
-"J 	c #D7D6D3",
-"K 	c #ADADAD",
-"L 	c #9B9B9B",
-"M 	c #B6B6B6",
-"N 	c #E6E6E6",
-"O 	c #F1F1F1",
-"P 	c #A8A8A8",
-"Q 	c #4B6983",
-"R 	c #9DB8D2",
-"S 	c #486481",
-"T 	c #314E6C",
-"U 	c #667A8D",
-"V 	c #D4D3CE",
-"W 	c #787878",
-"X 	c #D3D3D3",
-"Y 	c #E1E1E1",
-"Z 	c #ABABAB",
-"` 	c #5F7C96",
-" .	c #5D7A95",
-"..	c #4D6B87",
-"+.	c #3B556D",
-"@.	c #344A60",
-"#.	c #999999",
-"$.	c #C7C7C7",
-"%.	c #DDDBD6",
-"&.	c #DADADA",
-"*.	c #E2E2E2",
-"=.	c #898989",
-"-.	c #A9A9A9",
-";.	c #B0B0B0",
-">.	c #5D5D5D",
-",.	c #CBC9C2",
-"'.	c #BBBBBB",
-").	c #ECECEC",
-"!.	c #EAE8E3",
-"~.	c #DAD8D3",
-"{.	c #D3D2CD",
-"].	c #CECCC8",
-"^.	c #CCCAC6",
-"/.	c #D1CFCA",
-"(.	c #D2D0CB",
-"_.	c #C8C5BF",
-":.	c #737169",
-"<.	c #8F8F8F",
-"[.	c #B3B3B3",
-"}.	c #DCDCDC",
-"|.	c #E8E8E8",
-"1.	c #B5B5B5",
-"2.	c #565656",
-"3.	c #A0A0A0",
-"4.	c #C2C2C2",
-"5.	c #848484",
-"6.	c #838383",
-"7.	c #7B7B7B",
-"8.	c #8B8B8B",
-"9.	c #B2B2B2",
-"0.	c #B8B8B8",
-"                                                ",
-"                                                ",
-"        . . . . . . . . . . . . . . . . . . . . ",
-"        . + @ @ @ @ @ @ @ # # # # # # # # # $ . ",
-"        . @ % % % & & & & * * * * * = = = = - . ",
-"        . # & & & * * * * = = = = = ; ; ; ; > . ",
-"        . , ' ' ' ) ) ) ) - - - - - > > > > ! . ",
-"        . ~ { { { { { { { { { { { { { { { { ; . ",
-"        . # ; ; ; ] ] ] ] ] ^ ^ ^ ^ $ $ $ $ / . ",
-"        . # ] ] ] ^ ^ ^ ^ ^ $ & ^ $ ( ( ( ( _ . ",
-"  . . . . . . . . . . . . . . : < / [ [ [ [ } . ",
-". | 1 1 1 1 1 1 1 1 1 1 1 1 2 . 3 4 5 6 6 6 * . ",
-". 1 ~ 7 8 9 0 1 + 1 a 1 1 b c . d e f 3 3 3 g . ",
-". 1 h i j k l 1 m n o p + 1 q . r s t u u u g . ",
-". 1 h v w x y 1 1 1 1 1 1 1 z . A B C D D D E . ",
-". 1 F G H I J 1 K 1 L K 1 1 q . ) M N O O , P . ",
-". 1 Q R S T U 1 1 1 1 1 1 1 V . W D X Y Y Y Z . ",
-". 1 `  ...+.@.1 #.L 5 $.1 1 %.. E K &.*.*.*.K . ",
-". 1 1 1 1 1 1 1 1 1 1 1 1 1 c . A =.-.;.;.;.[ . ",
-". 1 1 >.1 >.1 W 1 L 1 * o F ,.. =.'.).@ @ @ $ . ",
-". g !.!.!.~.~.~.{.].^./.(._.:.. <.[.}.N |.|.1.. ",
-"  . . . . . . . . . . . . . . 2.3.% Y N |.|.1.. ",
-"        . 4.< - =.' 5.) r 6.7.E 8.2 9.1.0.0.e . ",
-"        . . . . . . . . . . . . . . . . . . . . "};
diff --git a/art/apply-filters-16.xpm b/art/apply-filters-16.xpm
deleted file mode 100644
index 28410fe30b..0000000000
--- a/art/apply-filters-16.xpm
+++ /dev/null
@@ -1,48 +0,0 @@
-/* XPM */
-static char * apply_filers_16_xpm[] = {
-"16 16 29 1",
-" 	c None",
-".	c #161616",
-"+	c #EDEAE8",
-"@	c #CDC1BA",
-"#	c #6A4E3D",
-"$	c #C6B8AF",
-"%	c #333333",
-"&	c #F3F1EE",
-"*	c #5E4537",
-"=	c #D6CCC5",
-"-	c #916C56",
-";	c #5A4235",
-">	c #BBA9A0",
-",	c #C3B3AC",
-"'	c #CEC1BB",
-")	c #BBAAA0",
-"!	c #A1897A",
-"~	c #664B3B",
-"{	c #383838",
-"]	c #856B60",
-"^	c #C2B3A9",
-"/	c #E9E3E0",
-"(	c #EEE9E7",
-"_	c #7B5A46",
-":	c #F5F4F2",
-"<	c #B8A69B",
-"[	c #AE998D",
-"}	c #553E32",
-"|	c #725442",
-"                ",
-"  .+.           ",
-"  .@.     .#    ",
-"  .$.     %&*   ",
-"  .$.......=-;  ",
-"  .$>$$$$$,'--. ",
-"  .$.......)-*  ",
-"  .$.     .!*   ",
-"  .$.     .~    ",
-"  .$.     {]    ",
-"  .^.     ./~   ",
-"  .(.......,-#  ",
-"  _$:,$$$$$<--. ",
-"   ~.......[-}  ",
-"          .!#   ",
-"          .|    "};
diff --git a/art/arrow-left-24.png b/art/arrow-left-24.png
deleted file mode 100644
index a977b3fb1a..0000000000
--- a/art/arrow-left-24.png
+++ /dev/null
diff --git a/art/arrow-right-24.png b/art/arrow-right-24.png
deleted file mode 100644
index 393b0dca3e..0000000000
--- a/art/arrow-right-24.png
+++ /dev/null
diff --git a/art/attachment.xpm b/art/attachment.xpm
deleted file mode 100644
index 21f2ecdb0e..0000000000
--- a/art/attachment.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * attachment_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #000000",
-"                ",
-"     ...        ",
-"    .+++. .     ",
-"   .+...+.+.    ",
-"   .+.+.+.+.    ",
-"   .+.+.+.+.    ",
-"   .+.+.+.+.    ",
-"   .+.+.+.+.    ",
-"   .+.+.+.+.    ",
-"   .+.+.+.+.    ",
-"   .+.+.+.+.    ",
-"   .+..+..+.    ",
-"   .+.....+.    ",
-"    .+...+.     ",
-"     .+++.      ",
-"      ...       "};
diff --git a/art/bcg.png b/art/bcg.png
deleted file mode 100644
index ec03f8ab6e..0000000000
--- a/art/bcg.png
+++ /dev/null
diff --git a/art/bell.xpm b/art/bell.xpm
deleted file mode 100644
index b1ab537a17..0000000000
--- a/art/bell.xpm
+++ /dev/null
@@ -1,83 +0,0 @@
-/* XPM */
-static char * bell_xpm[] = {
-"16 16 64 1",
-" 	c None",
-".	c #000000",
-"+	c #E3BB43",
-"@	c #E6C049",
-"#	c #EED275",
-"$	c #F4E193",
-"%	c #F4DF8C",
-"&	c #EAC95C",
-"*	c #EFD57A",
-"=	c #FAEFBB",
-"-	c #FDF6D3",
-";	c #FDF5C6",
-">	c #F4E18F",
-",	c #E4BD43",
-"'	c #F6E295",
-")	c #FEF9D8",
-"!	c #FFFFFF",
-"~	c #FFFADA",
-"{	c #FCEEAA",
-"]	c #EBCA5A",
-"^	c #E9C550",
-"/	c #FAEA9C",
-"(	c #FEF7CB",
-"_	c #FFF8CC",
-":	c #FDF1A8",
-"<	c #EED060",
-"[	c #D39D12",
-"}	c #F2D55D",
-"|	c #FCEC91",
-"1	c #FFF4AE",
-"2	c #FFF5B6",
-"3	c #FEEF97",
-"4	c #F3D65E",
-"5	c #D5A216",
-"6	c #FAE05C",
-"7	c #FFED7C",
-"8	c #FFEF8C",
-"9	c #FFF092",
-"0	c #FDEB7A",
-"a	c #F4D750",
-"b	c #D8A717",
-"c	c #EAC01D",
-"d	c #F6D83E",
-"e	c #FAE255",
-"f	c #FAE362",
-"g	c #F9E161",
-"h	c #F6DE5B",
-"i	c #F1D145",
-"j	c #E6BE28",
-"k	c #D09B09",
-"l	c #B67E00",
-"m	c #CE9100",
-"n	c #D69F04",
-"o	c #E0B011",
-"p	c #E6BA1D",
-"q	c #E3B721",
-"r	c #E0B21E",
-"s	c #DCAB16",
-"t	c #D7A20D",
-"u	c #CC9303",
-"v	c #BE8400",
-"w	c #AC7500",
-"x	c #A06B00",
-"y	c #FFDD00",
-"                ",
-"       ..       ",
-"      .+@.      ",
-"     .#$%&.     ",
-"    .*=-;>,.    ",
-"    .')!~{].    ",
-"   .^/(~_:<[.   ",
-"   .}|121345.   ",
-"   .678980ab.   ",
-"  .cdefghijkl.  ",
-" .mnopqrstuvwx. ",
-" .............. ",
-"      .8y.      ",
-"       ..       ",
-"                ",
-"                "};
diff --git a/art/briefcase.png b/art/briefcase.png
deleted file mode 100644
index 424ad09632..0000000000
--- a/art/briefcase.png
+++ /dev/null
diff --git a/art/butterfly.png b/art/butterfly.png
deleted file mode 100644
index 00089774e0..0000000000
--- a/art/butterfly.png
+++ /dev/null
diff --git a/art/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/configure_16_addressbook.xpm b/art/configure_16_addressbook.xpm
deleted file mode 100644
index 4e037fe7b5..0000000000
--- a/art/configure_16_addressbook.xpm
+++ /dev/null
@@ -1,77 +0,0 @@
-/* XPM */
-static char * 16_configure_addressbook_xpm[] = {
-"16 16 58 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #EFEFEF",
-"#	c #C3C3C3",
-"$	c #EAEAEA",
-"%	c #BDBDBD",
-"&	c #CFCFCF",
-"*	c #898989",
-"=	c #A8A8A8",
-"-	c #A3A3A3",
-";	c #F8F8F8",
-">	c #C9B49B",
-",	c #8E7151",
-"'	c #876E51",
-")	c #BAB1A5",
-"!	c #9D9D9D",
-"~	c #EAE8E3",
-"{	c #F3F3F3",
-"]	c #A88D6E",
-"^	c #DFD0BF",
-"/	c #5E432B",
-"(	c #7E6C5B",
-"_	c #A6A6A6",
-":	c #EEEEEE",
-"<	c #EEDFCC",
-"[	c #F4EEE6",
-"}	c #765E45",
-"|	c #736251",
-"1	c #C1C1C1",
-"2	c #B4B4B4",
-"3	c #FAFAFA",
-"4	c #7590AE",
-"5	c #C1665A",
-"6	c #445B71",
-"7	c #AEADAB",
-"8	c #E8E8E8",
-"9	c #4B6983",
-"0	c #9DB8D2",
-"a	c #486481",
-"b	c #314E6C",
-"c	c #BDBCB8",
-"d	c #5F7C96",
-"e	c #5D7A95",
-"f	c #4D6B87",
-"g	c #3B556D",
-"h	c #999794",
-"i	c #ADABA8",
-"j	c #5D5D5D",
-"k	c #9B9B9B",
-"l	c #DEDEDE",
-"m	c #C3C0BA",
-"n	c #DAD8D3",
-"o	c #B1AFAB",
-"p	c #CBC9C5",
-"q	c #A5A3A0",
-"r	c #96948F",
-"s	c #918E85",
-"       ..  ..   ",
-"      .+.  .@.  ",
-"      .+....@.  ",
-"      .+@@@@#.  ",
-" .......$@@#... ",
-".%+++++&.+#.*=-.",
-".+;>,')+.+@.!&~.",
-".+{]^/(+.+#._:~.",
-".+{<[}|1.+@.2&~.",
-".+34567.8@##.2~.",
-".+90ab.&@@@@#.c.",
-".+defg.+....@.h.",
-".+++++.+.!2.@.i.",
-".++j+j+..kl..!m.",
-".-~~~~~noc~pqrs.",
-" .............. "};
diff --git a/art/configure_16_calendar.xpm b/art/configure_16_calendar.xpm
deleted file mode 100644
index 3dd7392a1d..0000000000
--- a/art/configure_16_calendar.xpm
+++ /dev/null
@@ -1,76 +0,0 @@
-/* XPM */
-static char * configure_16_calendar_xpm[] = {
-"16 16 57 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #EFEFEF",
-"#	c #A8A8A8",
-"$	c #C3C3C3",
-"%	c #D4D4D4",
-"&	c #939393",
-"*	c #F5F5F5",
-"=	c #EAEAEA",
-"-	c #E05232",
-";	c #DF4623",
-">	c #E78B76",
-",	c #868686",
-"'	c #4A4A4A",
-")	c #DF502F",
-"!	c #E87F68",
-"~	c #FDF6F4",
-"{	c #A7A7A7",
-"]	c #747474",
-"^	c #CFCFCF",
-"/	c #DF4B29",
-"(	c #F1B2A3",
-"_	c #E05231",
-":	c #F3BFB4",
-"<	c #EEEEEE",
-"[	c #FAE8E4",
-"}	c #F9DDD6",
-"|	c #E87B62",
-"1	c #8D8D8D",
-"2	c #7B7B7B",
-"3	c #9C9C9C",
-"4	c #989898",
-"5	c #707070",
-"6	c #E2E2E2",
-"7	c #E8E8E8",
-"8	c #B4B4B4",
-"9	c #E1E1E1",
-"0	c #B0B0B0",
-"a	c #DEDEDE",
-"b	c #E0E0E0",
-"c	c #F4F4F4",
-"d	c #9D9D9D",
-"e	c #979797",
-"f	c #BDBDBD",
-"g	c #A0A0A0",
-"h	c #C1C1C1",
-"i	c #DADADA",
-"j	c #D9D9D9",
-"k	c #CECECE",
-"l	c #7C7C7C",
-"m	c #EDEDED",
-"n	c #9F9F9F",
-"o	c #ECECEC",
-"p	c #E6E6E6",
-"q	c #E7E7E7",
-"r	c #808080",
-" ..  ..         ",
-".+....@........ ",
-".+....@.++++++#.",
-".+@@@@$.++++%&*.",
-" .=@@$.++-+;>,*.",
-"  .+$.'#++)!~{*.",
-"  .+@.]^+/(_:+*.",
-"  .+$.#<+[+}|+<.",
-"  .+@.12$3$4$56.",
-" .7@$$.8++++++9.",
-".^@@@@$.^+++0ab.",
-".+....@.{+++c#b.",
-".+.de.@.f+++ghi.",
-" ..jk..da+++++b.",
-"  .lm^#n<op96qr.",
-"   ............ "};
diff --git a/art/configure_16_folder.xpm b/art/configure_16_folder.xpm
deleted file mode 100644
index 4d016ca91a..0000000000
--- a/art/configure_16_folder.xpm
+++ /dev/null
@@ -1,85 +0,0 @@
-/* XPM */
-static char * 16_configure_folder_xpm[] = {
-"16 16 66 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #EFEFEF",
-"#	c #C3C3C3",
-"$	c #E4E5DF",
-"%	c #D5D6CB",
-"&	c #D6D7CA",
-"*	c #F5F6F0",
-"=	c #ADB198",
-"-	c #C2C6A9",
-";	c #C0C3A7",
-">	c #B4B89D",
-",	c #EAECDB",
-"'	c #F6F6F4",
-")	c #EAECDA",
-"!	c #AAAB9E",
-"~	c #E5E8D4",
-"{	c #E4E7D2",
-"]	c #C7C9B6",
-"^	c #F7F7F7",
-"/	c #DADEBF",
-"(	c #DADEBE",
-"_	c #D8DCBC",
-":	c #D6DBB9",
-"<	c #797D66",
-"[	c #CDD2AD",
-"}	c #CBD1AA",
-"|	c #95997C",
-"1	c #F3F3EA",
-"2	c #70745E",
-"3	c #A3A889",
-"4	c #F3F4EA",
-"5	c #D5D9B7",
-"6	c #7F8369",
-"7	c #ABB08E",
-"8	c #929778",
-"9	c #F1F3E9",
-"0	c #D3D7B4",
-"a	c #7C7F65",
-"b	c #8F9474",
-"c	c #F0F1E7",
-"d	c #D1D6B2",
-"e	c #CFD4AF",
-"f	c #7A7D61",
-"g	c #8D9270",
-"h	c #EFF1E5",
-"i	c #86896D",
-"j	c #909273",
-"k	c #707459",
-"l	c #EBECDE",
-"m	c #CACFA8",
-"n	c #C8CDA5",
-"o	c #B8BD97",
-"p	c #848769",
-"q	c #BFC598",
-"r	c #60634C",
-"s	c #989E79",
-"t	c #C9CCB9",
-"u	c #919576",
-"v	c #848869",
-"w	c #686B52",
-"x	c #838768",
-"y	c #595C46",
-"z	c #797D60",
-"A	c #666951",
-"      ..  ..    ",
-"     .+.  .@.   ",
-"     .+....@.   ",
-"   ...+@@@@#.   ",
-"  .$%&.+@@#.    ",
-" .*=-;>.+#..... ",
-" .,',,).+@.!~{].",
-" .^/(_:.+#.<[}|.",
-" .1/(_:.+@.23}|.",
-" .4_:5.+@##.678.",
-" .950.+@@@@#.ab.",
-" .cde.+....@.fg.",
-" .h[}.+.ij.@.kg.",
-" .lmno..pq..rsg.",
-" .t8ubvwwgxyzgA.",
-"  ............. "};
diff --git a/art/configure_16_mail.xpm b/art/configure_16_mail.xpm
deleted file mode 100644
index b6416735ef..0000000000
--- a/art/configure_16_mail.xpm
+++ /dev/null
@@ -1,61 +0,0 @@
-/* XPM */
-static char * 16_configure_mail_xpm[] = {
-"16 16 42 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #EFEFEF",
-"#	c #C3C3C3",
-"$	c #010101",
-"%	c #2F2F2F",
-"&	c #A7A4A0",
-"*	c #FCFCFC",
-"=	c #F5F5F5",
-"-	c #5D5B57",
-";	c #EBEBEB",
-">	c #1B1B1B",
-",	c #FBFBF8",
-"'	c #716E6B",
-")	c #ECECEC",
-"!	c #BEBEBE",
-"~	c #EDEDED",
-"{	c #DFDFDF",
-"]	c #FBFAF7",
-"^	c #A5A29D",
-"/	c #E9E9E8",
-"(	c #797873",
-"_	c #8E8C8A",
-":	c #C6C3BD",
-"<	c #C9C5C0",
-"[	c #7D7A77",
-"}	c #F7F5F1",
-"|	c #FAF9F6",
-"1	c #F8F6F2",
-"2	c #DAD8D6",
-"3	c #656360",
-"4	c #E2DFD8",
-"5	c #090808",
-"6	c #D7D4CE",
-"7	c #D8D5CF",
-"8	c #D6D3CD",
-"9	c #D9D6D0",
-"0	c #D3D1CD",
-"a	c #BEBCB6",
-"b	c #E0DCD5",
-"c	c #222221",
-"         ..  .. ",
-"        .+.  .@.",
-"        .+....@.",
-"        .+@@@@#.",
-"         .+@@#. ",
-"          .+#.  ",
-"  $%$$$$$$.+@.  ",
-" $&******=.+#.  ",
-" $+-+++++;>+@.  ",
-" $+,'+++).!@##. ",
-" $+,,'+~.{@@@@#.",
-" $+,]^'/.+....@.",
-" $+](,,_.+.:<.@.",
-" $+[,}|12..34.. ",
-" $56777890abc$  ",
-"  $$$$$$$$$$$   "};
diff --git a/art/contact-is-a-list.png b/art/contact-is-a-list.png
deleted file mode 100644
index 3a7bc1c143..0000000000
--- a/art/contact-is-a-list.png
+++ /dev/null
diff --git a/art/copy-message.png b/art/copy-message.png
deleted file mode 100644
index 907ec1a85d..0000000000
--- a/art/copy-message.png
+++ /dev/null
diff --git a/art/copy.png b/art/copy.png
deleted file mode 100644
index 23a6db32e3..0000000000
--- a/art/copy.png
+++ /dev/null
diff --git a/art/copy_16_message.xpm b/art/copy_16_message.xpm
deleted file mode 100644
index a4f56cfd6e..0000000000
--- a/art/copy_16_message.xpm
+++ /dev/null
@@ -1,58 +0,0 @@
-/* XPM */
-static char * 16_copy_message_xpm[] = {
-"16 16 39 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #95938E",
-"&	c #FBFBFB",
-"*	c #F9F8F6",
-"=	c #FBFAFA",
-"-	c #F6F5F1",
-";	c #7D7B78",
-">	c #EAE8E3",
-",	c #969491",
-"'	c #F6F4F1",
-")	c #81807C",
-"!	c #E5E3DE",
-"~	c #F7F6F4",
-"{	c #B0ADA7",
-"]	c #83817E",
-"^	c #E1DFDA",
-"/	c #928F8B",
-"(	c #FBFBFA",
-"_	c #F7F5F2",
-":	c #F5F3F0",
-"<	c #B5B2AC",
-"[	c #A09C97",
-"}	c #F0EFEB",
-"|	c #E4E2DD",
-"1	c #AEABA6",
-"2	c #92908B",
-"3	c #E8E6E1",
-"4	c #F7F6F2",
-"5	c #F5F4F0",
-"6	c #6B6A68",
-"7	c #E2DFD9",
-"8	c #E2E0DB",
-"9	c #E3E1DC",
-"0	c #E6E4DF",
-"                ",
-" .+.........    ",
-".@#########$.   ",
-".#%&*#*=*-;>.   ",
-".#*,=*=*')'!.   ",
-".#**.+......... ",
-".#*.@#########$.",
-".#~.#%&*#*=*-;>.",
-".#{.#*,=*=*')'!.",
-".]^.#**/(*_)*:!.",
-" ...#*~<)#)[-}|.",
-"   .#~1**)__23|.",
-"   .#{*:45_:>63.",
-"   .]^777^8890$.",
-"    ........... ",
-"                "};
diff --git a/art/cut.png b/art/cut.png
deleted file mode 100644
index 7ffb512043..0000000000
--- a/art/cut.png
+++ /dev/null
diff --git a/art/dayview.xpm b/art/dayview.xpm
deleted file mode 100644
index dbabb24c5c..0000000000
--- a/art/dayview.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * dayview_xpm[] = {
-"24 24 7 1",
-" 	c None",
-".	c #000000",
-"+	c #D8D8D4",
-"@	c #919191",
-"#	c #666666",
-"$	c #FFFFFF",
-"%	c #F2F1ED",
-"....................... ",
-".++++++++++++++++++++@. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".@####################. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".@@@@@@@@@@@@@@@@@@@@#. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".@@@@@@@@@@@@@@@@@@@@#. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".@@@@@@@@@@@@@@@@@@@@#. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".$++@%%%%%%%%%%%%%%%%@. ",
-".+@@#@@@@@@@@@@@@@@@@#. ",
-"....................... ",
-"                        "};
diff --git a/art/delete-message.png b/art/delete-message.png
deleted file mode 100644
index 1bec6baac7..0000000000
--- a/art/delete-message.png
+++ /dev/null
diff --git a/art/drafts-16.png b/art/drafts-16.png
deleted file mode 100644
index 285646f60b..0000000000
--- a/art/drafts-16.png
+++ /dev/null
diff --git a/art/edit.xpm b/art/edit.xpm
deleted file mode 100644
index 28b8f090c4..0000000000
--- a/art/edit.xpm
+++ /dev/null
@@ -1,84 +0,0 @@
-/* XPM */
-static char * 16_edit_xpm[] = {
-"16 16 65 1",
-" 	c None",
-".	c #000000",
-"+	c #FDFDFD",
-"@	c #E2E2E2",
-"#	c #BAA88F",
-"$	c #836B4E",
-"%	c #FEFEFE",
-"&	c #FCFCFC",
-"*	c #FBFBFB",
-"=	c #E5E5E5",
-"-	c #C5A985",
-";	c #DC9E55",
-">	c #9E6233",
-",	c #FFFFFF",
-"'	c #F2F2F2",
-")	c #D9D9D9",
-"!	c #E4E4E4",
-"~	c #C3A783",
-"{	c #DD9D53",
-"]	c #A76631",
-"^	c #EEEEEE",
-"/	c #D4D4D4",
-"(	c #FAFAFA",
-"_	c #7B7B7B",
-":	c #C5AA88",
-"<	c #A86631",
-"[	c #DCDCDC",
-"}	c #F0F0F0",
-"|	c #5E5E5E",
-"1	c #C3A47A",
-"2	c #DD9D52",
-"3	c #A66430",
-"4	c #D5D5D5",
-"5	c #6A6A6A",
-"6	c #C2A174",
-"7	c #DC9B4E",
-"8	c #A96630",
-"9	c #6E6E6E",
-"0	c #D8D8D8",
-"a	c #D6D6D6",
-"b	c #9F9F9F",
-"c	c #BEA686",
-"d	c #DD9D51",
-"e	c #AA682F",
-"f	c #F5F5F5",
-"g	c #DDDDDD",
-"h	c #F9F9F9",
-"i	c #7A7A7A",
-"j	c #BCAC9B",
-"k	c #A86E3F",
-"l	c #797979",
-"m	c #F4F4F4",
-"n	c #F3F3F3",
-"o	c #DFDFDF",
-"p	c #7C7C7C",
-"q	c #4F4F4F",
-"r	c #6C6C6C",
-"s	c #EAEAEA",
-"t	c #F8F8F8",
-"u	c #F6F6F6",
-"v	c #F7F7F7",
-"w	c #EBEBEB",
-"x	c #ECECEC",
-"y	c #E0E0E0",
-"z	c #E8E8E8",
-"       ..    .. ",
-"     ..+@.  .#$.",
-"   ..%+&*=..-;>.",
-" ..,%+')*!.~{]. ",
-".,%%^/)*(_:{<.  ",
-".%%)[**}|123.   ",
-" .+'*}456789.   ",
-" .&*0abcde.fg.  ",
-"  .((hijklfmno. ",
-"  .(hpq.rfmnsg. ",
-"   .tilufm^oo.  ",
-"   .vuufwoo..   ",
-"    .uxyo..     ",
-"    .zg..       ",
-"     ..         ",
-"                "};
diff --git a/art/empty.gif b/art/empty.gif
deleted file mode 100644
index 0be4006193..0000000000
--- a/art/empty.gif
+++ /dev/null
diff --git a/art/empty.xpm b/art/empty.xpm
deleted file mode 100644
index aca06618b1..0000000000
--- a/art/empty.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * empty_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #FFFFFF",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                "};
diff --git a/art/encrypt.xpm b/art/encrypt.xpm
deleted file mode 100644
index 636345ad9d..0000000000
--- a/art/encrypt.xpm
+++ /dev/null
@@ -1,80 +0,0 @@
-/* XPM */
-static char * 16_encrypt_xpm[] = {
-"16 16 61 1",
-" 	c None",
-".	c #000000",
-"+	c #FDFDFD",
-"@	c #808080",
-"#	c #FEFEFE",
-"$	c #8F8F8F",
-"%	c #313131",
-"&	c #CDB86D",
-"*	c #EED680",
-"=	c #FFFFFF",
-"-	c #F2F2F2",
-";	c #343434",
-">	c #EEEEEE",
-",	c #D4D4D4",
-"'	c #D9D9D9",
-")	c #3D3D3D",
-"!	c #8D8D8D",
-"~	c #DCDCDC",
-"{	c #FBFBFB",
-"]	c #B2B2B2",
-"^	c #3A3A3A",
-"/	c #A9A9A9",
-"(	c #F0F0F0",
-"_	c #444444",
-":	c #E4E9F1",
-"<	c #B3C5D7",
-"[	c #AABDCE",
-"}	c #A2B4C5",
-"|	c #99ABBD",
-"1	c #8FA3B4",
-"2	c #3C5469",
-"3	c #FCFCFC",
-"4	c #D8D8D8",
-"5	c #D6D6D6",
-"6	c #6A6A6A",
-"7	c #BDCEE0",
-"8	c #8FAAC4",
-"9	c #819DB7",
-"0	c #7490AA",
-"a	c #66839D",
-"b	c #587690",
-"c	c #314456",
-"d	c #FAFAFA",
-"e	c #F9F9F9",
-"f	c #676767",
-"g	c #DFDFDF",
-"h	c #5F5F5F",
-"i	c #F8F8F8",
-"j	c #F7F7F7",
-"k	c #696969",
-"l	c #92A1B0",
-"m	c #5E7081",
-"n	c #556879",
-"o	c #4C5F70",
-"p	c #435668",
-"q	c #394E5F",
-"r	c #23313E",
-"s	c #F6F6F6",
-"t	c #7E7E7E",
-"u	c #E8E8E8",
-"v	c #DDDDDD",
-"                ",
-"        ..      ",
-"      ..+@...   ",
-"    ..#+$%&*&.  ",
-"  ..=#+-;&@. &. ",
-" .=##>,')*!. *. ",
-" .##'~{]^&!/.&..",
-"  .+-{(_:<[}|12.",
-"  .3{4567890abc.",
-"   .ddef7890abc.",
-"   .degh7890abc.",
-"    .ijklmnopqr.",
-"    .jsghkkt....",
-"     .sssg..    ",
-"     .uv..      ",
-"      ..        "};
diff --git a/art/envelope.png b/art/envelope.png
deleted file mode 100644
index 3e801181aa..0000000000
--- a/art/envelope.png
+++ /dev/null
diff --git a/art/es-appointments.png b/art/es-appointments.png
deleted file mode 100644
index e194232051..0000000000
--- a/art/es-appointments.png
+++ /dev/null
diff --git a/art/es-weather.png b/art/es-weather.png
deleted file mode 100644
index 3d31469e78..0000000000
--- a/art/es-weather.png
+++ /dev/null
diff --git a/art/evo-16-address-conduit.png b/art/evo-16-address-conduit.png
deleted file mode 100644
index 18a2e5809e..0000000000
--- a/art/evo-16-address-conduit.png
+++ /dev/null
diff --git a/art/evo-16-calendar-conduit.png b/art/evo-16-calendar-conduit.png
deleted file mode 100644
index dd8e8ab85e..0000000000
--- a/art/evo-16-calendar-conduit.png
+++ /dev/null
diff --git a/art/evo-16-todo-conduit.png b/art/evo-16-todo-conduit.png
deleted file mode 100644
index d36d2c61fd..0000000000
--- a/art/evo-16-todo-conduit.png
+++ /dev/null
diff --git a/art/evo-48-address-conduit.png b/art/evo-48-address-conduit.png
deleted file mode 100644
index 342a061088..0000000000
--- a/art/evo-48-address-conduit.png
+++ /dev/null
diff --git a/art/evo-48-calendar-conduit.png b/art/evo-48-calendar-conduit.png
deleted file mode 100644
index bb0a49791e..0000000000
--- a/art/evo-48-calendar-conduit.png
+++ /dev/null
diff --git a/art/evo-48-todo-conduit.png b/art/evo-48-todo-conduit.png
deleted file mode 100644
index dd4899e984..0000000000
--- a/art/evo-48-todo-conduit.png
+++ /dev/null
diff --git a/art/evolution-calendar-mini.png b/art/evolution-calendar-mini.png
deleted file mode 100644
index cddb0396dc..0000000000
--- a/art/evolution-calendar-mini.png
+++ /dev/null
diff --git a/art/evolution-calendar.png b/art/evolution-calendar.png
deleted file mode 100644
index 76afca6b6f..0000000000
--- a/art/evolution-calendar.png
+++ /dev/null
diff --git a/art/evolution-contacts-mini.png b/art/evolution-contacts-mini.png
deleted file mode 100644
index 5ddb92c1ce..0000000000
--- a/art/evolution-contacts-mini.png
+++ /dev/null
diff --git a/art/evolution-contacts-plain.png b/art/evolution-contacts-plain.png
deleted file mode 100644
index 542a81a508..0000000000
--- a/art/evolution-contacts-plain.png
+++ /dev/null
diff --git a/art/evolution-contacts.png b/art/evolution-contacts.png
deleted file mode 100644
index 0d2cfb7e5f..0000000000
--- a/art/evolution-contacts.png
+++ /dev/null
diff --git a/art/evolution-inbox-mini.png b/art/evolution-inbox-mini.png
deleted file mode 100644
index dbc20fcef1..0000000000
--- a/art/evolution-inbox-mini.png
+++ /dev/null
diff --git a/art/evolution-inbox.png b/art/evolution-inbox.png
deleted file mode 100644
index 66a4ba89cd..0000000000
--- a/art/evolution-inbox.png
+++ /dev/null
diff --git a/art/evolution-notes-mini.png b/art/evolution-notes-mini.png
deleted file mode 100644
index f5b5d776d0..0000000000
--- a/art/evolution-notes-mini.png
+++ /dev/null
diff --git a/art/evolution-notes.png b/art/evolution-notes.png
deleted file mode 100644
index f82006b894..0000000000
--- a/art/evolution-notes.png
+++ /dev/null
diff --git a/art/evolution-tasks-mini.png b/art/evolution-tasks-mini.png
deleted file mode 100644
index d23b5a0be7..0000000000
--- a/art/evolution-tasks-mini.png
+++ /dev/null
diff --git a/art/evolution-tasks.png b/art/evolution-tasks.png
deleted file mode 100644
index a3771c23eb..0000000000
--- a/art/evolution-tasks.png
+++ /dev/null
diff --git a/art/evolution-today-mini.png b/art/evolution-today-mini.png
deleted file mode 100644
index 6039b15e82..0000000000
--- a/art/evolution-today-mini.png
+++ /dev/null
diff --git a/art/evolution-today.png b/art/evolution-today.png
deleted file mode 100644
index 010bcb8cc7..0000000000
--- a/art/evolution-today.png
+++ /dev/null
diff --git a/art/evolution-trash-mini.png b/art/evolution-trash-mini.png
deleted file mode 100644
index 56a8daa51f..0000000000
--- a/art/evolution-trash-mini.png
+++ /dev/null
diff --git a/art/evolution-trash.png b/art/evolution-trash.png
deleted file mode 100644
index c2ac8da173..0000000000
--- a/art/evolution-trash.png
+++ /dev/null
diff --git a/art/evolution.png b/art/evolution.png
deleted file mode 100644
index 412dcfbbc0..0000000000
--- a/art/evolution.png
+++ /dev/null
diff --git a/art/executive-summary-bg.png b/art/executive-summary-bg.png
deleted file mode 100644
index fdcde6613d..0000000000
--- a/art/executive-summary-bg.png
+++ /dev/null
diff --git a/art/executive-summary-curve.png b/art/executive-summary-curve.png
deleted file mode 100644
index 3ba42dd02b..0000000000
--- a/art/executive-summary-curve.png
+++ /dev/null
diff --git a/art/faq-16.png b/art/faq-16.png
deleted file mode 100644
index fcf71658da..0000000000
--- a/art/faq-16.png
+++ /dev/null
diff --git a/art/fetch-mail.png b/art/fetch-mail.png
deleted file mode 100644
index 30cda0564d..0000000000
--- a/art/fetch-mail.png
+++ /dev/null
diff --git a/art/find_contact.xpm b/art/find_contact.xpm
deleted file mode 100644
index 37d957b13b..0000000000
--- a/art/find_contact.xpm
+++ /dev/null
@@ -1,127 +0,0 @@
-/* XPM */
-static char * 24_find_contact_xpm[] = {
-"24 24 100 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #BDBDBD",
-"@ 	c #FFFFFF",
-"# 	c #A3A3A3",
-"$ 	c #F8F8F8",
-"% 	c #C9B49B",
-"& 	c #8E7151",
-"* 	c #876E51",
-"= 	c #BAB1A5",
-"- 	c #FDFDFD",
-"; 	c #FBFBFB",
-"> 	c #EAE8E3",
-", 	c #F3F3F3",
-"' 	c #A88D6E",
-") 	c #DFD0BF",
-"! 	c #5E432B",
-"~ 	c #7E6C5B",
-"{ 	c #313131",
-"] 	c #575757",
-"^ 	c #FCFCFC",
-"/ 	c #555555",
-"( 	c #EEDFCC",
-"_ 	c #F4EEE6",
-": 	c #765E45",
-"< 	c #736251",
-"[ 	c #FAFAFA",
-"} 	c #7590AE",
-"| 	c #C1665A",
-"1 	c #445B71",
-"2 	c #D7D6D3",
-"3 	c #ADADAD",
-"4 	c #9B9B9B",
-"5 	c #4B6983",
-"6 	c #9DB8D2",
-"7 	c #486481",
-"8 	c #314E6C",
-"9 	c #667A8D",
-"0 	c #E0E0E0",
-"a 	c #BCBCBC",
-"b 	c #C5C5C5",
-"c 	c #5F7C96",
-"d 	c #5D7A95",
-"e 	c #4D6B87",
-"f 	c #3B556D",
-"g 	c #344A60",
-"h 	c #47473F",
-"i 	c #0A0A09",
-"j 	c #4B4B43",
-"k 	c #999999",
-"l 	c #34342E",
-"m 	c #9D9D8D",
-"n 	c #CFCFB9",
-"o 	c #C4C4AF",
-"p 	c #8D8D7F",
-"q 	c #353530",
-"r 	c #A2A2A2",
-"s 	c #D2D2D2",
-"t 	c #5D5D5D",
-"u 	c #46463F",
-"v 	c #9C9C8C",
-"w 	c #E2E2D0",
-"x 	c #EDEDE7",
-"y 	c #C0C0AC",
-"z 	c #B2B29F",
-"A 	c #828274",
-"B 	c #4C4C44",
-"C 	c #B9B9B9",
-"D 	c #D1CFC8",
-"E 	c #090908",
-"F 	c #D5D5BF",
-"G 	c #FBFBFA",
-"H 	c #C3C3AE",
-"I 	c #B5B5A2",
-"J 	c #A6A695",
-"K 	c #959586",
-"L 	c #080807",
-"M 	c #72706D",
-"N 	c #918E85",
-"O 	c #090909",
-"P 	c #CACAB5",
-"Q 	c #DDDDD0",
-"R 	c #B7B7A4",
-"S 	c #AAAA98",
-"T 	c #9B9B8B",
-"U 	c #8C8C7D",
-"V 	c #474740",
-"W 	c #929283",
-"X 	c #BABAA7",
-"Y 	c #ADAD9B",
-"Z 	c #9F9F8E",
-"` 	c #909081",
-" .	c #727266",
-"..	c #4C4C45",
-"+.	c #34342F",
-"@.	c #878779",
-"#.	c #A0A090",
-"$.	c #737367",
-"%.	c #010101",
-"&.	c #414141",
-"                                                ",
-"                                                ",
-"                                                ",
-"        . . . . . . . . . . . . . .             ",
-"      . + @ @ @ @ @ @ @ @ @ @ @ @ # .           ",
-"      . @ $ % & * = @ - @ ; @ @ @ > .           ",
-"      . @ , ' ) ! ~ @ { ] ^ / - @ > .           ",
-"      . @ , ( _ : < @ @ @ @ @ @ @ > .           ",
-"      . @ [ } | 1 2 @ 3 @ 4 3 @ @ > .           ",
-"      . @ 5 6 7 8 9 0 3 a b 0 @ @ > .           ",
-"      . @ c d e f g h i i j k b @ > .           ",
-"      . @ @ @ @ @ l m n o p q r s > .           ",
-"      . @ @ t @ u v w x y z A B C D .           ",
-"      . # > > > E F G H I J K L M N .           ",
-"        . . . . O P Q R S T U i . .             ",
-"                V W X Y Z `  ...                ",
-"                  +.@.#.W $.%.%.                ",
-"                    j i i &.  %.%.              ",
-"                              %.%.%.            ",
-"                                %.%.%.          ",
-"                                  %.%.%.        ",
-"                                    %.%.        ",
-"                                                ",
-"                                                "};
diff --git a/art/find_message.xpm b/art/find_message.xpm
deleted file mode 100644
index 04465b4ff8..0000000000
--- a/art/find_message.xpm
+++ /dev/null
@@ -1,130 +0,0 @@
-/* XPM */
-static char * find_message_xpm[] = {
-"24 24 103 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #E9E9E9",
-"@ 	c #E2E2E2",
-"# 	c #D7D7D7",
-"$ 	c #FDFDFD",
-"% 	c #FCFCFC",
-"& 	c #FBFBFB",
-"* 	c #D8D8D8",
-"= 	c #FEFEFE",
-"- 	c #E4E4E4",
-"; 	c #BABABA",
-"> 	c #E0E0E0",
-", 	c #FAFAFA",
-"' 	c #F9F9F9",
-") 	c #EAEAEA",
-"! 	c #F8F8F8",
-"~ 	c #CECECE",
-"{ 	c #BDBDBD",
-"] 	c #E6E6E6",
-"^ 	c #E7E7E7",
-"/ 	c #FFFFFF",
-"( 	c #C2C2C2",
-"_ 	c #E5E5E5",
-": 	c #47473F",
-"< 	c #0A0A09",
-"[ 	c #4B4B43",
-"} 	c #8E8E8E",
-"| 	c #AFAFAF",
-"1 	c #34342E",
-"2 	c #9D9D8D",
-"3 	c #CFCFB9",
-"4 	c #C4C4AF",
-"5 	c #8D8D7F",
-"6 	c #353530",
-"7 	c #848484",
-"8 	c #BFBFBF",
-"9 	c #F7F7F7",
-"0 	c #F5F5F5",
-"a 	c #46463F",
-"b 	c #9C9C8C",
-"c 	c #E2E2D0",
-"d 	c #EDEDE7",
-"e 	c #C0C0AC",
-"f 	c #B2B29F",
-"g 	c #828274",
-"h 	c #45453D",
-"i 	c #A7A7A7",
-"j 	c #D2D2D2",
-"k 	c #D5D5D5",
-"l 	c #090908",
-"m 	c #D5D5BF",
-"n 	c #FBFBFA",
-"o 	c #C3C3AE",
-"p 	c #B5B5A2",
-"q 	c #A6A695",
-"r 	c #959586",
-"s 	c #080807",
-"t 	c #979797",
-"u 	c #F4F4F4",
-"v 	c #090909",
-"w 	c #CACAB5",
-"x 	c #DDDDD0",
-"y 	c #B7B7A4",
-"z 	c #AAAA98",
-"A 	c #9B9B8B",
-"B 	c #8C8C7D",
-"C 	c #929292",
-"D 	c #CBCBCB",
-"E 	c #D3D3D3",
-"F 	c #474740",
-"G 	c #929283",
-"H 	c #BABAA7",
-"I 	c #ADAD9B",
-"J 	c #9F9F8E",
-"K 	c #909081",
-"L 	c #727266",
-"M 	c #4C4C45",
-"N 	c #A6A6A6",
-"O 	c #DFDFDF",
-"P 	c #34342F",
-"Q 	c #878779",
-"R 	c #A0A090",
-"S 	c #737367",
-"T 	c #010101",
-"U 	c #919191",
-"V 	c #C1C1C1",
-"W 	c #D1D1D1",
-"X 	c #414141",
-"Y 	c #4B4B4B",
-"Z 	c #131313",
-"` 	c #646464",
-" .	c #8B8B8B",
-"..	c #AEAEAE",
-"+.	c #5E5E5E",
-"@.	c #6E6E6E",
-"#.	c #575757",
-"$.	c #595959",
-"%.	c #585858",
-"&.	c #C4C4C4",
-"*.	c #DDDDDD",
-"=.	c #797979",
-"-.	c #2F2F2F",
-"                                                ",
-"                                                ",
-"                      . .                       ",
-"                  . . + @ .                     ",
-"              . . # $ % & .                     ",
-"          . . * = = = = & - .                   ",
-"        . ; = = = = > > , ' .   . .             ",
-"        . ) = = > > = = = ! . . + @ .           ",
-"          . $ = = = = ~ . . # $ % & .           ",
-"          . % & = { . . * = = = = & - .         ",
-"        . . . , ] . * ^ ^ ^ = > > , ' .         ",
-"      . / = . ( _ : < < [ } | ^ = = ! - .       ",
-"      . # = = . 1 2 3 4 5 6 7 8 > > 9 0 .       ",
-"        . $ = a b c d e f g h i j = = 0 - .     ",
-"        . k & l m n o p q r s t j > > 0 u .     ",
-"          . , v w x y z A B < C D = = = = - .   ",
-"          . E F G H I J K L M N j = = = O O .   ",
-"            . ! P Q R G S T T U V ^ O O . .     ",
-"            . W = [ < < X Y Z `  .... .         ",
-"              . = = > O +.@.#.T $.%.            ",
-"              . &.*.. .     =.. T -.            ",
-"                . .             T T T           ",
-"                                  T T           ",
-"                                                "};
diff --git a/art/folder-copy-16.png b/art/folder-copy-16.png
deleted file mode 100644
index 5c0a3c9dbd..0000000000
--- a/art/folder-copy-16.png
+++ /dev/null
diff --git a/art/folder-move-16.png b/art/folder-move-16.png
deleted file mode 100644
index 4a94499f1c..0000000000
--- a/art/folder-move-16.png
+++ /dev/null
diff --git a/art/folder.xpm b/art/folder.xpm
deleted file mode 100644
index 4ef29bcad7..0000000000
--- a/art/folder.xpm
+++ /dev/null
@@ -1,73 +0,0 @@
-/* XPM */
-static char * folder_xpm[] = {
-"16 16 54 1",
-" 	c None",
-".	c #000000",
-"+	c #E4E5DF",
-"@	c #D5D6CB",
-"#	c #D6D7CA",
-"$	c #A3A39D",
-"%	c #F5F6F0",
-"&	c #ADB198",
-"*	c #C2C6A9",
-"=	c #C0C3A7",
-"-	c #B4B89D",
-";	c #6D705F",
-">	c #EAECDB",
-",	c #F6F6F4",
-"'	c #EAECDA",
-")	c #E8EAD8",
-"!	c #E9EBDB",
-"~	c #E7E9D6",
-"{	c #E6E8D5",
-"]	c #E5E8D4",
-"^	c #E4E7D2",
-"/	c #C7C9B6",
-"(	c #F7F7F7",
-"_	c #DADEBF",
-":	c #DADEBE",
-"<	c #D8DCBC",
-"[	c #D6DBB9",
-"}	c #D5D9B7",
-"|	c #D3D7B4",
-"1	c #D1D6B2",
-"2	c #CFD4AF",
-"3	c #CDD2AD",
-"4	c #CBD1AA",
-"5	c #95997C",
-"6	c #F3F3EA",
-"7	c #F3F4EA",
-"8	c #CACFA8",
-"9	c #C8CDA5",
-"0	c #929778",
-"a	c #F1F3E9",
-"b	c #C6CCA3",
-"c	c #C4CAA0",
-"d	c #8F9474",
-"e	c #F0F1E7",
-"f	c #C2C89D",
-"g	c #C1C79B",
-"h	c #8D9270",
-"i	c #EFF1E5",
-"j	c #BFC598",
-"k	c #EBECDE",
-"l	c #C9CCB9",
-"m	c #919576",
-"n	c #8F9372",
-"o	c #666951",
-"                ",
-"                ",
-"   ....         ",
-"  .+@#$.        ",
-" .%&*=-;....... ",
-" .>,>>')!~~{]^/.",
-" .(_:<[}|112345.",
-" .6_:<[}|112345.",
-" .7<[}|12334890.",
-" .a}|1234889bcd.",
-" .e123489bbcfgh.",
-" .i3489bcffgjjh.",
-" .k89bcfgjjjjjh.",
-" .l0mdnhhhhhhho.",
-"  ............. ",
-"                "};
diff --git a/art/forget_passwords.xpm b/art/forget_passwords.xpm
deleted file mode 100644
index a121300716..0000000000
--- a/art/forget_passwords.xpm
+++ /dev/null
@@ -1,125 +0,0 @@
-/* XPM */
-static char * forget_passwords_xpm[] = {
-"16 16 106 2",
-"  	c None",
-". 	c #010101",
-"+ 	c #C0B09D",
-"@ 	c #FEC6BC",
-"# 	c #FFCDB4",
-"$ 	c #C2A887",
-"% 	c #DCB9A8",
-"& 	c #AF843A",
-"* 	c #755C5C",
-"= 	c #655E37",
-"- 	c #DBBCAE",
-"; 	c #FFC4B8",
-"> 	c #FFCDBC",
-", 	c #DDBCA3",
-"' 	c #DBBEB5",
-") 	c #B9933A",
-"! 	c #D3AF84",
-"~ 	c #BE933A",
-"{ 	c #CDA86F",
-"] 	c #A3753F",
-"^ 	c #554F2E",
-"/ 	c #FFC5A3",
-"( 	c #FFFFE3",
-"_ 	c #D4B584",
-": 	c #DCBEB5",
-"< 	c #CDAE95",
-"[ 	c #E6BAA8",
-"} 	c #BDA897",
-"| 	c #CCA871",
-"1 	c #B9841D",
-"2 	c #CCAF95",
-"3 	c #A8753F",
-"4 	c #C4B29C",
-"5 	c #E3B89E",
-"6 	c #E6BEA8",
-"7 	c #C89E58",
-"8 	c #DCB5A0",
-"9 	c #B5841D",
-"0 	c #E6B593",
-"a 	c #BA9E58",
-"b 	c #B4841D",
-"c 	c #C79E58",
-"d 	c #3B250B",
-"e 	c #FFE5BE",
-"f 	c #F2C7B2",
-"g 	c #F3BE9E",
-"h 	c #C7B5A9",
-"i 	c #F3C8B9",
-"j 	c #C29E58",
-"k 	c #E6C2AE",
-"l 	c #BBAAB1",
-"m 	c #C7A887",
-"n 	c #BE9E58",
-"o 	c #6D572C",
-"p 	c #CDB6AC",
-"q 	c #E6BE9E",
-"r 	c #C7AE95",
-"s 	c #E6C3B5",
-"t 	c #DCB593",
-"u 	c #B9A073",
-"v 	c #CAA49D",
-"w 	c #AE841D",
-"x 	c #A6781B",
-"y 	c #BA8E51",
-"z 	c #B1813F",
-"A 	c #C6A871",
-"B 	c #DCBEAF",
-"C 	c #E6BEB5",
-"D 	c #D4B0AE",
-"E 	c #BDA058",
-"F 	c #AC761B",
-"G 	c #A77D3F",
-"H 	c #A06422",
-"I 	c #B59358",
-"J 	c #BDA187",
-"K 	c #D3B5A0",
-"L 	c #BD933A",
-"M 	c #B09960",
-"N 	c #BD9D60",
-"O 	c #AC8131",
-"P 	c #935511",
-"Q 	c #753F20",
-"R 	c #753D1D",
-"S 	c #D4AE84",
-"T 	c #B09264",
-"U 	c #BDA475",
-"V 	c #B48431",
-"W 	c #B08431",
-"X 	c #A86813",
-"Y 	c #975C16",
-"Z 	c #A06413",
-"` 	c #5C3D1D",
-" .	c #A46A36",
-"..	c #903801",
-"+.	c #953D1D",
-"@.	c #751801",
-"#.	c #681601",
-"$.	c #844116",
-"%.	c #1D0101",
-"&.	c #A0581D",
-"*.	c #933A01",
-"=.	c #A67531",
-"-.	c #87581D",
-";.	c #A86F1D",
-">.	c #A1713A",
-",.	c #B09358",
-"                                ",
-"          . . . . . .           ",
-"      . . + @ # $ % & * .       ",
-"    = - ; > , ' ) ! ~ { ] .     ",
-"  ^ / ( _ : < [ } | 1 2 ) 3 .   ",
-". 4 5 6 7 : 8 9 0 a 2 b c ~ d   ",
-". e f g h i j k l m $ < n 1 o . ",
-". p q r s t b u v 2 c w c x y . ",
-"  . z A B 1 ) C D $ E j F G H . ",
-"    . I ~ J K L M 2 ~ N O P Q . ",
-"      . . R S T U V W X Y Z .   ",
-"            `  ...+.@.#.$..     ",
-"              . %.&.*.=.        ",
-"                . -.;.>.        ",
-"                  . ` ,..       ",
-"                    . . .       "};
diff --git a/art/forward.png b/art/forward.png
deleted file mode 100644
index bbce8ad3c7..0000000000
--- a/art/forward.png
+++ /dev/null
diff --git a/art/forward.xpm b/art/forward.xpm
deleted file mode 100644
index 7d2d1457df..0000000000
--- a/art/forward.xpm
+++ /dev/null
@@ -1,51 +0,0 @@
-/* XPM */
-static char * 16_forward_xpm[] = {
-"16 16 32 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #FFFFFF",
-"&	c #5D5B57",
-"*	c #868580",
-"=	c #E5E2DB",
-"-	c #FBFBF8",
-";	c #716E6B",
-">	c #62605C",
-",	c #F8F7F2",
-"'	c #DDDAD4",
-")	c #000000",
-"!	c #FBFAF7",
-"~	c #A5A29D",
-"{	c #797873",
-"]	c #BBC2CC",
-"^	c #576E87",
-"/	c #EFEFEF",
-"(	c #CCCCCC",
-"_	c #7D7A77",
-":	c #F7F5F1",
-"<	c #FAF9F6",
-"[	c #314E6C",
-"}	c #090808",
-"|	c #D7D4CE",
-"1	c #D8D5CF",
-"2	c #181818",
-"3	c #090909",
-"                ",
-"                ",
-"                ",
-"  .+.........   ",
-" .@#########$.  ",
-" .%&%%%%%%%*=.  ",
-" .%-;%%%%%>,'.  ",
-" .%--;%)))))))))",
-" .%-!~;)%%%%%%%)",
-" .%!{--)%]^///()",
-" .%_-:<)%^[[/[()",
-" .}|111)%/[[[[()",
-"  .....)%//[[[()",
-"       )%/[[[[()",
-"       )%((((((2",
-"       ))3))))))"};
diff --git a/art/globe.png b/art/globe.png
deleted file mode 100644
index 84bebd7e9a..0000000000
--- a/art/globe.png
+++ /dev/null
diff --git a/art/goto-16.png b/art/goto-16.png
deleted file mode 100644
index 800db10e41..0000000000
--- a/art/goto-16.png
+++ /dev/null
diff --git a/art/goto-24.png b/art/goto-24.png
deleted file mode 100644
index b6fc82fd73..0000000000
--- a/art/goto-24.png
+++ /dev/null
diff --git a/art/hand-16.xpm b/art/hand-16.xpm
deleted file mode 100644
index d925e2d968..0000000000
--- a/art/hand-16.xpm
+++ /dev/null
@@ -1,115 +0,0 @@
-/* XPM */
-static char * hand_16_xpm[] = {
-"16 16 96 2",
-"  	c None",
-". 	c #010100",
-"+ 	c #010000",
-"@ 	c #090600",
-"# 	c #030000",
-"$ 	c #E8E6E1",
-"% 	c #A3A09C",
-"& 	c #080000",
-"* 	c #D6D2CD",
-"= 	c #8F8A84",
-"- 	c #FFFAF7",
-"; 	c #98938D",
-"> 	c #F1EDE9",
-", 	c #88827E",
-"' 	c #181510",
-") 	c #F8EEE4",
-"! 	c #F8ECE0",
-"~ 	c #F8ECDE",
-"{ 	c #0D0600",
-"] 	c #F8EBDE",
-"^ 	c #F6E7D7",
-"/ 	c #D5C5B6",
-"( 	c #070000",
-"_ 	c #F6E5D3",
-": 	c #F7E9D9",
-"< 	c #050200",
-"[ 	c #080300",
-"} 	c #312722",
-"| 	c #EFE7E0",
-"1 	c #F6F2EF",
-"2 	c #F6F1EE",
-"3 	c #EDE4DB",
-"4 	c #F1E4D6",
-"5 	c #9D9790",
-"6 	c #12110D",
-"7 	c #958E88",
-"8 	c #DDCFC2",
-"9 	c #F6E8D9",
-"0 	c #F6F1EC",
-"a 	c #F5F1EE",
-"b 	c #E5D7CB",
-"c 	c #F7E8D8",
-"d 	c #EEDFD3",
-"e 	c #CAC0B6",
-"f 	c #645951",
-"g 	c #E7D9CA",
-"h 	c #F6E6D5",
-"i 	c #F7EBDE",
-"j 	c #E9DCD2",
-"k 	c #040000",
-"l 	c #F7EFE7",
-"m 	c #EDDECF",
-"n 	c #D6C8BA",
-"o 	c #CBB9AC",
-"p 	c #D2C8BC",
-"q 	c #F8EEE3",
-"r 	c #F5EEE8",
-"s 	c #EFE3D7",
-"t 	c #B8A99D",
-"u 	c #060100",
-"v 	c #D7CFC7",
-"w 	c #F9F2E9",
-"x 	c #F3E3D4",
-"y 	c #F1DFCF",
-"z 	c #E6D7C7",
-"A 	c #F8F2ED",
-"B 	c #EDE1D4",
-"C 	c #0A0300",
-"D 	c #D7CFC9",
-"E 	c #FAF2EC",
-"F 	c #F1E0D1",
-"G 	c #F6EEE8",
-"H 	c #000000",
-"I 	c #171111",
-"J 	c #A79D9D",
-"K 	c #C8BDBC",
-"L 	c #A59D9A",
-"M 	c #ABA8A3",
-"N 	c #BFB7B5",
-"O 	c #060000",
-"P 	c #0E0403",
-"Q 	c #0A0000",
-"R 	c #0A0200",
-"S 	c #080401",
-"T 	c #FCF4F2",
-"U 	c #F9F1EF",
-"V 	c #F8F0EE",
-"W 	c #F2EDEA",
-"X 	c #DDD9D6",
-"Y 	c #E5E4E0",
-"Z 	c #030400",
-"` 	c #0B0505",
-" .	c #050000",
-"..	c #14100F",
-"+.	c #090806",
-"@.	c #000100",
-"              . +               ",
-"          @ # $ % + +           ",
-"        & * = - ; > , '         ",
-"        & ) ; ! ; ~ ; {         ",
-"        & ] ; ^ ; ] ; / (       ",
-"        & _ ; _ ; : ; / (       ",
-"    < [ } | 1 2 3 4 5 / (       ",
-"  6 _ 7 & 8 _ 9 0 a b / (       ",
-"  + c d e f g h _ i j / (       ",
-"    k l m n o p q r s t (       ",
-"    u v w x y z A B _ t (       ",
-"      C D E _ F G _ / H         ",
-"        I J K _ _ L M &         ",
-"        N O P Q R k S           ",
-"        k T U V W X Y Z         ",
-"        k `  ...# +.H @.        "};
diff --git a/art/hide_deleted_messages.xpm b/art/hide_deleted_messages.xpm
deleted file mode 100644
index 189d8d350e..0000000000
--- a/art/hide_deleted_messages.xpm
+++ /dev/null
@@ -1,39 +0,0 @@
-/* XPM */
-static char * hide_deleted_messages_xpm[] = {
-"16 16 20 1",
-" 	c None",
-".	c #828282",
-"+	c #A0A0A0",
-"@	c #AAAAAA",
-"#	c #898989",
-"$	c #9A9A9A",
-"%	c #8F8F8F",
-"&	c #A9A9A9",
-"*	c #A5A5A5",
-"=	c #959595",
-"-	c #A8A8A8",
-";	c #AEAEAE",
-">	c #B1B1B1",
-",	c #B3B3B3",
-"'	c #9B9B9B",
-")	c #DF421E",
-"!	c #000000",
-"~	c #B7B7B7",
-"{	c #ADADAD",
-"]	c #AFAFAF",
-"                ",
-"                ",
-"                ",
-" .. .+.@#$..    ",
-" .. ..%&$*=$    ",
-" .. .@.-;$#>    ",
-"                ",
-" .%.; .%, '.  ) ",
-"!!!!!!!!!!!!! ))",
-" .~$. ... ..  ) ",
-"                ",
-" .+ .+.'% .+    ",
-" .{ .#%.] '&    ",
-" .' .$;.% ..    ",
-"                ",
-"                "};
diff --git a/art/hide_read_messages.xpm b/art/hide_read_messages.xpm
deleted file mode 100644
index 8df1313651..0000000000
--- a/art/hide_read_messages.xpm
+++ /dev/null
@@ -1,23 +0,0 @@
-/* XPM */
-static char * hide_read_messages_xpm[] = {
-"16 16 4 1",
-" 	c None",
-".	c #000000",
-"+	c #DF421E",
-"@	c #828282",
-"                ",
-"                ",
-"                ",
-"  .. .......    ",
-"              + ",
-"  @ @@@ @@ @  ++",
-"              + ",
-"  ... .. ...    ",
-"                ",
-"  ... . ....    ",
-"              + ",
-"  @@ @@@ @@@  ++",
-"              + ",
-"  . ... ....    ",
-"                ",
-"                "};
diff --git a/art/hide_selected_messages.xpm b/art/hide_selected_messages.xpm
deleted file mode 100644
index cb1989b84c..0000000000
--- a/art/hide_selected_messages.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * hide_selected_messages_xpm[] = {
-"16 16 14 1",
-" 	c None",
-".	c #4B6983",
-"+	c #DF421E",
-"@	c #FFFFFF",
-"#	c #798FA2",
-"$	c #BEC8D0",
-"%	c #F1F3F5",
-"&	c #CDD5DC",
-"*	c #A9B6C2",
-"=	c #000000",
-"-	c #647E94",
-";	c #A2B1BE",
-">	c #E4E8EC",
-",	c #D8DEE4",
-"                ",
-"                ",
-"                ",
-" ............ + ",
-" .@#$%%#@&*%. ++",
-" ............ + ",
-"                ",
-"  === == ===    ",
-"                ",
-"  === = ====    ",
-"                ",
-" ............ + ",
-" .@%-@&@;>,%. ++",
-" ............ + ",
-"                ",
-"                "};
diff --git a/art/house.png b/art/house.png
deleted file mode 100644
index df43ec6181..0000000000
--- a/art/house.png
+++ /dev/null
diff --git a/art/ico-calendar.png b/art/ico-calendar.png
deleted file mode 100644
index 3010528d7f..0000000000
--- a/art/ico-calendar.png
+++ /dev/null
diff --git a/art/ico-mail.png b/art/ico-mail.png
deleted file mode 100644
index 66a4ba89cd..0000000000
--- a/art/ico-mail.png
+++ /dev/null
diff --git a/art/ico-rdf.png b/art/ico-rdf.png
deleted file mode 100644
index 0e39037b95..0000000000
--- a/art/ico-rdf.png
+++ /dev/null
diff --git a/art/ico-weather.png b/art/ico-weather.png
deleted file mode 100644
index 25eb161f8c..0000000000
--- a/art/ico-weather.png
+++ /dev/null
diff --git a/art/imap-16.png b/art/imap-16.png
deleted file mode 100644
index 1e2932a728..0000000000
--- a/art/imap-16.png
+++ /dev/null
diff --git a/art/import.png b/art/import.png
deleted file mode 100644
index 151b60a270..0000000000
--- a/art/import.png
+++ /dev/null
diff --git a/art/import.xpm b/art/import.xpm
deleted file mode 100644
index a996072772..0000000000
--- a/art/import.xpm
+++ /dev/null
@@ -1,59 +0,0 @@
-/* XPM */
-static char * 16_import_xpm[] = {
-"16 16 40 1",
-" 	c None",
-".	c #000000",
-"+	c #A50B05",
-"@	c #A1A1A1",
-"#	c #FFFFFF",
-"$	c #A7A7A7",
-"%	c #980000",
-"&	c #DBDBDB",
-"*	c #9B9B9B",
-"=	c #9C9C9C",
-"-	c #E4E4E4",
-";	c #9F0502",
-">	c #A90F07",
-",	c #D23618",
-"'	c #AEAEAE",
-")	c #A3A3A3",
-"!	c #D83C1B",
-"~	c #E46243",
-"{	c #E87E64",
-"]	c #2C2C2C",
-"^	c #9E8754",
-"/	c #6B5B39",
-"(	c #826E46",
-"_	c #9E8655",
-":	c #BFA367",
-"<	c #DCCBA3",
-"[	c #99804F",
-"}	c #D8C7A2",
-"|	c #F0DBAC",
-"1	c #E4D3AF",
-"2	c #76520D",
-"3	c #865F10",
-"4	c #E1BB65",
-"5	c #D1940C",
-"6	c #906612",
-"7	c #7D5C14",
-"8	c #CF920B",
-"9	c #714F0C",
-"0	c #E2BE6C",
-"a	c #7B560E",
-".......  +      ",
-".@###$. %+      ",
-".&*#=-.%;>,,    ",
-".'-$-). ++ !    ",
-".......  + ~    ",
-"           {    ",
-"                ",
-"       ......]. ",
-"      .^/(_:<[. ",
-"     .}||||123. ",
-"     .45555567. ",
-"     .45555567. ",
-"     .45555567. ",
-"     .45585569. ",
-"     .055555a.  ",
-"     ........   "};
diff --git a/art/inbox-16.png b/art/inbox-16.png
deleted file mode 100644
index 88071fa91e..0000000000
--- a/art/inbox-16.png
+++ /dev/null
diff --git a/art/inbox-full-16.png b/art/inbox-full-16.png
deleted file mode 100644
index 289335eaa2..0000000000
--- a/art/inbox-full-16.png
+++ /dev/null
diff --git a/art/insert-image-24.png b/art/insert-image-24.png
deleted file mode 100644
index 4b2fd4ffae..0000000000
--- a/art/insert-image-24.png
+++ /dev/null
diff --git a/art/insert-link-24.png b/art/insert-link-24.png
deleted file mode 100644
index 9824bc8ae6..0000000000
--- a/art/insert-link-24.png
+++ /dev/null
diff --git a/art/insert-table-24.png b/art/insert-table-24.png
deleted file mode 100644
index 21344caea6..0000000000
--- a/art/insert-table-24.png
+++ /dev/null
diff --git a/art/jump.xpm b/art/jump.xpm
deleted file mode 100644
index d974142d9a..0000000000
--- a/art/jump.xpm
+++ /dev/null
@@ -1,14 +0,0 @@
-/* XPM */
-static char * jump_xpm[] = {
-"16 8 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFF00",
-"................",
-".++++++++++++++.",
-".++++++++++++++.",
-".++..++..++..++.",
-".++..++..++..++.",
-".++++++++++++++.",
-".++++++++++++++.",
-"................"};
diff --git a/art/ldap-mini.png b/art/ldap-mini.png
deleted file mode 100644
index 85c4dc0cf7..0000000000
--- a/art/ldap-mini.png
+++ /dev/null
diff --git a/art/ldap.png b/art/ldap.png
deleted file mode 100644
index 5ff8180b35..0000000000
--- a/art/ldap.png
+++ /dev/null
diff --git a/art/local-16.png b/art/local-16.png
deleted file mode 100644
index 1fc929bbf7..0000000000
--- a/art/local-16.png
+++ /dev/null
diff --git a/art/mail-config-druid-48.png b/art/mail-config-druid-48.png
deleted file mode 100644
index 35b452b4e9..0000000000
--- a/art/mail-config-druid-48.png
+++ /dev/null
diff --git a/art/mail-config-druid-account-name.png b/art/mail-config-druid-account-name.png
deleted file mode 100644
index 2cad5eb941..0000000000
--- a/art/mail-config-druid-account-name.png
+++ /dev/null
diff --git a/art/mail-config-druid-identity.png b/art/mail-config-druid-identity.png
deleted file mode 100644
index f895a1e168..0000000000
--- a/art/mail-config-druid-identity.png
+++ /dev/null
diff --git a/art/mail-config-druid-receive.png b/art/mail-config-druid-receive.png
deleted file mode 100644
index df75812db3..0000000000
--- a/art/mail-config-druid-receive.png
+++ /dev/null
diff --git a/art/mail-config-druid-send.png b/art/mail-config-druid-send.png
deleted file mode 100644
index 1bf501ddb2..0000000000
--- a/art/mail-config-druid-send.png
+++ /dev/null
diff --git a/art/mail-config-druid.png b/art/mail-config-druid.png
deleted file mode 100644
index 35b452b4e9..0000000000
--- a/art/mail-config-druid.png
+++ /dev/null
diff --git a/art/mail-need-reply.xpm b/art/mail-need-reply.xpm
deleted file mode 100644
index 283ef3d83f..0000000000
--- a/art/mail-need-reply.xpm
+++ /dev/null
@@ -1,101 +0,0 @@
-/* XPM */
-static char * mail_need_reply_xpm[] = {
-"16 16 82 1",
-" 	c None",
-".	c #2A2A2A",
-"+	c #AAAAAA",
-"@	c #A2A2A2",
-"#	c #949494",
-"$	c #E4E4E4",
-"%	c #F6F6F6",
-"&	c #F7F7F7",
-"*	c #F8F8F8",
-"=	c #E5E5E5",
-"-	c #898989",
-";	c #7A7A7A",
-">	c #DADADA",
-",	c #F5F5F5",
-"'	c #818181",
-")	c #B1B1B1",
-"!	c #858585",
-"~	c #EDEDED",
-"{	c #8E8E8E",
-"]	c #E1E1E1",
-"^	c #E2E2E2",
-"/	c #7F7F7F",
-"(	c #B7B7B7",
-"_	c #E0E0E0",
-":	c #BEBEBE",
-"<	c #737373",
-"[	c #848484",
-"}	c #E8E8E8",
-"|	c #DBDBDB",
-"1	c #363636",
-"2	c #9C9C9C",
-"3	c #C9C9C9",
-"4	c #919191",
-"5	c #B4B4B4",
-"6	c #AFAFAF",
-"7	c #C3C3C3",
-"8	c #6F635C",
-"9	c #372B24",
-"0	c #EBEBEB",
-"a	c #F1F1F1",
-"b	c #D7D7D7",
-"c	c #C7C7C7",
-"d	c #E9E9E9",
-"e	c #F3F3F3",
-"f	c #BDBDBD",
-"g	c #CDCDCD",
-"h	c #372E28",
-"i	c #F6B893",
-"j	c #88634D",
-"k	c #534339",
-"l	c #2C211A",
-"m	c #8F8F8F",
-"n	c #A8A8A8",
-"o	c #6F6F6F",
-"p	c #473B34",
-"q	c #DBA585",
-"r	c #F4A677",
-"s	c #F5AD82",
-"t	c #F5B189",
-"u	c #72503C",
-"v	c #3F3F3F",
-"w	c #1C1C1C",
-"x	c #2B1E15",
-"y	c #DC976F",
-"z	c #DA8A5B",
-"A	c #583725",
-"B	c #984816",
-"C	c #A75223",
-"D	c #43210E",
-"E	c #261102",
-"F	c #853F12",
-"G	c #A55123",
-"H	c #9C4C20",
-"I	c #984B20",
-"J	c #42200E",
-"K	c #853E12",
-"L	c #4A240E",
-"M	c #291408",
-"N	c #160A04",
-"O	c #200E01",
-"P	c #180B01",
-"Q	c #000000",
-"                ",
-"   .++++++++++. ",
-"   @#$%&**%&=-; ",
-"   +>#,,,,,,')! ",
-"   +*~{],,^/(_! ",
-"   +*,:<,,;[]}! ",
-"   +|1234-567}! ",
-"   +890abcdefg! ",
-"   hijkklmbbbno ",
-"  pqrsttu.vvvvw ",
-" xyzzzzzA       ",
-" xBCCCCCD       ",
-"  EFGHIIJ       ",
-"   EKLMMN       ",
-"    OP          ",
-"     Q          "};
diff --git a/art/mail-new.xpm b/art/mail-new.xpm
deleted file mode 100644
index 767ec6366f..0000000000
--- a/art/mail-new.xpm
+++ /dev/null
@@ -1,67 +0,0 @@
-/* XPM */
-static char * mail_new_xpm[] = {
-"16 16 48 1",
-" 	c None",
-".	c #000000",
-"+	c #202020",
-"@	c #817968",
-"#	c #F5F5F5",
-"$	c #4D493C",
-"%	c #736C5C",
-"&	c #F5EEEE",
-"*	c #FFEDC7",
-"=	c #FAF3EC",
-"-	c #FCE6B5",
-";	c #60594D",
-">	c #D3C29E",
-",	c #746D5D",
-"'	c #F5F1F1",
-")	c #FDEECD",
-"!	c #F8F4ED",
-"~	c #FAE3B3",
-"{	c #645F4F",
-"]	c #C9BA98",
-"^	c #71685A",
-"/	c #FCF5EA",
-"(	c #FFE8B7",
-"_	c #F5DEB2",
-":	c #FFEABD",
-"<	c #90856F",
-"[	c #7C7361",
-"}	c #E4D1A9",
-"|	c #C9B996",
-"1	c #FFEBC2",
-"2	c #887F6B",
-"3	c #726B59",
-"4	c #D1BF9C",
-"5	c #8B816C",
-"6	c #FFE9BA",
-"7	c #F9E2B2",
-"8	c #FFE8B8",
-"9	c #F6DFB3",
-"0	c #D4C19D",
-"a	c #534D42",
-"b	c #CFBF9C",
-"c	c #645F51",
-"d	c #C2B293",
-"e	c #C4B393",
-"f	c #C4B495",
-"g	c #C5B596",
-"h	c #CCBC99",
-"i	c #4C483D",
-"                ",
-"                ",
-"                ",
-"  .+.........   ",
-" .@#########$.  ",
-" .#%&*#*=*-;>.  ",
-" .#*,')!*~{~].  ",
-" .#**^/*({*_].  ",
-" .#*:<{#{[-}|.  ",
-" .#12**{((34|.  ",
-" .#5*_67890ab.  ",
-" .cdeeedffghi.  ",
-"  ...........   ",
-"                ",
-"                ",
-"                "};
diff --git a/art/mail-read.xpm b/art/mail-read.xpm
deleted file mode 100644
index b4e3160ab4..0000000000
--- a/art/mail-read.xpm
+++ /dev/null
@@ -1,70 +0,0 @@
-/* XPM */
-static char * mail_read_xpm[] = {
-"16 16 51 1",
-" 	c None",
-".	c #010101",
-"+	c #D9D6D0",
-"@	c #C3C0B9",
-"#	c #EFEDE8",
-"$	c #F7F7F6",
-"%	c #FAFAFA",
-"&	c #B6B4AE",
-"*	c #737373",
-"=	c #C2BFB8",
-"-	c #F5F4F2",
-";	c #FAFAF9",
-">	c #FFFFFF",
-",	c #D2CFC9",
-"'	c #707070",
-")	c #5D5B57",
-"!	c #868580",
-"~	c #E5E2DB",
-"{	c #FBFBF8",
-"]	c #716E6B",
-"^	c #62605C",
-"/	c #F8F7F2",
-"(	c #DDDAD4",
-"_	c #929191",
-":	c #969390",
-"<	c #92908A",
-"[	c #A1A0A0",
-"}	c #F7F5F1",
-"|	c #FBFAF7",
-"1	c #A5A29D",
-"2	c #908D87",
-"3	c #F9F7F3",
-"4	c #F0EEE8",
-"5	c #DDD9D2",
-"6	c #797873",
-"7	c #F9F8F4",
-"8	c #74726E",
-"9	c #E3E0D9",
-"0	c #7D7A77",
-"a	c #FAF9F6",
-"b	c #F8F6F2",
-"c	c #FAF8F5",
-"d	c #F7F5F2",
-"e	c #E2DFD8",
-"f	c #090808",
-"g	c #D7D4CE",
-"h	c #D8D5CF",
-"i	c #D6D3CD",
-"j	c #DAD7D1",
-"k	c #E0DCD5",
-"l	c #222221",
-"     .....      ",
-"    .+++++.     ",
-"   .++++++@.    ",
-"  .+++++#$%&.   ",
-" .*==-;>>>>,'.  ",
-" .>)>>>>>>>!~.  ",
-" .>{]>>>>>^/(.  ",
-" .>{{_::<[{}(.  ",
-" .>{|1{{{2345.  ",
-" .>|6{{{77895.  ",
-" .>0{}abcd~8e.  ",
-" .fghhhi++jkl.  ",
-"  ...........   ",
-"                ",
-"                ",
-"                "};
diff --git a/art/mail-replied.xpm b/art/mail-replied.xpm
deleted file mode 100644
index 06f4a7420a..0000000000
--- a/art/mail-replied.xpm
+++ /dev/null
@@ -1,52 +0,0 @@
-/* XPM */
-static char * mail_replied_xpm[] = {
-"16 16 33 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #95938E",
-"&	c #FBFBFB",
-"*	c #F9F8F6",
-"=	c #FBFAFA",
-"-	c #F6F5F1",
-";	c #7D7B78",
-">	c #EAE8E3",
-",	c #969491",
-"'	c #000000",
-")	c #928F8B",
-"!	c #FFFFFF",
-"~	c #F7F6F4",
-"{	c #B5B2AC",
-"]	c #003366",
-"^	c #EFEFEF",
-"/	c #CCCCCC",
-"(	c #AEABA6",
-"_	c #B0ADA7",
-":	c #F5F3F0",
-"<	c #83817E",
-"[	c #E1DFDA",
-"}	c #E2DFD9",
-"|	c #002C59",
-"1	c #002850",
-"2	c #00254A",
-"3	c #181818",
-"4	c #090909",
-"                ",
-"                ",
-"                ",
-"  .+.........   ",
-" .@#########$.  ",
-" .#%&*#*=*-;>.  ",
-" .#*,=''''''''' ",
-" .#**)'!!!!!!!' ",
-" .#*~{'!]]]]^/' ",
-" .#~(*'!]]]^^/' ",
-" .#_*:'!]]]]^/' ",
-" .<[}}'!]^]]|/' ",
-"  ....'!^^^12/' ",
-"      '!//////3 ",
-"      ''4'''''' ",
-"                "};
diff --git a/art/malehead.png b/art/malehead.png
deleted file mode 100644
index ada9545c85..0000000000
--- a/art/malehead.png
+++ /dev/null
diff --git a/art/mark-as-important-16.png b/art/mark-as-important-16.png
deleted file mode 100644
index 393d86e77c..0000000000
--- a/art/mark-as-important-16.png
+++ /dev/null
diff --git a/art/mark.xpm b/art/mark.xpm
deleted file mode 100644
index 710cd0e872..0000000000
--- a/art/mark.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * mark_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #36592A",
-"                ",
-"                ",
-"                ",
-"                ",
-"           .    ",
-"          ..    ",
-"         ..     ",
-"    .   ..      ",
-"    .. ...      ",
-"     ....       ",
-"     ...        ",
-"      ..        ",
-"      .         ",
-"                ",
-"                ",
-"                "};
diff --git a/art/meeting-request.png b/art/meeting-request.png
deleted file mode 100644
index 0fba577bfe..0000000000
--- a/art/meeting-request.png
+++ /dev/null
diff --git a/art/meeting.xpm b/art/meeting.xpm
deleted file mode 100644
index bf182fbd8f..0000000000
--- a/art/meeting.xpm
+++ /dev/null
@@ -1,64 +0,0 @@
-/* XPM */
-static char * meeting_xpm[] = {
-"16 16 45 1",
-" 	c None",
-".	c #000000",
-"+	c #161616",
-"@	c #A7A7A7",
-"#	c #8A8A8A",
-"$	c #757575",
-"%	c #686868",
-"&	c #555555",
-"*	c #434343",
-"=	c #2F2F2F",
-"-	c #2B2B2B",
-";	c #FFFFFF",
-">	c #CACACA",
-",	c #C0C0C0",
-"'	c #B6B6B6",
-")	c #D8D5CD",
-"!	c #CFCFCF",
-"~	c #AEADA5",
-"{	c #7F7D78",
-"]	c #85847F",
-"^	c #92908A",
-"/	c #E0DFD7",
-"(	c #A09E98",
-"_	c #E6E5E0",
-":	c #E5E3DF",
-"<	c #A5A49D",
-"[	c #9D9B95",
-"}	c #D5D5D5",
-"|	c #B4B1AB",
-"1	c #83817C",
-"2	c #D44D41",
-"3	c #A7453E",
-"4	c #919089",
-"5	c #E2E1DB",
-"6	c #9C9A94",
-"7	c #DEDBD5",
-"8	c #D9D6CE",
-"9	c #E79E3C",
-"0	c #934238",
-"a	c #B4B1AA",
-"b	c #807F79",
-"c	c #82817C",
-"d	c #7E7D78",
-"e	c #ACA9A3",
-"f	c #A3A09A",
-"                ",
-"                ",
-"                ",
-"                ",
-" .............  ",
-" +@#$%&&***=-.  ",
-" .;;>;;,;;';).  ",
-" .!~{~~]~~{~^.  ",
-" .;/(_:<))[)~.  ",
-" .}|1||2333|4.  ",
-" .;56783990)~.  ",
-" .}|1||3000|4.  ",
-" .)ab~~c~~def.  ",
-" .............  ",
-"                ",
-"                "};
diff --git a/art/meeting_widget.png b/art/meeting_widget.png
deleted file mode 100644
index b1979a6e5c..0000000000
--- a/art/meeting_widget.png
+++ /dev/null
diff --git a/art/monthview.xpm b/art/monthview.xpm
deleted file mode 100644
index 21c76151d5..0000000000
--- a/art/monthview.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * monthview_xpm[] = {
-"24 24 7 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #666666",
-"#	c #919191",
-"$	c #F2F1ED",
-"%	c #D8D8D4",
-"....................... ",
-".+++++++++++++++++++++. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".+@@@@@@@@@@@@@@@@@@@#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+####################. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+####################. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+####################. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".+$$$#$$$#$$$#$$$#$$$#. ",
-".%###################@. ",
-"....................... ",
-"                        "};
diff --git a/art/move-message.png b/art/move-message.png
deleted file mode 100644
index 143cea1a93..0000000000
--- a/art/move-message.png
+++ /dev/null
diff --git a/art/move_message.xpm b/art/move_message.xpm
deleted file mode 100644
index 846febbe49..0000000000
--- a/art/move_message.xpm
+++ /dev/null
@@ -1,59 +0,0 @@
-/* XPM */
-static char * 16_move_message_xpm[] = {
-"16 16 40 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #95938E",
-"&	c #FBFBFB",
-"*	c #F9F8F6",
-"=	c #FBFAFA",
-"-	c #F6F5F1",
-";	c #7D7B78",
-">	c #EAE8E3",
-",	c #969491",
-"'	c #F6F4F1",
-")	c #81807C",
-"!	c #E5E3DE",
-"~	c #000000",
-"{	c #928F8B",
-"]	c #FBFBFA",
-"^	c #F7F5F2",
-"/	c #F5F3F0",
-"(	c #F7F6F4",
-"_	c #B5B2AC",
-":	c #A09C97",
-"<	c #F0EFEB",
-"[	c #E4E2DD",
-"}	c #AEABA6",
-"|	c #92908B",
-"1	c #E8E6E1",
-"2	c #B0ADA7",
-"3	c #F7F6F2",
-"4	c #F5F4F0",
-"5	c #6B6A68",
-"6	c #83817E",
-"7	c #E1DFDA",
-"8	c #E2DFD9",
-"9	c #E2E0DB",
-"0	c #E3E1DC",
-"a	c #E6E4DF",
-"                ",
-" . . . . . .    ",
-".           .   ",
-"                ",
-".           .   ",
-"    .+......... ",
-".  .@#########$.",
-"   .#%&*#*=*-;>.",
-".  .#*,=*=*')'!.",
-" ~ .#**{]*^)*/!.",
-"   .#*(_)#):-<[.",
-"   .#(}**)^^|1[.",
-"   .#2*/34^/>51.",
-"   .678887990a$.",
-"    ........... ",
-"                "};
diff --git a/art/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_appointment.png b/art/new_appointment.png
deleted file mode 100644
index 5dc61801da..0000000000
--- a/art/new_appointment.png
+++ /dev/null
diff --git a/art/new_appointment.xpm b/art/new_appointment.xpm
deleted file mode 100644
index d55eb396e8..0000000000
--- a/art/new_appointment.xpm
+++ /dev/null
@@ -1,126 +0,0 @@
-/* XPM */
-static char * new_appointment_xpm[] = {
-"16 16 107 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #FEFEFE",
-"@ 	c #FDFDFD",
-"# 	c #E0E0E0",
-"$ 	c #C1C1C1",
-"% 	c #F1F1F1",
-"& 	c #C3C3C3",
-"* 	c #FBFBFB",
-"= 	c #A8A8A8",
-"- 	c #525252",
-"; 	c #141414",
-"> 	c #111111",
-", 	c #383838",
-"' 	c #6E6E6E",
-") 	c #ADADAD",
-"! 	c #717171",
-"~ 	c #5D5D5D",
-"{ 	c #404040",
-"] 	c #BA8D31",
-"^ 	c #EAB23D",
-"/ 	c #403011",
-"( 	c #E5E5E5",
-"_ 	c #B4B4B4",
-": 	c #606060",
-"< 	c #DADADA",
-"[ 	c #777777",
-"} 	c #4B4B49",
-"| 	c #161616",
-"1 	c #EFB63E",
-"2 	c #F6D591",
-"3 	c #F3B840",
-"4 	c #916D26",
-"5 	c #F8F8F8",
-"6 	c #F3F3F3",
-"7 	c #E7E7E7",
-"8 	c #B5B5B5",
-"9 	c #A1A1A1",
-"0 	c #919191",
-"a 	c #EEB53E",
-"b 	c #FAE7BC",
-"c 	c #FCD584",
-"d 	c #FEC142",
-"e 	c #FFC243",
-"f 	c #FFFFFF",
-"g 	c #CECECE",
-"h 	c #0B0B0B",
-"i 	c #B9B9B9",
-"j 	c #E4E4E4",
-"k 	c #B88B30",
-"l 	c #F9E2B2",
-"m 	c #FDD789",
-"n 	c #D0D0D0",
-"o 	c #373737",
-"p 	c #898989",
-"q 	c #ABABAB",
-"r 	c #33332D",
-"s 	c #CFCFB9",
-"t 	c #E7AF3C",
-"u 	c #F9DDA4",
-"v 	c #FECA5E",
-"w 	c #D09E36",
-"x 	c #8B8B8B",
-"y 	c #F6F6F6",
-"z 	c #131313",
-"A 	c #3A2B0F",
-"B 	c #8F6C25",
-"C 	c #FDC042",
-"D 	c #2D220C",
-"E 	c #6F6F6F",
-"F 	c #8F8F8F",
-"G 	c #353535",
-"H 	c #C3C3AE",
-"I 	c #DFDFDF",
-"J 	c #F0F0F0",
-"K 	c #FCFCFC",
-"L 	c #363636",
-"M 	c #AAAAAA",
-"N 	c #C8C8C8",
-"O 	c #A9A9A9",
-"P 	c #E1E1E1",
-"Q 	c #4A4A4A",
-"R 	c #FAFAFA",
-"S 	c #C4C4C4",
-"T 	c #3C3C36",
-"U 	c #ADAD9B",
-"V 	c #CCCCCC",
-"W 	c #D6D6D6",
-"X 	c #F4F4F4",
-"Y 	c #F7F7F7",
-"Z 	c #BABABA",
-"` 	c #BFBFBF",
-" .	c #C9C9C9",
-"..	c #767676",
-"+.	c #CBCBCB",
-"@.	c #ACACAC",
-"#.	c #B3B3B3",
-"$.	c #5C5C5C",
-"%.	c #C5C5C5",
-"&.	c #A0A0A0",
-"*.	c #444444",
-"=.	c #A7A7A7",
-"-.	c #989898",
-";.	c #4B4B4B",
-">.	c #9C9C9C",
-",.	c #A2A2A2",
-"'.	c #BBBBBB",
-"        . . . . . . . . .       ",
-"      . + + + + + + @ # $ .     ",
-"      . + % % % % % % & * = .   ",
-"      . - ; . > , ' % ) ! ~ { . ",
-"    . . ] ^ / ( _ . : < [ } | . ",
-"  . . 1 2 3 4 5 6 7 . : 8 9 0 . ",
-"  . a b c d e f g h i . 9 j 0 . ",
-". k l m e e e n o p % q r s 0 . ",
-". t u v e e w o x + y < z j 0 . ",
-". A B C e e D E f + F G . H 0 . ",
-". I J K f f n L M @ J N z j 0 . ",
-". O P y + + f n Q R S 9 T U 0 . ",
-"  . V W X R K * Y V Z . 9 j 0 . ",
-"  . . ` Z  ...+.@.#.. $.%.j 0 . ",
-"    . . &.@.*.=.-.. ;.>.,.'.&.. ",
-"      . . . . . . . . . . . .   "};
diff --git a/art/new_contact.xpm b/art/new_contact.xpm
deleted file mode 100644
index 9b7e778102..0000000000
--- a/art/new_contact.xpm
+++ /dev/null
@@ -1,98 +0,0 @@
-/* XPM */
-static char * new_contact_xpm[] = {
-"24 24 71 1",
-" 	c None",
-".	c #000000",
-"+	c #BABABA",
-"@	c #FDFDFD",
-"#	c #FCFCFC",
-"$	c #959595",
-"%	c #FBFBFB",
-"&	c #FAFAFA",
-"*	c #F9F9F9",
-"=	c #F8F8F8",
-"-	c #F7F7F7",
-";	c #E3E3E3",
-">	c #BDBDBD",
-",	c #9D9C9A",
-"'	c #999896",
-")	c #A4A4A3",
-"!	c #391414",
-"~	c #B1B1B1",
-"{	c #D4D4D4",
-"]	c #E2E2E2",
-"^	c #DCD4C7",
-"/	c #C1B8A6",
-"(	c #878682",
-"_	c #BFBFBF",
-":	c #7C7C7C",
-"<	c #909090",
-"[	c #747474",
-"}	c #818181",
-"|	c #A8A8A8",
-"1	c #B6B6B6",
-"2	c #F6F6F6",
-"3	c #7F742E",
-"4	c #E1E1E1",
-"5	c #959FA4",
-"6	c #678690",
-"7	c #9A9891",
-"8	c #959490",
-"9	c #F5F5F5",
-"0	c #2B6776",
-"a	c #294E70",
-"b	c #294770",
-"c	c #284D6F",
-"d	c #232362",
-"e	c #B1B3B4",
-"f	c #979797",
-"g	c #B0B0B0",
-"h	c #AFAFAF",
-"i	c #D3D3D3",
-"j	c #E0E0E0",
-"k	c #27276C",
-"l	c #28286D",
-"m	c #282A6F",
-"n	c #2A5A73",
-"o	c #DFDFDF",
-"p	c #A2A2A2",
-"q	c #B5B5B5",
-"r	c #727272",
-"s	c #BCBCBC",
-"t	c #F4F4F4",
-"u	c #DEDEDE",
-"v	c #D5D5D5",
-"w	c #DDDDDD",
-"x	c #BEBEBE",
-"y	c #D1D1D1",
-"z	c #F3F3F3",
-"A	c #DCDCDC",
-"B	c #E7E7E7",
-"C	c #E6E6E6",
-"D	c #E5E5E5",
-"E	c #E4E4E4",
-"F	c #686868",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"  ..................... ",
-" .+@@@@@@@@@@@@@@@@@@#$.",
-" .@%%%%%&&&&*****===--;.",
-" .@%>>,')>&*****==----;.",
-" .@%>>!..,***~={=>----].",
-" .@%>>^/.(**_:<[<}|1-2].",
-" .@%>>^3.'**={=----2224.",
-" .@&>567.8*===----22294.",
-" .@&0abcde==1<f{ghi>99j.",
-" .@&akklmn==----222999o.",
-" .@*****===-pg|qiprs9tu.",
-" .@*vvv=1>----222999ttw.",
-" .@*vxf=p---gi2h$syytzw.",
-" .@*===-----22999tttzzA.",
-" .hBBCDDE;]]]44joouwwAF.",
-"  ..................... ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/art/new_task-16.png b/art/new_task-16.png
deleted file mode 100644
index 7937d8d53b..0000000000
--- a/art/new_task-16.png
+++ /dev/null
diff --git a/art/new_task.png b/art/new_task.png
deleted file mode 100644
index 16a1c94b6b..0000000000
--- a/art/new_task.png
+++ /dev/null
diff --git a/art/next-message.png b/art/next-message.png
deleted file mode 100644
index 80de893ecf..0000000000
--- a/art/next-message.png
+++ /dev/null
diff --git a/art/offline.png b/art/offline.png
deleted file mode 100644
index 57bdd27be2..0000000000
--- a/art/offline.png
+++ /dev/null
diff --git a/art/online.png b/art/online.png
deleted file mode 100644
index 9a6a3980c2..0000000000
--- a/art/online.png
+++ /dev/null
diff --git a/art/open-in-new-window-16.png b/art/open-in-new-window-16.png
deleted file mode 100644
index 07496e8b81..0000000000
--- a/art/open-in-new-window-16.png
+++ /dev/null
diff --git a/art/outbox-16.png b/art/outbox-16.png
deleted file mode 100644
index e52e00a7f3..0000000000
--- a/art/outbox-16.png
+++ /dev/null
diff --git a/art/outbox-full-16.png b/art/outbox-full-16.png
deleted file mode 100644
index cb138fa2b3..0000000000
--- a/art/outbox-full-16.png
+++ /dev/null
diff --git a/art/paste.png b/art/paste.png
deleted file mode 100644
index 736900531a..0000000000
--- a/art/paste.png
+++ /dev/null
diff --git a/art/pattern.png b/art/pattern.png
deleted file mode 100644
index 33abc187ef..0000000000
--- a/art/pattern.png
+++ /dev/null
diff --git a/art/pgp-signature-bad.png b/art/pgp-signature-bad.png
deleted file mode 100644
index 82318fbb4d..0000000000
--- a/art/pgp-signature-bad.png
+++ /dev/null
diff --git a/art/pgp-signature-nokey.png b/art/pgp-signature-nokey.png
deleted file mode 100644
index 00250e090c..0000000000
--- a/art/pgp-signature-nokey.png
+++ /dev/null
diff --git a/art/pgp-signature-ok.png b/art/pgp-signature-ok.png
deleted file mode 100644
index 51782b0e40..0000000000
--- a/art/pgp-signature-ok.png
+++ /dev/null
diff --git a/art/pin.png b/art/pin.png
deleted file mode 100644
index fff34d7d96..0000000000
--- a/art/pin.png
+++ /dev/null
diff --git a/art/previous-message.png b/art/previous-message.png
deleted file mode 100644
index 17c3dcadb6..0000000000
--- a/art/previous-message.png
+++ /dev/null
diff --git a/art/print-preview-24.png b/art/print-preview-24.png
deleted file mode 100644
index cd6b90e6bd..0000000000
--- a/art/print-preview-24.png
+++ /dev/null
diff --git a/art/print-preview.xpm b/art/print-preview.xpm
deleted file mode 100644
index a4b36d639d..0000000000
--- a/art/print-preview.xpm
+++ /dev/null
@@ -1,153 +0,0 @@
-/* XPM */
-static char * print_preview_xpm[] = {
-"16 16 134 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #9D9D8D",
-"@ 	c #CFCFB9",
-"# 	c #C4C4AF",
-"$ 	c #8D8D7F",
-"% 	c #353530",
-"& 	c #828282",
-"* 	c #9C9C8C",
-"= 	c #E2E2D0",
-"- 	c #EDEDE7",
-"; 	c #C0C0AC",
-"> 	c #B2B29F",
-", 	c #828274",
-"' 	c #4C4C44",
-") 	c #FFFFFF",
-"! 	c #EFEFEF",
-"~ 	c #ECECEC",
-"{ 	c #090908",
-"] 	c #D5D5BF",
-"^ 	c #FBFBFA",
-"/ 	c #C3C3AE",
-"( 	c #B5B5A2",
-"_ 	c #A6A695",
-": 	c #959586",
-"< 	c #080807",
-"[ 	c #E3E3E3",
-"} 	c #CDCDCD",
-"| 	c #D7D7D7",
-"1 	c #090909",
-"2 	c #CACAB5",
-"3 	c #DDDDD0",
-"4 	c #B7B7A4",
-"5 	c #AAAA98",
-"6 	c #9B9B8B",
-"7 	c #8C8C7D",
-"8 	c #0A0A09",
-"9 	c #E9E9E9",
-"0 	c #EBEBEB",
-"a 	c #DBDBDB",
-"b 	c #929283",
-"c 	c #BABAA7",
-"d 	c #ADAD9B",
-"e 	c #9F9F8E",
-"f 	c #909081",
-"g 	c #727266",
-"h 	c #52524C",
-"i 	c #A4A4A4",
-"j 	c #34342F",
-"k 	c #878779",
-"l 	c #A0A090",
-"m 	c #737367",
-"n 	c #010101",
-"o 	c #575757",
-"p 	c #A6A6A6",
-"q 	c #4B4B43",
-"r 	c #414141",
-"s 	c #777777",
-"t 	c #979797",
-"u 	c #BCBBBB",
-"v 	c #D4D4D3",
-"w 	c #878787",
-"x 	c #323232",
-"y 	c #A5A5A5",
-"z 	c #D0D0CF",
-"A 	c #B5B5B5",
-"B 	c #C2C2C2",
-"C 	c #FBFBFB",
-"D 	c #FAFAFA",
-"E 	c #999999",
-"F 	c #363636",
-"G 	c #9E9E9E",
-"H 	c #ECECEB",
-"I 	c #AEADAB",
-"J 	c #F7F7F7",
-"K 	c #E5E5E4",
-"L 	c #8D8D8D",
-"M 	c #F1F1F1",
-"N 	c #A0A0A0",
-"O 	c #E2E2E2",
-"P 	c #D9D9D8",
-"Q 	c #898988",
-"R 	c #0C0C0C",
-"S 	c #302F2F",
-"T 	c #A4A3A1",
-"U 	c #CCCAC6",
-"V 	c #1B1B1B",
-"W 	c #969594",
-"X 	c #D6D4D2",
-"Y 	c #DDDBDA",
-"Z 	c #DCDCDB",
-"` 	c #DEDDDD",
-" .	c #DFDEDD",
-"..	c #DDDCDB",
-"+.	c #DBDBD9",
-"@.	c #7E7E7D",
-"#.	c #383838",
-"$.	c #555453",
-"%.	c #9F9E9A",
-"&.	c #A8A7A6",
-"*.	c #9E9D9C",
-"=.	c #615E59",
-"-.	c #54514E",
-";.	c #54524E",
-">.	c #514F4B",
-",.	c #52504C",
-"'.	c #504D49",
-").	c #4D4B47",
-"!.	c #4F4D49",
-"~.	c #514F4C",
-"{.	c #535251",
-"].	c #8E8D8A",
-"^.	c #B4B3B1",
-"/.	c #C0BFBC",
-"(.	c #B9B8B5",
-"_.	c #B3B1AF",
-":.	c #B1B1AE",
-"<.	c #AFAEAC",
-"[.	c #B0AEAC",
-"}.	c #ACACA9",
-"|.	c #A6A6A4",
-"1.	c #ABAAA7",
-"2.	c #AEADAA",
-"3.	c #AAA9A6",
-"4.	c #201F1E",
-"5.	c #403F3D",
-"6.	c #444341",
-"7.	c #454542",
-"8.	c #42423F",
-"9.	c #3F3E3C",
-"0.	c #3A3936",
-"a.	c #393835",
-"b.	c #31302D",
-"c.	c #1E1D1B",
-"      . . . .                   ",
-"    . + @ # $ % & . . . .       ",
-"  . * = - ; > , ' ) ! ~ .       ",
-"  { ] ^ / ( _ : < [ } | .       ",
-"  1 2 3 4 5 6 7 8 9 0 a .       ",
-"  . b c d e f g h . i a .       ",
-"    j k l b m n o p 0 a .       ",
-"      q 8 8 r s n . t a . .     ",
-"    . u v ) 9 9 w n x y z A .   ",
-"  . B C ) D ) D C E n F G H I . ",
-"  . D J K L M N O P Q R S T U V ",
-"  . W X Y Z `  ...P +.@.#.$.%.. ",
-"  . &.*.=.-.;.>.,.'.).!.~.{.].. ",
-"  . ^./.(._.:.<.[.}.|.1.2.<.3.. ",
-"  . 4.5.6.7.7.7.8.5.9.0.a.b.c.. ",
-"    . . . . . . . . . . . . .   "};
diff --git a/art/print.png b/art/print.png
deleted file mode 100644
index f223a1146d..0000000000
--- a/art/print.png
+++ /dev/null
diff --git a/art/print.xpm b/art/print.xpm
deleted file mode 100644
index da46eb0157..0000000000
--- a/art/print.xpm
+++ /dev/null
@@ -1,107 +0,0 @@
-/* XPM */
-static char * print_xpm[] = {
-"16 16 88 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #ECECEC",
-"#	c #353535",
-"$	c #D3D3D3",
-"%	c #131313",
-"&	c #C7C7C7",
-"*	c #D7D7D7",
-"=	c #EBEBEB",
-"-	c #E9E9E9",
-";	c #DBDBDB",
-">	c #4D4D4D",
-",	c #A4A4A4",
-"'	c #414141",
-")	c #8C8C8C",
-"!	c #979797",
-"~	c #BCBBBB",
-"{	c #D4D4D3",
-"]	c #D0D0CF",
-"^	c #B5B5B5",
-"/	c #C2C2C2",
-"(	c #FBFBFB",
-"_	c #FAFAFA",
-":	c #F8F8F8",
-"<	c #F4F4F3",
-"[	c #ECECEB",
-"}	c #AEADAB",
-"|	c #F7F7F7",
-"1	c #E5E5E4",
-"2	c #8D8D8D",
-"3	c #F1F1F1",
-"4	c #A0A0A0",
-"5	c #E2E2E2",
-"6	c #D9D9D8",
-"7	c #DEDDDC",
-"8	c #DCDCDA",
-"9	c #D8D7D4",
-"0	c #B3B2B0",
-"a	c #CCCAC6",
-"b	c #1B1B1B",
-"c	c #969594",
-"d	c #D6D4D2",
-"e	c #DDDBDA",
-"f	c #DCDCDB",
-"g	c #DEDDDD",
-"h	c #DFDEDD",
-"i	c #DDDCDB",
-"j	c #DBDBD9",
-"k	c #DAD9D7",
-"l	c #D9D8D6",
-"m	c #81807E",
-"n	c #9F9E9A",
-"o	c #A8A7A6",
-"p	c #9E9D9C",
-"q	c #615E59",
-"r	c #54514E",
-"s	c #54524E",
-"t	c #514F4B",
-"u	c #52504C",
-"v	c #504D49",
-"w	c #4D4B47",
-"x	c #4F4D49",
-"y	c #514F4C",
-"z	c #939291",
-"A	c #9B9A97",
-"B	c #B4B3B1",
-"C	c #C0BFBC",
-"D	c #B9B8B5",
-"E	c #B3B1AF",
-"F	c #B1B1AE",
-"G	c #AFAEAC",
-"H	c #B0AEAC",
-"I	c #ACACA9",
-"J	c #A6A6A4",
-"K	c #ABAAA7",
-"L	c #AEADAA",
-"M	c #AAA9A6",
-"N	c #201F1E",
-"O	c #403F3D",
-"P	c #444341",
-"Q	c #454542",
-"R	c #42423F",
-"S	c #3F3E3C",
-"T	c #3A3936",
-"U	c #393835",
-"V	c #31302D",
-"W	c #1E1D1B",
-"                ",
-"    .........   ",
-"    .++++++@.   ",
-"    .+#$.%&*.   ",
-"    .+=---=;.   ",
-"    .+>.=.,;.   ",
-"    .+=====;.   ",
-"   ..+'=).!;..  ",
-"  .~{+------]^. ",
-" ./(+_+_((_:<[}.",
-" ._|1234567890ab",
-" .cdefghi6jklmn.",
-" .opqrstuvwxyzA.",
-" .BCDEFGHIJKLGM.",
-" .NOPQQQROSTUVW.",
-"  ............. "};
diff --git a/art/priority-high.xpm b/art/priority-high.xpm
deleted file mode 100644
index 884c8b8236..0000000000
--- a/art/priority-high.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * priority_high_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #FFFFFF",
-"X	c #A7453E",
-"                ",
-"                ",
-"        .       ",
-"       .X.      ",
-"      .XXX.     ",
-"      .XXX.     ",
-"      .XXX.     ",
-"      .XX.      ",
-"      .XX.      ",
-"      .X.       ",
-"      ..        ",
-"     .XX.       ",
-"     .XX.       ",
-"      ..        ",
-"                ",
-"                "};
diff --git a/art/priority-low.xpm b/art/priority-low.xpm
deleted file mode 100644
index ad53e9e0cc..0000000000
--- a/art/priority-low.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * priority_low_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #21405A",
-"                ",
-"                ",
-"                ",
-"       ..       ",
-"       ..       ",
-"       ..       ",
-"       ..       ",
-"       ..       ",
-"     ......     ",
-"      ....      ",
-"      ....      ",
-"       ..       ",
-"       ..       ",
-"                ",
-"                ",
-"                "};
diff --git a/art/properties-16.png b/art/properties-16.png
deleted file mode 100644
index 7586e3ab27..0000000000
--- a/art/properties-16.png
+++ /dev/null
diff --git a/art/rdf.png b/art/rdf.png
deleted file mode 100644
index b4bdbafa99..0000000000
--- a/art/rdf.png
+++ /dev/null
diff --git a/art/receive-24.png b/art/receive-24.png
deleted file mode 100644
index bfa7d972bc..0000000000
--- a/art/receive-24.png
+++ /dev/null
diff --git a/art/recur.xpm b/art/recur.xpm
deleted file mode 100644
index bb34fa4568..0000000000
--- a/art/recur.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * recur_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #333366",
-"                ",
-"                ",
-"    ..   .....  ",
-"  ...    ....   ",
-"  ..     ....   ",
-" ..      .....  ",
-" ..      .  ..  ",
-" ..         ..  ",
-" ..  .      ..  ",
-" .....      ..  ",
-"  ....     ..   ",
-"  ....    ...   ",
-" .....   ..     ",
-"                ",
-"                ",
-"                "};
diff --git a/art/refresh-nntp-folders-24.png b/art/refresh-nntp-folders-24.png
deleted file mode 100644
index b1c339a973..0000000000
--- a/art/refresh-nntp-folders-24.png
+++ /dev/null
diff --git a/art/remove-nntp-folder-24.png b/art/remove-nntp-folder-24.png
deleted file mode 100644
index 5500bdec23..0000000000
--- a/art/remove-nntp-folder-24.png
+++ /dev/null
diff --git a/art/reply-to-all.png b/art/reply-to-all.png
deleted file mode 100644
index fa64fdeecf..0000000000
--- a/art/reply-to-all.png
+++ /dev/null
diff --git a/art/reply.png b/art/reply.png
deleted file mode 100644
index 70ee66b8eb..0000000000
--- a/art/reply.png
+++ /dev/null
diff --git a/art/reply.xpm b/art/reply.xpm
deleted file mode 100644
index 059d3ebc12..0000000000
--- a/art/reply.xpm
+++ /dev/null
@@ -1,46 +0,0 @@
-/* XPM */
-static char * 16_reply_xpm[] = {
-"16 16 27 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #FFFFFF",
-"&	c #5D5B57",
-"*	c #868580",
-"=	c #E5E2DB",
-"-	c #FBFBF8",
-";	c #716E6B",
-">	c #000000",
-",	c #FBFAF7",
-"'	c #A5A29D",
-")	c #990000",
-"!	c #EFEFEF",
-"~	c #CCCCCC",
-"{	c #797873",
-"]	c #7D7A77",
-"^	c #F7F5F1",
-"/	c #090808",
-"(	c #D7D4CE",
-"_	c #D8D5CF",
-":	c #7F0000",
-"<	c #181818",
-"[	c #090909",
-"                ",
-"                ",
-"                ",
-"  .+.........   ",
-" .@#########$.  ",
-" .%&%%%%%%%*=.  ",
-" .%-;%>>>>>>>>> ",
-" .%--;>%%%%%%%> ",
-" .%-,'>%))))!~> ",
-" .%,{->%)))!!~> ",
-" .%]-^>%))))!~> ",
-" ./(__>%)!)):~> ",
-"  ....>%!!!::~> ",
-"      >%~~~~~~< ",
-"      >>[>>>>>> ",
-"                "};
diff --git a/art/reply_to_all.xpm b/art/reply_to_all.xpm
deleted file mode 100644
index 0c0a00e020..0000000000
--- a/art/reply_to_all.xpm
+++ /dev/null
@@ -1,52 +0,0 @@
-/* XPM */
-static char * 16_reply_to_all_xpm[] = {
-"16 16 33 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #FFFFFF",
-"&	c #5D5B57",
-"*	c #868580",
-"=	c #E5E2DB",
-"-	c #FBFBF8",
-";	c #716E6B",
-">	c #62605C",
-",	c #F8F7F2",
-"'	c #DDDAD4",
-")	c #F7F5F1",
-"!	c #FBFAF7",
-"~	c #A5A29D",
-"{	c #000000",
-"]	c #797873",
-"^	c #7D7A77",
-"/	c #FAF9F6",
-"(	c #F8F6F2",
-"_	c #990000",
-":	c #EFEFEF",
-"<	c #CCCCCC",
-"[	c #090808",
-"}	c #D7D4CE",
-"|	c #D8D5CF",
-"1	c #D6D3CD",
-"2	c #7F0000",
-"3	c #181818",
-"4	c #090909",
-"                ",
-"                ",
-" .+.........    ",
-".@#########$.   ",
-".%&%%%%%%%*=..  ",
-".%-;%%%%%>,'.$. ",
-".%--;%%%;-)'.=. ",
-".%-!~;-{{{{{{{{{",
-".%!]--;{%%%%%%%{",
-".%^-)/({%____:<{",
-".[}|||1{%___::<{",
-" ......{%____:<{",
-"  .[}||{%_:__2<{",
-"   ....{%:::22<{",
-"       {%<<<<<<3",
-"       {{4{{{{{{"};
diff --git a/art/save-16.png b/art/save-16.png
deleted file mode 100644
index 20a27ca2a1..0000000000
--- a/art/save-16.png
+++ /dev/null
diff --git a/art/save-24.png b/art/save-24.png
deleted file mode 100644
index 51375a3f40..0000000000
--- a/art/save-24.png
+++ /dev/null
diff --git a/art/save-as-16.png b/art/save-as-16.png
deleted file mode 100644
index 3b9612efdf..0000000000
--- a/art/save-as-16.png
+++ /dev/null
diff --git a/art/save.xpm b/art/save.xpm
deleted file mode 100644
index 7b1812943e..0000000000
--- a/art/save.xpm
+++ /dev/null
@@ -1,45 +0,0 @@
-/* XPM */
-static char * 16_save_xpm[] = {
-"16 16 26 1",
-" 	c None",
-".	c #000000",
-"+	c #B8CADB",
-"@	c #C5D4E3",
-"#	c #687B8D",
-"$	c #D8D8D8",
-"%	c #CFDBE6",
-"&	c #9DB8D2",
-"*	c #728699",
-"=	c #BCCEDF",
-"-	c #FFFFFF",
-";	c #D2DEEA",
-">	c #C0D1E2",
-",	c #CFDBE7",
-"'	c #798EA3",
-")	c #D0DDE9",
-"!	c #B7CBDE",
-"~	c #B6CADD",
-"{	c #B7CADD",
-"]	c #BACCDF",
-"^	c #9FB9D3",
-"/	c #7E94A9",
-"(	c #A4BDD5",
-"_	c #BABABA",
-":	c #556474",
-"<	c #2A303A",
-"                ",
-"                ",
-"  ............  ",
-" .+@#$$$$$$%&*. ",
-" .=&#------;&*. ",
-" .>&#$$$$$$,&*. ",
-" .>&'------)&*. ",
-" .>&&!~~{{]^&*. ",
-" .>&&&&&&&&&&*. ",
-" .>&&//////&&*. ",
-" .>(/$$_$-$/&*. ",
-" .>&/$_$-/$/&*. ",
-" .>&/$_-$/$/&*. ",
-" .=&/_$-$$$/**. ",
-"  .:........<.  ",
-"                "};
diff --git a/art/score-high.xpm b/art/score-high.xpm
deleted file mode 100644
index bb7bd47562..0000000000
--- a/art/score-high.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_high_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #00FF00",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .+   ",
-"    @@@    .++  ",
-"   @#@#@   .++  ",
-"   @$%$@   .++  ",
-"   @$$$@   . +  ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-higher.xpm b/art/score-higher.xpm
deleted file mode 100644
index 696e74bed5..0000000000
--- a/art/score-higher.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_higher_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #00FF00",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++  ",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .  ++",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-highest.xpm b/art/score-highest.xpm
deleted file mode 100644
index d8dab65079..0000000000
--- a/art/score-highest.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_highest_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #00FF00",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++++",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .    ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-low.xpm b/art/score-low.xpm
deleted file mode 100644
index e071741adc..0000000000
--- a/art/score-low.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_low_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #FF0000",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .+   ",
-"    @@@    .++  ",
-"   @#@#@   .++  ",
-"   @$%$@   .++  ",
-"   @$$$@   . +  ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-lower.xpm b/art/score-lower.xpm
deleted file mode 100644
index 74da90d670..0000000000
--- a/art/score-lower.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_lower_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #FF0000",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++  ",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .  ++",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-lowest.xpm b/art/score-lowest.xpm
deleted file mode 100644
index 9beee1849f..0000000000
--- a/art/score-lowest.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_lowest_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #FF0000",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++++",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .    ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-normal.xpm b/art/score-normal.xpm
deleted file mode 100644
index 82b618cb8d..0000000000
--- a/art/score-normal.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * score_normal_xpm[] = {
-"16 16 5 1",
-" 	c None",
-".	c #000000",
-"+	c #17D1EA",
-"@	c #FFFFFF",
-"#	c #EF9815",
-"                ",
-"                ",
-"    ...         ",
-"   .+.+.        ",
-"   .@#@.        ",
-"   .@@@.        ",
-"   ..@..        ",
-"  ..@@@..       ",
-" ..@@@@@..      ",
-" ..@@@@@..      ",
-" ..@@@@@..      ",
-" ..@@@@@..      ",
-"  .@@@@@.       ",
-"   ##@##        ",
-"   ## ##        ",
-"                "};
diff --git a/art/search-16.png b/art/search-16.png
deleted file mode 100644
index 6e9837d8ee..0000000000
--- a/art/search-16.png
+++ /dev/null
diff --git a/art/search-and-replace-16.png b/art/search-and-replace-16.png
deleted file mode 100644
index 5daa4c39a0..0000000000
--- a/art/search-and-replace-16.png
+++ /dev/null
diff --git a/art/send-16.png b/art/send-16.png
deleted file mode 100644
index 4cf96ead39..0000000000
--- a/art/send-16.png
+++ /dev/null
diff --git a/art/send-24-receive.png b/art/send-24-receive.png
deleted file mode 100644
index 1d3d4df420..0000000000
--- a/art/send-24-receive.png
+++ /dev/null
diff --git a/art/send-24.png b/art/send-24.png
deleted file mode 100644
index 5c7e4a261e..0000000000
--- a/art/send-24.png
+++ /dev/null
diff --git a/art/send-48-receive.png b/art/send-48-receive.png
deleted file mode 100644
index 53f8b15d9a..0000000000
--- a/art/send-48-receive.png
+++ /dev/null
diff --git a/art/send-later-16.png b/art/send-later-16.png
deleted file mode 100644
index 3b2bb791d4..0000000000
--- a/art/send-later-16.png
+++ /dev/null
diff --git a/art/send-receive.xpm b/art/send-receive.xpm
deleted file mode 100644
index f9ba82e5c8..0000000000
--- a/art/send-receive.xpm
+++ /dev/null
@@ -1,58 +0,0 @@
-/* XPM */
-static char * send_receive_xpm[] = {
-"16 16 39 1",
-" 	c None",
-".	c #000000",
-"+	c #F7EFD0",
-"@	c #F7EFD1",
-"#	c #EED680",
-"$	c #C38909",
-"%	c #F6ECC9",
-"&	c #D1940C",
-"*	c #B98208",
-"=	c #A59458",
-"-	c #D1BC70",
-";	c #E9D17B",
-">	c #B07C08",
-",	c #916608",
-"'	c #F3E3A8",
-")	c #AE7B0A",
-"!	c #F4E4AD",
-"~	c #F5E9BC",
-"{	c #D8E6D2",
-"]	c #B9C9B1",
-"^	c #6F9059",
-"/	c #C6B26A",
-"(	c #D7E5D0",
-"_	c #AECCA1",
-":	c #557C3B",
-"<	c #D3E3CB",
-"[	c #D0E1C9",
-"}	c #DBE7D6",
-"|	c #B9C3B5",
-"1	c #BDCEB6",
-"2	c #A9C79C",
-"3	c #65894C",
-"4	c #748C64",
-"5	c #668154",
-"6	c #669447",
-"7	c #58833C",
-"8	c #E1EBDC",
-"9	c #5E8A41",
-"0	c #E0EADB",
-"    .           ",
-"   .+.          ",
-"  .@#$.         ",
-" .%##&*.        ",
-".%=-;>,,.       ",
-"...'#)...       ",
-"  .!#).  .....  ",
-"  .~#).  .{]^.  ",
-"  .#/).  .(_:.  ",
-"  .....  .<_:.  ",
-"       ...[_:...",
-"       .}|12345.",
-"        .}__67. ",
-"         .8_9.  ",
-"          .0.   ",
-"           .    "};
diff --git a/art/send.png b/art/send.png
deleted file mode 100644
index fb95df6016..0000000000
--- a/art/send.png
+++ /dev/null
diff --git a/art/service-close.png b/art/service-close.png
deleted file mode 100644
index d8e7cea744..0000000000
--- a/art/service-close.png
+++ /dev/null
diff --git a/art/service-configure.png b/art/service-configure.png
deleted file mode 100644
index 8c56dc4c7a..0000000000
--- a/art/service-configure.png
+++ /dev/null
diff --git a/art/service-down-disabled.png b/art/service-down-disabled.png
deleted file mode 100644
index f6742ff105..0000000000
--- a/art/service-down-disabled.png
+++ /dev/null
diff --git a/art/service-down.png b/art/service-down.png
deleted file mode 100644
index 49f532f527..0000000000
--- a/art/service-down.png
+++ /dev/null
diff --git a/art/service-left-disabled.png b/art/service-left-disabled.png
deleted file mode 100644
index fc4256346b..0000000000
--- a/art/service-left-disabled.png
+++ /dev/null
diff --git a/art/service-left.png b/art/service-left.png
deleted file mode 100644
index 38fe293e39..0000000000
--- a/art/service-left.png
+++ /dev/null
diff --git a/art/service-right-disabled.png b/art/service-right-disabled.png
deleted file mode 100644
index 848c2a499c..0000000000
--- a/art/service-right-disabled.png
+++ /dev/null
diff --git a/art/service-right.png b/art/service-right.png
deleted file mode 100644
index 7fdabac13d..0000000000
--- a/art/service-right.png
+++ /dev/null
diff --git a/art/service-up-disabled.png b/art/service-up-disabled.png
deleted file mode 100644
index 6258caa5d9..0000000000
--- a/art/service-up-disabled.png
+++ /dev/null
diff --git a/art/service-up.png b/art/service-up.png
deleted file mode 100644
index a24b336c6d..0000000000
--- a/art/service-up.png
+++ /dev/null
diff --git a/art/show_all_messages.xpm b/art/show_all_messages.xpm
deleted file mode 100644
index f38a42aebf..0000000000
--- a/art/show_all_messages.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * show_all_messages_xpm[] = {
-"16 16 8 1",
-" 	c None",
-".	c #000000",
-"+	c #9DB8D2",
-"@	c #FFFFFF",
-"#	c #89A1B9",
-"$	c #859DB4",
-"%	c #CACACA",
-"&	c #8199AF",
-"                ",
-"                ",
-"                ",
-"                ",
-"    .         . ",
-"   . .       . .",
-"  .         .  .",
-" ...........    ",
-" .+@+. .+@+.    ",
-" .#+$. .%+&.    ",
-"  ...   ...     ",
-"                ",
-"                ",
-"                ",
-"                ",
-"                "};
diff --git a/art/splash-1-0.png b/art/splash-1-0.png
deleted file mode 100644
index 13dabfd980..0000000000
--- a/art/splash-1-0.png
+++ /dev/null
diff --git a/art/splash.png b/art/splash.png
deleted file mode 100644
index ad1fe5442e..0000000000
--- a/art/splash.png
+++ /dev/null