1529 files changed, 0 insertions, 508778 deletions
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 00c805b196..0000000000
--- a/.cvsignore
+++ /dev/null
@@ -1,25 +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
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 5156573f32..0000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,66 +0,0 @@
-Evolution was written by:
-
-Addressbook
-	Arturo Esponosa <arturo@nuclecu.unam.mx> (Original Gnomecard author)
-	Nat Friedman <nat@helixcode.com>
-	Chris Lahey <clahey@helixcode.com>
-	Chris Toshok <toshok@helixcode.com>
-
-Artwork
-	Tuomas Kuosmanen <tigert@helixcode.com>
-
-Calendar
-	Seth Alves <seth@helixcode.com>
-	Eric Busboom <eric@softwarestudio.org> (libical author)
-	Arturo Esponosa <arturo@nuclecu.unam.mx> (Gnomecal contributor)
-	Damon Chaplin <damon@helixcode.com>
-	Federico Mena-Quintero <federico@helixcode.com>
-	Russell Steinthal <rms39@columbia.edu> (Gnomecal maintainer)
-
-Documentation
-	Kevin Breit <battery841@mypad.com>
-	Aaron Weber <aaron@helixcode.com>
-
-Mailer
-	Bertrand Guiheneuf <bertrand@helixcode.com>
-	Matt Loper <matt@helixcode.com>
-	Ettore Perazzoli <ettore@helixcode.com>
-	Jeff Stedfast <fejj@helixcode.com>
-	Peter Williams <peterw@helixcode.com>
-	Dan Winship <danw@helixcode.com>
-	Michael Zucchi <notzed@helixcode.com>
-
-Notes
-	Anders Carlsson <andersca@gnu.org>
-
-Shell
-	Miguel de Icaza <miguel@helixcode.com>
-	Ettore Perazzoli <ettore@helixcode.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>
-	GNOME PL Team <gnomepl@pandora.info.bielsko.pl>
-	Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
-	H�ctor Garc�a Alvarez <hector@scouts-es.org>
-	Jes�s Bravo �lvarez <jba@pobox.com>
-	Keld Simonsen <keld@dkuug.dk>
-	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>
-
-Widgets
-	Damon Chaplin <damon@helixcode.com>
-	Miguel de Icaza <miguel@helixcode.com>
-	Chris Lahey <clahey@helixcode.com>
-	Federico Mena-Quintero <federico@helixcode.com>
-	Chris Toshok <toshok@helixcode.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/ChangeLog b/ChangeLog
deleted file mode 100644
index 51f6049aa7..0000000000
--- a/ChangeLog
+++ /dev/null
@@ -1,5597 +0,0 @@
-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 7a42d1eee8..0000000000
--- a/MAINTAINERS
+++ /dev/null
@@ -1 +0,0 @@
-Email: miguel@kernel.org
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 3ab0d6962d..0000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-changelogs =			\
-	ChangeLog
-
-appicondir = $(datadir)/pixmaps
-appicon_DATA = evolution.png
-
-applicationdir = $(datadir)/gnome/apps/Applications
-application_DATA = evolution.desktop
-
-EXTRA_DIST =			\
-	AUTHORS			\
-	$(changelogs)		\
-	README			\
-	HACKING			\
-	MAINTAINERS		\
-	NEWS			\
-	evolution.spec.in	\
-	$(appicon_DATA)		\
-	$(application_DATA)
-
-
-SUBDIRS =			\
-        intl                    \
-        macros                  \
-        data                    \
-        e-util                  \
-        widgets                 \
-        shell                   \
-        libibex                 \
-        camel                   \
-        filter                  \
-        composer                \
-        mail                    \
-        libical                 \
-        libversit               \
-        addressbook             \
-        calendar                \
-        wombat                  \
-        art                     \
-	ui			\
-        default_user            \
-        tools                   \
-        po                      \
-        doc
-
-
-dist-hook: evolution.spec
-	cp evolution.spec $(distdir)
-
-
diff --git a/NEWS b/NEWS
deleted file mode 100644
index 6e69eded32..0000000000
--- a/NEWS
+++ /dev/null
@@ -1,472 +0,0 @@
-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 f0a7032d3b..0000000000
--- a/README
+++ /dev/null
@@ -1,184 +0,0 @@
-Evolution is the integrated mail, calendar and address book
-distributed suite from Helix Code, Inc.
-
-See http://www.helixcode.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 interested in hacking on Evolution, you should subscribe to
-the Evolution mailing list. Send mail to
-"evolution-request@helixcode.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 is a mailing list archive available at
-http://lists.helixcode.com/archives/public/evolution/
-
-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 you have built Evolution and it doesn't work, or you can't get it
-or one of its dependencies to compile, try running the
-"verify-evolution-install.sh" script in the tools/ subdirectory. It
-may be able to figure out what went wrong.
-
-
-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, but may 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" and "autogen"
-when building the other packages you need. Eg:
-
-	./configure --prefix=/usr --sysconfdir=/etc
-
-
-If you do not do this, you will need to set the GNOME_PATH environment
-variable (and ACLOCAL_FLAGS as well if building from CVS) to include
-the prefix you install into. Eg:
-
-        export GNOME_PATH=/usr/local
-	export ACLOCAL_FLAGS="-I /usr/local/share/aclocal"
-
-(Assuming your shell is bash, and you installed into /usr/local.) You
-need to set GNOME_PATH both during compiling AND when you run
-evolution. Remember also that if you're installing into an odd prefix
-such as /evolution, that you also need to make sure to put
-${prefix}/bin in your PATH.
-
-If you install Evolution into a different prefix from OAF, you will
-also need to set OAF_INFO_PATH to include the directory where the
-oafinfo files are installed (${prefix}/share/oaf). (OAF will
-eventually obey the GNOME_PATH variable, but it does not do so
-currently.) Eg:
-
-	export OAF_INFO_PATH=/usr/local/share/oaf
-
-If you are already running an oafd, you will need to kill it after
-setting that variable so it gets restarted later with that in its
-environment.
-
-
-Dependencies
-------------
-
-All of these libraries are available in GNOME CVS, under the given
-names. Most (but not all) of them are also available as tarballs on
-ftp.gnome.org. The (*)ed packages are available in Helix GNOME.
-(http://www.helixcode.com/desktop/)
-
- - gnome-xml - 1.8.7 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_X".)
-   (*)
-
- - gnome-print - 0.20 (*). The gnome-print CVS HEAD will NOT work, nor
-   will 0.21.
-
- - gdk-pixbuf - 0.7.0 or later (*)
-
- - ORBit - 0.5.3 or later (*)
-
- - oaf - 0.5 or later
-
-   *** 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 - 0.3 or later
-
-   *** If you are using gnome-vfs from CVS, you should use the flag
-   *** "--disable-more-warnings" when configuring, or it may fail to
-   *** build.
-
- - bonobo - 0.17 or later
-
-   *** Note that bonobo must be installed with the same --prefix as
-   *** either gnome-libs or evolution for the Makefiles to work
-   *** properly.
-
- - libunicode - 0.4 or later, available from
-   http://www.pango.org/download.shtml
-
- - gconf - 0.6 or later
-
- - gal (GNOME Application Library) - from CVS
-
- - gtkhtml - 0.5 or later
-
- - libglade (*)
-
-If you want support for PalmPilot syncing (currently only supported by
-the calendar and not yet very stable/functional), you will also need
-the following packages:
-
- - pilot-link (*)
-
- - gnome-pilot - from CVS, with --enable-oaf
-
-
-
-
-The layout of the source tree is:
-
-addressbook:	the Address Book UI
-art:		graphics used by evolution
-calendar:	the Calendar UI
-camel:		libcamel, a messaging library used by the mailer.
-		Camel is inspired by Sun's JavaMail
-		(http://java.sun.com/products/javamail/) and the
-		IMAPv4 spec (RFC 2060).
-composer:	the message composer UI
-data:		the .desktop file for Evolution
-default_user:	initial Evolution config files for new users
-devel-docs:	entirely inadequate documentation
-doc:		more adequate documentation
-e-util:		utility code used by various parts of Evolution
-filter:		libfilter, a mail filtering library
-libibex:	an indexing library used by the mailer
-libical:	a library for the iCalendar format (RFC 2445-2446)
-libversit:	a library for the vCard (RFC 2425-2426) and vCalendar
-		(http://www.imc.org/pdi/vcal-10.txt) formats
-mail:		the mail display UI
-shell:		the Evolution shell (the main program that launches
-		the other components)
-tests:		some test programs
-tools:		utilities, notably "killev", a script to kill of all
-		of the Evolution components
-widgets:	widgets used by Evolution, including the shortcut bar,
-		ETable, and EText
-wombat:		Has source code that will load in the addressbook
-		and calendar backend, and will form the server
-		process we'll be using
diff --git a/acconfig.h b/acconfig.h
deleted file mode 100644
index de3e404849..0000000000
--- a/acconfig.h
+++ /dev/null
@@ -1,31 +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 USING_OAF
-#undef HAVE_KRB4
-#undef HAVE_KRB5
-#undef MOVEMAIL_PATH
-#undef PGP_PROGRAM
-#undef GPG_PATH
-#undef PGP5_PATH
-#undef PGP_PATH
-#undef USING_GNOME_PRINT_0_20
-#undef NEED_KRB_SENDAUTH_PROTO
-#undef HAVE_ISBLANK
-
-/* Define this if you want to build against the development gtk */
-#undef HAVE_DEVGTK
-
-/* Define if ctime_r takes three arguments */
-#undef CTIME_R_THREE_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 531c07ec44..0000000000
--- a/addressbook/ChangeLog
+++ /dev/null
@@ -1,2823 +0,0 @@
-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/Makefile.am b/addressbook/Makefile.am
deleted file mode 100644
index cc89ee5aeb..0000000000
--- a/addressbook/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-if ENABLE_PILOT_CONDUITS
-CONDUIT_SUBDIR=conduit
-endif
-
-SUBDIRS =	\
-	backend printing contact-editor 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 1abc66db18..0000000000
--- a/addressbook/backend/ebook/.cvsignore
+++ /dev/null
@@ -1,16 +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
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
deleted file mode 100644
index 7f4a4c59fe..0000000000
--- a/addressbook/backend/ebook/Makefile.am
+++ /dev/null
@@ -1,124 +0,0 @@
-noinst_PROGRAMS = test-card test-client test-client-list
-
-bin_PROGRAMS = load-pine-addressbook load-gnomecard-addressbook
-
-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) $(srcdir)/../idl/addressbook.idl $(idl_flags)
-
-INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
-	-DG_LOG_DOMAIN=\"EBook\"			\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_srcdir)/addressbook/ename		\
-	-I$(top_builddir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/ename		\
-        $(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-card-cursor.c					\
-	e-card-simple.c					\
-	e-card.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-card-cursor.h					\
-	e-card-pairs.h					\
-	e-card-simple.h					\
-	e-card-types.h					\
-	e-card.h
-
-
-#
-# make a static library for use by addressbook's conduit's shared library
-#
-noinst_LTLIBRARIES = libebook-static.la
-libebook_static_la_SOURCES = $(libebook_la_SOURCES)
-libebook_static_la_LDFLAGS = --all-static
-
-
-test_client_SOURCES =					\
-	test-client.c
-
-test_client_LDADD =					\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/e-util/libeutil.la
-
-test_client_list_SOURCES =				\
-	test-client-list.c
-
-test_client_list_LDADD =				\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-test_card_SOURCES =					\
-	test-card.c
-
-test_card_LDADD =					\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-
-load_pine_addressbook_SOURCES =				\
-	load-pine-addressbook.c
-
-load_pine_addressbook_LDADD =				\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-
-load_gnomecard_addressbook_SOURCES =			\
-	load-gnomecard-addressbook.c
-
-load_gnomecard_addressbook_LDADD =			\
-	libebook.la					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)				\
-	$(top_builddir)/e-util/ename/libename.la	\
-	$(top_builddir)/libversit/libversit.la		\
-	$(top_builddir)/e-util/libeutil.la
-
-
-BUILT_SOURCES = $(CORBA_SOURCE)
-CLEANFILES   += $(BUILT_SOURCES)
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 5efdaa37df..0000000000
--- a/addressbook/backend/ebook/e-book-listener.c
+++ /dev/null
@@ -1,587 +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@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "e-book-listener.h"
-
-static EBookStatus e_book_listener_convert_status (Evolution_BookListener_CallStatus status);
-
-enum {
-	RESPONSES_QUEUED,
-	LAST_SIGNAL
-};
-
-static guint e_book_listener_signals [LAST_SIGNAL];
-
-static BonoboObjectClass          *e_book_listener_parent_class;
-POA_Evolution_BookListener__vepv  e_book_listener_vepv;
-
-struct _EBookListenerPrivate {
-	GList *response_queue;
-	gint   idle_id;
-};
-
-static gboolean
-e_book_listener_check_queue (EBookListener *listener)
-{
-	if (listener->priv->response_queue != NULL) {
-		gtk_signal_emit (GTK_OBJECT (listener),
-				 e_book_listener_signals [RESPONSES_QUEUED]);
-	}
-
-	if (listener->priv->response_queue == NULL) {
-		listener->priv->idle_id = 0;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-e_book_listener_queue_response (EBookListener         *listener,
-				EBookListenerResponse *response)
-{
-	listener->priv->response_queue =
-		g_list_append (listener->priv->response_queue,
-			       response);
-
-	if (listener->priv->idle_id == 0) {
-		listener->priv->idle_id = g_idle_add (
-			(GSourceFunc) e_book_listener_check_queue, listener);
-	}
-}
-
-/* Add, Remove, Modify */
-static void
-e_book_listener_queue_generic_response (EBookListener          *listener,
-					EBookListenerOperation  op,
-					EBookStatus             status)
-{
-	EBookListenerResponse *resp;
-
-	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,
-				     Evolution_Book  book)
-{
-	EBookListenerResponse *resp;
-
-	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;
-
-	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;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op     = CreateCardResponse;
-	resp->status = status;
-	resp->id     = g_strdup (id);
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-e_book_listener_queue_get_cursor_response (EBookListener        *listener,
-					   EBookStatus           status,
-					   Evolution_CardCursor  cursor)
-{
-	EBookListenerResponse *resp;
-	
-	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,
-					 Evolution_BookView    book_view)
-{
-	EBookListenerResponse *resp;
-	
-	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_link_status (EBookListener *listener,
-				   gboolean       connected)
-{
-	EBookListenerResponse *resp;
-
-	resp = g_new0 (EBookListenerResponse, 1);
-
-	resp->op        = LinkStatusEvent;
-	resp->connected = connected;
-
-	e_book_listener_queue_response (listener, resp);
-}
-
-static void
-impl_BookListener_respond_create_card (PortableServer_Servant                   servant,
-				       const Evolution_BookListener_CallStatus  status,
-				       const Evolution_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 Evolution_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 Evolution_BookListener_CallStatus status,
-				       CORBA_Environment *ev)
-{
-	EBookListener *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-
-	e_book_listener_queue_generic_response (
-		listener, ModifyCardResponse,
-		e_book_listener_convert_status (status));
-}
-
-static void
-impl_BookListener_respond_get_cursor (PortableServer_Servant servant,
-				      const Evolution_BookListener_CallStatus status,
-				      const Evolution_CardCursor cursor,
-				      CORBA_Environment *ev)
-{
-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	Evolution_CardCursor  cursor_copy;
-
-	cursor_copy = CORBA_Object_duplicate (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 Evolution_BookListener_CallStatus status,
-				    const Evolution_BookView book_view,
-				    CORBA_Environment *ev)
-{
-	EBookListener        *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	Evolution_BookView    book_view_copy;
-
-	book_view_copy = CORBA_Object_duplicate (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_open_book (PortableServer_Servant servant,
-				     const Evolution_BookListener_CallStatus status,
-				     const Evolution_Book book,
-				     CORBA_Environment *ev)
-{
-	EBookListener  *listener = E_BOOK_LISTENER (bonobo_object_from_servant (servant));
-	Evolution_Book  book_copy;
-
-	book_copy = CORBA_Object_duplicate (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_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);
-}
-
-/**
- * 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 Evolution_BookListener_CallStatus status)
-{
-	switch (status) {
-	case Evolution_BookListener_Success:
-		return E_BOOK_STATUS_SUCCESS;
-	case Evolution_BookListener_RepositoryOffline:
-		return E_BOOK_STATUS_REPOSITORY_OFFLINE;
-	case Evolution_BookListener_PermissionDenied:
-		return E_BOOK_STATUS_PERMISSION_DENIED;
-	case Evolution_BookListener_CardNotFound:
-		return E_BOOK_STATUS_CARD_NOT_FOUND;
-	case Evolution_BookListener_ProtocolNotSupported:
-		return E_BOOK_STATUS_PROTOCOL_NOT_SUPPORTED;
-	case Evolution_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_Evolution_BookListener *servant;
-	CORBA_Environment           ev;
-	CORBA_Object                obj;
-
-	g_assert (listener != NULL);
-	g_assert (E_IS_BOOK_LISTENER (listener));
-
-	servant = (POA_Evolution_BookListener *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &e_book_listener_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_Evolution_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");
-		gtk_object_unref (GTK_OBJECT (listener));
-		return NULL;
-	}
-
-	return retval;
-}
-
-static void
-e_book_listener_init (EBookListener *listener)
-{
-	listener->priv = g_new0 (EBookListenerPrivate, 1);
-}
-
-static void
-e_book_listener_destroy (GtkObject *object)
-{
-	EBookListener     *listener = E_BOOK_LISTENER (object);
-	GList             *l;
-
-	for (l = listener->priv->response_queue; l != NULL; l = l->next) {
-		EBookListenerResponse *resp = l->data;
-
-		g_free (resp->msg);
-		g_free (resp->id);
-
-		if (resp->book != CORBA_OBJECT_NIL) {
-			CORBA_Environment ev;
-
-			CORBA_exception_init (&ev);
-
-			CORBA_Object_release (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);
-
-			CORBA_Object_release (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);
-
-			CORBA_Object_release (resp->book_view, &ev);
-
-			if (ev._major != CORBA_NO_EXCEPTION) {
-				g_warning ("e_book_listener_destroy: "
-					   "Exception destroying book_view "
-					   "in response queue!\n");
-			}
-			
-			CORBA_exception_free (&ev);
-		}
-
-		g_free (resp);
-	}
-	g_list_free (listener->priv->response_queue);
-
-	g_free (listener->priv);
-	
-	GTK_OBJECT_CLASS (e_book_listener_parent_class)->destroy (object);
-}
-
-POA_Evolution_BookListener__epv *
-e_book_listener_get_epv (void)
-{
-	POA_Evolution_BookListener__epv *epv;
-
-	epv = g_new0 (POA_Evolution_BookListener__epv, 1);
-
-	epv->report_open_book_progress = impl_BookListener_report_open_book_progress;
-	epv->respond_open_book         = impl_BookListener_respond_open_book;
-
-	epv->respond_create_card       = impl_BookListener_respond_create_card;
-	epv->respond_remove_card       = impl_BookListener_respond_remove_card;
-	epv->respond_modify_card       = impl_BookListener_respond_modify_card;
-
-	epv->respond_get_cursor        = impl_BookListener_respond_get_cursor;
-	epv->respond_get_view          = impl_BookListener_respond_get_view;
-
-	epv->report_connection_status  = impl_BookListener_report_connection_status;
-
-	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.Evolution_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 eb0432e360..0000000000
--- a/addressbook/backend/ebook/e-book-listener.h
+++ /dev/null
@@ -1,95 +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@helixcode.com)
- *
- * Copyright 2000, Helix Code, 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>
-
-BEGIN_GNOME_DECLS
-
-typedef struct _EBookListener EBookListener;
-typedef struct _EBookListenerClass EBookListenerClass;
-typedef struct _EBookListenerPrivate EBookListenerPrivate;
-
-struct _EBookListener {
-	BonoboObject           parent;
-	EBookListenerPrivate *priv;
-};
-
-struct _EBookListenerClass {
-	BonoboObjectClass parent;
-
-	/*
-	 * Signals
-	 */
-	void (*responses_queued) (void);
-};
-
-typedef enum {
-	/* Async responses */
-	OpenBookResponse,
-	CreateCardResponse,
-	RemoveCardResponse,
-	ModifyCardResponse,
-	GetCursorResponse,
-	GetBookViewResponse,
-
-	/* Async events */
-	LinkStatusEvent,
-	OpenProgressEvent,
-} EBookListenerOperation;
-
-typedef struct {
-	EBookListenerOperation  op;
-
-	/* For most Response notifications */
-	EBookStatus             status;
-
-	/* For OpenBookResponse */
-	Evolution_Book          book;
-
-	/* For GetCursorResponse */
-	Evolution_CardCursor    cursor;
-
-	/* For GetBookViewReponse */
-	Evolution_BookView      book_view;
-
-	/* For OpenProgressEvent */
-	char                   *msg;
-	short                   percent;
-
-	/* For LinkStatusEvent */
-	gboolean                connected;
-
-	/* For Card[Added|Removed|Modified]Event */
-	char                   *id;
-} EBookListenerResponse;
-
-EBookListener         *e_book_listener_new            (void);
-int                    e_book_listener_check_pending  (EBookListener *listener);
-EBookListenerResponse *e_book_listener_pop_response   (EBookListener *listener);
-GtkType                e_book_listener_get_type       (void);
-
-POA_Evolution_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 a3e8bbc032..0000000000
--- a/addressbook/backend/ebook/e-book-types.h
+++ /dev/null
@@ -1,31 +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@helixcode.com)
- *
- * Copyright 2000, Helix Code, 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_PROTOCOL_NOT_SUPPORTED,
-	E_BOOK_STATUS_OTHER_ERROR
-} EBookStatus;
-
-END_GNOME_DECLS
-
-#endif /* ! __E_BOOK_TYPES_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 cd1bdc6000..0000000000
--- a/addressbook/backend/ebook/e-book-view-listener.c
+++ /dev/null
@@ -1,408 +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@helixcode.com)
- *
- * Copyright 2000, Helix Code, 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_Evolution_BookViewListener__vepv  e_book_view_listener_vepv;
-
-struct _EBookViewListenerPrivate {
-	GList *response_queue;
-	gint   idle_id;
-};
-
-static gboolean
-e_book_view_listener_check_queue (EBookViewListener *listener)
-{
-	if (listener->priv->response_queue != NULL) {
-		gtk_signal_emit (GTK_OBJECT (listener),
-				 e_book_view_listener_signals [RESPONSES_QUEUED]);
-	}
-
-	if (listener->priv->response_queue == NULL) {
-		listener->priv->idle_id = 0;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-e_book_view_listener_queue_response (EBookViewListener         *listener,
-				     EBookViewListenerResponse *response)
-{
-	listener->priv->response_queue =
-		g_list_append (listener->priv->response_queue,
-			       response);
-
-	if (listener->priv->idle_id == 0) {
-		listener->priv->idle_id = g_idle_add (
-			(GSourceFunc) e_book_view_listener_check_queue, listener);
-	}
-}
-
-/* Add, Remove, Modify */
-static void
-e_book_view_listener_queue_empty_event (EBookViewListener          *listener,
-					EBookViewListenerOperation  op)
-{
-	EBookViewListenerResponse *resp;
-
-	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;
-
-	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 Evolution_VCardList  *cards)
-{
-	EBookViewListenerResponse *resp;
-	int i;
-
-	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;
-
-	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_signal_card_added (PortableServer_Servant servant,
-					 const Evolution_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_signal_card_removed (PortableServer_Servant servant,
-					   const Evolution_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_signal_card_changed (PortableServer_Servant servant,
-					   const Evolution_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_signal_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_signal_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_Evolution_BookViewListener *servant;
-	CORBA_Environment           ev;
-	CORBA_Object                obj;
-
-	g_assert (listener != NULL);
-	g_assert (E_IS_BOOK_VIEW_LISTENER (listener));
-
-	servant = (POA_Evolution_BookViewListener *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &e_book_view_listener_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_Evolution_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");
-		gtk_object_unref (GTK_OBJECT (listener));
-		return NULL;
-	}
-
-	return retval;
-}
-
-static void
-e_book_view_listener_init (EBookViewListener *listener)
-{
-	listener->priv                 = g_new0 (EBookViewListenerPrivate, 1);
-	listener->priv->response_queue = NULL;
-	listener->priv->idle_id        = 0;
-}
-
-static void
-e_book_view_listener_destroy (GtkObject *object)
-{
-	EBookViewListener     *listener = E_BOOK_VIEW_LISTENER (object);
-	GList             *l;
-
-	if (listener->priv->idle_id)
-		g_source_remove(listener->priv->idle_id);
-
-	for (l = listener->priv->response_queue; l != NULL; l = l->next) {
-		EBookViewListenerResponse *resp = l->data;
-
-		g_free(resp->id);
-
-		g_list_foreach(resp->cards, (GFunc) gtk_object_unref, NULL);
-		g_list_free(resp->cards);
-
-		g_free (resp->message);
-
-		g_free (resp);
-	}
-	g_list_free (listener->priv->response_queue);
-
-	g_free (listener->priv);
-	
-	GTK_OBJECT_CLASS (e_book_view_listener_parent_class)->destroy (object);
-}
-
-POA_Evolution_BookViewListener__epv *
-e_book_view_listener_get_epv (void)
-{
-	POA_Evolution_BookViewListener__epv *epv;
-
-	epv = g_new0 (POA_Evolution_BookViewListener__epv, 1);
-
-	epv->signal_card_changed       = impl_BookViewListener_signal_card_changed;
-	epv->signal_card_removed       = impl_BookViewListener_signal_card_removed;
-	epv->signal_card_added         = impl_BookViewListener_signal_card_added;
-	epv->signal_sequence_complete  = impl_BookViewListener_signal_sequence_complete;
-	epv->signal_status_message     = impl_BookViewListener_signal_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.Evolution_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 5a535a209a..0000000000
--- a/addressbook/backend/ebook/e-book-view-listener.h
+++ /dev/null
@@ -1,77 +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@helixcode.com)
- *
- * Copyright 2000, Helix Code, 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);
-
-POA_Evolution_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 6e0379f2cc..0000000000
--- a/addressbook/backend/ebook/e-book-view.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 1999, 2000, Helix Code, 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"
-
-GtkObjectClass *e_book_view_parent_class;
-
-struct _EBookViewPrivate {
-	Evolution_BookView     corba_book_view;
-	
-	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
-e_book_view_do_added_event (EBookView                 *book_view,
-			    EBookViewListenerResponse *resp)
-{
-	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)
-{
-	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);
-	}
-
-	g_free (resp);
-}
-
-static gboolean
-e_book_view_construct (EBookView *book_view, Evolution_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 = CORBA_Object_duplicate(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);
-		return FALSE;
-	}
-
-	Evolution_BookView_ref(book_view->priv->corba_book_view, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_view_construct: Exception reffing corba_book_view.\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	        CORBA_Object_release (book_view->priv->corba_book_view, &ev);
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("e_book_view_construct: Exception releasing corba_book_view.\n");
-		}
-		CORBA_exception_free (&ev);
-		book_view->priv->corba_book_view = NULL;
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	/*
-	 * Create our local BookListener interface.
-	 */
-	book_view->priv->listener = listener;
-
-	bonobo_object_ref(BONOBO_OBJECT(book_view->priv->listener));
-	book_view->priv->responses_queued_id = gtk_signal_connect (GTK_OBJECT (book_view->priv->listener), "responses_queued",
-								   e_book_view_check_listener_queue, book_view);
-
-	return TRUE;
-}
-
-/**
- * e_book_view_new:
- */
-EBookView *
-e_book_view_new (Evolution_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;
-}
-
-static void
-e_book_view_init (EBookView *book_view)
-{
-	book_view->priv                      = g_new0 (EBookViewPrivate, 1);
-	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->corba_book_view) {
-		CORBA_exception_init (&ev);
-
-		Evolution_BookView_unref(book_view->priv->corba_book_view, &ev);
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_warning ("EBookView: Exception while unreffing BookView\n");
-			
-			CORBA_exception_free (&ev);
-			CORBA_exception_init (&ev);
-		}
-
-		CORBA_Object_release (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);
-		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 bd64c9dbc7..0000000000
--- a/addressbook/backend/ebook/e-book-view.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 1999, 2000, Helix Code, 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 _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                    (Evolution_BookView corba_book_view, EBookViewListener *listener);
-
-GtkType            e_book_view_get_type               (void);
-void               e_book_view_get_book_view_listener (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 bb0226eb5a..0000000000
--- a/addressbook/backend/ebook/e-book.c
+++ /dev/null
@@ -1,1030 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 1999, 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkmarshal.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:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80"
-
-typedef enum {
-	URINotLoaded,
-	URILoading,
-	URILoaded
-} EBookLoadState;
-
-struct _EBookPrivate {
-	Evolution_BookFactory  book_factory;
-	EBookListener	      *listener;
-
-	Evolution_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;
-};
-
-enum {
-	OPEN_PROGRESS,
-	LINK_STATUS,
-	LAST_SIGNAL
-};
-
-static guint e_book_signals [LAST_SIGNAL];
-
-typedef struct {
-	gpointer  cb;
-	gpointer  closure;
-	EBookViewListener *listener;
-} EBookOp;
-
-/*
- * Local response queue management.
- */
-static void
-e_book_queue_op (EBook    *book,
-		 gpointer  cb,
-		 gpointer  closure,
-		 EBookViewListener *listener)
-{
-	EBookOp *op;
-
-	op           = g_new0 (EBookOp, 1);
-	op->cb       = cb;
-	op->closure  = closure;
-	op->listener = listener;
-
-	book->priv->pending_ops =
-		g_list_append (book->priv->pending_ops, op);
-}
-
-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 void
-e_book_do_response_create_card (EBook                 *book,
-				EBookListenerResponse *resp)
-{
-	EBookOp *op;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_create_card: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	if (op->cb)
-		((EBookIdCallback) op->cb) (book, resp->status, resp->id, op->closure);
-	g_free (resp->id);
-	g_free (op);
-}
-
-static void
-e_book_do_response_generic (EBook                 *book,
-			    EBookListenerResponse *resp)
-{
-	EBookOp *op;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_generic: Cannot find operation "
-			   "in local op queue!\n");
-	}
-
-	if (op->cb)
-		((EBookCallback) op->cb) (book, resp->status, op->closure);
-
-	g_free (op);
-}
-
-static void
-e_book_do_response_get_cursor (EBook                 *book,
-			       EBookListenerResponse *resp)
-{
-	CORBA_Environment ev;
-	EBookOp *op;
-	ECardCursor *cursor;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_get_cursor: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	cursor = e_card_cursor_new(resp->cursor);
-
-	if (op->cb)
-		((EBookCursorCallback) op->cb) (book, resp->status, cursor, op->closure);
-
-	/*
-	 * Release the remote Evolution_Book in the PAS.
-	 */
-	CORBA_exception_init (&ev);
-
-	Bonobo_Unknown_unref  (resp->cursor, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_do_response_get_cursor: Exception unref'ing "
-			   "remote Evolution_CardCursor interface!\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-	
-	CORBA_Object_release (resp->cursor, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_do_response_get_cursor: Exception releasing "
-			   "remote Evolution_CardCursor interface!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	gtk_object_unref(GTK_OBJECT(cursor));
-	
-	g_free (op);
-}
-
-static void
-e_book_do_response_get_view (EBook                 *book,
-			     EBookListenerResponse *resp)
-{
-	CORBA_Environment ev;
-	EBookOp *op;
-	EBookView *book_view;
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_get_view: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	book_view = e_book_view_new(resp->book_view, op->listener);
-	
-	if (op->cb)
-		((EBookBookViewCallback) op->cb) (book, resp->status, book_view, op->closure);
-
-	/*
-	 * Release the remote Evolution_Book in the PAS.
-	 */
-	CORBA_exception_init (&ev);
-
-	Bonobo_Unknown_unref  (resp->book_view, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_do_response_get_view: Exception unref'ing "
-			   "remote Evolution_BookView interface!\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-	
-	CORBA_Object_release (resp->book_view, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_do_response_get_view: Exception releasing "
-			   "remote Evolution_BookView interface!\n");
-	}
-
-	CORBA_exception_free (&ev);
-
-	gtk_object_unref(GTK_OBJECT(book_view));
-	bonobo_object_unref(BONOBO_OBJECT(op->listener));
-	
-	g_free (op);
-}
-
-static void
-e_book_do_response_open (EBook                 *book,
-			 EBookListenerResponse *resp)
-{
-	EBookOp *op;
-
-	if (resp->status == E_BOOK_STATUS_SUCCESS) {
-		book->priv->corba_book  = resp->book;
-		book->priv->load_state  = URILoaded;
-	}
-
-	op = e_book_pop_op (book);
-
-	if (op == NULL) {
-		g_warning ("e_book_do_response_open: Cannot find operation "
-			   "in local op queue!\n");
-		return;
-	}
-
-	if (op->cb)
-		((EBookCallback) op->cb) (book, resp->status, op->closure);
-	g_free (op);
-}
-
-static void
-e_book_do_progress_event (EBook                 *book,
-			  EBookListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book), e_book_signals [OPEN_PROGRESS],
-			 resp->msg, resp->percent);
-
-	g_free (resp->msg);
-}
-
-static void
-e_book_do_link_event (EBook                 *book,
-		      EBookListenerResponse *resp)
-{
-	gtk_signal_emit (GTK_OBJECT (book), e_book_signals [LINK_STATUS],
-			 resp->connected);
-}
-
-
-/*
- * 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:
-		e_book_do_response_generic (book, resp);
-		break;
-	case GetCursorResponse:
-		e_book_do_response_get_cursor (book, resp);
-		break;
-	case GetBookViewResponse:
-		e_book_do_response_get_view(book, resp);
-		break;
-	case OpenBookResponse:
-		e_book_do_response_open (book, resp);
-		break;
-
-	case OpenProgressEvent:
-		e_book_do_progress_event (book, resp);
-		break;
-	case LinkStatusEvent:
-		e_book_do_link_event (book, resp);
-		break;
-	default:
-		g_error ("EBook: Unknown operation %d in listener queue!\n",
-			 resp->op);
-	}
-
-	g_free (resp);
-}
-
-/**
- * e_book_load_uri:
- */
-gboolean
-e_book_load_uri (EBook                     *book,
-		 const char                *uri,
-		 EBookCallback              open_response,
-		 gpointer                   closure)
-{
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (book != NULL,          FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book),      FALSE);
-	g_return_val_if_fail (uri != NULL,           FALSE);
-	g_return_val_if_fail (open_response != NULL, FALSE);
-
-	if (book->priv->load_state != URINotLoaded) {
-		g_warning ("e_book_load_uri: Attempted to load a URI "
-			   "on a book which already has a URI loaded!\n");
-		return FALSE;
-	}
-
-	/*
-	 * Create our local BookListener interface.
-	 */
-	book->priv->listener = e_book_listener_new ();
-	if (book->priv->listener == NULL) {
-		g_warning ("e_book_load_uri: Could not create EBookListener!\n");
-		return FALSE;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (book->priv->listener), "responses_queued",
-			    e_book_check_listener_queue, book);
-
-	/*
-	 * Load the addressbook into the PAS.
-	 */
-	CORBA_exception_init (&ev);
-
-	Evolution_BookFactory_open_book (
-		book->priv->book_factory, uri,
-		bonobo_object_corba_objref (BONOBO_OBJECT (book->priv->listener)),
-		&ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_load_uri: CORBA exception while opening addressbook!\n");
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	book->priv->load_state = URILoading;
-
-	e_book_queue_op (book, open_response, closure, NULL);
-
-	/* 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 Evolution_Book in the PAS.
-	 */
-	CORBA_exception_init (&ev);
-
-	Bonobo_Unknown_unref  (book->priv->corba_book, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_unload_uri: Exception unref'ing "
-			   "remote Evolution_Book interface!\n");
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-	
-	CORBA_Object_release (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);
-
-	bonobo_object_unref (BONOBO_OBJECT (book->priv->listener));
-
-	book->priv->listener   = NULL;
-	book->priv->load_state = URINotLoaded;
-}
-
-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 = Evolution_Book_get_static_capabilities(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;
-}
-
-static gboolean
-e_book_construct (EBook *book)
-{
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-
-	/*
-	 * Connect to the Personal Addressbook Server.
-	 */
-
-	book->priv->book_factory = (Evolution_BookFactory)
-		oaf_activate_from_id (CARDSERVER_OAF_ID, 0, NULL, NULL);
-	if (book->priv->book_factory == CORBA_OBJECT_NIL) {
-		g_warning ("e_book_construct: Could not obtain a handle "
-			   "to the Personal Addressbook Server!\n");
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/**
- * e_book_new:
- */
-EBook *
-e_book_new (void)
-{
-	EBook *book;
-
-	book = gtk_type_new (E_BOOK_TYPE);
-
-	if (! e_book_construct (book)) {
-		gtk_object_unref (GTK_OBJECT (book));
-		return NULL;
-	}
-
-	return book;
-}
-
-/* Fetching cards */
-
-/**
- * e_book_get_card:
- */
-ECard *
-e_book_get_card (EBook       *book,
-		 const char  *id)
-{
-	char  *vcard;
-	ECard *card;
-
-	g_return_val_if_fail (book != NULL,     NULL);
-	g_return_val_if_fail (E_IS_BOOK (book), NULL);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_card: No URI loaded!\n");
-		return NULL;
-	}
-
-	vcard = e_book_get_vcard (book, id);
-
-	if (vcard == NULL) {
-		g_warning ("e_book_get_card: Got bogus VCard from PAS!\n");
-		return NULL;
-	}
-
-	card = e_card_new (vcard);
-	g_free(vcard);
-	
-	e_card_set_id(card, id);
-
-	return card;
-}
-
-/**
- * e_book_get_vcard:
- */
-char *
-e_book_get_vcard (EBook       *book,
-		  const char  *id)
-{
-	CORBA_Environment  ev;
-	char              *retval;
-	char              *vcard;
-
-	g_return_val_if_fail (book != NULL,     NULL);
-	g_return_val_if_fail (E_IS_BOOK (book), NULL);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_get_vcard: No URI loaded!\n");
-		return NULL;
-	}
-
-	CORBA_exception_init (&ev);
-
-	vcard = Evolution_Book_get_vcard (book->priv->corba_book,
-					  (Evolution_CardId) id,
-					  &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("e_book_get_vcard: Exception getting VCard from PAS!\n");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	if (vcard == NULL || strlen (vcard) == 0) {
-		g_warning ("e_book_get_vcard: Got NULL VCard from PAS!\n");
-		return NULL;
-	}
-
-	retval = g_strdup (vcard);
-	CORBA_free (vcard);
-
-	return retval;
-}
-
-/* Deleting cards. */
-
-/**
- * e_book_remove_card:
- */
-gboolean
-e_book_remove_card (EBook         *book,
-		    ECard         *card,
-		    EBookCallback  cb,
-		    gpointer       closure)
-{
-	const char *id;
-
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (card != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_CARD (card), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_remove_card: No URI loaded!\n");
-		return FALSE;
-	}
-
-	id = e_card_get_id (card);
-	g_assert (id != NULL);
-
-	return e_book_remove_card_by_id (book, id, cb, closure);
-}
-
-/**
- * e_book_remove_card_by_id:
- */
-gboolean
-e_book_remove_card_by_id (EBook         *book,
-			  const char    *id,
-			  EBookCallback  cb,
-			  gpointer       closure)
-
-{
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (id != NULL,       FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_remove_card_by_id: No URI loaded!\n");
-		return FALSE;
-	}
-
-	CORBA_exception_init (&ev);
-
-	Evolution_Book_remove_card (
-		book->priv->corba_book, (const Evolution_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);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, cb, closure, NULL);
-
-	return TRUE;
-}
-
-/* Adding cards. */
-
-/**
- * e_book_add_card:
- */
-gboolean
-e_book_add_card (EBook           *book,
-		 ECard           *card,
-		 EBookIdCallback  cb,
-		 gpointer         closure)
-
-{
-	char     *vcard;
-	gboolean  retval;
-
-	g_return_val_if_fail (book != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (card != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_CARD (card), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_add_card: No URI loaded!\n");
-		return FALSE;
-	}
-
-	vcard = e_card_get_vcard (card);
-
-	if (vcard == NULL) {
-		g_warning ("e_book_add_card: Cannot convert card to VCard string!\n");
-		return FALSE;
-	}
-
-	retval = e_book_add_vcard (book, vcard, cb, closure);
-
-	g_free (vcard);
-
-	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);
-
-	Evolution_Book_create_card (
-		book->priv->corba_book, (const Evolution_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);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, (EBookCallback) cb, closure, NULL);
-
-	return TRUE;
-}
-
-/* Modifying cards. */
-
-/**
- * e_book_commit_card:
- */
-gboolean
-e_book_commit_card (EBook         *book,
-		    ECard         *card,
-		    EBookCallback  cb,
-		    gpointer       closure)
-{
-	char     *vcard;
-	gboolean  retval;
-	
-	g_return_val_if_fail (book  != NULL,    FALSE);
-	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
-	g_return_val_if_fail (card != NULL,     FALSE);
-	g_return_val_if_fail (E_IS_CARD (card), FALSE);
-
-	if (book->priv->load_state != URILoaded) {
-		g_warning ("e_book_commit_card: No URI loaded!\n");
-		return FALSE;
-	}
-
-	vcard = e_card_get_vcard (card);
-
-	if (vcard == NULL) {
-		g_warning ("e_book_commit_card: Error "
-			   "getting VCard for card!\n");
-		return FALSE;
-	}
-
-	retval = e_book_commit_vcard (book, vcard, cb, closure);
-
-	g_free (vcard);
-
-	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);
-
-	Evolution_Book_modify_card (
-		book->priv->corba_book, (const Evolution_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);
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, cb, closure, NULL);
-
-	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);
-
-	Evolution_Book_check_connection (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;
-}
-
-gboolean e_book_get_cursor       (EBook               *book,
-				  gchar               *query,
-				  EBookCursorCallback  cb,
-				  gpointer             closure)
-{
-	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);
-	
-	Evolution_Book_get_cursor (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);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, cb, closure, NULL);
-
-	return TRUE;
-}
-
-gboolean e_book_get_book_view       (EBook                 *book,
-				     gchar                 *query,
-				     EBookBookViewCallback  cb,
-				     gpointer               closure)
-{
-	CORBA_Environment ev;
-	EBookViewListener *listener;
-  
-	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_get_book_view: No URI loaded!\n");
-		return FALSE;
-	}
-
-	listener = e_book_view_listener_new();
-	
-	CORBA_exception_init (&ev);
-	
-	Evolution_Book_get_book_view (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);
-		return FALSE;
-	}
-	
-	CORBA_exception_free (&ev);
-
-	e_book_queue_op (book, cb, closure, listener);
-
-	return TRUE;
-}
-
-/**
- * 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 = Evolution_Book_get_name (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;
-}
-
-static void
-e_book_destroy (GtkObject *object)
-{
-	EBook             *book = E_BOOK (object);
-	CORBA_Environment  ev;
-
-	if (book->priv->load_state == URILoaded)
-		e_book_unload_uri (book);
-
-	CORBA_exception_init (&ev);
-
-	CORBA_Object_release (book->priv->book_factory, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("EBook: Exception while releasing BookFactory\n");
-
-		CORBA_exception_free (&ev);
-		CORBA_exception_init (&ev);
-	}
-
-	g_free (book->priv);
-
-	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);
-
-	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 29f3787f66..0000000000
--- a/addressbook/backend/ebook/e-book.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * The Evolution addressbook client object.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 1999, 2000, Helix Code, 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);
-};
-
-/* Callbacks for asynchronous functions. */
-typedef void (*EBookCallback) (EBook *book, EBookStatus status, gpointer closure);
-typedef void (*EBookOpenProgressCallback)     (EBook          *book,
-					       const char     *status_message,
-					       short           percent,
-					       gpointer        closure);
-typedef void (*EBookIdCallback) (EBook *book, EBookStatus status, const char *id, gpointer closure);
-typedef void (*EBookCursorCallback) (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure);
-typedef void (*EBookBookViewCallback) (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure);
-
-
-/* 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);
-char     *e_book_get_static_capabilities  (EBook                 *book);
-
-/* Fetching cards. */
-ECard    *e_book_get_card                 (EBook                 *book,
-					   const char            *id);
-char     *e_book_get_vcard                (EBook                 *book,
-					   const char            *id);
-
-/* Deleting cards. */
-gboolean  e_book_remove_card              (EBook                 *book,
-					   ECard                 *card,
-					   EBookCallback          cb,
-					   gpointer               closure);
-gboolean  e_book_remove_card_by_id        (EBook                 *book,
-					   const char            *id,
-					   EBookCallback          cb,
-					   gpointer               closure);
-
-/* Adding cards. */
-gboolean  e_book_add_card                 (EBook                 *book,
-					   ECard                 *card,
-					   EBookIdCallback        cb,
-					   gpointer               closure);
-gboolean  e_book_add_vcard                (EBook                 *book,
-					   const char            *vcard,
-					   EBookIdCallback        cb,
-					   gpointer               closure);
-
-/* Modifying cards. */
-gboolean  e_book_commit_card              (EBook                 *book,
-					   ECard                 *card,
-					   EBookCallback          cb,
-					   gpointer               closure);
-gboolean  e_book_commit_vcard             (EBook                 *book,
-					   const char            *vcard,
-					   EBookCallback          cb,
-					   gpointer               closure);
-
-/* Checking to see if we're connected to the card repository. */
-gboolean  e_book_check_connection         (EBook                 *book);
-gboolean  e_book_get_cursor               (EBook                 *book,
-					   char                  *query,
-					   EBookCursorCallback    cb,
-					   gpointer               closure);
-
-gboolean  e_book_get_book_view            (EBook                 *book,
-					   char                  *query,
-					   EBookBookViewCallback  cb,
-					   gpointer               closure);
-
-/* 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-cursor.c b/addressbook/backend/ebook/e-card-cursor.c
deleted file mode 100644
index 1618a6ddee..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@helixcode.com.
- */
-
-#include <config.h>
-#include <gtk/gtk.h>
-#include "addressbook.h"
-#include "e-card-cursor.h"
-
-struct _ECardCursorPrivate {
-	Evolution_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);
-
-	Evolution_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 = Evolution_CardCursor_get_length(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 = Evolution_CardCursor_get_nth(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 #Evolution_CardCursor
- *
- * Wraps an #Evolution_CardCursor object inside the #ECardCursor
- * @cursor object.
- *
- * Returns: a new #ECardCursor on success, or %NULL on failure.
- */
-ECardCursor *
-e_card_cursor_construct (ECardCursor          *cursor,
-			 Evolution_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);
-	}
-	
-	Evolution_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 #Evolution_CardCursor to be wrapped
- *
- * Creates a new #ECardCursor, which wraps an #Evolution_CardCursor
- * object.
- *
- * Returns: a new #ECardCursor on success, or %NULL on failure.
- */
-ECardCursor *
-e_card_cursor_new (Evolution_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 b318e646c4..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@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#ifndef __E_CARD_CURSOR_H__
-#define __E_CARD_CURSOR_H__
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtk.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       (Evolution_CardCursor  corba_cursor);
-ECardCursor *e_card_cursor_construct (ECardCursor          *cursor,
-				      Evolution_CardCursor  corba_cursor);
-
-GtkType      e_card_cursor_get_type    (void);
-
-/* Fetching cards. */
-long         e_card_cursor_get_length  (ECardCursor          *cursor);
-ECard       *e_card_cursor_get_nth     (ECardCursor          *cursor,
-					const long            nth);
-#define E_CARD_CURSOR_TYPE        (e_card_cursor_get_type ())
-#define E_CARD_CURSOR(o)          (GTK_CHECK_CAST ((o), E_CARD_CURSOR_TYPE, ECardCursor))
-#define E_CARD_CURSOR_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CARD_CURSOR_TYPE, ECardCursorClass))
-#define E_IS_CARD_CURSOR(o)       (GTK_CHECK_TYPE ((o), E_CARD_CURSOR_TYPE))
-#define E_IS_CARD_CURSOR_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CARD_CURSOR_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __E_CARD_CURSOR_H__ */
diff --git a/addressbook/backend/ebook/e-card-pairs.h b/addressbook/backend/ebook/e-card-pairs.h
deleted file mode 100644
index 0f379d3477..0000000000
--- a/addressbook/backend/ebook/e-card-pairs.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* GnomeCard - a graphical contact manager.
- *
- * pairs.h: This file is part of GnomeCard.
- * 
- * Copyright (C) 1999 The Free Software Foundation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __E_CARD_PAIRS_H__
-#define __E_CARD_PAIRS_H__
-
-#include <libversit/vcc.h>
-#include <ebook/e-card.h>
-
-
-#if 0
-struct pair
-{
-	char *str;
-	ECardPropertyType i ;
-};
-
-struct pair prop_lookup[] = {
-		{        VCFullNameProp, PROP_FNAME },
-		{            VCNameProp, PROP_NAME },
-		{           VCPhotoProp, PROP_PHOTO },
-		{       VCBirthDateProp, PROP_BDAY },
-		{             VCAdrProp, PROP_DELADDR },
-		{   VCDeliveryLabelProp, PROP_DELLABEL },
-		{       VCTelephoneProp, PROP_PHONE },
-		{    VCEmailAddressProp, PROP_EMAIL },
-		{          VCMailerProp, PROP_MAILER },
-		{        VCTimeZoneProp, PROP_TIMEZN },
-		{             VCGeoProp, PROP_GEOPOS },
-		{           VCTitleProp, PROP_TITLE },
-		{    VCBusinessRoleProp, PROP_ROLE },
-		{            VCLogoProp, PROP_LOGO },
-		{           VCAgentProp, PROP_AGENT },
-		{             VCOrgProp, PROP_ORG },
-		{      VCCategoriesProp, PROP_CATEGORIES },
-		{         VCCommentProp, PROP_COMMENT },
-		{     VCLastRevisedProp, PROP_REV },
-		{   VCPronunciationProp, PROP_SOUND },
-		{             VCURLProp, PROP_URL },
-		{    VCUniqueStringProp, PROP_UID },
-		{         VCVersionProp, PROP_VERSION },
-		{       VCPublicKeyProp, PROP_KEY },
-		{           VCValueProp, PROP_VALUE },
-		{        VCEncodingProp, PROP_ENCODING },
-		{ VCQuotedPrintableProp, PROP_QUOTED_PRINTABLE },
-		{            VC8bitProp, PROP_8BIT },
-		{          VCBase64Prop, PROP_BASE64 },
-		{        VCLanguageProp, PROP_LANG },
-		{         VCCharSetProp, PROP_CHARSET },
-		{ NULL, PROP_NONE} };
-
-struct pair photo_pairs[] = {
-		{ VCGIFProp, PHOTO_GIF },
-		{ VCCGMProp, PHOTO_CGM },
-		{ VCWMFProp, PHOTO_WMF },
-		{ VCBMPProp, PHOTO_BMP },
-		{ VCMETProp, PHOTO_MET },
-		{ VCPMBProp, PHOTO_PMB },
-		{ VCDIBProp, PHOTO_DIB },
-		{ VCPICTProp, PHOTO_PICT },
-		{ VCTIFFProp, PHOTO_TIFF },
-		{ VCPDFProp, PHOTO_PDF },
-		{ VCPSProp, PHOTO_PS },
-		{ VCJPEGProp, PHOTO_JPEG },
-		{ VCMPEGProp, PHOTO_MPEG },
-		{ VCMPEG2Prop, PHOTO_MPEG2 },
-		{ VCAVIProp, PHOTO_AVI },
-		{ VCQuickTimeProp, PHOTO_QTIME },
-		{ NULL, 0 } };
-
-struct pair email_pairs[] = {
-		{ VCAOLProp, EMAIL_AOL },
-		{ VCAppleLinkProp, EMAIL_APPLE_LINK },
-		{ VCATTMailProp, EMAIL_ATT },
-		{ VCCISProp, EMAIL_CIS },
-		{ VCEWorldProp, EMAIL_EWORLD },
-		{ VCInternetProp, EMAIL_INET },
-		{ VCIBMMailProp, EMAIL_IBM },
-		{ VCMCIMailProp, EMAIL_MCI },
-		{ VCPowerShareProp, EMAIL_POWERSHARE },
-		{ VCProdigyProp, EMAIL_PRODIGY },
-		{ VCTLXProp, EMAIL_TLX },
-		{ VCX400Prop, EMAIL_X400 },
-		{ NULL, 0 } };
-
-struct pair sound_pairs[] = {
-		{ VCAIFFProp, SOUND_AIFF },
-		{ VCPCMProp, SOUND_PCM },
-		{ VCWAVEProp, SOUND_WAVE },
-		{ NULL, 0 } };
-
-struct pair key_pairs[] = {
-		{ VCX509Prop, KEY_X509 },
-		{ VCPGPProp, KEY_PGP },
-		{ NULL, 0 } };
-	  
-
-#endif
-#endif /* ! __E_CARD_PAIRS_H__ */
diff --git a/addressbook/backend/ebook/e-card-simple.c b/addressbook/backend/ebook/e-card-simple.c
deleted file mode 100644
index ff65ff82b0..0000000000
--- a/addressbook/backend/ebook/e-card-simple.c
+++ /dev/null
@@ -1,1067 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@helixcode.com>
- *   Arturo Espinosa (arturo@nuclecu.unam.mx)
- *   Nat Friedman    (nat@helixcode.com)
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include <libversit/vcc.h>
-#include "e-card-simple.h"
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_CARD,
-#if 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_FBURL,
-	ARG_NOTE,
-	ARG_ID
-#endif
-};
-
-
-typedef enum _ECardSimpleInternalType ECardSimpleInternalType;
-typedef struct _ECardSimpleFieldData ECardSimpleFieldData;
-
-enum _ECardSimpleInternalType {
-	E_CARD_SIMPLE_INTERNAL_TYPE_STRING,
-	E_CARD_SIMPLE_INTERNAL_TYPE_DATE,
-	E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS,
-	E_CARD_SIMPLE_INTERNAL_TYPE_PHONE,
-	E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL,
-	E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL,
-};
-
-struct _ECardSimpleFieldData {
-	ECardSimpleField         field;
-	char                    *ecard_field;
-	char                    *name;
-	char                    *short_name;
-	int                      list_type_index;
-	ECardSimpleInternalType  type;
-};
-
-/* This order must match the order in the .h. */
-
-static ECardSimpleFieldData field_data[] =
-{
-	{ E_CARD_SIMPLE_FIELD_FILE_AS,            "file_as",     "File As",       "",         0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_FULL_NAME,          "full_name",   "Name",          "Name",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_FAMILY_NAME,        "family_name", "Family Name",   "Family Name",  0,                               E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },
-	{ E_CARD_SIMPLE_FIELD_EMAIL,              "",            "Email",         "Email",    E_CARD_SIMPLE_EMAIL_ID_EMAIL,   	   E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },
-	{ E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,      "",            "Primary",       "Prim",     E_CARD_SIMPLE_PHONE_ID_PRIMARY,      E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,     "",            "Business",      "Bus",      E_CARD_SIMPLE_PHONE_ID_BUSINESS,     E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME,         "",            "Home",          "Home",     E_CARD_SIMPLE_PHONE_ID_HOME,         E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_ORG,                "org",         "Organization",  "Org",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS,   "",            "Business",      "Bus",      E_CARD_SIMPLE_ADDRESS_ID_BUSINESS,   E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },
-	{ E_CARD_SIMPLE_FIELD_ADDRESS_HOME,       "",            "Home",          "Home",     E_CARD_SIMPLE_ADDRESS_ID_HOME,       E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },
-	{ E_CARD_SIMPLE_FIELD_PHONE_MOBILE,       "",            "Mobile",        "Mobile",   E_CARD_SIMPLE_PHONE_ID_MOBILE,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_CAR,          "",            "Car",           "Car",      E_CARD_SIMPLE_PHONE_ID_CAR,          E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX, "",            "Business Fax",  "Bus Fax",  E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX, E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX,     "",            "Home Fax",      "Home Fax", E_CARD_SIMPLE_PHONE_ID_HOME_FAX,     E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2,   "",            "Business 2",    "Bus 2",    E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,   E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_HOME_2,       "",            "Home 2",        "Home 2",   E_CARD_SIMPLE_PHONE_ID_HOME_2,       E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_ISDN,         "",            "ISDN",          "ISDN",     E_CARD_SIMPLE_PHONE_ID_ISDN,         E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_OTHER,        "",            "Other",         "Other",    E_CARD_SIMPLE_PHONE_ID_OTHER,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_PHONE_PAGER,        "",            "Pager",         "Pager",    E_CARD_SIMPLE_PHONE_ID_PAGER,        E_CARD_SIMPLE_INTERNAL_TYPE_PHONE },
-	{ E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,      "",            "Other",         "Other",    E_CARD_SIMPLE_ADDRESS_ID_OTHER,      E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS },
-	{ E_CARD_SIMPLE_FIELD_EMAIL_2,            "",            "Email 2",       "Email 2",  E_CARD_SIMPLE_EMAIL_ID_EMAIL_2, 	   E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },
-	{ E_CARD_SIMPLE_FIELD_EMAIL_3,            "",            "Email 3",       "Email 3",  E_CARD_SIMPLE_EMAIL_ID_EMAIL_3, 	   E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL },
-	{ E_CARD_SIMPLE_FIELD_URL,                "url",         "Web Site",      "Url",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ORG_UNIT,           "org_unit",    "Department",    "Dep",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_OFFICE,             "office",      "Office",        "Off",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_TITLE,              "title",       "Title",         "Title",    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ROLE,               "role",        "Profession",    "Prof",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_MANAGER,            "manager",     "Manager",       "Man",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ASSISTANT,          "assistant",   "Assistant",     "Ass",      0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_NICKNAME,           "nickname",    "Nickname",      "Nick",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_SPOUSE,             "spouse",      "Spouse",        "Spouse",   0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_NOTE,               "note",        "Note",          "Note",     0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_FBURL,              "fburl",       "Free-busy URL", "FBUrl",    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_ANNIVERSARY,        "anniversary", "Anniversary",   "Anniv",    0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_DATE },
-	{ E_CARD_SIMPLE_FIELD_BIRTH_DATE,         "birth_date",  "Birth Date",    "",         0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_DATE },
-	{ E_CARD_SIMPLE_FIELD_MAILER,             "mailer",      "",              "",         0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_STRING },
-	{ E_CARD_SIMPLE_FIELD_NAME_OR_ORG,        "nameororg",   "",              "",         0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },
-};
-
-static void e_card_simple_init (ECardSimple *simple);
-static void e_card_simple_class_init (ECardSimpleClass *klass);
-
-static void e_card_simple_destroy (GtkObject *object);
-static void e_card_simple_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_card_simple_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void fill_in_info(ECardSimple *simple);
-
-ECardPhoneFlags phone_correspondences[] = {
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    */
-	E_CARD_PHONE_WORK | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS,	   */
-	E_CARD_PHONE_WORK | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,   */
-	E_CARD_PHONE_WORK | E_CARD_PHONE_FAX, /* E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX, */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */
-	E_CARD_PHONE_CAR | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_CAR,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */
-	E_CARD_PHONE_HOME | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_HOME,	   */
-	E_CARD_PHONE_HOME | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_HOME_2,	   */
-	E_CARD_PHONE_HOME | E_CARD_PHONE_FAX, /* E_CARD_SIMPLE_PHONE_ID_HOME_FAX,	   */
-	E_CARD_PHONE_ISDN, /* E_CARD_SIMPLE_PHONE_ID_ISDN,	   */
-	E_CARD_PHONE_CELL | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_MOBILE,	   */
-	E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_OTHER,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */
-	E_CARD_PHONE_PAGER | E_CARD_PHONE_VOICE, /* E_CARD_SIMPLE_PHONE_ID_PAGER,	   */
-	E_CARD_PHONE_PREF, /* E_CARD_SIMPLE_PHONE_ID_PRIMARY,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */
-	0xFF, /* E_CARD_SIMPLE_PHONE_ID_TTYTTD,	   */
-};
-
-char *phone_names[] = {
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    */
-	"Business",
-	"Business 2",
-	"Business Fax",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */
-	"Car",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */
-	"Home",
-	"Home 2",
-	"Home Fax",
-	"ISDN",
-	"Mobile",
-	"Other",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */
-	"Pager",
-	"Primary",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TTYTTD,	   */
-};
-
-char *phone_short_names[] = {
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_ASSISTANT,    */
-	"Bus",
-	"Bus 2",
-	"Bus Fax",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_CALLBACK,	   */
-	"Car",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_COMPANY,	   */
-	"Home",
-	"Home 2",
-	"Home Fax",
-	"ISDN",
-	"Mob",
-	"Other",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,	   */
-	"Pag",
-	"Prim",
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_RADIO,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TELEX,	   */
-	NULL, /* E_CARD_SIMPLE_PHONE_ID_TTYTTD,	   */
-};
-
-ECardAddressFlags addr_correspondences[] = {
-	E_CARD_ADDR_WORK, /* E_CARD_SIMPLE_ADDRESS_ID_BUSINESS, */
-	E_CARD_ADDR_HOME, /* E_CARD_SIMPLE_ADDRESS_ID_HOME,	 */
-	E_CARD_ADDR_POSTAL, /* E_CARD_SIMPLE_ADDRESS_ID_OTHER,    */
-};
-
-char *address_names[] = {
-	"Business",
-	"Home",
-	"Other",
-};
-
-/**
- * e_card_simple_get_type:
- * @void: 
- * 
- * Registers the &ECardSimple class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ECardSimple class.
- **/
-GtkType
-e_card_simple_get_type (void)
-{
-	static GtkType simple_type = 0;
-
-	if (!simple_type) {
-		GtkTypeInfo simple_info = {
-			"ECardSimple",
-			sizeof (ECardSimple),
-			sizeof (ECardSimpleClass),
-			(GtkClassInitFunc) e_card_simple_class_init,
-			(GtkObjectInitFunc) e_card_simple_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		simple_type = gtk_type_unique (gtk_object_get_type (), &simple_info);
-	}
-
-	return simple_type;
-}
-
-/**
- * e_card_simple_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ECardSimple that wraps the @VCard.
- */
-ECardSimple *
-e_card_simple_new (ECard *card)
-{
-	ECardSimple *simple = E_CARD_SIMPLE(gtk_type_new(e_card_simple_get_type()));
-	gtk_object_set(GTK_OBJECT(simple),
-		       "card", card,
-		       NULL);
-	return simple;
-}
-
-ECardSimple *e_card_simple_duplicate(ECardSimple *simple)
-{
-	char *vcard = e_card_simple_get_vcard(simple);
-	ECard *card = e_card_new(vcard);
-	ECardSimple *new_simple = e_card_simple_new(card);
-	g_free (vcard);
-	return new_simple;
-}
-
-/**
- * e_card_simple_get_id:
- * @simple: an #ECardSimple
- *
- * Returns: a string representing the id of the simple, which is unique
- * within its book.
- */
-char *
-e_card_simple_get_id (ECardSimple *simple)
-{
-	if (simple->card)
-		return e_card_get_id(simple->card);
-	else
-		return "";
-}
-
-/**
- * e_card_simple_get_id:
- * @simple: an #ECardSimple
- * @id: a id in string format
- *
- * Sets the identifier of a simple, which should be unique within its
- * book.
- */
-void
-e_card_simple_set_id (ECardSimple *simple, const char *id)
-{
-	if ( simple->card )
-		e_card_set_id(simple->card, id);
-}
-
-/**
- * e_card_simple_get_vcard:
- * @simple: an #ECardSimple
- *
- * Returns: a string in vcard format, which is wrapped by the @simple.
- */
-char
-*e_card_simple_get_vcard (ECardSimple *simple)
-{
-	if (simple->card)
-		return e_card_get_vcard(simple->card);
-	else
-		return g_strdup("");
-}
-
-static void
-e_card_simple_class_init (ECardSimpleClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	gtk_object_add_arg_type ("ECardSimple::card",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CARD);
-
-	object_class->destroy = e_card_simple_destroy;
-	object_class->get_arg = e_card_simple_get_arg;
-	object_class->set_arg = e_card_simple_set_arg;
-}
-
-/*
- * ECardSimple lifecycle management and vcard loading/saving.
- */
-
-static void
-e_card_simple_destroy (GtkObject *object)
-{
-	ECardSimple *simple;
-	int i;
-	
-	simple = E_CARD_SIMPLE (object);
-
-	if (simple->card)
-		gtk_object_unref(GTK_OBJECT(simple->card));
-	g_list_foreach(simple->temp_fields, (GFunc) g_free, NULL);
-	g_list_free(simple->temp_fields);
-	simple->temp_fields = NULL;
-
-	for(i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i++)
-		g_free(simple->phone[i]);
-	for(i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++)
-		g_free(simple->email[i]);
-	for(i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++)
-		g_free(simple->address[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);
-		if (simple->card)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(simple->card);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		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;
-}
-
-static void
-fill_in_info(ECardSimple *simple)
-{
-	ECard *card = simple->card;
-	if (card) {
-		EList *address_list;
-		EList *phone_list;
-		EList *email_list;
-		EList *delivery_list;
-		const ECardPhone *phone;
-		const char *email;
-		const ECardAddrLabel *address;
-		const ECardDeliveryAddress *delivery;
-		int i;
-
-		EIterator *iterator;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "address_label", &address_list,
-			       "address",       &delivery_list,
-			       "phone",         &phone_list,
-			       "email",         &email_list,
-			       NULL);
-		for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i++) {
-			e_card_phone_free(simple->phone[i]);
-			simple->phone[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(phone_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			phone = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-				if (((phone->flags & phone_correspondences[i]) == phone_correspondences[i]) && (simple->phone[i] == NULL)) {
-					simple->phone[i] = e_card_phone_copy(phone);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i++) {
-			g_free(simple->email[i]);
-			simple->email[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(email_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			email = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-				if ((simple->email[i] == NULL)) {
-					simple->email[i] = g_strdup(email);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-			e_card_address_label_free(simple->address[i]);
-			simple->address[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(address_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			address = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if (((address->flags & addr_correspondences[i]) == addr_correspondences[i]) && (simple->address[i] == NULL)) {
-					simple->address[i] = e_card_address_label_copy(address);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {
-			e_card_delivery_address_free(simple->delivery[i]);
-			simple->delivery[i] = NULL;
-		}
-		for (iterator = e_list_get_iterator(delivery_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			delivery = e_iterator_get(iterator);
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if (((delivery->flags & addr_correspondences[i]) == addr_correspondences[i]) && (simple->delivery[i] == NULL)) {
-					simple->delivery[i] = e_card_delivery_address_copy(delivery);
-					break;
-				}
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-}
-
-void
-e_card_simple_sync_card(ECardSimple *simple)
-{
-	ECard *card = simple->card;
-	if (card) {
-		EList *address_list;
-		EList *phone_list;
-		EList *email_list;
-		EList *delivery_list;
-		const ECardPhone *phone;
-		const ECardAddrLabel *address;
-		const ECardDeliveryAddress *delivery;
-		const char *email;
-		int i;
-		int iterator_next = 1;
-
-		EIterator *iterator;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "address_label", &address_list,
-			       "address",       &delivery_list,
-			       "phone",         &phone_list,
-			       "email",         &email_list,
-			       NULL);
-
-		for (iterator = e_list_get_iterator(phone_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {
-			int i;
-			phone = e_iterator_get(iterator);
-			iterator_next = 1;
-			for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-				if ((phone->flags & phone_correspondences[i]) == phone_correspondences[i]) {
-					if (simple->phone[i]) {
-						simple->phone[i]->flags = phone_correspondences[i];
-						if (simple->phone[i]->number && *simple->phone[i]->number) {
-							e_iterator_set(iterator, simple->phone[i]);
-						} else {
-							e_iterator_delete(iterator);
-							iterator_next = 0;
-						}
-						e_card_phone_free(simple->phone[i]);
-						simple->phone[i] = NULL;
-						break;
-					}
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-			if (simple->phone[i]) {
-				simple->phone[i]->flags = phone_correspondences[i];
-				e_list_append(phone_list, simple->phone[i]);
-				e_card_phone_free(simple->phone[i]);
-				simple->phone[i] = NULL;
-			}
-		}
-
-		for (iterator = e_list_get_iterator(email_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {
-			int i;
-			email = e_iterator_get(iterator);
-			iterator_next = 1;
-			for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-				if (simple->email[i]) {
-					if (*simple->email[i]) {
-						e_iterator_set(iterator, simple->email[i]);
-					} else {
-						e_iterator_delete(iterator);
-						iterator_next = 0;
-					}
-					g_free(simple->email[i]);
-					simple->email[i] = NULL;
-					break;
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-			if (simple->email[i]) {
-				e_list_append(email_list, simple->email[i]);
-				g_free(simple->email[i]);
-				simple->email[i] = NULL;
-			}
-		}
-
-		for (iterator = e_list_get_iterator(address_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {
-			int i;
-			address = e_iterator_get(iterator);
-			iterator_next = 1;
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if ((address->flags & addr_correspondences[i]) == addr_correspondences[i]) {
-					if (simple->address[i]) {
-						simple->address[i]->flags = addr_correspondences[i];
-						if (simple->address[i]->data && *simple->address[i]->data) {
-							e_iterator_set(iterator, simple->address[i]);
-						} else {
-							e_iterator_delete(iterator);
-							iterator_next = 0;
-						}
-						e_card_address_label_free(simple->address[i]);
-						simple->address[i] = NULL;
-						break;
-					}
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-			if (simple->address[i]) {
-				simple->address[i]->flags = addr_correspondences[i];
-				e_list_append(address_list, simple->address[i]);
-				e_card_address_label_free(simple->address[i]);
-				simple->address[i] = NULL;
-			}
-		}
-
-		for (iterator = e_list_get_iterator(delivery_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {
-			int i;
-			delivery = e_iterator_get(iterator);
-			iterator_next = 1;
-			for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-				if ((delivery->flags & addr_correspondences[i]) == addr_correspondences[i]) {
-					if (simple->delivery[i]) {
-						simple->delivery[i]->flags = addr_correspondences[i];
-						if (!e_card_delivery_address_is_empty(simple->delivery[i])) {
-							e_iterator_set(iterator, simple->delivery[i]);
-						} else {
-							e_iterator_delete(iterator);
-							iterator_next = 0;
-						}
-						e_card_delivery_address_free(simple->delivery[i]);
-						simple->delivery[i] = NULL;
-						break;
-					}
-				}
-			}
-		}	
-		gtk_object_unref(GTK_OBJECT(iterator));
-		for (i = 0; i < E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {
-			if (simple->delivery[i]) {
-				simple->delivery[i]->flags = addr_correspondences[i];
-				e_list_append(delivery_list, simple->delivery[i]);
-				e_card_delivery_address_free(simple->delivery[i]);
-				simple->delivery[i] = NULL;
-			}
-		}
-		fill_in_info(simple);
-	}
-}
-
-const ECardPhone     *e_card_simple_get_phone   (ECardSimple          *simple,
-						 ECardSimplePhoneId    id)
-{
-	return simple->phone[id];
-}
-
-const char           *e_card_simple_get_email   (ECardSimple          *simple,
-						 ECardSimpleEmailId    id)
-{
-	return simple->email[id];
-}
-
-const ECardAddrLabel *e_card_simple_get_address (ECardSimple          *simple,
-						 ECardSimpleAddressId  id)
-{
-	return simple->address[id];
-}
-
-const ECardDeliveryAddress *e_card_simple_get_delivery_address (ECardSimple          *simple,
-								ECardSimpleAddressId  id)
-{
-	return simple->delivery[id];
-}
-
-void            e_card_simple_set_phone   (ECardSimple          *simple,
-					   ECardSimplePhoneId    id,
-					   const ECardPhone           *phone)
-{
-	if (simple->phone[id])
-		e_card_phone_free(simple->phone[id]);
-	simple->phone[id] = e_card_phone_copy(phone);
-}
-
-void            e_card_simple_set_email   (ECardSimple          *simple,
-					   ECardSimpleEmailId    id,
-					   const char                 *email)
-{
-	if (simple->email[id])
-		g_free(simple->email[id]);
-	simple->email[id] = g_strdup(email);
-}
-
-void            e_card_simple_set_address (ECardSimple          *simple,
-					   ECardSimpleAddressId  id,
-					   const ECardAddrLabel       *address)
-{
-	if (simple->address[id])
-		e_card_address_label_free(simple->address[id]);
-	simple->address[id] = e_card_address_label_copy(address);
-	if (simple->delivery[id])
-		e_card_delivery_address_free(simple->delivery[id]);
-	simple->delivery[id] = e_card_delivery_address_from_label(simple->address[id]);
-}
-
-void            e_card_simple_set_delivery_address (ECardSimple          *simple,
-						    ECardSimpleAddressId  id,
-						    const ECardDeliveryAddress *delivery)
-{
-	if (simple->delivery[id])
-		e_card_delivery_address_free(simple->delivery[id]);
-	simple->delivery[id] = e_card_delivery_address_copy(delivery);
-}
-
-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:
-		gtk_object_get(GTK_OBJECT(simple->card),
-			       field_data[field].ecard_field, &string,
-			       NULL);
-		return g_strdup(string);
-	case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:
-		gtk_object_get(GTK_OBJECT(simple->card),
-			       field_data[field].ecard_field, &date,
-			       NULL);
-		return NULL; /* FIXME!!!! */
-	case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:
-		addr = e_card_simple_get_address(simple,
-						 field_data[field].list_type_index);
-		if (addr)
-			return g_strdup(addr->data);
-		else
-			return NULL;
-	case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:
-		phone = e_card_simple_get_phone(simple,
-						field_data[field].list_type_index);
-		if (phone)
-			return g_strdup(phone->number);
-		else
-			return NULL;
-	case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:
-		string = e_card_simple_get_email(simple,
-						 field_data[field].list_type_index);
-		return g_strdup(string);
-	case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:
-		switch (field) {
-		case E_CARD_SIMPLE_FIELD_NAME_OR_ORG:
-			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);
-		case E_CARD_SIMPLE_FIELD_FAMILY_NAME:
-			gtk_object_get (GTK_OBJECT(simple->card),
-					"name", &name,
-					NULL);
-			return g_strdup (name->family);
-		default:
-			return NULL;
-		}
-	default:
-		return NULL;
-	}
-}
-
-static char *
-name_to_style(const ECardName *name, char *company, int style)
-{
-	char *string;
-	char *strings[4], **stringptr;
-	char *substring;
-	switch (style) {
-	case 0:
-		stringptr = strings;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		*stringptr = NULL;
-		string = g_strjoinv(", ", strings);
-		break;
-	case 1:
-		stringptr = strings;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		*stringptr = NULL;
-		string = g_strjoinv(" ", strings);
-		break;
-	case 2:
-		string = g_strdup(company);
-		break;
-	case 3: /* Fall Through */
-	case 4:
-		stringptr = strings;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		*stringptr = NULL;
-		substring = g_strjoinv(", ", strings);
-		if (!(company && *company))
-			company = "";
-		if (style == 3)
-			string = g_strdup_printf("%s (%s)", substring, company);
-		else
-			string = g_strdup_printf("%s (%s)", company, substring);
-		g_free(substring);
-		break;
-	default:
-		string = g_strdup("");
-	}
-	return string;
-}
-
-static int
-file_as_get_style (ECardSimple *simple)
-{
-	char *filestring = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FILE_AS);
-	char *trystring;
-	char *full_name = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);
-	char *company = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);
-	ECardName *name = NULL;
-	int i;
-	int style;
-	style = 0;
-	if (!full_name)
-		full_name = g_strdup("");
-	if (!company)
-		company = g_strdup("");
-	if (filestring) {
-
-		name = e_card_name_from_string(full_name);
-		
-		if (!name) {
-			goto end;
-		}
-
-		style = -1;
-		
-		for (i = 0; i < 5; i++) {
-			trystring = name_to_style(name, company, i);
-			if (!strcmp(trystring, filestring)) {
-				g_free(trystring);
-				style = i;
-				goto end;
-			}
-			g_free(trystring);
-		}
-	}		
- end:
-		
-	g_free(filestring);
-	g_free(full_name);
-	g_free(company);
-	if (name)
-		e_card_name_free(name);
-	
-	return style;
-}
-
-static void
-file_as_set_style(ECardSimple *simple, int style)
-{
-	if (style != -1) {
-		char *string;
-		char *full_name = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);
-		char *company = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);
-		ECardName *name;
-		
-		if (!full_name)
-			full_name = g_strdup("");
-		if (!company)
-			company = g_strdup("");
-		name = e_card_name_from_string(full_name);
-		if (name) {
-			string = name_to_style(name, company, style);
-			e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_FILE_AS, string);
-			g_free(string);
-		}
-		g_free(full_name);
-		g_free(company);
-		e_card_name_free(name);
-	}
-}
-
-void            e_card_simple_set            (ECardSimple          *simple,
-					      ECardSimpleField      field,
-					      const char           *data)
-{
-	ECardSimpleInternalType type = field_data[field].type;
-	ECardAddrLabel *address;
-	ECardPhone *phone;
-	int style;
-	switch (field) {
-	case E_CARD_SIMPLE_FIELD_FULL_NAME:
-	case E_CARD_SIMPLE_FIELD_ORG:
-		style = file_as_get_style(simple);
-		gtk_object_set(GTK_OBJECT(simple->card),
-			       field_data[field].ecard_field, data,
-			       NULL);
-		file_as_set_style(simple, style);
-		break;
-	default:
-		switch(type) {
-		case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:
-			gtk_object_set(GTK_OBJECT(simple->card),
-				       field_data[field].ecard_field, data,
-				       NULL);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:
-			break; /* FIXME!!!! */
-		case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:
-			address = e_card_address_label_new();
-			address->data = (char *) data;
-			e_card_simple_set_address(simple,
-						  field_data[field].list_type_index,
-						  address);
-			address->data = NULL;
-			e_card_address_label_free(address);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:
-			phone = e_card_phone_new();
-			phone->number = (char *) data;
-			e_card_simple_set_phone(simple,
-						field_data[field].list_type_index,
-						phone);
-			phone->number = NULL;
-			e_card_phone_free(phone);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:
-			e_card_simple_set_email(simple,
-						field_data[field].list_type_index,
-						data);
-			break;
-		case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:
-			break;
-		}
-		break;
-	}
-}
-					     
-ECardSimpleType e_card_simple_type       (ECardSimple          *simple,
-					  ECardSimpleField      field)
-{
-	ECardSimpleInternalType type = field_data[field].type;
-	switch(type) {
-	case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:
-	case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:
-	default:
-		return E_CARD_SIMPLE_TYPE_STRING;
-
-	case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:
-		return E_CARD_SIMPLE_TYPE_DATE;
-
-	case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:
-		return E_CARD_SIMPLE_TYPE_STRING;
-	}
-}
-
-const char     *e_card_simple_get_name       (ECardSimple          *simple,
-					      ECardSimpleField      field)
-{
-	return field_data[field].name;
-}
-
-const char     *e_card_simple_get_short_name (ECardSimple          *simple,
-					      ECardSimpleField      field)
-{
-	return field_data[field].short_name;
-}
-
-void                  e_card_simple_arbitrary_foreach (ECardSimple                  *simple,
-						       ECardSimpleArbitraryCallback *callback,
-						       gpointer                      closure)
-{
-	if (simple->card) {
-		EList *list;
-		EIterator *iterator;
-		gtk_object_get(GTK_OBJECT(simple->card),
-			       "arbitrary", &list,
-			       NULL);
-		for (iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);
-			if (callback)
-				(*callback) (arbitrary, closure);
-		}
-	}
-}
-
-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;
-		}
-	}
-	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;
-		gtk_object_get(GTK_OBJECT(simple->card),
-			       "arbitrary", &list,
-			       NULL);
-		for (iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);
-			if (!strcasecmp(arbitrary->key, key)) {
-				new_arb = e_card_arbitrary_new();
-				new_arb->key = g_strdup(key);
-				new_arb->type = g_strdup(type);
-				new_arb->value = g_strdup(value);
-				e_iterator_set(iterator, new_arb);
-				e_card_arbitrary_free(new_arb);
-				return;
-			}
-		}
-		new_arb = e_card_arbitrary_new();
-		new_arb->key = g_strdup(key);
-		new_arb->type = g_strdup(type);
-		new_arb->value = g_strdup(value);
-		e_list_append(list, new_arb);
-		e_card_arbitrary_free(new_arb);
-	}
-}
-
diff --git a/addressbook/backend/ebook/e-card-simple.h b/addressbook/backend/ebook/e-card-simple.h
deleted file mode 100644
index e23f5fe90c..0000000000
--- a/addressbook/backend/ebook/e-card-simple.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *   Arturo Espinosa
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_CARD_SIMPLE_H__
-#define __E_CARD_SIMPLE_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-types.h>
-#include <e-util/e-list.h>
-
-#define E_TYPE_CARD_SIMPLE            (e_card_simple_get_type ())
-#define E_CARD_SIMPLE(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD_SIMPLE, ECardSimple))
-#define E_CARD_SIMPLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CARD_SIMPLE, ECardSimpleClass))
-#define E_IS_CARD_SIMPLE(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CARD_SIMPLE))
-#define E_IS_CARD_SIMPLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD_SIMPLE))
-
-typedef enum _ECardSimplePhoneId ECardSimplePhoneId;
-typedef enum _ECardSimpleEmailId ECardSimpleEmailId;
-typedef enum _ECardSimpleAddressId ECardSimpleAddressId;
-typedef enum _ECardSimpleType ECardSimpleType;
-typedef enum _ECardSimpleField ECardSimpleField;
-
-enum _ECardSimplePhoneId {
-	E_CARD_SIMPLE_PHONE_ID_ASSISTANT,
-	E_CARD_SIMPLE_PHONE_ID_BUSINESS,
-	E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,
-	E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX,
-	E_CARD_SIMPLE_PHONE_ID_CALLBACK,
-	E_CARD_SIMPLE_PHONE_ID_CAR,
-	E_CARD_SIMPLE_PHONE_ID_COMPANY,
-	E_CARD_SIMPLE_PHONE_ID_HOME,
-	E_CARD_SIMPLE_PHONE_ID_HOME_2,
-	E_CARD_SIMPLE_PHONE_ID_HOME_FAX,
-	E_CARD_SIMPLE_PHONE_ID_ISDN,
-	E_CARD_SIMPLE_PHONE_ID_MOBILE,
-	E_CARD_SIMPLE_PHONE_ID_OTHER,
-	E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,
-	E_CARD_SIMPLE_PHONE_ID_PAGER,
-	E_CARD_SIMPLE_PHONE_ID_PRIMARY,
-	E_CARD_SIMPLE_PHONE_ID_RADIO,
-	E_CARD_SIMPLE_PHONE_ID_TELEX,
-	E_CARD_SIMPLE_PHONE_ID_TTYTTD,
-	E_CARD_SIMPLE_PHONE_ID_LAST
-};
-
-/* We need HOME and WORK email addresses here. */
-enum _ECardSimpleEmailId {
-	E_CARD_SIMPLE_EMAIL_ID_EMAIL,
-	E_CARD_SIMPLE_EMAIL_ID_EMAIL_2,
-	E_CARD_SIMPLE_EMAIL_ID_EMAIL_3,
-	E_CARD_SIMPLE_EMAIL_ID_LAST
-};
-
-/* Should this include (BILLING/SHIPPING)? */
-enum _ECardSimpleAddressId {
-	E_CARD_SIMPLE_ADDRESS_ID_BUSINESS,
-	E_CARD_SIMPLE_ADDRESS_ID_HOME,
-	E_CARD_SIMPLE_ADDRESS_ID_OTHER,
-	E_CARD_SIMPLE_ADDRESS_ID_LAST
-};
-
-enum _ECardSimpleType {
-	E_CARD_SIMPLE_TYPE_STRING,
-	E_CARD_SIMPLE_TYPE_DATE,
-};
-
-enum _ECardSimpleField {
-	E_CARD_SIMPLE_FIELD_FILE_AS,
-        E_CARD_SIMPLE_FIELD_FULL_NAME,
-        E_CARD_SIMPLE_FIELD_FAMILY_NAME,
-        E_CARD_SIMPLE_FIELD_EMAIL,
-        E_CARD_SIMPLE_FIELD_PHONE_PRIMARY,
-        E_CARD_SIMPLE_FIELD_PHONE_BUSINESS,
-        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_PAGER,
-        E_CARD_SIMPLE_FIELD_ADDRESS_OTHER,
-        E_CARD_SIMPLE_FIELD_EMAIL_2,
-        E_CARD_SIMPLE_FIELD_EMAIL_3,
-        E_CARD_SIMPLE_FIELD_URL,
-        E_CARD_SIMPLE_FIELD_ORG_UNIT,
-        E_CARD_SIMPLE_FIELD_OFFICE,
-        E_CARD_SIMPLE_FIELD_TITLE,
-        E_CARD_SIMPLE_FIELD_ROLE,
-        E_CARD_SIMPLE_FIELD_MANAGER,
-        E_CARD_SIMPLE_FIELD_ASSISTANT,
-        E_CARD_SIMPLE_FIELD_NICKNAME,
-        E_CARD_SIMPLE_FIELD_SPOUSE,
-        E_CARD_SIMPLE_FIELD_NOTE,
-        E_CARD_SIMPLE_FIELD_FBURL,
-        E_CARD_SIMPLE_FIELD_ANNIVERSARY,
-        E_CARD_SIMPLE_FIELD_BIRTH_DATE,
-	E_CARD_SIMPLE_FIELD_MAILER,
-	E_CARD_SIMPLE_FIELD_NAME_OR_ORG,
-        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];
-};
-
-struct _ECardSimpleClass {
-	GtkObjectClass parent_class;
-};
-
-typedef void (*ECardSimpleArbitraryCallback) (const ECardArbitrary *arbitrary, gpointer closure);
-ECardSimple                *e_card_simple_new                   (ECard                        *card);
-char                       *e_card_simple_get_id                (ECardSimple                  *simple);
-void                        e_card_simple_set_id                (ECardSimple                  *simple,
-								 const gchar                  *character);
-char                       *e_card_simple_get_vcard             (ECardSimple                  *simple);
-ECardSimple                *e_card_simple_duplicate             (ECardSimple                  *simple);
-char                       *e_card_simple_get                   (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-const char                 *e_card_simple_get_const             (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-void                        e_card_simple_set                   (ECardSimple                  *simple,
-								 ECardSimpleField              field,
-								 const char                   *data);
-ECardSimpleType             e_card_simple_type                  (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-const char                 *e_card_simple_get_name              (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-const char                 *e_card_simple_get_short_name        (ECardSimple                  *simple,
-								 ECardSimpleField              field);
-
-
-/* Use these only if building lists of specific types.  It should be
- * easier to use the above if you consider a phone field to be the
- * same as any other field.
- */
-const ECardPhone           *e_card_simple_get_phone             (ECardSimple                  *simple,
-								 ECardSimplePhoneId            id);
-const char                 *e_card_simple_get_email             (ECardSimple                  *simple,
-								 ECardSimpleEmailId            id);
-const ECardAddrLabel       *e_card_simple_get_address           (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id);
-const ECardDeliveryAddress *e_card_simple_get_delivery_address  (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id);
-void                        e_card_simple_set_phone             (ECardSimple                  *simple,
-								 ECardSimplePhoneId            id,
-								 const ECardPhone             *phone);
-void                        e_card_simple_set_email             (ECardSimple                  *simple,
-								 ECardSimpleEmailId            id,
-								 const char                   *email);
-void                        e_card_simple_set_address           (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id,
-								 const ECardAddrLabel         *address);
-void                        e_card_simple_set_delivery_address  (ECardSimple                  *simple,
-								 ECardSimpleAddressId          id,
-								 const ECardDeliveryAddress   *delivery);
-void                        e_card_simple_arbitrary_foreach     (ECardSimple                  *simple,
-								 ECardSimpleArbitraryCallback *callback,
-								 gpointer                      closure);
-const ECardArbitrary       *e_card_simple_get_arbitrary         (ECardSimple                  *simple,
-								 const char                   *key);
-/* Any of these except key can be NULL */	      
-void                        e_card_simple_set_arbitrary         (ECardSimple                  *simple,
-								 const char                   *key,
-								 const char                   *type,
-								 const char                   *value);
-void                        e_card_simple_sync_card             (ECardSimple                  *simple);
-
-/* 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 a2563d4bf6..0000000000
--- a/addressbook/backend/ebook/e-card-types.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Arturo Espinosa
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_CARD_TYPES_H__
-#define __E_CARD_TYPES_H__
-
-/* IDENTIFICATION PROPERTIES */
-
-typedef struct {
-	char            *prefix;        /* Mr. */
-	char            *given;         /* John */
-	char            *additional;    /* Quinlan */
-	char            *family;        /* Public */
-	char            *suffix;        /* Esq. */
-} ECardName;
-
-typedef struct {
-	int year;
-	int month;
-	int day;
-} ECardDate;
-
-/* TELECOMMUNICATIONS ADDRESSING PROPERTIES */
-
-typedef enum {
-	E_CARD_PHONE_PREF  = 1 << 0,
-	E_CARD_PHONE_WORK  = 1 << 1,
-	E_CARD_PHONE_HOME  = 1 << 2,
-	E_CARD_PHONE_VOICE = 1 << 3,
-	E_CARD_PHONE_FAX   = 1 << 4,
-	E_CARD_PHONE_MSG   = 1 << 5,
-	E_CARD_PHONE_CELL  = 1 << 6,
-	E_CARD_PHONE_PAGER = 1 << 7,
-	E_CARD_PHONE_BBS   = 1 << 8,
-	E_CARD_PHONE_MODEM = 1 << 9,
-	E_CARD_PHONE_CAR   = 1 << 10,
-	E_CARD_PHONE_ISDN  = 1 << 11,
-	E_CARD_PHONE_VIDEO = 1 << 12 
-} ECardPhoneFlags;
-
-typedef struct {
-	ECardPhoneFlags  flags;
-	char            *number;
-} ECardPhone;
-
-/* DELIVERY ADDRESSING PROPERTIES */
-
-typedef enum {
-	E_CARD_ADDR_HOME   = 1 << 0, 
-	E_CARD_ADDR_WORK   = 1 << 1,
-	E_CARD_ADDR_POSTAL = 1 << 2, 
-	E_CARD_ADDR_PARCEL = 1 << 3, 
-	E_CARD_ADDR_DOM    = 1 << 4,
-	E_CARD_ADDR_INTL   = 1 << 5 
-} ECardAddressFlags;
-
-typedef struct {
-	ECardAddressFlags  flags;
-
-	char     	  *po;
-	char     	  *ext;
-	char     	  *street;
-	char     	  *city;
-	char     	  *region;
-	char     	  *code;
-	char     	  *country;
-} ECardDeliveryAddress;
-
-typedef struct {
-	ECardAddressFlags  flags;
-	char              *data;
-} ECardAddrLabel;
-
-/* ARBITRARY PROPERTIES */
-
-typedef struct {
-	char *key;
-	char *type;
-	char *value;
-} ECardArbitrary;
-
-/* PILOT SYNC STATUS */
-
-enum {
-	E_CARD_PILOT_STATUS_NONE,
-	E_CARD_PILOT_STATUS_MOD,
-	E_CARD_PILOT_STATUS_DEL
-};
-
-#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 1a6fa8f9a0..0000000000
--- a/addressbook/backend/ebook/e-card.c
+++ /dev/null
@@ -1,3383 +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@helixcode.com)
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include <libversit/vcc.h>
-#include "e-card.h"
-#include "e-card-pairs.h"
-#include <e-util/ename/e-name-western.h>
-#include <e-util/ename/e-address-western.h>
-
-#include <gal/util/e-util.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_PILOT_ID "X-EVOLUTION-PILOTID"
-#define XEV_PILOT_STATUS "X-EVOLUTION-PILOTSTATUS"
-#define XEV_WANTS_HTML "X-MOZILLA-HTML"
-#define XEV_ARBITRARY "X-EVOLUTION-ARBITRARY"
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_FILE_AS,
-	ARG_FULL_NAME,
-	ARG_NAME,
-	ARG_ADDRESS,
-	ARG_ADDRESS_LABEL,
-	ARG_PHONE,
-	ARG_EMAIL,
-	ARG_BIRTH_DATE,
-	ARG_URL,
-	ARG_ORG,
-	ARG_ORG_UNIT,
-	ARG_OFFICE,
-	ARG_TITLE,
-	ARG_ROLE,
-	ARG_MANAGER,
-	ARG_ASSISTANT,
-	ARG_NICKNAME,
-	ARG_SPOUSE,
-	ARG_ANNIVERSARY,
-	ARG_MAILER,
-	ARG_FBURL,
-	ARG_NOTE,
-	ARG_CATEGORIES,
-	ARG_CATEGORY_LIST,
-	ARG_WANTS_HTML,
-	ARG_WANTS_HTML_SET,
-	ARG_PILOTID,
-	ARG_PILOTSTATUS,
-	ARG_ARBITRARY,
-	ARG_ID,
-};
-
-#if 0
-static VObject *card_convert_to_vobject (ECard *crd);
-#endif
-static void parse(ECard *card, VObject *vobj);
-static void e_card_init (ECard *card);
-static void e_card_class_init (ECardClass *klass);
-
-static void e_card_destroy (GtkObject *object);
-static void e_card_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_card_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-static void assign_string(VObject *vobj, char **string);
-
-char *e_v_object_get_child_value(VObject *vobj, char *name);
-static ECardDate e_card_date_from_string (char *str);
-
-static void parse_bday(ECard *card, VObject *object);
-static void parse_full_name(ECard *card, VObject *object);
-static void parse_file_as(ECard *card, VObject *object);
-static void parse_name(ECard *card, VObject *object);
-static void parse_email(ECard *card, VObject *object);
-static void parse_phone(ECard *card, VObject *object);
-static void parse_address(ECard *card, VObject *object);
-static void parse_address_label(ECard *card, VObject *object);
-static void parse_url(ECard *card, VObject *object);
-static void parse_org(ECard *card, VObject *object);
-static void parse_office(ECard *card, VObject *object);
-static void parse_title(ECard *card, VObject *object);
-static void parse_role(ECard *card, VObject *object);
-static void parse_manager(ECard *card, VObject *object);
-static void parse_assistant(ECard *card, VObject *object);
-static void parse_nickname(ECard *card, VObject *object);
-static void parse_spouse(ECard *card, VObject *object);
-static void parse_anniversary(ECard *card, VObject *object);
-static void parse_mailer(ECard *card, VObject *object);
-static void parse_fburl(ECard *card, VObject *object);
-static void parse_note(ECard *card, VObject *object);
-static void parse_categories(ECard *card, VObject *object);
-static void parse_wants_html(ECard *card, VObject *object);
-static void parse_pilot_id(ECard *card, VObject *object);
-static void parse_pilot_status(ECard *card, VObject *object);
-static void parse_arbitrary(ECard *card, VObject *object);
-static void parse_id(ECard *card, VObject *object);
-
-static ECardPhoneFlags get_phone_flags (VObject *vobj);
-static void set_phone_flags (VObject *vobj, ECardPhoneFlags flags);
-static ECardAddressFlags get_address_flags (VObject *vobj);
-static void set_address_flags (VObject *vobj, ECardAddressFlags flags);
-
-typedef void (* ParsePropertyFunc) (ECard *card, VObject *object);
-
-struct {
-	char *key;
-	ParsePropertyFunc function;
-} attribute_jump_array[] = 
-{
-	{ VCFullNameProp,            parse_full_name },
-	{ "X-EVOLUTION-FILE-AS",     parse_file_as },
-	{ VCNameProp,                parse_name },
-	{ VCBirthDateProp,           parse_bday },
-	{ VCEmailAddressProp,        parse_email },
-	{ VCTelephoneProp,           parse_phone },
-	{ VCAdrProp,                 parse_address },
-	{ VCDeliveryLabelProp,       parse_address_label },
-	{ VCURLProp,                 parse_url },
-	{ VCOrgProp,                 parse_org },
-	{ "X-EVOLUTION-OFFICE",      parse_office },
-	{ VCTitleProp,               parse_title },
-	{ VCBusinessRoleProp,        parse_role },
-	{ "X-EVOLUTION-MANAGER",     parse_manager },
-	{ "X-EVOLUTION-ASSISTANT",   parse_assistant },
-	{ "NICKNAME",                parse_nickname },
-	{ "X-EVOLUTION-SPOUSE",      parse_spouse },
-	{ "X-EVOLUTION-ANNIVERSARY", parse_anniversary },   
-	{ VCMailerProp,              parse_mailer },
-	{ "FBURL",                   parse_fburl },
-	{ VCNoteProp,                parse_note },
-	{ "CATEGORIES",              parse_categories },
-	{ XEV_WANTS_HTML,            parse_wants_html },
-	{ XEV_PILOT_ID,              parse_pilot_id },
-	{ XEV_PILOT_STATUS,          parse_pilot_status },
-	{ XEV_ARBITRARY,             parse_arbitrary },
-	{ VCUniqueStringProp,        parse_id }
-};
-
-/**
- * e_card_get_type:
- * @void: 
- * 
- * Registers the &ECard class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ECard class.
- **/
-GtkType
-e_card_get_type (void)
-{
-	static GtkType card_type = 0;
-
-	if (!card_type) {
-		GtkTypeInfo card_info = {
-			"ECard",
-			sizeof (ECard),
-			sizeof (ECardClass),
-			(GtkClassInitFunc) e_card_class_init,
-			(GtkObjectInitFunc) e_card_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		card_type = gtk_type_unique (gtk_object_get_type (), &card_info);
-	}
-
-	return card_type;
-}
-
-/**
- * e_card_new:
- * @vcard: a string in vCard format
- *
- * Returns: a new #ECard that wraps the @vcard.
- */
-ECard *
-e_card_new (char *vcard)
-{
-	ECard *card = E_CARD(gtk_type_new(e_card_get_type()));
-	VObject *vobj = Parse_MIME(vcard, strlen(vcard));
-	while(vobj) {
-		VObject *next;
-		parse(card, vobj);
-		next = nextVObjectInList(vobj);
-		cleanVObject(vobj);
-		vobj = next;
-	}
-	return card;
-}
-
-ECard *e_card_duplicate(ECard *card)
-{
-	char *vcard = e_card_get_vcard(card);
-	ECard *new_card = e_card_new(vcard);
-	g_free (vcard);
-	return new_card;
-}
-
-/**
- * e_card_get_id:
- * @card: an #ECard
- *
- * Returns: a string representing the id of the card, which is unique
- * within its book.
- */
-char *
-e_card_get_id (ECard *card)
-{
-	return card->id;
-}
-
-/**
- * e_card_get_id:
- * @card: an #ECard
- * @id: a id in string format
- *
- * Sets the identifier of a card, which should be unique within its
- * book.
- */
-void
-e_card_set_id (ECard *card, const char *id)
-{
-	if ( card->id )
-		g_free(card->id);
-	card->id = g_strdup(id);
-}
-
-/**
- * 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; /*, *vprop; */
-	char *temp, *ret_val;
-	
-	vobj = newVObject (VCCardProp);
-
-	if ( card->file_as && *card->file_as )
-		addPropValue(vobj, "X-EVOLUTION-FILE-AS", card->file_as);
-	else if (card->file_as)
-		addProp(vobj, "X-EVOLUTION-FILE_AS");
-
-	if ( card->fname )
-		addPropValue(vobj, VCFullNameProp, card->fname);
-
-	if ( card->name && (card->name->prefix || card->name->given || card->name->additional || card->name->family || card->name->suffix) ) {
-		VObject *nameprop;
-		nameprop = addProp(vobj, VCNameProp);
-		if ( card->name->prefix )
-			addPropValue(nameprop, VCNamePrefixesProp, card->name->prefix);
-		if ( card->name->given )
-			addPropValue(nameprop, VCGivenNameProp, card->name->given);
-		if ( card->name->additional )
-			addPropValue(nameprop, VCAdditionalNamesProp, card->name->additional);
-		if ( card->name->family )
-			addPropValue(nameprop, VCFamilyNameProp, card->name->family);
-		if ( card->name->suffix )
-			addPropValue(nameprop, VCNameSuffixesProp, card->name->suffix);
-	}
-
-
-	if ( card->address ) {
-		EIterator *iterator = e_list_get_iterator(card->address);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *addressprop;
-			ECardDeliveryAddress *address = (ECardDeliveryAddress *) e_iterator_get(iterator);
-			addressprop = addProp(vobj, VCAdrProp);
-			
-			set_address_flags (addressprop, address->flags);
-			if ( address->po )
-				addPropValue(addressprop, VCPostalBoxProp, address->po);
-			if ( address->ext )
-				addPropValue(addressprop, VCExtAddressProp, address->ext);
-			if ( address->street )
-				addPropValue(addressprop, VCStreetAddressProp, address->street);
-			if ( address->city )
-				addPropValue(addressprop, VCCityProp, address->city);
-			if ( address->region )
-				addPropValue(addressprop, VCRegionProp, address->region);
-			if ( address->code )
-				addPropValue(addressprop, VCPostalCodeProp, address->code);
-			if ( address->country )
-				addPropValue(addressprop, VCCountryNameProp, address->country);
-			addProp(addressprop, VCQuotedPrintableProp);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->address_label ) {
-		EIterator *iterator = e_list_get_iterator(card->address_label);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *labelprop;
-			ECardAddrLabel *address_label = (ECardAddrLabel *) e_iterator_get(iterator);
-			if (address_label->data)
-				labelprop = addPropValue(vobj, VCDeliveryLabelProp, address_label->data);
-			else
-				labelprop = addProp(vobj, VCDeliveryLabelProp);
-			
-			set_address_flags (labelprop, address_label->flags);
-			addProp(labelprop, VCQuotedPrintableProp);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->phone ) { 
-		EIterator *iterator = e_list_get_iterator(card->phone);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *phoneprop;
-			ECardPhone *phone = (ECardPhone *) e_iterator_get(iterator);
-			phoneprop = addPropValue(vobj, VCTelephoneProp, phone->number);
-			
-			set_phone_flags (phoneprop, phone->flags);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->email ) { 
-		EIterator *iterator = e_list_get_iterator(card->email);
-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {
-			VObject *emailprop;
-			emailprop = addPropValue(vobj, VCEmailAddressProp, (char *) e_iterator_get(iterator));
-			addProp (emailprop, VCInternetProp);
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-	}
-
-	if ( card->bday ) {
-		ECardDate date;
-		char *value;
-		date = *card->bday;
-		date.year = MIN(date.year, 9999);
-		date.month = MIN(date.month, 12);
-		date.day = MIN(date.day, 31);
-		value = g_strdup_printf("%04d-%02d-%02d", date.year, date.month, date.day);
-		addPropValue(vobj, VCBirthDateProp, value);
-		g_free(value);
-	}
-
-	if (card->url)
-		addPropValue(vobj, VCURLProp, card->url);
-
-	if (card->org || card->org_unit) {
-		VObject *orgprop;
-		orgprop = addProp(vobj, VCOrgProp);
-		
-		if (card->org)
-			addPropValue(orgprop, VCOrgNameProp, card->org);
-		if (card->org_unit)
-			addPropValue(orgprop, VCOrgUnitProp, card->org_unit);
-	}
-	
-	if (card->office)
-		addPropValue(vobj, "X-EVOLUTION-OFFICE", card->office);
-
-	if (card->title)
-		addPropValue(vobj, VCTitleProp, card->title);
-
-	if (card->role)
-		addPropValue(vobj, VCBusinessRoleProp, card->role);
-	
-	if (card->manager)
-		addPropValue(vobj, "X-EVOLUTION-MANAGER", card->manager);
-	
-	if (card->assistant)
-		addPropValue(vobj, "X-EVOLUTION-ASSISTANT", card->assistant);
-	
-	if (card->nickname)
-		addPropValue(vobj, "NICKNAME", card->nickname);
-
-	if (card->spouse)
-		addPropValue(vobj, "X-EVOLUTION-SPOUSE", card->spouse);
-
-	if ( card->anniversary ) {
-		ECardDate date;
-		char *value;
-		date = *card->anniversary;
-		date.year = MIN(date.year, 9999);
-		date.month = MIN(date.month, 12);
-		date.day = MIN(date.day, 31);
-		value = g_strdup_printf("%04d-%02d-%02d", date.year, date.month, date.day);
-		addPropValue(vobj, "X-EVOLUTION-ANNIVERSARY", value);
-		g_free(value);
-	}
-
-	if (card->mailer) {
-		addPropValue(vobj, VCMailerProp, card->mailer);
-	}
-	
-	if (card->fburl)
-		addPropValue(vobj, "FBURL", card->fburl);
-	
-	if (card->note)
-		addPropValue(vobj, VCNoteProp, card->note);
-
-	if (card->categories) {
-		EIterator *iterator;
-		int length = 0;
-		char *string;
-		char *stringptr;
-		for (iterator = e_list_get_iterator(card->categories); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			length += strlen(e_iterator_get(iterator)) + 1;
-		}
-		string = g_new(char, length + 1);
-		stringptr = string;
-		*stringptr = 0;
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			strcpy(stringptr, e_iterator_get(iterator));
-			stringptr += strlen(stringptr);
-			*stringptr = ',';
-			stringptr++;
-			*stringptr = 0;
-		}
-		if (stringptr > string) {
-			stringptr --;
-			*stringptr = 0;
-		}
-		addPropValue (vobj, "CATEGORIES", string);
-		g_free(string);
-	}
-
-	if (card->wants_html_set) {
-		addPropValue (vobj, XEV_WANTS_HTML, card->wants_html ? "TRUE" : "FALSE");
-	}
-
-	if (card->pilot_id) {
-		gchar *pilotid_str;
-		pilotid_str = g_strdup_printf ("%d", card->pilot_id);
-		addPropValue (vobj, XEV_PILOT_ID, pilotid_str);
-		g_free (pilotid_str);
-	}
-
-	if (card->pilot_status) {
-		gchar *pilotstatus_str;
-		pilotstatus_str = g_strdup_printf ("%d", card->pilot_status);
-		addPropValue (vobj, XEV_PILOT_STATUS, pilotstatus_str);
-		g_free (pilotstatus_str);
-	}
-
-	if (card->arbitrary) {
-		EIterator *iterator;
-		for (iterator = e_list_get_iterator(card->arbitrary); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);
-			VObject *arb_object;
-			if (arbitrary->value) {
-				arb_object = addPropValue (vobj, XEV_ARBITRARY, arbitrary->value);
-			} else {
-				arb_object = addProp (vobj, XEV_ARBITRARY);
-			}
-			if (arbitrary->type) {
-				addPropValue (arb_object, "TYPE", arbitrary->type);
-			}
-			if (arbitrary->key) {
-				addProp (arb_object, arbitrary->key);
-			}
-		}
-	}
-
-	if (card->id)
-		addPropValue (vobj, VCUniqueStringProp, 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;
-			addPropValue (vobj, xp->name, xp->data);
-			add_CardProperty (vobj, &xp->prop);
-		}
-	}
-	
-	if (crd->timezn.prop.used) {
-		char *str;
-		
-		str = card_timezn_str (crd->timezn);
-		vprop = addPropValue (vobj, VCTimeZoneProp, str);
-		free (str);
-		add_CardProperty (vprop, &crd->timezn.prop);
-	}
-	
-	if (crd->geopos.prop.used) {
-		char *str;
-		
-		str = card_geopos_str (crd->geopos);
-		vprop = addPropValue (vobj, VCGeoLocationProp, str);
-		free (str);
-		add_CardProperty (vprop, &crd->geopos.prop);
-	}
-	
-	if (crd->logo.prop.used) {
-		vprop = addPropSizedValue (vobj, VCLogoProp, 
-					  crd->logo.data, crd->logo.size);
-		add_PhotoType (vprop, crd->logo.type);
-		add_CardProperty (vprop, &crd->logo.prop);
-	}
-	
-	if (crd->agent)
-	  addVObjectProp (vobj, card_convert_to_vobject (crd->agent));
-	
-	if (crd->sound.prop.used) {
-		if (crd->sound.type != SOUND_PHONETIC)
-		  vprop = addPropSizedValue (vobj, VCPronunciationProp,
-					    crd->sound.data, crd->sound.size);
-		else
-		  vprop = addPropValue (vobj, VCPronunciationProp, 
-				       crd->sound.data);
-		
-		add_SoundType (vprop, crd->sound.type);
-		add_CardProperty (vprop, &crd->sound.prop);
-	}
-	
-	if (crd->key.prop.used) {
-		vprop = addPropValue (vobj, VCPublicKeyProp, crd->key.data);
-		add_KeyType (vprop, crd->key.type);
-		add_CardProperty (vprop, &crd->key.prop);
-	}
-#endif
-	temp = writeMemVObject(NULL, NULL, vobj);
-	ret_val = g_strdup(temp);
-	free(temp);
-	cleanVObject(vobj);
-	return ret_val;
-}
-
-static void
-parse_file_as(ECard *card, VObject *vobj)
-{
-	if ( card->file_as )
-		g_free(card->file_as);
-	assign_string(vobj, &(card->file_as));
-}
-
-static void
-parse_name(ECard *card, VObject *vobj)
-{
-	if ( card->name ) {
-		e_card_name_free(card->name);
-	}
-	card->name = g_new(ECardName, 1);
-
-	card->name->family     = e_v_object_get_child_value (vobj, VCFamilyNameProp);
-	card->name->given      = e_v_object_get_child_value (vobj, VCGivenNameProp);
-	card->name->additional = e_v_object_get_child_value (vobj, VCAdditionalNamesProp);
-	card->name->prefix     = e_v_object_get_child_value (vobj, VCNamePrefixesProp);
-	card->name->suffix     = e_v_object_get_child_value (vobj, VCNameSuffixesProp);
-}
-
-static void
-parse_full_name(ECard *card, VObject *vobj)
-{
-	if ( card->fname )
-		g_free(card->fname);
-	assign_string(vobj, &(card->fname));
-}
-
-static void
-parse_email(ECard *card, VObject *vobj)
-{
-	char *next_email;
-	EList *list;
-
-	assign_string(vobj, &next_email);
-	gtk_object_get(GTK_OBJECT(card),
-		       "email", &list,
-		       NULL);
-	e_list_append(list, next_email);
-	g_free (next_email);
-}
-
-static void
-parse_bday(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if ( card->bday )
-			g_free(card->bday);
-		card->bday = g_new(ECardDate, 1);
-		*(card->bday) = e_card_date_from_string(str);
-		free(str);
-	}
-}
-
-static void
-parse_phone(ECard *card, VObject *vobj)
-{
-	ECardPhone *next_phone = g_new(ECardPhone, 1);
-	EList *list;
-
-	assign_string(vobj, &(next_phone->number));
-	next_phone->flags = get_phone_flags(vobj);
-
-	gtk_object_get(GTK_OBJECT(card),
-		       "phone", &list,
-		       NULL);
-	e_list_append(list, next_phone);
-	e_card_phone_free (next_phone);
-}
-
-static void
-parse_address(ECard *card, VObject *vobj)
-{
-	ECardDeliveryAddress *next_addr = g_new(ECardDeliveryAddress, 1);
-	EList *list;
-
-	next_addr->flags   = get_address_flags (vobj);
-	next_addr->po      = e_v_object_get_child_value (vobj, VCPostalBoxProp);
-	next_addr->ext     = e_v_object_get_child_value (vobj, VCExtAddressProp);
-	next_addr->street  = e_v_object_get_child_value (vobj, VCStreetAddressProp);
-	next_addr->city    = e_v_object_get_child_value (vobj, VCCityProp);
-	next_addr->region  = e_v_object_get_child_value (vobj, VCRegionProp);
-	next_addr->code    = e_v_object_get_child_value (vobj, VCPostalCodeProp);
-	next_addr->country = e_v_object_get_child_value (vobj, VCCountryNameProp);
-
-	gtk_object_get(GTK_OBJECT(card),
-		       "address", &list,
-		       NULL);
-	e_list_append(list, next_addr);
-	e_card_delivery_address_free (next_addr);
-}
-
-static void
-parse_address_label(ECard *card, VObject *vobj)
-{
-	ECardAddrLabel *next_addr = g_new(ECardAddrLabel, 1);
-	EList *list;
-
-	next_addr->flags   = get_address_flags (vobj);
-	assign_string(vobj, &next_addr->data);
-
-	gtk_object_get(GTK_OBJECT(card),
-		       "address_label", &list,
-		       NULL);
-	e_list_append(list, next_addr);
-	e_card_address_label_free (next_addr);
-}
-
-static void
-parse_url(ECard *card, VObject *vobj)
-{
-	if (card->url)
-		g_free(card->url);
-	assign_string(vobj, &(card->url));
-}
-
-static void
-parse_org(ECard *card, VObject *vobj)
-{
-	char *temp;
-	
-	temp = e_v_object_get_child_value(vobj, VCOrgNameProp);
-	if (temp) {
-		if (card->org)
-			g_free(card->org);
-		card->org = temp;
-	}
-	temp = e_v_object_get_child_value(vobj, VCOrgUnitProp);
-	if (temp) {
-		if (card->org_unit)
-			g_free(card->org_unit);
-		card->org_unit = temp;
-	}
-}
-
-static void
-parse_office(ECard *card, VObject *vobj)
-{
-	if ( card->office )
-		g_free(card->office);
-	assign_string(vobj, &(card->office));
-}
-
-static void
-parse_title(ECard *card, VObject *vobj)
-{
-	if ( card->title )
-		g_free(card->title);
-	assign_string(vobj, &(card->title));
-}
-
-static void
-parse_role(ECard *card, VObject *vobj)
-{
-	if (card->role)
-		g_free(card->role);
-	assign_string(vobj, &(card->role));
-}
-
-static void
-parse_manager(ECard *card, VObject *vobj)
-{
-	if ( card->manager )
-		g_free(card->manager);
-	assign_string(vobj, &(card->manager));
-}
-
-static void
-parse_assistant(ECard *card, VObject *vobj)
-{
-	if ( card->assistant )
-		g_free(card->assistant);
-	assign_string(vobj, &(card->assistant));
-}
-
-static void
-parse_nickname(ECard *card, VObject *vobj)
-{
-	if (card->nickname)
-		g_free(card->nickname);
-	assign_string(vobj, &(card->nickname));
-}
-
-static void
-parse_spouse(ECard *card, VObject *vobj)
-{
-	if ( card->spouse )
-		g_free(card->spouse);
-	assign_string(vobj, &(card->spouse));
-}
-
-static void
-parse_anniversary(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if (card->anniversary)
-			g_free(card->anniversary);
-		card->anniversary = g_new(ECardDate, 1);
-		*(card->anniversary) = e_card_date_from_string(str);
-		free(str);
-	}
-}
-
-static void
-parse_mailer(ECard *card, VObject *vobj)
-{
-	if ( card->mailer )
-		g_free(card->mailer);
-	assign_string(vobj, &(card->mailer));
-}
-
-static void
-parse_fburl(ECard *card, VObject *vobj)
-{
-	g_free(card->fburl);
-	assign_string(vobj, &(card->fburl));
-}
-
-static void
-parse_note(ECard *card, VObject *vobj)
-{
-	g_free(card->note);
-	assign_string(vobj, &(card->note));
-}
-
-static void
-add_list_unique(ECard *card, EList *list, char *string)
-{
-	char *temp = e_strdup_strip(string);
-	EIterator *iterator;
-
-	if (!*temp) {
-		g_free(temp);
-		return;
-	}
-	for ( iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		if (!strcmp(e_iterator_get(iterator), temp)) {
-			break;
-		}
-	}
-	if (!e_iterator_is_valid(iterator)) {
-		e_list_append(list, temp);
-	}
-	g_free(temp);
-	gtk_object_unref(GTK_OBJECT(iterator));
-}
-
-static void
-do_parse_categories(ECard *card, char *str)
-{
-	int length = strlen(str);
-	char *copy = g_new(char, length + 1);
-	int i, j;
-	EList *list;
-	gtk_object_get(GTK_OBJECT(card),
-		       "category_list", &list,
-		       NULL);
-	for (i = 0, j = 0; str[i]; i++, j++) {
-		switch (str[i]) {
-		case '\\':
-			i++;
-			if (str[i]) {
-				copy[j] = str[i];
-			} else
-				i--;
-			break;
-		case ',':
-			copy[j] = 0;
-			add_list_unique(card, list, copy);
-			j = -1;
-			break;
-		default:
-			copy[j] = str[i];
-			break;
-		}
-	}
-	copy[j] = 0;
-	add_list_unique(card, list, copy);
-	g_free(copy);
-}
-
-static void
-parse_categories(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		do_parse_categories(card, str);
-		free(str);
-	}
-}
-
-static void
-parse_wants_html(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		if (!strcasecmp(str, "true")) {
-			card->wants_html = TRUE;
-			card->wants_html_set = TRUE;
-		}
-		if (!strcasecmp(str, "false")) {
-			card->wants_html = FALSE;
-			card->wants_html_set = TRUE;
-		}
-		free(str);
-	}
-}
-
-static void
-parse_pilot_id(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		card->pilot_id = atoi(str);
-		free(str);
-	}
-}
-
-static void
-parse_pilot_status(ECard *card, VObject *vobj)
-{
-	if ( vObjectValueType (vobj) ) {
-		char *str = fakeCString (vObjectUStringZValue (vobj));
-		card->pilot_status = atoi(str);
-		free(str);
-	}
-}
-
-typedef union ValueItem {
-    const char *strs;
-    const wchar_t *ustrs;
-    unsigned int i;
-    unsigned long l;
-    void *any;
-    VObject *vobj;
-} ValueItem;
-
-struct VObject {
-    VObject *next;
-    const char *id;
-    VObject *prop;
-    unsigned short valType;
-    ValueItem val;
-};
-
-static void
-parse_arbitrary(ECard *card, VObject *vobj)
-{
-	ECardArbitrary *arbitrary = e_card_arbitrary_new();
-	VObjectIterator iterator;
-	EList *list;
-	for ( initPropIterator (&iterator, vobj); moreIteration(&iterator); ) {
-		VObject *temp = nextVObject(&iterator);
-		const char *name = vObjectName(temp);
-		if (name && !strcmp(name, "TYPE")) {
-			g_free(arbitrary->type);
-			assign_string(temp, &(arbitrary->type));
-		} else {
-			g_free(arbitrary->key);
-			arbitrary->key = g_strdup(name);
-		}
-	}
-
-	assign_string(vobj, &(arbitrary->value));
-	
-	gtk_object_get(GTK_OBJECT(card),
-		       "arbitrary", &list,
-		       NULL);
-	e_list_append(list, arbitrary);
-	e_card_arbitrary_free(arbitrary);
-}
-
-static void
-parse_id(ECard *card, VObject *vobj)
-{
-	if ( card->id )
-		g_free(card->id);
-	assign_string(vobj, &(card->id));
-}
-
-static void
-parse_attribute(ECard *card, VObject *vobj)
-{
-	ParsePropertyFunc function = g_hash_table_lookup(E_CARD_CLASS(GTK_OBJECT(card)->klass)->attribute_jump_table, vObjectName(vobj));
-	if ( function )
-		function(card, vobj);
-}
-
-static void
-parse(ECard *card, VObject *vobj)
-{
-	VObjectIterator iterator;
-	initPropIterator(&iterator, vobj);
-	while(moreIteration (&iterator)) {
-		parse_attribute(card, nextVObject(&iterator));
-	}
-	if (!card->fname) {
-		card->fname = g_strdup("");
-	}
-	if (!card->name) {
-		card->name = e_card_name_from_string(card->fname);
-	}
-	if (!card->file_as) {
-		ECardName *name = card->name;
-		char *strings[3], **stringptr;
-		char *string;
-		stringptr = strings;
-		if (name->family && *name->family)
-			*(stringptr++) = name->family;
-		if (name->given && *name->given)
-			*(stringptr++) = name->given;
-		*stringptr = NULL;
-		string = g_strjoinv(", ", strings);
-		card->file_as = string;
-	}
-}
-
-static void
-e_card_class_init (ECardClass *klass)
-{
-	int i;
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	klass->attribute_jump_table = g_hash_table_new(g_str_hash, g_str_equal);
-
-	for ( i = 0; i < sizeof(attribute_jump_array) / sizeof(attribute_jump_array[0]); i++ ) {
-		g_hash_table_insert(klass->attribute_jump_table, attribute_jump_array[i].key, attribute_jump_array[i].function);
-	}
-
-	gtk_object_add_arg_type ("ECard::file_as",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FILE_AS);
-	gtk_object_add_arg_type ("ECard::full_name",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FULL_NAME);  
-	gtk_object_add_arg_type ("ECard::name",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_NAME);
-	gtk_object_add_arg_type ("ECard::address",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_ADDRESS);
-	gtk_object_add_arg_type ("ECard::address_label",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_ADDRESS_LABEL);
-	gtk_object_add_arg_type ("ECard::phone",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_PHONE);
-	gtk_object_add_arg_type ("ECard::email",
-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_EMAIL);
-	gtk_object_add_arg_type ("ECard::birth_date",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_BIRTH_DATE);
-	gtk_object_add_arg_type ("ECard::url",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_URL);  
-	gtk_object_add_arg_type ("ECard::org",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ORG);
-	gtk_object_add_arg_type ("ECard::org_unit",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ORG_UNIT);
-	gtk_object_add_arg_type ("ECard::office",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_OFFICE);
-	gtk_object_add_arg_type ("ECard::title",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_TITLE);  
-	gtk_object_add_arg_type ("ECard::role",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ROLE);
-	gtk_object_add_arg_type ("ECard::manager",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_MANAGER);
-	gtk_object_add_arg_type ("ECard::assistant",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ASSISTANT);
-	gtk_object_add_arg_type ("ECard::nickname",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_NICKNAME);
-	gtk_object_add_arg_type ("ECard::spouse",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_SPOUSE);
-	gtk_object_add_arg_type ("ECard::anniversary",
-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_ANNIVERSARY);
-	gtk_object_add_arg_type ("ECard::mailer",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_MAILER);
-	gtk_object_add_arg_type ("ECard::fburl",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FBURL);
-	gtk_object_add_arg_type ("ECard::note",
-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_NOTE);
-	gtk_object_add_arg_type ("ECard::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::pilot_id",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_PILOTID);
-	gtk_object_add_arg_type ("ECard::pilot_status",
-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_PILOTSTATUS);
-	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);
-
-
-	object_class->destroy = e_card_destroy;
-	object_class->get_arg = e_card_get_arg;
-	object_class->set_arg = e_card_set_arg;
-}
-
-ECardPhone *
-e_card_phone_new (void)
-{
-	ECardPhone *newphone = g_new(ECardPhone, 1);
-
-	newphone->number = NULL;
-	newphone->flags = 0;
-	
-	return newphone;
-}
-
-void
-e_card_phone_free (ECardPhone *phone)
-{
-	if ( phone ) {
-		g_free(phone->number);
-
-		g_free(phone);
-	}
-}
-
-ECardPhone *
-e_card_phone_copy (const ECardPhone *phone)
-{
-	if ( phone ) {
-		ECardPhone *phone_copy = g_new(ECardPhone, 1);
-		phone_copy->number = g_strdup(phone->number);
-		phone_copy->flags  = phone->flags;
-		return phone_copy;
-	} else
-		return NULL;
-}
-
-ECardDeliveryAddress *
-e_card_delivery_address_new (void)
-{
-	ECardDeliveryAddress *newaddr = g_new(ECardDeliveryAddress, 1);
-
-	newaddr->po      = NULL;
-	newaddr->ext     = NULL;
-	newaddr->street  = NULL;
-	newaddr->city    = NULL;
-	newaddr->region  = NULL;
-	newaddr->code    = NULL;
-	newaddr->country = NULL;
-	newaddr->flags   = 0;
-
-	return newaddr;
-}
-
-void
-e_card_delivery_address_free (ECardDeliveryAddress *addr)
-{
-	if ( addr ) {
-		g_free(addr->po);
-		g_free(addr->ext);
-		g_free(addr->street);
-		g_free(addr->city);
-		g_free(addr->region);
-		g_free(addr->code);
-		g_free(addr->country);
-
-		g_free(addr);
-	}
-}
-
-ECardDeliveryAddress *
-e_card_delivery_address_copy (const ECardDeliveryAddress *addr)
-{
-	if ( addr ) {
-		ECardDeliveryAddress *addr_copy = g_new(ECardDeliveryAddress, 1);
-		addr_copy->po      = g_strdup(addr->po     );
-		addr_copy->ext     = g_strdup(addr->ext    );
-		addr_copy->street  = g_strdup(addr->street );
-		addr_copy->city    = g_strdup(addr->city   );
-		addr_copy->region  = g_strdup(addr->region );
-		addr_copy->code    = g_strdup(addr->code   );
-		addr_copy->country = g_strdup(addr->country);
-		addr_copy->flags   = addr->flags;
-		return addr_copy;
-	} else
-		return NULL;
-}
-
-gboolean
-e_card_delivery_address_is_empty (const ECardDeliveryAddress *addr)
-{
-	return (((addr->po      == NULL) || (*addr->po      == 0)) &&
-		((addr->ext     == NULL) || (*addr->ext     == 0)) &&
-		((addr->street  == NULL) || (*addr->street  == 0)) &&
-		((addr->city    == NULL) || (*addr->city    == 0)) &&
-		((addr->region  == NULL) || (*addr->region  == 0)) &&
-		((addr->code    == NULL) || (*addr->code    == 0)) &&
-		((addr->country == NULL) || (*addr->country == 0)));
-}
-
-ECardDeliveryAddress *
-e_card_delivery_address_from_label(const ECardAddrLabel *label)
-{
-	ECardDeliveryAddress *addr = g_new(ECardDeliveryAddress, 1);
-	EAddressWestern *western = e_address_western_parse (label->data);
-	
-	addr->po      = g_strdup (western->po_box     );
-	addr->ext     = g_strdup (western->extended   );
-	addr->street  = g_strdup (western->street     );
-	addr->city    = g_strdup (western->locality   );
-	addr->region  = g_strdup (western->region     );
-	addr->code    = g_strdup (western->postal_code);
-	addr->country = g_strdup (western->country    );
-	addr->flags   = label->flags;
-	
-	e_address_western_free(western);
-	
-	return addr;
-}
-
-char *
-e_card_delivery_address_to_string(const ECardDeliveryAddress *addr)
-{
-	char *strings[5], **stringptr = strings;
-	char *line1, *line22, *line2;
-	char *final;
-	if (addr->po && *addr->po)
-		*(stringptr++) = addr->po;
-	if (addr->street && *addr->street)
-		*(stringptr++) = addr->street;
-	*stringptr = NULL;
-	line1 = g_strjoinv(" ", strings);
-	stringptr = strings;
-	if (addr->region && *addr->region)
-		*(stringptr++) = addr->region;
-	if (addr->code && *addr->code)
-		*(stringptr++) = addr->code;
-	*stringptr = NULL;
-	line22 = g_strjoinv(" ", strings);
-	stringptr = strings;
-	if (addr->city && *addr->city)
-		*(stringptr++) = addr->city;
-	if (line22 && *line22)
-		*(stringptr++) = line22;
-	*stringptr = NULL;
-	line2 = g_strjoinv(", ", strings);
-	stringptr = strings;
-	if (line1 && *line1)
-		*(stringptr++) = line1;
-	if (addr->ext && *addr->ext)
-		*(stringptr++) = addr->ext;
-	if (line2 && *line2)
-		*(stringptr++) = line2;
-	if (addr->country && *addr->country)
-		*(stringptr++) = addr->country;
-	*stringptr = NULL;
-	final = g_strjoinv("\n", strings);
-	g_free(line1);
-	g_free(line22);
-	g_free(line2);
-	return final;
-}
-
-ECardAddrLabel *
-e_card_delivery_address_to_label    (const ECardDeliveryAddress *addr)
-{
-	ECardAddrLabel *label;
-	label = e_card_address_label_new();
-	label->flags = addr->flags;
-	label->data = e_card_delivery_address_to_string(addr);
-
-	return label;
-}
-
-ECardAddrLabel *
-e_card_address_label_new (void)
-{
-	ECardAddrLabel *newaddr = g_new(ECardAddrLabel, 1);
-
-	newaddr->data = NULL;
-	newaddr->flags = 0;
-	
-	return newaddr;
-}
-
-void
-e_card_address_label_free (ECardAddrLabel *addr)
-{
-	if ( addr ) {
-		g_free(addr->data);
-
-		g_free(addr);
-	}
-}
-
-ECardAddrLabel *
-e_card_address_label_copy (const ECardAddrLabel *addr)
-{
-	if ( addr ) {
-		ECardAddrLabel *addr_copy = g_new(ECardAddrLabel, 1);
-		addr_copy->data    = g_strdup(addr->data);
-		addr_copy->flags   = addr->flags;
-		return addr_copy;
-	} else
-		return NULL;
-}
-
-ECardName *e_card_name_new(void)
-{
-	ECardName *newname = g_new(ECardName, 1);
-
-	newname->prefix     = NULL;
-	newname->given      = NULL;
-	newname->additional = NULL;
-	newname->family     = NULL;
-	newname->suffix     = NULL;
-
-	return newname;
-}
-
-void
-e_card_name_free(ECardName *name)
-{
-	if (name) {
-		if ( name->prefix )
-			g_free(name->prefix);
-		if ( name->given )
-			g_free(name->given);
-		if ( name->additional )
-			g_free(name->additional);
-		if ( name->family )
-			g_free(name->family);
-		if ( name->suffix )
-			g_free(name->suffix);
-		g_free ( name );
-	}
-}
-
-ECardName *
-e_card_name_copy(const ECardName *name)
-{
-	if (name) {
-		ECardName *newname = g_new(ECardName, 1);
-		
-		newname->prefix = g_strdup(name->prefix);
-		newname->given = g_strdup(name->given);
-		newname->additional = g_strdup(name->additional);
-		newname->family = g_strdup(name->family);
-		newname->suffix = g_strdup(name->suffix);
-
-		return newname;
-	} else
-		return NULL;
-}
-
-char *
-e_card_name_to_string(const ECardName *name)
-{
-	char *strings[6], **stringptr = strings;
-
-	g_return_val_if_fail (name != NULL, NULL);
-
-	if (name->prefix && *name->prefix)
-		*(stringptr++) = name->prefix;
-	if (name->given && *name->given)
-		*(stringptr++) = name->given;
-	if (name->additional && *name->additional)
-		*(stringptr++) = name->additional;
-	if (name->family && *name->family)
-		*(stringptr++) = name->family;
-	if (name->suffix && *name->suffix)
-		*(stringptr++) = name->suffix;
-	*stringptr = NULL;
-	return g_strjoinv(" ", strings);
-}
-
-ECardName *
-e_card_name_from_string(const char *full_name)
-{
-	ECardName *name = g_new(ECardName, 1);
-	ENameWestern *western = e_name_western_parse (full_name);
-	
-	name->prefix     = g_strdup (western->prefix);
-	name->given      = g_strdup (western->first );
-	name->additional = g_strdup (western->middle);
-	name->family     = g_strdup (western->last  );
-	name->suffix     = g_strdup (western->suffix);
-	
-	e_name_western_free(western);
-	
-	return name;
-}
-
-ECardArbitrary *
-e_card_arbitrary_new(void)
-{
-	ECardArbitrary *arbitrary = g_new(ECardArbitrary, 1);
-	arbitrary->key = NULL;
-	arbitrary->type = NULL;
-	arbitrary->value = NULL;
-	return arbitrary;
-}
-
-ECardArbitrary *
-e_card_arbitrary_copy(const ECardArbitrary *arbitrary)
-{
-	if (arbitrary) {
-		ECardArbitrary *arb_copy = g_new(ECardArbitrary, 1);
-		arb_copy->key = g_strdup(arbitrary->key);
-		arb_copy->type = g_strdup(arbitrary->type);
-		arb_copy->value = g_strdup(arbitrary->value);
-		return arb_copy;
-	} else
-		return NULL;
-}
-
-void
-e_card_arbitrary_free(ECardArbitrary *arbitrary)
-{
-	if (arbitrary) {
-		g_free(arbitrary->key);
-		g_free(arbitrary->type);
-		g_free(arbitrary->value);
-	}
-	g_free(arbitrary);
-}
-
-/*
- * ECard lifecycle management and vCard loading/saving.
- */
-
-static void
-e_card_destroy (GtkObject *object)
-{
-	ECard *card = E_CARD(object);
-	g_free(card->id);
-	g_free(card->file_as);
-	g_free(card->fname);
-	if ( card->name )
-		e_card_name_free(card->name);
-	g_free(card->bday);
-
-	g_free(card->url);
-	g_free(card->org);
-	g_free(card->org_unit);
-	g_free(card->office);
-	g_free(card->title);
-	g_free(card->role);
-	g_free(card->manager);
-	g_free(card->assistant);
-	g_free(card->nickname);
-	g_free(card->spouse);
-	g_free(card->anniversary);
-	g_free(card->fburl);
-	g_free(card->note);
-		
-	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));
-		break;
-	case ARG_FULL_NAME:
-		g_free(card->fname);
-		card->fname = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_NAME:
-		if ( card->name )
-			e_card_name_free(card->name);
-		card->name = GTK_VALUE_POINTER(*arg);
-		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);
-		card->bday = GTK_VALUE_POINTER(*arg);
-		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);
-		card->anniversary = GTK_VALUE_POINTER(*arg);
-		break;
-	case ARG_MAILER:
-		g_free(card->mailer);
-		card->mailer = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_FBURL:
-		g_free(card->fburl);
-		card->fburl = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_NOTE:
-		g_free (card->note);
-		card->note = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	case ARG_WANTS_HTML:
-		card->wants_html = GTK_VALUE_BOOL(*arg);
-		card->wants_html_set = TRUE;
-		break;
-	case ARG_PILOTID:
-		card->pilot_id = GTK_VALUE_INT(*arg);
-		break;
-	case ARG_PILOTSTATUS:
-		card->pilot_status = GTK_VALUE_INT(*arg);
-		break;
-	case ARG_ARBITRARY:
-		if (card->arbitrary)
-			gtk_object_unref(GTK_OBJECT(card->arbitrary));
-		card->arbitrary = E_LIST(GTK_VALUE_OBJECT(*arg));
-		if (card->arbitrary)
-			gtk_object_ref(GTK_OBJECT(card->arbitrary));
-		break;
-	case ARG_ID:
-		g_free(card->id);
-		card->id = g_strdup(GTK_VALUE_STRING(*arg));
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the card */
-static void
-e_card_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ECard *card;
-
-	card = E_CARD (object);
-
-	switch (arg_id) {
-	case ARG_FILE_AS:
-		GTK_VALUE_STRING (*arg) = card->file_as;
-		break;
-	case ARG_FULL_NAME:
-		GTK_VALUE_STRING (*arg) = card->fname;
-		break;
-	case ARG_NAME:
-		GTK_VALUE_POINTER(*arg) = card->name;
-		break;
-	case ARG_ADDRESS:
-		if (!card->address)
-			card->address = e_list_new((EListCopyFunc) e_card_delivery_address_copy, 
-							(EListFreeFunc) e_card_delivery_address_free,
-							NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->address);
-		break;
-	case ARG_ADDRESS_LABEL:
-		if (!card->address_label)
-			card->address_label = e_list_new((EListCopyFunc) e_card_address_label_copy, 
-							      (EListFreeFunc) e_card_address_label_free,
-							      NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->address_label);
-		break;
-	case ARG_PHONE:
-		if (!card->phone)
-			card->phone = e_list_new((EListCopyFunc) e_card_phone_copy, 
-						      (EListFreeFunc) e_card_phone_free,
-						      NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->phone);
-		break;
-	case ARG_EMAIL:
-		if (!card->email)
-			card->email = e_list_new((EListCopyFunc) g_strdup, 
-						      (EListFreeFunc) g_free,
-						      NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->email);
-		break;
-	case ARG_CATEGORIES:
-		{
-			int i;
-			char ** strs;
-			int length;
-			EIterator *iterator;
-			if (!card->categories)
-				card->categories = e_list_new((EListCopyFunc) g_strdup, 
-								   (EListFreeFunc) g_free,
-								   NULL);
-			length = e_list_length(card->categories);
-			strs = g_new(char *, length + 1);
-			for (iterator = e_list_get_iterator(card->categories), i = 0; e_iterator_is_valid(iterator); e_iterator_next(iterator), i++) {
-				strs[i] = (char *)e_iterator_get(iterator);
-			}
-			strs[i] = 0;
-			GTK_VALUE_STRING(*arg) = g_strjoinv(", ", strs);
-			g_free(strs);
-		}
-		break;
-	case ARG_CATEGORY_LIST:
-		if (!card->categories)
-			card->categories = e_list_new((EListCopyFunc) g_strdup, 
-							   (EListFreeFunc) g_free,
-							   NULL);
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->categories);
-		break;
-	case ARG_BIRTH_DATE:
-		GTK_VALUE_POINTER(*arg) = card->bday;
-		break;
-	case ARG_URL:
-		GTK_VALUE_STRING(*arg) = card->url;
-		break;
-	case ARG_ORG:
-		GTK_VALUE_STRING(*arg) = card->org;
-		break;
-	case ARG_ORG_UNIT:
-		GTK_VALUE_STRING(*arg) = card->org_unit;
-		break;
-	case ARG_OFFICE:
-		GTK_VALUE_STRING(*arg) = card->office;
-		break;
-	case ARG_TITLE:
-		GTK_VALUE_STRING(*arg) = card->title;
-		break;
-	case ARG_ROLE:
-		GTK_VALUE_STRING(*arg) = card->role;
-		break;
-	case ARG_MANAGER:
-		GTK_VALUE_STRING(*arg) = card->manager;
-		break;
-	case ARG_ASSISTANT:
-		GTK_VALUE_STRING(*arg) = card->assistant;
-		break;
-	case ARG_NICKNAME:
-		GTK_VALUE_STRING(*arg) = card->nickname;
-		break;
-	case ARG_SPOUSE:
-		GTK_VALUE_STRING(*arg) = card->spouse;
-		break;
-	case ARG_ANNIVERSARY:
-		GTK_VALUE_POINTER(*arg) = card->anniversary;
-		break;
-	case ARG_MAILER:
-		GTK_VALUE_STRING(*arg) = card->mailer;
-		break;
-	case ARG_FBURL:
-		GTK_VALUE_STRING(*arg) = card->fburl;
-		break;
-	case ARG_NOTE:
-		GTK_VALUE_STRING(*arg) = card->note;
-		break;
-	case ARG_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_PILOTID:
-		GTK_VALUE_INT(*arg) = card->pilot_id;
-		break;
-	case ARG_PILOTSTATUS:
-		GTK_VALUE_INT(*arg) = card->pilot_status;
-		break;
-	case ARG_ARBITRARY:
-		if (!card->arbitrary)
-			card->arbitrary = e_list_new((EListCopyFunc) e_card_arbitrary_copy,
-							  (EListFreeFunc) e_card_arbitrary_free,
-							  NULL);
-
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card->arbitrary);
-		break;
-	case ARG_ID:
-		GTK_VALUE_STRING(*arg) = card->id;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-
-/**
- * e_card_init:
- */
-static void
-e_card_init (ECard *card)
-{
-	card->id = g_strdup("");
-	
-	card->file_as = NULL;
-	card->fname = NULL;
-	card->name = NULL;
-	card->bday = NULL;
-	card->email = NULL;
-	card->phone = NULL;
-	card->address = NULL;
-	card->address_label = NULL;
-	card->url = NULL;
-	card->org = NULL;
-	card->org_unit = NULL;
-	card->office = NULL;
-	card->title = NULL;
-	card->role = NULL;
-	card->manager = NULL;
-	card->assistant = NULL;
-	card->nickname = NULL;
-	card->spouse = NULL;
-	card->anniversary = NULL;
-	card->mailer = NULL;
-	card->fburl = NULL;
-	card->note = NULL;
-	card->categories = NULL;
-	card->wants_html = FALSE;
-	card->wants_html_set = FALSE;
-	card->pilot_id = 0;
-	card->pilot_status = 0;
-	card->arbitrary = NULL;
-#if 0
-
-	c = g_new0 (ECard, 1);
-	
-	c->fname      = 
-	c->mailer     = 
-	c->role       = 
-	c->comment    = 
-	c->categories = 
-	c->uid        = e_card_prop_str_empty ();
-	
-	c->photo.type = PHOTO_JPEG;
-	c->logo.type  = PHOTO_JPEG;
-	c->rev.utc    = -1;
-	c->sound.type = SOUND_PHONETIC;
-	c->key.type   = KEY_PGP;
-
-	c->categories.prop.encod = ENC_QUOTED_PRINTABLE;
-	c->comment.prop.encod    = ENC_QUOTED_PRINTABLE;
-	
-	c->name.prop   = c->photo.prop = c->bday.prop     = c->timezn.prop   = 
-	c->geopos.prop = c->logo.prop  = c->org.prop      = c->rev.prop      =
-	c->sound.prop  = c->key.prop   = c->deladdr.prop  = c->dellabel.prop =
-	c->phone.prop  = c->email.prop = c->xtension.prop = c->prop = e_card_prop_empty ();
-	
-	c->prop.type            = PROP_CARD;
-	c->fname.prop.type      = PROP_FNAME;
-	c->name.prop.type       = PROP_NAME;
-	c->photo.prop.type      = PROP_PHOTO;
-	c->bday.prop.type       = PROP_BDAY;
-	
-	c->deladdr.prop.type    = PROP_DELADDR_LIST;
-	c->dellabel.prop.type   = PROP_DELLABEL_LIST;
-	c->phone.prop.type      = PROP_PHONE_LIST;
-	c->email.prop.type      = PROP_EMAIL_LIST;
-	c->xtension.prop.type   = PROP_XTENSION_LIST;
-	c->mailer.prop.type     = PROP_MAILER;
-	c->timezn.prop.type     = PROP_TIMEZN;
-	c->geopos.prop.type     = PROP_GEOPOS;
-	c->role.prop.type       = PROP_ROLE;
-	c->logo.prop.type       = PROP_LOGO;
-	c->org.prop.type        = PROP_ORG;
-	c->categories.prop.type = PROP_CATEGORIES;
-	c->comment.prop.type    = PROP_COMMENT;
-	c->rev.prop.type        = PROP_REV;
-	c->sound.prop.type      = PROP_SOUND;
-	c->uid.prop.type 	= PROP_UID;
-	c->key.prop.type 	= PROP_KEY;
-	
-	return c;
-#endif
-}
-
-GList *
-e_card_load_cards_from_file(const char *filename)
-{
-	VObject *vobj = Parse_MIME_FromFileName((char *) filename);
-	GList *list = NULL;
-	while(vobj) {
-		VObject *next;
-		ECard *card = E_CARD(gtk_type_new(e_card_get_type()));
-		parse(card, vobj);
-		next = nextVObjectInList(vobj);
-		cleanVObject(vobj);
-		vobj = next;
-		list = g_list_prepend(list, card);
-	}
-	list = g_list_reverse(list);
-	return list;
-}
-
-static void
-assign_string(VObject *vobj, char **string)
-{
-	int type = vObjectValueType(vobj);
-	char *str;
-
-	switch(type) {
-	case VCVT_STRINGZ:
-		*string = g_strdup (vObjectStringZValue(vobj));
-		break;
-	case VCVT_USTRINGZ:
-		str = (vObjectValueType (vobj) ? fakeCString (vObjectUStringZValue (vobj)) : calloc(1, 1));
-		*string = g_strdup(str);
-		free(str);
-		break;
-	default:
-		*string = g_strdup("");
-		break;
-	}
-}
-
-#if 0
-static void
-e_card_str_free (CardStrProperty *sp)
-{
-	g_free (sp->str);
-
-	e_card_prop_free (sp->prop);
-}
-
-static void
-e_card_photo_free (CardPhoto *photo)
-{
-	g_free (photo->data);
-
-	e_card_prop_free (photo->prop);
-}
-
-/**
- * e_card_free:
- */
-void
-e_card_free (ECard *card)
-{
-	GList *l;
-
-	g_return_if_fail (card != NULL);
-
-	e_card_name_free (& card->name);
-	e_card_str_free  (& card->fname);
-
-	e_card_photo_free (card->photo);
-
-	e_card_logo_free (card->logo);
-	e_card_org_free (card->org);
-	e_card_key_free (card->key);
-	e_card_sound_free (card->sound);
-
-	e_card_prop_str_free (& card->mailer);
-	e_card_prop_str_free (& card->role);
-	e_card_prop_str_free (& card->categories);
-	e_card_prop_str_free (& card->comment);
-	e_card_prop_str_free (& card->uid);
-
-	/* address is a little more complicated */
-	card_prop_free (card->deladdr.prop);
-	while ((l = card->deladdr.l)) {
-
-		e_card_deladdr_free ((CardDelAddr *) l->data);
-
-		card->deladdr.l = g_list_remove_link (card->deladdr.l, l);
-		g_list_free (l);
-	}
-	
-	g_free (card);
-}
-
-typedef struct
-{
-	char c;
-	int id;
-	
-	GList *sons;
-} tree;
-
-extern CardProperty 
-e_card_prop_empty (void)
-{
-	CardProperty prop;
-	
-	prop.used = FALSE;
-	
-	prop.type = PROP_NONE;
-	prop.encod = ENC_7BIT;
-	prop.value = VAL_INLINE;
-	prop.charset = NULL;
-	prop.lang = NULL;
-	prop.grp = NULL;
-	prop.xtension = NULL;
-	
-	prop.user_data = NULL;
-	
-	return prop;
-}
-
-static CardStrProperty 
-e_card_prop_str_empty (void)
-{
-	CardStrProperty strprop;
-	
-	strprop.prop = card_prop_empty ();
-	strprop.str = NULL;
-	
-	return strprop;
-}
-
-/* Intended to check asserts. */
-extern int card_check_prop (ECardProperty prop)
-{
-	if (((prop.used == FALSE) || (prop.used == TRUE)) &&
-	    ((prop.type >= PROP_NONE) && (prop.type <= PROP_LAST)) &&
-	    ((prop.encod >= ENC_NONE) && (prop.encod <= ENC_LAST)) &&
-	    ((prop.value >= VAL_NONE) && (prop.value <= VAL_LAST)))
-	  return TRUE;
-	    
-	return FALSE;
-}
-
-extern void
-card_prop_free (CardProperty prop)
-{
-	GList *l;
-	
-	g_free (prop.charset);
-	g_free (prop.lang);
-	
-	for (l = prop.xtension; l; l = l->next) {
-		CardXAttribute *xa = (CardXAttribute *) l->data;
-		g_free (xa->name);
-		g_free (xa->data);
-	}
-	
-	g_list_free (l);
-	
-	prop.used = FALSE;
-}
-	
-e_card_deladdr_free (ECardDelAddr *c)
-{
-	card_prop_free (c->prop);
-
-	g_free (p->pobox);
-	g_free (p->ext);
-	g_free (p->street);
-	g_free (p->city);
-	g_free (p->region);
-	g_free (p->code);
-	g_free (p->country);
-}
-
-void 
-card_free (Card *crd)
-{
-}
-
-static tree *
-new_tree (char c, int id)
-{
-	tree *t;
-	
-	t = malloc (sizeof (tree));
-	t->c = c;
-	t->id = id;
-	t->sons = NULL;
-	
-	return t;
-}
-
-static void 
-add_branch (tree *t, char *str, int id)
-{
-	tree *tmp;
-	char *end;
-	
-	end = str + strlen (str) + 1;
-
-	while (str != end) {
-		tmp = new_tree (*str, id);
-		t->sons = g_list_append (t->sons, (gpointer) tmp);
-		t = tmp;
-		
-		str ++;
-	}
-}
-
-static tree *
-add_to_tree (tree *t, struct pair p)
-{
-	GList *node;
-	char *c, *end;
-	tree *tmp;
-	
-	  c = p.str;
-	end = c + strlen (c) + 1;
-	tmp = t;
-	
-	while (c != end) {
-		for (node = tmp->sons; node; node = node->next)
-		  if (((tree *) node->data)->c == *c) {
-			  break;
-		  }
-		
-		if (node) {
-			tmp = (tree *) node->data;
-			tmp->id = 0;
-			c++;
-		}
-		else {
-			add_branch (tmp, c, p.id);
-			break;
-		}
-	}
-	
-	return t;
-}
-		
-static tree *
-create_search_tree (void)
-{
-	tree *t;
-	int i;
-
-	t = new_tree (0, 0);
-	for (i = 0; prop_lookup[i].str; i++)
-	  t = add_to_tree (t, prop_lookup[i]);
-	
-	return t;
-}
-		
-static int 
-card_lookup_name (const char *c)
-{
-	static tree *search_tree = NULL;
-	GList *node;
-	tree *tmp;
-	const char *end;
-	
-	if (!search_tree)
-	  search_tree = create_search_tree ();
-	
-	tmp = search_tree;
-	end = c + strlen (c) + 1;
-	
-	while (tmp->id == 0 && c != end) {
-		for (node = tmp->sons; node; node = node->next)
-		  if (((tree *) node->data)->c == *c) {
-			  break;
-		  }
-	
-		if (node) {
-			tmp = (tree *) node->data;
-			c++;
-		}
-		else
-		  return 0;
-	}
-	
-	return tmp->id;
-}
-
-static enum PhotoType 
-get_photo_type (VObject *o)
-{
-	VObject *vo;
-	int i;
-	
-	for (i = 0; photo_pairs[i].str; i++)
-	  if (has (o, photo_pairs[i].str))
-	    return photo_pairs[i].id;
-
-	g_warning ("? < No PhotoType for Photo property. Falling back to JPEG.");
-	return PHOTO_JPEG;
-}
-
-static CardProperty 
-get_CardProperty (VObject *o)
-{
-	VObjectIterator i;
-	CardProperty prop;
-
-	prop = card_prop_empty ();
-	prop.used = TRUE;
-	
-	initPropIterator (&i, o);
-	while (moreIteration (&i)) {
-		VObject *vo = nextVObject (&i);
-		const char *n = vObjectName (vo);
-		int propid;
-	
-		propid = card_lookup_name (n);
-		
-		switch (propid) {
-			
-		 case PROP_VALUE:
-		
-			if (has (vo, VCContentIDProp))
-			  prop.value = VAL_CID;
-			break;
-			
-		 case PROP_ENCODING:
-			if (has (vo, VCQuotedPrintableProp))
-			  prop.encod = ENC_QUOTED_PRINTABLE;
-			else if (has (vo, VC8bitProp))
-			  prop.encod = ENC_8BIT;
-			else if (has (vo, VCBase64Prop))
-			  prop.encod = ENC_BASE64;
-			break;
-			
-		 case PROP_QUOTED_PRINTABLE:
-			prop.encod = ENC_QUOTED_PRINTABLE;
-			break;
-			
-		 case PROP_8BIT:
-			prop.encod = ENC_8BIT;
-			break;
-			
-		 case PROP_BASE64:
-			prop.encod = ENC_BASE64;
-			break;
-	
-		 case PROP_LANG:
-			if (vObjectValueType (vo)) {
-				prop.lang = 
-				  g_strdup (vObjectStringZValue (vo));
-			} else
-			  g_warning ("? < No value for LANG attribute.");
-			break;
-			
-		 case PROP_CHARSET:
-			if (vObjectValueType (vo)) {
-				prop.charset = 
-				  g_strdup (vObjectStringZValue (vo));
-				g_warning (prop.charset); 
-			} else
-			  g_warning ("? < No value for CHARSET attribute.");
-			break;
-		 default:
-				{
-					CardXAttribute *c;
-
-					c = malloc (sizeof (CardXAttribute));
-					c->name = g_strdup (n);
-					
-					if (vObjectValueType (vo))
-					  c->data = 
-					  g_strdup (vObjectStringZValue (vo));
-					else
-					  c->data = NULL;
-					
-					prop.xtension = 
-					  g_list_append (prop.xtension, c);
-				}
-		}
-	}
-
-	return prop;
-}
-
-static gboolean
-e_card_prop_has (VObject    *o,
-		 const char *id)
-{
-	g_assert (o  != NULL);
-	g_assert (id != NULL);
-
-	if (isAPropertyOf (o, id) == NULL)
-		return FALSE;
-
-	return TRUE;
-}
-
-static const char *
-e_card_prop_get_str (VObject    *o,
-		     const char *id)
-{
-	VObject *strobj;
-
-	g_assert (o  != NULL);
-	g_assert (id != NULL);
-
-	strobj = isAPropertyOf (o, id);
-
-	if (strobj == NULL)
-		return g_strdup ("");
-
-	if (vObjectValueType (strobj) != NULL) {
-		char *str;
-		char *g_str;
-
-		str = fakeCString (vObjectStringZValue (strobj));
-		g_str = g_strdup (str);
-		free (str);
-
-		return g_str;
-	}
-
-	return g_strdup ("");
-}
-
-static ECardName *
-e_card_get_name (VObject *o)
-{
-	CardName *name;
-	VObject *vo;
-	char *the_str;
-
-	name = g_new0 (ECardName, 1);
-
-	name->family     = e_card_prop_get_substr (o, VCFamilyNameProp);
-	name->given      = e_card_prop_get_substr (o, VCGivenNameProp);
-	name->additional = e_card_prop_get_substr (o, VCAdditionalNamesProp);
-	name->prefix     = e_card_prop_get_substr (o, VCNamePrefixesProp);
-	name->suffix     = e_card_prop_get_substr (o, VCNameSuffixesProp);
-
-	return name;
-}
-
-static CardDelLabel *
-get_CardDelLabel (VObject *o)
-{
-	CardDelLabel *dellabel;
-	char *the_str;
-	
-	dellabel = malloc (sizeof (CardDelLabel));
-	
-	dellabel->type = get_addr_type (o);
-	dellabel->data = g_strdup (str_val (o));
-	
-	free (the_str);
-	return dellabel;
-}
-
-static CardPhone *
-get_CardPhone (VObject *o)
-{
-	CardPhone *ret;
-	char *the_str;
-	
-	ret = malloc (sizeof (CardPhone));
-	ret->type = get_phone_type (o);
-	ret->data = g_strdup (str_val (o));
-	
-	free (the_str);
-
-	return ret;
-}
-
-static CardEMail *
-get_CardEMail (VObject *o)
-{
-	CardEMail *ret;
-	char *the_str; 
-	
-	ret = malloc (sizeof (CardEMail)); 
-	ret->type = get_email_type (o);
-	ret->data = g_strdup (str_val (o));
-	
-	free (the_str);
-	
-	return ret;
-}
-	
-static CardTimeZone 
-strtoCardTimeZone (char *str)
-{
-	char s[3];
-	CardTimeZone tz;
-	
-	if (*str == '-') {
-		tz.sign = -1;
-		str++;
-	} else
-	  tz.sign = 1;
-	
-	tz.hours = 0;
-	tz.mins = 0;
-	
-	s[2] = 0;
-	if (strlen (str) > 2) {
-		s[0] = str[0];
-		s[1] = str[1];
-		tz.hours = atoi (s);
-	} else {
-		g_warning ("? < TimeZone value is too short.");
-		return tz;
-	}
-	
-	str += 2;
-	if (*str == ':')
-	  str++;
-	
-	if (strlen (str) >= 2) {
-		s[0] = str[0];
-		s[1] = str[1];
-		tz.mins = atoi (s);
-	} else {
-		g_warning ("? < TimeZone value is too short.");
-		return tz;
-	}
-	
-	if (strlen (str) > 3)
-		g_warning ("? < TimeZone value is too long.");
-
-	return tz;
-}
-
-static CardGeoPos 
-strtoCardGeoPos (char *str)
-{
-	CardGeoPos gp;
-	char *s;
-	
-	gp.lon = 0;
-	gp.lat = 0;
-	  
-	s = strchr (str, ',');
-	
-	if (! s) {
-		g_warning ("? < Bad format for GeoPos property.");
-		return gp;
-	}
-	
-	*s = 0;
-	s++;
-	
-	gp.lon = atof (str);
-	gp.lat = atof (s);
-	
-	return gp;
-}
-	
-static CardOrg *
-e_card_vobject_to_org (VObject *o)
-{
-	VObject *vo;
-	char *the_str;
-	CardOrg *org;
-
-	org = g_new0 (CardOrg, 1);
-
-	if (has (o, VCOrgNameProp)) {
-		org.name = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnitProp)) {
-		org.unit1 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnit2Prop)) {
-		org.unit2 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnit3Prop)) {
-		org.unit3 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	if (has (o, VCOrgUnit4Prop)) {
-		org.unit4 = g_strdup (str_val (vo));
-		free (the_str);
-	}
-	
-	return org;
-}
-
-static CardXProperty *
-get_XProp (VObject *o)
-{
-	char *the_str;
-	CardXProperty *ret;
-	
-	ret = malloc (sizeof (CardXProperty)); 
-	ret->name = g_strdup (vObjectName (o));
-	ret->data = g_strdup (str_val (o));
-	free (the_str);
-	
-	return ret;
-}
-
-static CardRev 
-strtoCardRev (char *str)
-{
-	char s[3], *t, *ss;
-	int len, i;
-	CardRev rev;
-	
-	rev.utc = 0;
-	len = strlen (str);
-	
-	if (str[len] == 'Z') {              /* Is it UTC? */
-		rev.utc = 1;
-		str[len] = 0;
-	}
-	  
-	s[2] = 0;
-	t = strchr (str, 'T');
-	if (t) {                            /* Take the Time */
-		*t = 0;
-		t++;
-		if (strlen (t) > 2) {
-			s[0] = t[0];
-			s[1] = t[1];
-			rev.tm.tm_hour = atoi (s);
-		} else {
-			g_warning ("? < Rev value is too short.");
-			return rev;
-		}
-		
-		t += 2;
-		if (*t == ':')             /* Ignore ':' separator */
-		  t++;
-		
-		if (strlen (t) > 2) {
-			s[0] = t[0];
-			s[1] = t[1];
-			rev.tm.tm_min = atoi (s);
-		} else {
-			g_warning ("? < Rev value is too short.");
-			return rev;
-		}
-		
-		t += 2;
-		if (*t == ':')
-		  t++;
-		
-		if (strlen (t) > 2) {
-			s[0] = t[0];
-			s[1] = t[1];
-			rev.tm.tm_sec = atoi (s);
-		} else {
-			g_warning ("? < Rev value is too short.");
-			return rev;
-		}
-
-		if (strlen (str) > 3)
-		  g_warning ("? < Rev value is too long.");
-		
-	} else {
-		g_warning ("? < No time value for Rev property.");
-	}
-
-	/* Now the date (the part before the T) */
-	
-	if (strchr (str, '-')) {                        /* extended iso 8601 */
-		for (ss = strtok (str, "-"), i = 0; ss;
-		     ss = strtok (NULL, "-"), i++)
-		  switch (i) {
-		   case 0:
-			  rev.tm.tm_year = atoi (ss);
-			  break;
-		   case 1:
-			  rev.tm.tm_mon = atoi (ss);
-			  break;
-		   case 2:
-			  rev.tm.tm_mday = atoi (ss);
-			  break;
-		   default:
-			  g_warning ("? < Too many values for Rev property.");
-		  }
-		
-		if (i < 2)
-		  g_warning ("? < Too few values for Rev property.");
-	} else {
-		if (strlen (str) >= 8) {             /* short representation */
-			rev.tm.tm_mday = atoi (str + 6);
-			str[6] = 0;
-			rev.tm.tm_mon = atoi (str + 4);
-			str[4] = 0;
-			rev.tm.tm_year = atoi (str);
-		} else
-		  g_warning ("? < Bad format for Rev property.");
-	}
-	
-	return rev;
-}
-		
-static enum KeyType 
-get_key_type (VObject *o)
-{
-	VObject *vo;
-	int i;
-	
-	for (i = 0; key_pairs[i].str; i++)
-	  if (has (o, key_pairs[i].str))
-	    return key_pairs[i].id;
-
-	g_warning ("? < No KeyType for Key property. Falling back to PGP.");
-	return KEY_PGP;
-}
-
-static CardPhoto 
-get_CardPhoto (VObject *o)
-{
-	VObject *vo;
-	char *the_str;
-	CardPhoto photo;
-
-	photo.type = get_photo_type (o);
-	
-	if (has (o, VCDataSizeProp)) {
-		photo.size = vObjectIntegerValue (vo);
-		photo.data = malloc (photo.size);
-		memcpy (photo.data, vObjectAnyValue (o), photo.size);
-	} else {
-		photo.size = strlen (str_val (o)) + 1;
-		photo.data = g_strdup (the_str);
-		free (the_str);
-	}
-	
-	return photo;
-}
-
-static enum SoundType 
-get_sound_type (VObject *o)
-{
-	VObject *vo;
-	int i;
-	
-	for (i = 0; sound_pairs[i].str; i++)
-	  if (has (o, sound_pairs[i].str))
-	    return sound_pairs[i].id;
-
-	return SOUND_PHONETIC;
-}
-	
-static CardSound 
-get_CardSound (VObject *o)
-{
-	VObject *vo;
-	char *the_str;
-	CardSound sound;
-
-	sound.type = get_sound_type (o);
-	
-	if (has (o, VCDataSizeProp)) {
-		sound.size = vObjectIntegerValue (vo);
-		sound.data = malloc (sound.size);
-		memcpy (sound.data, vObjectAnyValue (o), sound.size);
-	} else {
-		sound.size = strlen (str_val (o));
-		sound.data = g_strdup (the_str);
-		free (the_str);
-	}
-	
-	return sound;
-}
-
-/* Loads our card contents from a VObject */
-static ECard *
-e_card_construct_from_vobject (ECard   *card,
-			       VObject *vcrd)
-{
-	VObjectIterator i;
-	Card *crd;
-	char *the_str;
-
-	initPropIterator (&i, vcrd);
-	crd = card_new ();
-
-	while (moreIteration (&i)) {
-		VObject *o = nextVObject (&i);
-		const char *n = vObjectName (o);
-		int propid;
-		CardProperty *prop = NULL;
-
-		propid = card_lookup_name (n);
-		
-		switch (propid) {
-		case PROP_FNAME:
-			prop = &crd->fname.prop;
-			crd->fname.str = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_NAME:
-			prop = &crd->name.prop;
-			crd->name = e_card_get_name (o);
-			break;
-		 case PROP_PHOTO:
-			prop = &crd->photo.prop;
-			crd->photo = get_CardPhoto (o);
-			break;
-		 case PROP_BDAY:
-			prop = &crd->bday.prop;
-			crd->bday = strtoCardBDay (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_DELADDR:
-				{
-					CardDelAddr *c;
-					c = get_CardDelAddr (o);
-					prop = &c->prop;
-					crd->deladdr.l = g_list_append (crd->deladdr.l, c);
-				}
-			break;
-		 case PROP_DELLABEL:
-				{
-					CardDelLabel *c;
-					c = get_CardDelLabel (o);
-					prop = &c->prop;
-					crd->dellabel.l = g_list_append (crd->dellabel.l, c);
-				}
-			break;
-		 case PROP_PHONE:
-				{
-					CardPhone *c;
-					
-					c = get_CardPhone (o);
-					prop = &c->prop;
-					crd->phone.l = g_list_append (crd->phone.l, c);
-				}
-			break;
-		 case PROP_EMAIL:
-				{
-					CardEMail *c;
-					
-					c = get_CardEMail (o);
-					prop = &c->prop;
-					crd->email.l = g_list_append (crd->email.l, c);
-				}
-			break;
-		 case PROP_MAILER:
-			prop = &crd->mailer.prop;
-			crd->mailer.str = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_TIMEZN:
-			prop = &crd->timezn.prop;
-			crd->timezn = strtoCardTimeZone (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_GEOPOS:
-			prop = &crd->geopos.prop;
-			crd->geopos = strtoCardGeoPos (str_val (o));
-			break;
-		 case PROP_ROLE:
-			prop = &crd->role.prop;
-			crd->role.str = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_LOGO:
-			prop = &crd->logo.prop;
-			crd->logo = get_CardPhoto (o);
-			break;
-		 case PROP_AGENT:
-			crd->agent = card_create_from_vobject (o);
-			break;
-		 case PROP_ORG:
-			prop = &crd->org.prop;
-			crd->org = get_CardOrg (o);
-			break;
-		 case PROP_CATEGORIES:
-			prop = &crd->categories.prop;
-			crd->categories.str = g_strdup (str_val (o));
-			crd->categories.prop.encod = ENC_QUOTED_PRINTABLE;
-			free (the_str);
-			break;
-		 case PROP_COMMENT:
-			prop = &crd->comment.prop;
-			crd->comment.str = g_strdup (str_val (o));
-			crd->comment.prop.encod = ENC_QUOTED_PRINTABLE;
-			free (the_str);
-			break;
-		 case PROP_REV:
-			prop = &crd->rev.prop;
-			crd->rev = strtoCardRev (str_val (o));
-			free (the_str);
-			break;
-		 case PROP_SOUND:
-			prop = &crd->sound.prop;
-			crd->sound = get_CardSound (o);
-			break;
-		 case PROP_VERSION:
-				{
-					char *str;
-					str = str_val (o);
-					if (strcmp (str, "2.1"))
-					  g_warning ("? < Version doesn't match.");
-					free (the_str);
-				}
-			break;
-		 case PROP_KEY:
-			prop = &crd->key.prop;
-			crd->key.type = get_key_type (o);
-			crd->key.data = g_strdup (str_val (o));
-			free (the_str);
-			break;
-		 default:
-				{
-					CardXProperty *c;
-				
-					c = get_XProp (o);
-					prop = &c->prop;
-					crd->xtension.l = g_list_append (crd->xtension.l, c);
-				}
-			break;
-		}
-		
-		if (prop) {
-			*prop = get_CardProperty (o);
-			prop->type = propid;
-		}
-	}
-	
-	return crd;
-}
-		
-/* Loads a card from a file */
-GList *
-card_load (GList *crdlist, char *fname)
-{
-	VObject *vobj, *tmp;
-	
-	vobj = Parse_MIME_FromFileName (fname);
-	if (!vobj) {
-		g_warning ("Could not load the cardfile");
-		return NULL;
-	}
-
-	while (vobj) {
-		const char *n = vObjectName (vobj);
-		
-		if (strcmp (n, VCCardProp) == 0) {
-			crdlist = g_list_append (crdlist, (gpointer)
-					    card_create_from_vobject (vobj));
-		}
-		tmp = vobj;
-		vobj = nextVObjectInList (vobj);
-		cleanVObject (tmp);
-	}
-
-	cleanVObject (vobj);
-	cleanStrTbl ();
-	return crdlist;
-}
-
-static VObject *
-add_strProp (VObject *o, const char *id, char *val)
-{
-	VObject *vo = NULL;
-	
-	if (val)
-	  vo = addPropValue (o, id, val);
-
-	return vo;
-}
-
-static VObject *
-add_CardProperty (VObject *o, CardProperty *prop)
-{
-	GList *node;
-	
-	switch (prop->encod) {
-	 case ENC_BASE64:
-		addProp (o, VCBase64Prop);
-		break;
-	 case ENC_QUOTED_PRINTABLE:
-		addProp (o, VCQuotedPrintableProp);
-		break;
-	 case ENC_8BIT:
-		addProp (o, VC8bitProp);
-		break;
-	 case ENC_7BIT:
-		/* Do nothing: 7BIT is the default. Avoids file clutter. */
-		break;
-	 default:
-		g_warning ("? < Card had invalid encoding type.");
-	}
-	
-	switch (prop->value) {
-	 case VAL_CID:
-		addProp (o, VCContentIDProp);
-		break;
-	 case VAL_INLINE:
-		/* Do nothing: INLINE is the default. Avoids file clutter. */
-		break;
-	 default:
-		g_warning ("? < Card had invalid value type.");
-	}
-	
-	for (node = prop->xtension; node; node = node->next) {
-		CardXAttribute *xa = (CardXAttribute *) node->data;
-		if (xa->data)
-		  addPropValue (o, xa->name, xa->data);
-		else
-		  addProp (o, xa->name);
-	}
-
-	add_strProp (o, VCCharSetProp, prop->charset);
-	add_strProp (o, VCLanguageProp, prop->lang);
-	
-	return o;
-}
-
-static VObject *
-add_CardStrProperty (VObject *vobj, const char *id, CardStrProperty *strprop)
-{
-	VObject *vprop;
-	
-	if (strprop->prop.used) {
-		vprop = add_strProp (vobj, id, strprop->str);
-		add_CardProperty (vprop, &strprop->prop);
-	}
-	
-	return vobj;
-}
-
-static VObject *
-add_PhotoType (VObject *o, enum PhotoType photo_type)
-{
-	int i;
-	
-	for (i = 0; photo_pairs[i].str; i++)
-	  if (photo_type == photo_pairs[i].id) {
-		  addProp (o, photo_pairs[i].str);
-		  return o;
-	  }
-
-	g_warning ("? > No PhotoType for Photo property. Falling back to JPEG.");
-	addProp (o, VCJPEGProp);
-	
-	return o;
-}
-
-static VObject *
-add_AddrType (VObject *o, int addr_type)
-{
-	int i;
-	
-	for (i = 0; addr_pairs[i].str; i++)
-	  if (addr_type & addr_pairs[i].id)
-	    addProp (o, addr_pairs[i].str);
-	
-	return o;
-}
-
-static void
-add_strAddrType (GString *string, int addr_type)
-{
-	int i, first = 1;
-	char *str;
-	
-	if (addr_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; addr_pairs[i].str; i++)
-		  if (addr_type & addr_pairs[i].id) {
-			  if (!first)
-			    g_string_append (string, ", ");
-			  first = 0;
-			  str = my_cap (addr_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_PhoneType (VObject *o, int phone_type)
-{
-	int i;
-	
-	for (i = 0; phone_pairs[i].str; i++)
-	  if (phone_type & phone_pairs[i].id)
-	    addProp (o, phone_pairs[i].str);
-	
-	return o;
-}
-
-static void
-add_strPhoneType (GString *string, int phone_type)
-{
-	int i, first = 1;
-	char *str;
-	
-	if (phone_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; phone_pairs[i].str; i++)
-		  if (phone_type & phone_pairs[i].id) {
-			  if (!first)
-			    g_string_append (string, ", ");
-			  first = 0;
-			  str = my_cap (phone_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_EMailType (VObject *o, enum EMailType email_type)
-{
-	int i;
-	
-	for (i = 0; email_pairs[i].str; i++)
-	  if (email_type == email_pairs[i].id) {
-		  addProp (o, email_pairs[i].str);
-		  return o;
-	  }
-
-	g_warning ("? > No EMailType for EMail property. Falling back to INET.");
-	addProp (o, VCInternetProp);
-	
-	return o;
-}
-
-static void
-add_strEMailType (GString *string, int email_type)
-{
-	int i;
-	char *str;
-	
-	if (email_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; email_pairs[i].str; i++)
-		  if (email_type == email_pairs[i].id) {
-			  str = my_cap (email_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-			  break;
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_KeyType (VObject *o, enum KeyType key_type)
-{
-	int i;
-	
-	for (i = 0; key_pairs[i].str; i++)
-	  if (key_type == key_pairs[i].id) {
-		  addProp (o, key_pairs[i].str);
-		  return o;
-	  }
-
-	g_warning ("? > No KeyType for Key property. Falling back to PGP.");
-	addProp (o, VCPGPProp);
-	
-	return o;
-}
-
-static void
-add_strKeyType (GString *string, int key_type)
-{
-	int i;
-	char *str;
-	
-	if (key_type) {
-		g_string_append (string, " (");
-		
-		for (i = 0; key_pairs[i].str; i++)
-		  if (key_type == key_pairs[i].id) {
-			  str = my_cap (key_pairs[i].str);
-			  g_string_append (string, str);
-			  g_free (str);
-			  break;
-		  }
-		
-		g_string_append_c (string, ')');
-	}
-}
-
-static VObject *
-add_SoundType (VObject *o, enum SoundType sound_type)
-{
-	int i;
-	
-	for (i = 0; sound_pairs[i].str; i++)
-	  if (sound_type == sound_pairs[i].id) {
-		  addProp (o, sound_pairs[i].str);
-		  return o;
-	  }
-
-	return o;
-}
-
-char *card_timezn_str (CardTimeZone timezn)
-{
-	char *str;
-	
-	str = malloc (7);
-	snprintf (str, 7, (timezn.sign == -1)? "-%02d:%02d" : "%02d:%02d",
-		 timezn.hours, timezn.mins);
-	return str;
-}
-
-char *card_geopos_str (CardGeoPos geopos)
-{
-	char *str;
-	
-	str = malloc (15);
-	snprintf (str, 15, "%03.02f,%03.02f", geopos.lon, geopos.lat);
-	return str;
-}
-
-static void add_CardStrProperty_to_string (GString *string, char *prop_name,
-					   CardStrProperty *strprop)
-{
-	if (strprop->prop.used) {
-		if (prop_name)
-		  g_string_append (string, prop_name);
-		
-		g_string_append (string, strprop->str);
-	}
-}
-
-static void add_strProp_to_string (GString *string, char *prop_name, char *val)
-{
-	if (val) {
-		if (prop_name)
-		  g_string_append (string, prop_name);
-		
-		g_string_append (string, val);
-	}
-}
-
-static void addProp_to_string (GString *string, char *prop_name)
-{
-	if (prop_name)
-	  g_string_append (string, prop_name);
-}
-
-char *
-card_to_string (Card *crd)
-{
-	GString *string;
-	char *ret;
-	
-	string = g_string_new ("");
-	
-	add_CardStrProperty_to_string (string, _ ("Card: "), &crd->fname);
-	if (crd->name.prop.used) {
-		addProp_to_string (string, _ ("\nName: "));
-		add_strProp_to_string (string, _ ("\n  Prefix:     "), crd->name.prefix);
-		add_strProp_to_string (string, _ ("\n  Given:      "), crd->name.given);
-		add_strProp_to_string (string, _ ("\n  Additional: "), crd->name.additional);
-		add_strProp_to_string (string, _ ("\n  Family:     "), crd->name.family);
-		add_strProp_to_string (string, _ ("\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, _ ("\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, _ ("\nAddress:"));
-				add_strAddrType (string, deladdr->type);
-				add_strProp_to_string (string, _ ("\n  Postal Box:  "), deladdr->po);
-				add_strProp_to_string (string, _ ("\n  Ext:         "),deladdr->ext);
-				add_strProp_to_string (string, _ ("\n  Street:      "),deladdr->street);
-				add_strProp_to_string (string, _ ("\n  City:        "), deladdr->city);
-				add_strProp_to_string (string, _ ("\n  Region:      "), deladdr->region);
-				add_strProp_to_string (string, _ ("\n  Postal Code: "), deladdr->code);
-				add_strProp_to_string (string, _ ("\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, _ ("\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, _ ("\nTelephones:\n"));
-		} else {
-			sep = " ";
-			g_string_append (string, _ ("\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, _ ("\nE-mail:\n"));
-		} else {
-			sep = " ";
-			g_string_append (string, _ ("\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, _ ("\nMailer: "), &crd->mailer);
-	
-	if (crd->timezn.prop.used) {
-		char *str;
-		
-		str = card_timezn_str (crd->timezn);
-		add_strProp_to_string (string, _ ("\nTime Zone: "), str);
-		free (str);
-	}
-	
-	if (crd->geopos.prop.used) {
-		char *str;
-		
-		str = card_geopos_str (crd->geopos);
-		add_strProp_to_string (string, _ ("\nGeo Location: "), str);
-		free (str);
-	}
-	
-        add_CardStrProperty_to_string (string, _ ("\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, _ ("\nOrg: "));
-		add_strProp_to_string (string, _ ("\n  Name:  "), crd->org.name);
-		add_strProp_to_string (string, _ ("\n  Unit:  "), crd->org.unit1);
-		add_strProp_to_string (string, _ ("\n  Unit2: "), crd->org.unit2);
-		add_strProp_to_string (string, _ ("\n  Unit3: "), crd->org.unit3);
-		add_strProp_to_string (string, _ ("\n  Unit4: "), crd->org.unit4);
-		g_string_append_c (string, '\n');
-	}
-	
-        add_CardStrProperty_to_string (string, _ ("\nCategories: "), &crd->categories);
-        add_CardStrProperty_to_string (string, _ ("\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, _ ("\nUnique String: "), &crd->uid);
-	
-	if (crd->key.prop.used) {
-		add_strProp_to_string (string, _ ("\nPublic Key: "), crd->key.data);
-		add_strKeyType (string, crd->key.type);
-	}
-	
-	ret = g_strdup (string->str);
-	g_string_free (string, TRUE);
-	
-	return ret;
-}
-#endif
-
-static ECardDate
-e_card_date_from_string (char *str)
-{
-	ECardDate date;
-	int length;
-
-	date.year = 0;
-	date.month = 0;
-	date.day = 0;
-
-	length = strlen(str);
-	
-	if (length == 10 ) {
-		date.year = str[0] * 1000 + str[1] * 100 + str[2] * 10 + str[3] - '0' * 1111;
-		date.month = str[5] * 10 + str[6] - '0' * 11;
-		date.day = str[8] * 10 + str[9] - '0' * 11;
-	} else if ( length == 8 ) {
-		date.year = str[0] * 1000 + str[1] * 100 + str[2] * 10 + str[3] - '0' * 1111;
-		date.month = str[4] * 10 + str[5] - '0' * 11;
-		date.day = str[6] * 10 + str[7] - '0' * 11;
-	}
-	
-	return date;
-}
-
-char *
-e_v_object_get_child_value(VObject *vobj, char *name)
-{
-	char *ret_val;
-	VObjectIterator iterator;
-	initPropIterator(&iterator, vobj);
-	while(moreIteration (&iterator)) {
-		VObject *attribute = nextVObject(&iterator);
-		const char *id = vObjectName(attribute);
-		if ( ! strcmp(id, name) ) {
-			assign_string(attribute, &ret_val);
-			return ret_val;
-		}
-	}
-	ret_val = g_new(char, 1);
-	*ret_val = 0;
-	return ret_val;
-}
-
-static ECardPhoneFlags
-get_phone_flags (VObject *vobj)
-{
-	ECardPhoneFlags ret = 0;
-	int i;
-
-	struct { 
-		char *id;
-		ECardPhoneFlags flag;
-	} phone_pairs[] = {
-		{ VCPreferredProp, E_CARD_PHONE_PREF },
-		{ VCWorkProp,      E_CARD_PHONE_WORK },
-		{ VCHomeProp,      E_CARD_PHONE_HOME },
-		{ VCVoiceProp,     E_CARD_PHONE_VOICE },
-		{ VCFaxProp,       E_CARD_PHONE_FAX },
-		{ VCMessageProp,   E_CARD_PHONE_MSG },
-		{ VCCellularProp,  E_CARD_PHONE_CELL },
-		{ VCPagerProp,     E_CARD_PHONE_PAGER },
-		{ VCBBSProp,       E_CARD_PHONE_BBS },
-		{ VCModemProp,     E_CARD_PHONE_MODEM },
-		{ VCCarProp,       E_CARD_PHONE_CAR },
-		{ VCISDNProp,      E_CARD_PHONE_ISDN },
-		{ VCVideoProp,     E_CARD_PHONE_VIDEO },
-	};
-	
-	for (i = 0; i < sizeof(phone_pairs) / sizeof(phone_pairs[0]); i++) {
-		if (isAPropertyOf (vobj, phone_pairs[i].id)) {
-			ret |= phone_pairs[i].flag;
-		}
-	}
-	
-	return ret;
-}
-
-static void
-set_phone_flags (VObject *vobj, ECardPhoneFlags flags)
-{
-	int i;
-
-	struct { 
-		char *id;
-		ECardPhoneFlags flag;
-	} phone_pairs[] = {
-		{ VCPreferredProp, E_CARD_PHONE_PREF },
-		{ VCWorkProp,      E_CARD_PHONE_WORK },
-		{ VCHomeProp,      E_CARD_PHONE_HOME },
-		{ VCVoiceProp,     E_CARD_PHONE_VOICE },
-		{ VCFaxProp,       E_CARD_PHONE_FAX },
-		{ VCMessageProp,   E_CARD_PHONE_MSG },
-		{ VCCellularProp,  E_CARD_PHONE_CELL },
-		{ VCPagerProp,     E_CARD_PHONE_PAGER },
-		{ VCBBSProp,       E_CARD_PHONE_BBS },
-		{ VCModemProp,     E_CARD_PHONE_MODEM },
-		{ VCCarProp,       E_CARD_PHONE_CAR },
-		{ VCISDNProp,      E_CARD_PHONE_ISDN },
-		{ VCVideoProp,     E_CARD_PHONE_VIDEO },
-	};
-	
-	for (i = 0; i < sizeof(phone_pairs) / sizeof(phone_pairs[0]); i++) {
-		if (flags & phone_pairs[i].flag) {
-				addProp (vobj, phone_pairs[i].id);
-		}
-	}
-}
-
-static ECardAddressFlags
-get_address_flags (VObject *vobj)
-{
-	ECardAddressFlags ret = 0;
-	int i;
-
-	struct { 
-		char *id;
-		ECardAddressFlags flag;
-	} addr_pairs[] = {
-		{ VCDomesticProp, E_CARD_ADDR_DOM },
-		{ VCInternationalProp, E_CARD_ADDR_INTL },
-		{ VCPostalProp, E_CARD_ADDR_POSTAL },
-		{ VCParcelProp, E_CARD_ADDR_PARCEL },
-		{ VCHomeProp, E_CARD_ADDR_HOME },
-		{ VCWorkProp, E_CARD_ADDR_WORK },
-	};
-	
-	for (i = 0; i < sizeof(addr_pairs) / sizeof(addr_pairs[0]); i++) {
-		if (isAPropertyOf (vobj, addr_pairs[i].id)) {
-			ret |= addr_pairs[i].flag;
-		}
-	}
-	
-	return ret;
-}
-
-static void
-set_address_flags (VObject *vobj, ECardAddressFlags flags)
-{
-	int i;
-
-	struct { 
-		char *id;
-		ECardAddressFlags flag;
-	} addr_pairs[] = {
-		{ VCDomesticProp, E_CARD_ADDR_DOM },
-		{ VCInternationalProp, E_CARD_ADDR_INTL },
-		{ VCPostalProp, E_CARD_ADDR_POSTAL },
-		{ VCParcelProp, E_CARD_ADDR_PARCEL },
-		{ VCHomeProp, E_CARD_ADDR_HOME },
-		{ VCWorkProp, E_CARD_ADDR_WORK },
-	};
-	
-	for (i = 0; i < sizeof(addr_pairs) / sizeof(addr_pairs[0]); i++) {
-		if (flags & addr_pairs[i].flag) {
-			addProp (vobj, addr_pairs[i].id);
-		}
-	}
-}
diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h
deleted file mode 100644
index bad7b3068b..0000000000
--- a/addressbook/backend/ebook/e-card.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *   Arturo Espinosa
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Copyright (C) 1999 The Free Software Foundation
- */
-
-#ifndef __E_CARD_H__
-#define __E_CARD_H__
-
-#include <time.h>
-#include <gtk/gtk.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 _ECard {
-	GtkObject object;
-	char *id;
-
-	char            *file_as;       /* The File As field.               */
-	char            *fname;         /* The full name.                   */
-	ECardName       *name;          /* The structured name.             */
-	EList       *address;  	/* Delivery addresses (ECardDeliveryAddress *) */
-	EList       *address_label; /* Delivery address labels
-					 * (ECardAddrLabel *)               */
-
-	EList       *phone;         /* Phone numbers (ECardPhone *)     */
-	EList       *email;         /* Email addresses (char *)         */
-	char            *url;	        /* The person's web page.           */
-
-	ECardDate       *bday;	        /* The person's birthday.           */
-
-	char            *note;
-
-
-	char            *org;           /* The person's organization.       */
-	char            *org_unit;      /* The person's organization unit.  */
-	char            *office;        /* The person's office.             */
-	char            *role;          /* The person's role w/in his org   */
-	char            *title;	        /* The person's title w/in his org  */
-
-	char            *manager;
-	char            *assistant;
-
-	char            *nickname;      /* The person's nickname            */
-	
-	char            *spouse;        /* The person's spouse.             */
-	ECardDate       *anniversary;   /* The person's anniversary.        */
-
-	char            *mailer;        /* Mailer                           */
-
-	char            *fburl;         /* Free Busy URL                    */
-
-	gint             timezone;      /* number of minutes from UTC as an int */
-
-	EList       *categories;    /* Categories.                      */
-
-	EList       *arbitrary;     /* Arbitrary fields.                */
-
-	guint32         wants_html : 1; /* Wants html mail. */
-	guint32         wants_html_set : 1; /* Wants html mail. */
-
-	guint32         pilot_id;       /* id of the corresponding pilot */
-	guint32         pilot_status;   /* status information */
-#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.       */
-	
-
-	char            *categories;    /* A list of the categories to which
-					   this card belongs.               */
-	
-	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;
-};
-
-
-ECard         *e_card_new       (      char  *vcard);
-char          *e_card_get_id    (      ECard *card);
-void           e_card_set_id    (      ECard *card,
-				 const char  *character);
-char          *e_card_get_vcard (      ECard *card);
-ECard         *e_card_duplicate (      ECard *card);
-
-ECardPhone *e_card_phone_new  (void);
-ECardPhone *e_card_phone_copy (const ECardPhone *phone);
-void        e_card_phone_free (      ECardPhone *phone);
-
-ECardDeliveryAddress *e_card_delivery_address_new         (void);
-ECardDeliveryAddress *e_card_delivery_address_copy        (const ECardDeliveryAddress *addr);
-void                  e_card_delivery_address_free        (      ECardDeliveryAddress *addr);
-gboolean              e_card_delivery_address_is_empty    (const ECardDeliveryAddress *addr);
-char                 *e_card_delivery_address_to_string   (const ECardDeliveryAddress *addr);
-ECardDeliveryAddress *e_card_delivery_address_from_label  (const ECardAddrLabel *label);
-ECardAddrLabel       *e_card_delivery_address_to_label    (const ECardDeliveryAddress *addr);
-
-ECardAddrLabel *e_card_address_label_new  (void);
-ECardAddrLabel *e_card_address_label_copy (const ECardAddrLabel *addr);
-void            e_card_address_label_free (      ECardAddrLabel *addr);
-
-ECardName *e_card_name_new         (void);
-ECardName *e_card_name_copy        (const ECardName *name);
-void       e_card_name_free        (      ECardName *name);
-char      *e_card_name_to_string   (const ECardName *name);
-ECardName *e_card_name_from_string (const char      *full_name);
-
-ECardArbitrary *e_card_arbitrary_new  (void);
-ECardArbitrary *e_card_arbitrary_copy (const ECardArbitrary *arbitrary);
-void            e_card_arbitrary_free (      ECardArbitrary *arbitrary);
-
-GList *e_card_load_cards_from_file(const char *filename);
-
-/* Standard Gtk function */
-GtkType        e_card_get_type (void);
-
-#endif /* ! __E_CARD_H__ */
diff --git a/addressbook/backend/ebook/load-gnomecard-addressbook.c b/addressbook/backend/ebook/load-gnomecard-addressbook.c
deleted file mode 100644
index 3295854b0a..0000000000
--- a/addressbook/backend/ebook/load-gnomecard-addressbook.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include <gnome.h>
-#include <stdio.h>
-
-#include <e-book.h>
-
-static CORBA_Environment ev;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-static void
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	ECard *card = E_CARD(closure);
-	char *vcard = e_card_get_vcard(card);
-	g_print ("Saved card: %s\n", vcard);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	GList *list = e_card_load_cards_from_file("gnomecard.vcf");
-	GList *iterator;
-	for (iterator = list; iterator; iterator = g_list_next(iterator)) {
-		ECard *card = iterator->data;
-		e_book_add_card(book, card, add_card_cb, card);
-	}
-	g_list_free(list);
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	gchar *path, *uri;
-	
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return FALSE;
-	}
-	
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	if (! e_book_load_uri (book, uri, book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-
-
-	return FALSE;
-}
-
-int
-main (int argc, char **argv)
-{
-
-	CORBA_exception_init (&ev);
-
-	gnome_init_with_popt_table("blah", "0.0", argc, argv, NULL, 0, NULL);
-	oaf_init (argc, argv);
-	init_bonobo (argc, argv);
-
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-	
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/load-pine-addressbook.c b/addressbook/backend/ebook/load-pine-addressbook.c
deleted file mode 100644
index 30fda41be4..0000000000
--- a/addressbook/backend/ebook/load-pine-addressbook.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include <gnome.h>
-#include <stdio.h>
-
-#include <e-book.h>
-#include <ctype.h>
-
-static CORBA_Environment ev;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-static void
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	ECard *card = E_CARD(closure);
-	char *vcard = e_card_get_vcard(card);
-	g_print ("Saved card: %s\n", vcard);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-parse_line (EBook *book, char *line)
-{
-	char **strings;
-	ECardName *name;
-	ECard *card;
-	EList *list;
-
-	card = e_card_new("");
-	strings = g_strsplit(line, "\t", 3);
-	if (strings[0] && strings[1] && strings[2]) {
-		name = e_card_name_from_string(strings[1]);
-		gtk_object_set(GTK_OBJECT(card),
-			       "nickname", strings[0],
-			       "full_name", strings[1],
-			       "name", name,
-			       NULL);
-		gtk_object_get(GTK_OBJECT(card),
-			       "email", &list,
-			       NULL);
-		e_list_append(list, strings[2]);
-		g_strfreev(strings);
-		e_book_add_card(book, card, add_card_cb, card);
-	}
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	FILE *fp = fopen (".addressbook", "r");
-	char line[2 * 1024];
-	int which = 0;
-	char *lastline = NULL;
-
-	if (!fp) {
-		g_warning ("Can't find .addressbook");
-		return;
-	}
-
-	while(fgets(line + which * 1024, 1024, fp)) {
-		int length;
-		char *thisline = line + which * 1024;
-		length = strlen(thisline);
-		if (thisline[length - 1] == '\n')
-			line[--length] = 0;
-		if (lastline && *thisline && isspace(*thisline)) {
-			char *temp;
-			while(*thisline && isspace(*thisline))
-				thisline ++;
-			temp = lastline;
-			lastline = g_strdup_printf("%s%s", lastline, thisline);
-			g_free(temp);
-			continue;
-		}
-		if (lastline) {
-			parse_line (book, lastline);
-			g_free(lastline);
-		}
-		lastline = g_strdup(thisline);
-	}
-
-	if (lastline) {
-		parse_line (book, lastline);
-		g_free(lastline);
-	}
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	gchar *path, *uri;
-	
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return FALSE;
-	}
-	
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	if (! e_book_load_uri (book, uri, book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-
-
-	return FALSE;
-}
-
-#if 0
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-#endif
-
-int
-main (int argc, char **argv)
-{
-
-	CORBA_exception_init (&ev);
-
-	gnome_init_with_popt_table("blah", "0.0", argc, argv, NULL, 0, NULL);
-	oaf_init (argc, argv);
-	init_bonobo (argc, argv);
-
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-	
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/test-card.c b/addressbook/backend/ebook/test-card.c
deleted file mode 100644
index a727dae7a3..0000000000
--- a/addressbook/backend/ebook/test-card.c
+++ /dev/null
@@ -1,194 +0,0 @@
-#include <gnome.h>
-#include "e-card.h"
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"ORG:Helix Code, 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@helixcode.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
-
-static char *
-read_file (char *name)
-{
-	int  len;
-	char buff[65536];
-	char line[1024];
-	FILE *f;
-
-	f = fopen (name, "r");
-	if (f == NULL)
-		g_error ("Unable to open %s!\n", name);
-
-	len  = 0;
-	while (fgets (line, sizeof (line), f) != NULL) {
-		strcpy (buff + len, line);
-		len += strlen (line);
-	}
-
-	fclose (f);
-
-	return g_strdup (buff);
-}
-
-
-
-int
-main (int argc, char **argv)
-{
-	char  *cardstr;
-	ECard *card;
-
-	/* Fields */
-	char *fname;
-	char *org;
-	char *org_unit;
-        char *title;
-	char *role;
-	char *nickname;
-	char *fburl;
-	ECardName *name;
-	EList *address;
-	EList *phone;
-	EList *email;
-	EIterator *iterator;
-	ECardDate *bday;
-
-	gnome_init ("TestCard", "0.0", argc, argv);
-
-	cardstr = NULL;
-	if (argc == 2)
-		cardstr = read_file (argv [1]);
-
-	if (cardstr == NULL)
-		cardstr = TEST_VCARD;
-#if 0
-	{
-	  int i;
-	  for ( i = 0; i < 100000; i++ ) {
-	    card = e_card_new (cardstr);
-	  
-	    gtk_object_unref (GTK_OBJECT (card));
-	  }
-	}
-#endif
-	card = e_card_new (cardstr);
-	gtk_object_get(GTK_OBJECT(card),
-		       "full_name",  &fname,
-		       "name",       &name,
-		       "address",    &address,
-		       "phone",      &phone,
-		       "email",      &email,
-		       "org",        &org,
-		       "org_unit",   &org_unit,
-		       "title",      &title,
-		       "role",       &role,
-		       "nickname",   &nickname,
-		       "fburl",      &fburl,
-		       "birth_date", &bday,
-		       NULL);
-	if ( fname ) {
-	  printf("Name : %s\n", fname);
-	  g_free(fname);
-	}
-	if ( name ) {
-	  printf("Full Name:\n");
-	  if ( name->prefix )
-	    printf("  prefix     : %s\n", name->prefix);
-	  if ( name->given )
-	    printf("  given      : %s\n", name->given);
-	  if ( name->additional )
-	    printf("  additional : %s\n", name->additional);
-	  if ( name->family )
-	    printf("  family     : %s\n", name->family);
-	  if ( name->suffix )
-	    printf("  suffix     : %s\n", name->suffix);
-	}
-	if ( org ) {
-	  printf("Company : %s\n", org);
-        }
-	if ( org_unit ) {
-	  printf("Department : %s\n", org_unit);
-        }
-	if ( title ) {
-	  printf("Title : %s\n", title);
-        }
-	if ( role ) {
-	  printf("Profession : %s\n", role);
-        }
-	if ( nickname ) {
-	  printf("Nickname : %s\n", nickname);
-        }
-	if ( fburl ) {
-	  printf("Free Busy URL : %s\n", fburl);
-        }
-	if ( bday ) {
-	  printf("BDay : %4d-%02d-%02d\n", bday->year, bday->month, bday->day);
-	}
-	if ( email ) {
-	  iterator = e_list_get_iterator(address);
-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-	    printf("Email : %s\n", (char *) e_iterator_get(iterator));
-	  }
-	  gtk_object_unref(GTK_OBJECT(iterator));
-	}
-	if ( phone ) {
-	  iterator = e_list_get_iterator(address);
-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-	    ECardPhone *e_card_phone = (ECardPhone *) e_iterator_get(iterator);
-	    printf("Phone ; %d : %s\n", e_card_phone->flags, e_card_phone->number);
-	  }
-	  gtk_object_unref(GTK_OBJECT(iterator));
-	}
-	if ( address ) {
-	  iterator = e_list_get_iterator(address);
-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-	    ECardDeliveryAddress *del_address = (ECardDeliveryAddress *) e_iterator_get(iterator);
-	    printf("Address ; %d:\n", del_address->flags);
-	    if ( del_address->po )
-	      printf("  Po      : %s\n", del_address->po);
-	    if ( del_address->ext )
-	      printf("  Ext     : %s\n", del_address->ext);
-	    if ( del_address->street )
-	      printf("  Street  : %s\n", del_address->street);
-	    if ( del_address->city )
-	      printf("  City    : %s\n", del_address->city);
-	    if ( del_address->region )
-	      printf("  Region  : %s\n", del_address->region);
-	    if ( del_address->code )
-	      printf("  Code    : %s\n", del_address->code);
-	    if ( del_address->country )
-	      printf("  Country : %s\n", del_address->country);
-	  }
-	  gtk_object_unref(GTK_OBJECT(iterator));
-	}
-	printf("%s", e_card_get_vcard(card));
-	gtk_object_unref (GTK_OBJECT (card));
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/test-client-list.c b/addressbook/backend/ebook/test-client-list.c
deleted file mode 100644
index 69422ba20e..0000000000
--- a/addressbook/backend/ebook/test-client-list.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <bonobo.h>
-#include <gnome.h>
-#include <liboaf/liboaf.h>
-
-#include "e-book.h"
-
-CORBA_Environment ev;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	gnome_init ("blah", "0.0", argc, argv);
-	oaf_init (argc, argv);
-
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-static void
-get_cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure)
-{
-	long length = e_card_cursor_get_length(cursor);
-	long i;
-	
-	printf ("Length: %d\n", (int) length);
-	for ( i = 0; i < length; i++ ) {
-		ECard *card = e_card_cursor_get_nth(cursor, i);
-		char *vcard = e_card_get_vcard(card);
-		printf("[%s]\n", vcard);
-		g_free(vcard);
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	printf ("Book opened.\n");
-	e_book_get_cursor(book, "", get_cursor_cb, NULL);
-}
-
-static guint
-ebook_create (void)
-{
-	EBook *book;
-	
-	book = e_book_new ();
-
-	if (! e_book_load_uri (book, "file:/tmp/test.db", book_open_cb, NULL)) {
-		printf ("error calling load_uri!\n");
-	}
-
-
-	return FALSE;
-}
-
-int
-main (int argc, char **argv)
-{
-
-	CORBA_exception_init (&ev);
-	init_bonobo (argc, argv);
-
-	gtk_idle_add ((GtkFunction) ebook_create, NULL);
-
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/backend/ebook/test-client.c b/addressbook/backend/ebook/test-client.c
deleted file mode 100644
index acbeedac41..0000000000
--- a/addressbook/backend/ebook/test-client.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#include <config.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include <gnome.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@helixcode.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"END:VCARD
-"                        \
-"
-"
-
-static CORBA_Environment ev;
-static char *cardstr;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-static void
-get_cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure)
-{
-	long length = e_card_cursor_get_length(cursor);
-	long i;
-
-	/* we just added a card, so the length should be >1 */
-	printf ("\n%s: %s(): Number of cards is %ld\n",
-		__FILE__, __FUNCTION__, length);
-	if (length < 1)
-		printf ("*** Why isn't this above zero?? ***\n\n");
-	
-	for ( i = 0; i < length; i++ ) {
-		ECard *card = e_card_cursor_get_nth(cursor, i);
-		char *vcard = e_card_get_vcard(card);
-		printf("Get all cards callback: [%s]\n", vcard);
-		g_free(vcard);
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-}
-
-static void
-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)
-{
-	char *vcard;
-	ECard *card;
-	GTimer *timer;
-
-	printf ("Status: %d\n", status);
-
-	printf ("Id: %s\n", id);
-
-	timer = g_timer_new ();
-	g_timer_start (timer);
-	card = e_book_get_card (book, id);
-	g_timer_stop (timer);
-
-	vcard = e_card_get_vcard(card);
-	printf ("%g\n", g_timer_elapsed (timer, NULL));
-	printf ("Card added: [%s]\n", vcard);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(card));
-
-	printf ("Getting cards..\n");
-	e_book_get_cursor(book, "", get_cursor_cb, NULL);
-	printf ("Done getting all cards.\n");	
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	e_book_add_vcard(book, cardstr, add_card_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 e520621858..0000000000
--- a/addressbook/backend/idl/addressbook.idl
+++ /dev/null
@@ -1,136 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-module Evolution {
-
-	typedef string CardId;
-	typedef string VCard;
-	typedef sequence<VCard> VCardList;
-
-	interface CardCursor : Bonobo::Unknown {
-		long   get_length ();
-		string get_nth    (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 signal_card_added (in VCardList cards);
-		void signal_card_removed (in CardId id);
-		void signal_card_changed (in VCardList cards);
-		void signal_sequence_complete ();
-		void signal_status_message (in string message);
-	};
-	
-	interface BookView : Bonobo::Unknown {
-	};
-
-	interface Book : Bonobo::Unknown {
-		/*
-		 * Fetching cards in the addresbook.
-		 */
-		VCard get_vcard (in CardId id);
-
-		/*
-		 * Permissions.  the first form is general write
-		 * permission (whether or not the user can add or
-		 * remove or modify any entry in the addressbook.)
-		 *
-		 * if can_write returns TRUE, can_write_card can still
-		 * return FALSE if the user doesn't have permission to
-		 * modify/remove that specific card.
-		 */
-		boolean can_write ();
-		boolean can_write_card (in CardId Id);
-
-		/*
-		 * Adding and deleting cards in the book.
-		 */
-		void create_card (in VCard vcard);
-		void remove_card (in CardId Id);
-	        
-		/*
-		 * Modifying cards in the addressbook.
-		 */
-		void modify_card (in VCard vcard);
-		
-		/*
-		 * These two functions return 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 get_cursor (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 get_book_view(in BookViewListener listener, in string query);
-
-		void check_connection ();
-
-		string get_static_capabilities ();
-
-		string get_name ();
-	};
-
-	interface BookListener : Bonobo::Unknown {
-
-		enum CallStatus {
-			Success,
-			RepositoryOffline,
-			PermissionDenied,
-			CardNotFound,
-			ProtocolNotSupported,
-			OtherError
-		};
-
-		void respond_create_card (in CallStatus status, in CardId Id);
-
-		void respond_remove_card (in CallStatus status);
-
-		void respond_modify_card (in CallStatus status);
-		
-		void report_open_book_progress (in string status_message, in short percent);
-
-		void respond_open_book (in CallStatus status, in Book book);
-
-		void respond_get_cursor (in CallStatus status, in CardCursor cursor);
-
-		void respond_get_view (in CallStatus status, in BookView view);
-
-		/**
-		 * report_connection_status:
-		 *
-		 * 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 report_connection_status (in boolean connected);
-	};
-
-	interface BookFactory : Bonobo::Unknown {
-		exception ProtocolNotSupported {};
-
-		void open_book (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 8f4f8a3731..0000000000
--- a/addressbook/backend/pas/Makefile.am
+++ /dev/null
@@ -1,52 +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) $(srcdir)/../idl/addressbook.idl $(idl_flags)
-
-INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
-	-DG_LOG_DOMAIN=\"wombat-pas\"			\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/addressbook/backend		\
-	-I$(top_builddir)/addressbook/backend		\
-        $(BONOBO_GNOME_CFLAGS)
-
-LDAP_BACKEND_SOURCES = pas-backend-ldap.c pas-backend-ldap.h
-
-if ENABLE_LDAP
-LDAP_BACKEND = $(LDAP_BACKEND_SOURCES)
-else
-LDAP_BACKEND = 
-endif
-
-noinst_LIBRARIES = libpas.a
-
-libpas_a_SOURCES =					\
-	$(CORBA_SOURCE)					\
-	pas-book-factory.c				\
-	pas-book-factory.h				\
-	pas-book-view.c					\
-	pas-book-view.h					\
-	pas-book.c					\
-	pas-book.h					\
-	pas-backend-file.c				\
-	pas-backend-file.h				\
-	$(LDAP_BACKEND)					\
-	pas-backend.c					\
-	pas-backend.h					\
-	pas-card-cursor.c				\
-	pas-card-cursor.h
-
-BUILT_SOURCES = $(CORBA_SOURCE)
-CLEANFILES   += $(BUILT_SOURCES)
-
-EXTRA_DIST = $(LDAP_BACKEND_SOURCES)
-\ No newline at end of file
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/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
deleted file mode 100644
index a54d32d424..0000000000
--- a/addressbook/backend/pas/pas-backend-file.c
+++ /dev/null
@@ -1,1286 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include "config.h"  
-#include <gtk/gtksignal.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-#ifdef HAVE_DB_185_H
-#include <db_185.h>
-#else
-#ifdef HAVE_DB1_DB_H
-#include <db1/db.h>
-#else
-#include <db.h>
-#endif
-#endif
-
-#include "pas-backend-file.h"
-#include "pas-book.h"
-#include "pas-card-cursor.h"
-#include <ebook/e-card-simple.h>
-#include <e-util/e-sexp.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
-
-#define PAS_BACKEND_FILE_VERSION_NAME "PAS-DB-VERSION"
-#define PAS_BACKEND_FILE_VERSION "0.1"
-
-static PASBackendClass *pas_backend_file_parent_class;
-typedef struct _PASBackendFileCursorPrivate PASBackendFileCursorPrivate;
-typedef struct _PASBackendFileBookView PASBackendFileBookView;
-typedef struct _PASBackendFileSearchContext PASBackendFileSearchContext;
-
-struct _PASBackendFilePrivate {
-	GList    *clients;
-	gboolean  loaded;
-	char     *uri;
-	DB       *file_db;
-	EList    *book_views;
-};
-
-struct _PASBackendFileCursorPrivate {
-	PASBackend *backend;
-	PASBook    *book;
-
-	GList      *elements;
-	guint32    num_elements;
-};
-
-struct _PASBackendFileBookView {
-	PASBookView                 *book_view;
-	gchar                       *search;
-	ESExp                       *search_sexp;
-	PASBackendFileSearchContext *search_context;
-};
-
-struct _PASBackendFileSearchContext {
-	ECardSimple *card;
-};
-
-static PASBackendFileBookView *
-pas_backend_file_book_view_copy(const PASBackendFileBookView *book_view, void *closure)
-{
-	PASBackendFileBookView *new_book_view;
-	new_book_view = g_new(PASBackendFileBookView, 1);
-	new_book_view->book_view = book_view->book_view;
-	new_book_view->search = g_strdup(book_view->search);
-	new_book_view->search_sexp = book_view->search_sexp;
-	if (new_book_view->search_sexp)
-		gtk_object_ref(GTK_OBJECT(new_book_view->search_sexp));
-	new_book_view->search_context = g_new(PASBackendFileSearchContext, 1);
-	new_book_view->search_context->card = book_view->search_context->card;
-	return new_book_view;
-}
-
-static void
-pas_backend_file_book_view_free(PASBackendFileBookView *book_view, void *closure)
-{
-	g_free(book_view->search);
-	if (book_view->search_sexp)
-		gtk_object_unref(GTK_OBJECT(book_view->search_sexp));
-	g_free(book_view->search_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;
-	Evolution_Book corba_book;
-	PASBackendFileCursorPrivate *cursor_data = (PASBackendFileCursorPrivate *) data;
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(cursor_data->book));
-
-	CORBA_exception_init(&ev);
-
-	Evolution_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)
-{
-	CORBA_Environment ev;
-	Evolution_Book    corba_book;
-	PASBook           *book = (PASBook *)data;
-	PASBackendFile    *bf;
-	EIterator         *iterator;
-
-	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);
-			break;
-		}
-	}
-	gtk_object_unref(GTK_OBJECT(iterator));
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	Evolution_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
-string_to_dbt(const char *str, DBT *dbt)
-{
-	dbt->data = (void*)str;
-	dbt->size = strlen (str) + 1;
-}
-
-static char *
-pas_backend_file_create_unique_id (char *vcard)
-{
-	/* use a 32 counter and the 32 bit timestamp to make an id.
-	   it's doubtful 2^32 id's will be created in a second, so we
-	   should be okay. */
-	static guint c = 0;
-	return g_strdup_printf ("pas-id-%08lX%08X", time(NULL), c++);
-}
-
-static gboolean
-compare_email (ECardSimple *card, const char *str,
-	       char *(*compare)(const char*, const char*))
-{
-	int i;
-
-	for (i = E_CARD_SIMPLE_EMAIL_ID_EMAIL; i < E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {
-		const char *email = e_card_simple_get_email (card, i);
-
-		if (email && compare(email, str))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-compare_phone (ECardSimple *card, const char *str,
-	       char *(*compare)(const char*, const char*))
-{
-	int i;
-
-	for (i = E_CARD_SIMPLE_PHONE_ID_ASSISTANT; i < E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {
-		const ECardPhone *phone = e_card_simple_get_phone (card, i);
-
-		if (phone && compare(phone->number, str))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-compare_address (ECardSimple *card, const char *str,
-		 char *(*compare)(const char*, const char*))
-{
-	g_warning("address searching not implemented\n");
-	return FALSE;
-}
-
-static 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
-	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 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"),
-	LIST_PROP ( "email", "email", compare_email ),
-	LIST_PROP ( "phone", "phone", compare_phone ),
-	LIST_PROP ( "address", "address", compare_address ),
-};
-static int num_prop_infos = sizeof(prop_info_table) / sizeof(prop_info_table[0]);
-
-static ESExpResult *
-entry_compare(PASBackendFileSearchContext *ctx, struct _ESExp *f,
-	      int argc, struct _ESExpResult **argv,
-	      char *(*compare)(const char*, const char*))
-{
-	ESExpResult *r;
-	int truth = FALSE;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname;
-		struct prop_info *info = NULL;
-		int i;
-		gboolean any_field;
-
-		propname = argv[0]->value.string;
-
-		any_field = !strcmp(propname, "x-evolution-any-field");
-		for (i = 0; i < num_prop_infos; i ++) {
-			if (any_field
-			    || !strcmp (prop_info_table[i].query_prop, propname)) {
-				info = &prop_info_table[i];
-				
-				if (info->prop_type == PROP_TYPE_NORMAL) {
-					char *prop = NULL;
-					/* searches where the query's property
-					   maps directly to an ecard property */
-					
-					prop = e_card_simple_get (ctx->card, info->field_id);
-
-					if (prop && compare(prop, argv[1]->value.string)) {
-						truth = TRUE;
-					}
-					if ((!prop) && compare("", argv[1]->value.string)) {
-						truth = TRUE;
-					}
-				}
-				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);
-				}
-
-				/* 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(ESEXP_RES_BOOL);
-	r->value.bool = truth;
-
-	return r;
-}
-
-static ESExpResult *
-func_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendFileSearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, (char *(*)(const char*, const char*)) e_utf8_strstrcase);
-}
-
-static char *
-is_helper (const char *s1, const char *s2)
-{
-	if (!strcmp(s1, s2))
-		return (char*)s1;
-	else
-		return NULL;
-}
-
-static ESExpResult *
-func_is(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendFileSearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, is_helper);
-}
-
-static char *
-endswith_helper (const char *s1, const char *s2)
-{
-	char *p;
-	if ((p = strstr(s1, s2))
-	    && (strlen(p) == strlen(s2)))
-		return p;
-	else
-		return NULL;
-}
-
-static ESExpResult *
-func_endswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendFileSearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, endswith_helper);
-}
-
-static char *
-beginswith_helper (const char *s1, const char *s2)
-{
-	char *p;
-	if ((p = strstr(s1, s2))
-	    && (p == s1))
-		return p;
-	else
-		return NULL;
-}
-
-static ESExpResult *
-func_beginswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	PASBackendFileSearchContext *ctx = data;
-
-	return entry_compare (ctx, f, argc, argv, beginswith_helper);
-}
-
-/* 'builtin' functions */
-static struct {
-	char *name;
-	ESExpFunc *func;
-	int type;		/* set to 1 if a function can perform shortcut evaluation, or
-				   doesn't execute everything, 0 otherwise */
-} symbols[] = {
-	{ "contains", func_contains, 0 },
-	{ "is", func_is, 0 },
-	{ "beginswith", func_beginswith, 0 },
-	{ "endswith", func_endswith, 0 },
-};
-
-static gboolean
-vcard_matches_search (const PASBackendFileBookView *view, char *vcard_string)
-{
-	ESExpResult *r;
-	gboolean retval;
-	ECard *card;
-
-	card = e_card_new (vcard_string);
-	view->search_context->card = e_card_simple_new (card);
-	gtk_object_unref(GTK_OBJECT(card));
-
-	/* if it's not a valid vcard why is it in our db? :) */
-	if (!view->search_context->card)
-		return FALSE;
-
-	r = e_sexp_eval(view->search_sexp);
-
-	retval = (r && r->type == ESEXP_RES_BOOL && r->value.bool);
-
-
-	gtk_object_unref(GTK_OBJECT(view->search_context->card));
-
-	e_sexp_result_free(r);
-
-	return retval;
-}
-
-static void
-pas_backend_file_search (PASBackendFile  	      *bf,
-			 PASBook         	      *book,
-			 const PASBackendFileBookView *cnstview)
-{
-	int     db_error = 0;
-	GList   *cards = NULL;
-	DB      *db = bf->priv->file_db;
-	DBT     id_dbt, vcard_dbt;
-	int i;
-	PASBackendFileBookView *view = (PASBackendFileBookView *)cnstview;
-
-	if (!bf->priv->loaded)
-		return;
-
-	if (view->search_sexp)
-		gtk_object_unref(GTK_OBJECT(view->search_sexp));
-	view->search_sexp = e_sexp_new();
-
-	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
-		if (symbols[i].type == 1) {
-			e_sexp_add_ifunction(view->search_sexp, 0, symbols[i].name,
-					     (ESExpIFunc *)symbols[i].func, view->search_context);
-		} else {
-			e_sexp_add_function(view->search_sexp, 0, symbols[i].name,
-					    symbols[i].func, view->search_context);
-		}
-	}
-
-	e_sexp_input_text(view->search_sexp, view->search, strlen(view->search));
-	e_sexp_parse(view->search_sexp);
-
-	db_error = db->seq(db, &id_dbt, &vcard_dbt, R_FIRST);
-
-	while (db_error == 0) {
-
-		/* don't include the version in the list of cards */
-		if (id_dbt.size != strlen(PAS_BACKEND_FILE_VERSION_NAME) + 1
-		    || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {
-			char *vcard_string = vcard_dbt.data;
-
-			/* check if the vcard matches the search sexp */
-			if (vcard_matches_search (view, vcard_string)) {
-				cards = g_list_append (cards, strdup(vcard_string));
-			}
-		}
-		
-		db_error = db->seq(db, &id_dbt, &vcard_dbt, R_NEXT);
-	}
-
-	if (db_error == -1) {
-		g_warning ("pas_backend_file_search: error building list\n");
-	}
-	else {
-		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 char *
-do_create(PASBackend *backend,
-	  char       *vcard_req,
-	  char      **vcard_ptr)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	DB             *db = bf->priv->file_db;
-	DBT            id_dbt, vcard_dbt;
-	int            db_error;
-	char           *id;
-	ECard          *card;
-	char           *vcard;
-	char           *ret_val;
-
-	id = pas_backend_file_create_unique_id (vcard_req);
-
-	string_to_dbt (id, &id_dbt);
-	
-	card = e_card_new(vcard_req);
-	e_card_set_id(card, id);
-	vcard = e_card_get_vcard(card);
-
-	string_to_dbt (vcard, &vcard_dbt);
-
-	db_error = db->put (db, &id_dbt, &vcard_dbt, 0);
-
-	if (0 == db_error) {
-		db_error = db->sync (db, 0);
-		if (db_error != 0)
-			g_warning ("db->sync failed.\n");
-		ret_val = id;
-
-	}
-	else {
-		ret_val = NULL;
-	}
-
-	gtk_object_unref(GTK_OBJECT(card));
-	card = NULL;
-
-	if (vcard_ptr && ret_val)
-		*vcard_ptr = vcard;
-	else
-		g_free (vcard);
-
-	return ret_val;
-}
-
-static void
-pas_backend_file_process_create_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	char *id;
-	char *vcard;
-	EIterator *iterator;
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-
-	id = do_create(backend, req->vcard, &vcard);
-	if (id) {
-		for (iterator = e_list_get_iterator(bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const PASBackendFileBookView *view = e_iterator_get(iterator);
-			if (vcard_matches_search (view, vcard)) {
-				pas_book_view_notify_add_1 (view->book_view, vcard);
-				pas_book_view_notify_complete (view->book_view);
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-		
-		pas_book_respond_create (
-			book,
-			Evolution_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,
-				 Evolution_BookListener_CardNotFound,
-				 "");
-	}
-
-	g_free(req->vcard);
-}
-
-static void
-pas_backend_file_process_remove_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	DB             *db = bf->priv->file_db;
-	DBT            id_dbt, vcard_dbt;
-	int            db_error;
-	EIterator     *iterator;
-	char          *vcard_string;
-
-	string_to_dbt (req->id, &id_dbt);
-
-	db_error = db->get (db, &id_dbt, &vcard_dbt, 0);
-	if (0 != db_error) {
-		pas_book_respond_remove (
-				 book,
-				 Evolution_BookListener_CardNotFound);
-		g_free (req->id);
-		return;
-	}
-	
-	db_error = db->del (db, &id_dbt, 0);
-	if (0 != db_error) {
-		pas_book_respond_remove (
-				 book,
-				 Evolution_BookListener_CardNotFound);
-		g_free (req->id);
-		return;
-	}
-
-	db_error = db->sync (db, 0);
-	if (db_error != 0)
-		g_warning ("db->sync failed.\n");
-
-
-	vcard_string = vcard_dbt.data;
-	for (iterator = e_list_get_iterator (bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const PASBackendFileBookView *view = e_iterator_get(iterator);
-		if (vcard_matches_search (view, vcard_string)) {
-			pas_book_view_notify_remove (view->book_view, req->id);
-			pas_book_view_notify_complete (view->book_view);
-		}
-	}
-	gtk_object_unref(GTK_OBJECT(iterator));
-	
-	pas_book_respond_remove (
-				 book,
-				 Evolution_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;
-	char          *id;
-	char          *old_vcard_string;
-
-	/* create a new ecard from the request data */
-	card = e_card_new(req->vcard);
-	id = e_card_get_id(card);
-
-	string_to_dbt (id, &id_dbt);	
-
-	/* get the old ecard - the one that's presently in the db */
-	db_error = db->get (db, &id_dbt, &vcard_dbt, 0);
-	if (0 != db_error) {
-		pas_book_respond_modify (
-				 book,
-				 Evolution_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, &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,
-				 Evolution_BookListener_Success);
-	}
-	else {
-		pas_book_respond_modify (
-				 book,
-				 Evolution_BookListener_CardNotFound);
-	}
-
-	g_free(old_vcard_string);
-
-	gtk_object_unref(GTK_OBJECT(card));
-	g_free (req->vcard);
-}
-
-static void
-pas_backend_file_build_all_cards_list(PASBackend *backend,
-				      PASBackendFileCursorPrivate *cursor_data)
-{
-	  PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	  DB             *db = bf->priv->file_db;
-	  int            db_error;
-	  DBT  id_dbt, vcard_dbt;
-  
-	  cursor_data->elements = NULL;
-	  
-	  db_error = db->seq(db, &id_dbt, &vcard_dbt, R_FIRST);
-
-	  while (db_error == 0) {
-
-		  /* don't include the version in the list of cards */
-		  if (id_dbt.size != strlen(PAS_BACKEND_FILE_VERSION_NAME) + 1
-		      || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) {
-
-			  cursor_data->elements = g_list_append(cursor_data->elements,
-								g_strdup(vcard_dbt.data));
-
-		  }
-
-		  db_error = db->seq(db, &id_dbt, &vcard_dbt, R_NEXT);
-
-	  }
-
-	  if (db_error == -1) {
-		  g_warning ("pas_backend_file_build_all_cards_list: error building list\n");
-	  }
-	  else {
-		  cursor_data->num_elements = g_list_length (cursor_data->elements);
-	  }
-}
-
-static void
-pas_backend_file_process_get_cursor (PASBackend *backend,
-				     PASBook    *book,
-				     PASRequest *req)
-{
-	/*
-	  PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	  DB             *db = bf->priv->file_db;
-	  DBT            id_dbt, vcard_dbt;
-	*/
-	CORBA_Environment ev;
-	int            db_error = 0;
-	PASBackendFileCursorPrivate *cursor_data;
-	PASCardCursor *cursor;
-	Evolution_Book corba_book;
-
-	cursor_data = g_new(PASBackendFileCursorPrivate, 1);
-	cursor_data->backend = backend;
-	cursor_data->book = book;
-
-	pas_backend_file_build_all_cards_list(backend, cursor_data);
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	Evolution_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 
-		 ? Evolution_BookListener_Success 
-		 : Evolution_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;
-	Evolution_Book    corba_book;
-	PASBackendFileBookView view;
-	PASBackendFileSearchContext ctx;
-	EIterator *iterator;
-
-	g_return_if_fail (req->listener != NULL);
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	Evolution_Book_ref(corba_book, &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);
-
-	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_book_view (book,
-		   (book_view != NULL
-		    ? Evolution_BookListener_Success 
-		    : Evolution_BookListener_CardNotFound /* XXX */),
-		   book_view);
-
-	view.book_view = book_view;
-	view.search = req->search;
-	view.search_sexp = NULL;
-	view.search_context = &ctx;
-	ctx.card = 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_search (bf, book, e_iterator_get(iterator));
-	gtk_object_unref(GTK_OBJECT(iterator));
-
-	g_free(req->search);
-}
-
-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 gboolean
-can_write (PASBackend *backend)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	char *path = pas_backend_file_extract_path_from_uri (bf->priv->uri);
-	gboolean retval;
-
-	retval = (access (path, W_OK) != -1);
-
-	g_free (path);
-
-	return retval;
-}
-
-static gboolean
-pas_backend_file_can_write (PASBook *book)
-{
-	PASBackend* backend = pas_book_get_backend (book);
-
-	return can_write(backend);
-}
-
-static gboolean
-pas_backend_file_can_write_card (PASBook *book,
-				 const char *id)
-{
-	PASBackend* backend = pas_book_get_backend (book);
-
-	return can_write(backend);
-}
-
-static void
-pas_backend_file_process_client_requests (PASBook *book)
-{
-	PASBackend *backend;
-	PASRequest *req;
-
-	backend = pas_book_get_backend (book);
-
-	req = pas_book_pop_request (book);
-	if (req == NULL)
-		return;
-
-	switch (req->op) {
-	case CreateCard:
-		pas_backend_file_process_create_card (backend, book, req);
-		break;
-
-	case RemoveCard:
-		pas_backend_file_process_remove_card (backend, book, req);
-		break;
-
-	case ModifyCard:
-		pas_backend_file_process_modify_card (backend, book, req);
-		break;
-
-	case CheckConnection:
-		pas_backend_file_process_check_connection (backend, book, req);
-		break;
-		
-	case GetCursor:
-		pas_backend_file_process_get_cursor (backend, book, req);
-		break;
-		
-	case GetBookView:
-		pas_backend_file_process_get_book_view (backend, book, req);
-		break;
-	}
-
-	g_free (req);
-}
-
-static void
-pas_backend_file_book_destroy_cb (PASBook *book, gpointer data)
-{
-	PASBackendFile *backend;
-
-	backend = PAS_BACKEND_FILE (data);
-
-	pas_backend_remove_client (PAS_BACKEND (backend), book);
-}
-
-static char *
-pas_backend_file_get_vcard (PASBook *book, const char *id)
-{
-	PASBackendFile *bf;
-	DBT            id_dbt, vcard_dbt;
-	DB             *db;
-	int            db_error;
-
-	bf = PAS_BACKEND_FILE (pas_book_get_backend (book));
-	db = bf->priv->file_db;
-
-	string_to_dbt (id, &id_dbt);
-
-	db_error = db->get (db, &id_dbt, &vcard_dbt, 0);
-	if (db_error == 0) {
-		/* success */
-		return g_strdup (vcard_dbt.data);
-	}
-	else if (db_error == 1) {
-		/* key was not in file */
-		return g_strdup (""); /* XXX */
-	}
-	else /* if (db_error < 0)*/ {
-		/* error */
-		return g_strdup (""); /* XXX */
-	}
-}
-
-static gboolean
-pas_backend_file_upgrade_db (PASBackendFile *bf, char *old_version)
-{
-	if (!strcmp (old_version, "0.0")) {
-		/* 0.0 is the same as 0.1, we just need to add the version */
-		DB  *db = bf->priv->file_db;
-		DBT version_name_dbt, version_dbt;
-		int db_error;
-
-		string_to_dbt (PAS_BACKEND_FILE_VERSION_NAME, &version_name_dbt);
-		string_to_dbt (PAS_BACKEND_FILE_VERSION, &version_dbt);
-
-		db_error = db->put (db, &version_name_dbt, &version_dbt, 0);
-		if (db_error == 0)
-			return TRUE;
-		else
-			return FALSE;
-	}
-	else {
-		g_warning ("unsupported version '%s' found in PAS backend file\n",
-			   old_version);
-		return FALSE;
-	}
-}
-
-static gboolean
-pas_backend_file_maybe_upgrade_db (PASBackendFile *bf)
-{
-	DB   *db = bf->priv->file_db;
-	DBT  version_name_dbt, version_dbt;
-	int  db_error;
-	char *version;
-	gboolean ret_val = TRUE;
-
-	string_to_dbt (PAS_BACKEND_FILE_VERSION_NAME, &version_name_dbt);
-
-	db_error = db->get (db, &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:Helix Code, Inc.\n\
-LABEL;WORK;QUOTED-PRINTABLE:101 Rogers St. Ste. 214=0ACambridge, MA 02142=0AUSA\n\
-TEL;WORK;VOICE:(617) 679-1984\n\
-TEL;WORK;FAX:(617) 679-1949\n\
-EMAIL;INTERNET:hello@helixcode.com\n\
-URL:http://www.helixcode.com/\n\
-ORG:Helix Code, Inc.;\n\
-NOTE:Welcome to the Helix Code Addressbook.\n\
-END:VCARD"
-
-static gboolean
-pas_backend_file_load_uri (PASBackend             *backend,
-			   const char             *uri)
-{
-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
-	char           *filename;
-
-	g_assert (bf->priv->loaded == FALSE);
-
-	filename = pas_backend_file_extract_path_from_uri (uri);
-
-	bf->priv->file_db = dbopen (filename, O_RDWR, 0666, DB_HASH, NULL);
-	if (bf->priv->file_db == NULL) {
-		bf->priv->file_db = dbopen (filename, O_RDWR | O_CREAT, 0666, DB_HASH, NULL);
-
-		if (bf->priv->file_db) {
-			char *id;
-			id = do_create(backend, INITIAL_VCARD, NULL);
-			g_free (id);
-		}
-	}
-
-	g_free (filename);
-
-	if (bf->priv->file_db != NULL) {
-		if (pas_backend_file_maybe_upgrade_db (bf))
-			bf->priv->loaded = TRUE;
-		/* XXX what if we fail to upgrade it? */
-		
-		g_free(bf->priv->uri);
-		bf->priv->uri = g_strdup (uri);
-	} else
-		return FALSE;
-
-	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,
-			     Evolution_BookListener  listener)
-{
-	PASBackendFile *bf;
-	PASBook        *book;
-
-	g_assert (backend != NULL);
-	g_assert (PAS_IS_BACKEND_FILE (backend));
-
-	bf = PAS_BACKEND_FILE (backend);
-
-	book = pas_book_new (
-		backend, listener,
-		pas_backend_file_get_vcard,
-		pas_backend_file_can_write,
-		pas_backend_file_can_write_card);
-
-	if (!book) {
-		if (!bf->priv->clients)
-			pas_backend_last_client_gone (backend);
-
-		return FALSE;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (book), "destroy",
-			    pas_backend_file_book_destroy_cb, backend);
-
-	gtk_signal_connect (GTK_OBJECT (book), "requests_queued",
-		    pas_backend_file_process_client_requests, NULL);
-
-	bf->priv->clients = g_list_prepend (
-		bf->priv->clients, book);
-
-	if (bf->priv->loaded) {
-		pas_book_respond_open (
-			book, Evolution_BookListener_Success);
-	} else {
-		/* Open the book. */
-		pas_book_respond_open (
-			book, Evolution_BookListener_Success);
-	}
-
-	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;
-
-	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 4da9a29cc5..0000000000
--- a/addressbook/backend/pas/pas-backend-file.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2000, Helix Code, 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 c37bb7aaa8..0000000000
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ /dev/null
@@ -1,1813 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include "config.h"  
-#include <gtk/gtksignal.h>
-#include <fcntl.h>
-#include <time.h>
-#include <lber.h>
-#include <ldap.h>
-
-#include "pas-backend-ldap.h"
-#include "pas-book.h"
-#include "pas-card-cursor.h"
-
-#include <e-util/e-sexp.h>
-#include <ebook/e-card-simple.h>
-
-#define LDAP_MAX_SEARCH_RESPONSES 100
-
-/* this really needs addressing */
-#define OBJECT_CLASS "newPilotPerson"
-
-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;
-
-	/* whether or not there's a request in process on our LDAP* */
-	LDAPOp *current_op;
-	GList *pending_ops;
-	int op_idle;
-};
-
-struct _PASBackendLDAPCursorPrivate {
-	PASBackend *backend;
-	PASBook    *book;
-
-	GList      *elements;
-	long       num_elements;
-};
-
-struct _PASBackendLDAPBookView {
-	PASBookView           *book_view;
-	PASBackendLDAPPrivate *blpriv;
-	gchar                 *search;
-	int                   search_idle;
-	int                   search_msgid;
-	LDAPOp                *search_op;
-};
-
-typedef gboolean (*LDAPOpHandler)(PASBackend *backend, LDAPOp *op);
-typedef void (*LDAPOpDtor)(PASBackend *backend, LDAPOp *op);
-
-struct LDAPOp {
-	LDAPOpHandler handler;
-	LDAPOpDtor    dtor;
-	PASBackend    *backend;
-	PASBook       *book;
-	PASBookView   *view;
-};
-
-static void     ldap_op_init (LDAPOp *op, PASBackend *backend, PASBook *book, PASBookView *view, LDAPOpHandler handler, LDAPOpDtor dtor);
-static void     ldap_op_process_current (PASBackend *backend);
-static void     ldap_op_process (LDAPOp *op);
-static void     ldap_op_restart (LDAPOp *op);
-static gboolean ldap_op_process_on_idle (PASBackend *backend);
-static void     ldap_op_finished (LDAPOp *op);
-
-static ECardSimple *build_card_from_entry (LDAP *ldap, LDAPMessage *e);
-
-static void email_populate_func(ECardSimple *card, char **values);
-struct berval** email_ber_func(ECardSimple *card);
-gboolean email_compare_func (ECardSimple *ecard1, ECardSimple *ecard2);
-
-struct prop_info {
-	ECardSimpleField field_id;
-	char *query_prop;
-	char *ldap_attr;
-#define PROP_TYPE_NORMAL   0x01
-#define PROP_TYPE_LIST     0x02
-#define PROP_DN            0x04
-	int prop_type;
-
-	/* the remaining items are only used for the TYPE_LIST props */
-
-	/* used when reading from the ldap server populates ECard with the values in **values. */
-	void (*populate_ecard_func)(ECardSimple *card, char **values);
-	/* used when writing to an ldap server.  returns a NULL terminated array of berval*'s */
-	struct berval** (*ber_func)(ECardSimple *card);
-	/* used to compare list attributes */
-	gboolean (*compare_func)(ECardSimple *card1, ECardSimple *card2);
-
-} prop_info[] = {
-
-#define DN_NORMAL_PROP(fid,q,a) {fid, q, a, PROP_TYPE_NORMAL | PROP_DN, NULL}
-#define DN_LIST_PROP(fid,q,a,ctor,ber,cmp) {fid, q, a, PROP_TYPE_LIST | PROP_DN, ctor, ber, cmp}
-#define NORMAL_PROP(fid,q,a) {fid, q, a, PROP_TYPE_NORMAL, NULL}
-
-	DN_NORMAL_PROP (E_CARD_SIMPLE_FIELD_FULL_NAME, "full_name", "cn" ),
-	DN_NORMAL_PROP (E_CARD_SIMPLE_FIELD_FAMILY_NAME, "family_name", "sn" ),
-	NORMAL_PROP    (E_CARD_SIMPLE_FIELD_TITLE,     "title", "title"),
-	DN_NORMAL_PROP (E_CARD_SIMPLE_FIELD_ORG,       "org", "o"),
-	NORMAL_PROP    (E_CARD_SIMPLE_FIELD_PHONE_PRIMARY, "phone", "telephonenumber"),
-	DN_LIST_PROP   (E_CARD_SIMPLE_FIELD_EMAIL, "email", "mail", email_populate_func, email_ber_func, email_compare_func)
-
-#undef DN_NORMAL_PROP
-#undef DN_LIST_PROP
-#undef NORMAL_PROP
-};
-
-static int num_prop_infos = sizeof(prop_info) / sizeof(prop_info[0]);
-
-static void
-view_destroy(GtkObject *object, gpointer data)
-{
-	CORBA_Environment ev;
-	Evolution_Book    corba_book;
-	PASBook           *book = (PASBook *)data;
-	PASBackendLDAP    *bl;
-	GList             *list;
-
-	bl = PAS_BACKEND_LDAP(pas_book_get_backend(book));
-	for (list = bl->priv->book_views; list; list = g_list_next(list)) {
-		PASBackendLDAPBookView *view = list->data;
-		if (view->book_view == PAS_BOOK_VIEW(object)) {
-			if (view->search_idle != 0) {
-				/* we have a search running on the
-				   ldap connection.  remove the idle
-				   handler and anbandon the msg id */
-				g_source_remove(view->search_idle);
-				pas_book_view_notify_status_message (view->book_view, "Abandoning pending search");
-				if (view->search_msgid != -1)
-					ldap_abandon (bl->priv->ldap, view->search_msgid);
-
-				/* if the search op is the current op,
-				   finish it. else, remove it from the
-				   list and nuke it ourselves. */
-				if (view->search_op == bl->priv->current_op)
-					ldap_op_finished (view->search_op);
-				else {
-					bl->priv->pending_ops = g_list_remove (bl->priv->pending_ops,
-									       view->search_op);
-					view->search_op->dtor (view->search_op->backend,
-							       view->search_op);
-				}
-			}
-			g_free (view->search);
-			g_free (view);
-			bl->priv->book_views = g_list_remove_link(bl->priv->book_views, list);
-			g_list_free_1(list);
-			break;
-		}
-	}
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	Evolution_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
-pas_backend_ldap_connect (PASBackendLDAP *bl)
-{
-	PASBackendLDAPPrivate *blpriv = bl->priv;
-
-	/* close connection first if it's open first */
-	if (blpriv->ldap)
-		ldap_unbind (blpriv->ldap);
-
-	blpriv->ldap = ldap_open (blpriv->ldap_host, blpriv->ldap_port);
-	if (NULL != blpriv->ldap) {
-		ldap_simple_bind_s(blpriv->ldap,
-				   NULL /*binddn*/, NULL /*passwd*/);
-		blpriv->connected = TRUE;
-	}
-	else {
-		g_warning ("pas_backend_ldap_connect failed for "
-			   "'ldap://%s:%d/%s'\n",
-			   blpriv->ldap_host,
-			   blpriv->ldap_port,
-			   blpriv->ldap_rootdn ? blpriv->ldap_rootdn : "");
-		blpriv->connected = FALSE;
-	}
-}
-
-static void
-ldap_op_init (LDAPOp *op, PASBackend *backend,
-	      PASBook *book, PASBookView *view,
-	      LDAPOpHandler handler, LDAPOpDtor dtor)
-{
-	op->backend = backend;
-	op->book = book;
-	op->view = view;
-	op->handler = handler;
-	op->dtor = dtor;
-}
-
-static void
-ldap_op_process_current (PASBackend *backend)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	LDAPOp *op = bl->priv->current_op;
-
-	if (!bl->priv->connected) {
-		if (op->view)
-			pas_book_view_notify_status_message (op->view, "Connecting to LDAP server");
-		pas_backend_ldap_connect(bl);
-	}
-
-	if (op->handler (backend, op))
-		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 Evolution_BookListener_Success;
-	else if (NAME_ERROR (ldap_error))
-		return Evolution_BookListener_CardNotFound;
-	else if (ldap_error == LDAP_INSUFFICIENT_ACCESS)
-		return Evolution_BookListener_PermissionDenied;
-	else if (ldap_error == LDAP_SERVER_DOWN)
-		return Evolution_BookListener_RepositoryOffline;
-	else
-		return Evolution_BookListener_OtherError;
-}
-
-
-static char *
-create_dn_from_ecard (ECardSimple *card)
-{
-	char *o, *o_part = NULL;
-	const char *mail;
-	char *mail_part = NULL;
-	char *cn, *cn_part = NULL;
-	char *dn;
-	gboolean need_comma = FALSE;
-
-	o = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_ORG);
-	if (o) {
-		o_part = g_strdup_printf ("o=%s", o);
-		need_comma = TRUE;
-	}
-	else {
-		o_part = g_strdup ("");
-		need_comma = FALSE;
-	}
-
-	mail = e_card_simple_get_email (card, E_CARD_SIMPLE_EMAIL_ID_EMAIL);
-	if (mail) {
-		mail_part = g_strdup_printf ("mail=%s%s", mail, need_comma ? "," : "");
-		need_comma = TRUE;
-	}
-	else {
-		mail_part = g_strdup ("");
-	}
-
-	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, mail_part, o_part);
-
-	g_free (cn_part);
-	g_free (mail_part);
-	g_free (o_part);
-
-	g_print ("generated dn: %s\n", dn);
-
-	return dn;
-}
-
-static GPtrArray*
-build_mods_from_ecards (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 ++) {
-		char *new_prop = NULL;
-		char *current_prop = NULL;
-		gboolean include;
-
-		/* 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. */
-		new_prop = e_card_simple_get (new, prop_info[i].field_id);
-
-		/* 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 */
-			include = (new_prop != NULL);
-		}
-		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. */
-			current_prop = e_card_simple_get (current, prop_info[i].field_id);
-
-			if (new_prop && current_prop)
-				include = strcmp (new_prop, current_prop);
-			else
-				include = (!!new_prop != !!current_prop);
-		}
-
-		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)
-					mod->mod_op = LDAP_MOD_DELETE;
-				else if (!current_prop)
-					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_NORMAL) {
-				mod->mod_values = g_new (char*, 2);
-				mod->mod_values[0] = e_card_simple_get (new, prop_info[i].field_id);
-				mod->mod_values[1] = NULL;
-			}
-			else {
-				mod->mod_bvalues = prop_info[i].ber_func (new);
-			}
-
-			g_ptr_array_add (result, mod);
-		}
-	}
-
-	/* NULL terminate the list of modifications */
-	g_ptr_array_add (result, NULL);
-
-	return result;
-}
-
-static void
-free_mods (GPtrArray *mods)
-{
-	int i = 0;
-	LDAPMod *mod;
-
-	while ((mod = g_ptr_array_index (mods, i++))) {
-		g_free (mod->mod_type);
-
-		/* XXX we leak the values */
-		g_free (mod);
-	}
-
-	g_ptr_array_free (mods, TRUE /* XXX ? */);
-}
-
-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;
-	LDAPMod *objectclass_mod;
-	LDAP *ldap;
-
-	new_ecard = e_card_new (create_op->vcard);
-	new_card = e_card_simple_new (new_ecard);
-
-	dn = create_dn_from_ecard (new_card);
-
-	ldap = bl->priv->ldap;
-
-	/* build our mods */
-	mod_array = build_mods_from_ecards (NULL, new_card, NULL);
-	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*, 1);
-	objectclass_mod->mod_values[0] = g_strdup (OBJECT_CLASS);
-	objectclass_mod->mod_values[1] = NULL;
-
-	g_ptr_array_add (mod_array, objectclass_mod);
-
-	ldap_mods = (LDAPMod**)mod_array->pdata;
-
-	/* actually perform the ldap add */
-	ldap_error = ldap_add_s (ldap, dn, ldap_mods);
-
-	g_print ("ldap_add_s returned 0x%x (%s) status\n", ldap_error, ldap_err2string(ldap_error));
-
-	/* and clean up */
-	free_mods (mod_array);
-	g_free (dn);
-
-	gtk_object_unref (GTK_OBJECT(new_card));
-
-	/* and lastly respond */
-	response = ldap_error_to_response (ldap_error);
-	pas_book_respond_create (create_op->op.book,
-				 response,
-				 dn);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-create_card_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPCreateOp *create_op = (LDAPCreateOp*)op;
-
-	g_free (create_op->vcard);
-	g_free (create_op);
-}
-
-static void
-pas_backend_ldap_process_create_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	LDAPCreateOp *create_op = g_new (LDAPCreateOp, 1);
-
-	ldap_op_init ((LDAPOp*)create_op, backend, book, NULL, create_card_handler, create_card_dtor);
-
-	create_op->vcard = req->vcard;
-
-	ldap_op_process ((LDAPOp*)create_op);
-}
-
-
-typedef struct {
-	LDAPOp op;
-	char *id;
-} LDAPRemoveOp;
-
-static gboolean
-remove_card_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPRemoveOp *remove_op = (LDAPRemoveOp*)op;
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	int response;
-	int ldap_error;
-
-	ldap_error = ldap_delete_s (bl->priv->ldap, remove_op->id);
-
-	response = ldap_error_to_response (ldap_error);
-
-	pas_book_respond_remove (remove_op->op.book,
-				 response);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-remove_card_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPRemoveOp *remove_op = (LDAPRemoveOp*)op;
-
-	g_free (remove_op->id);
-	g_free (remove_op);
-}
-
-static void
-pas_backend_ldap_process_remove_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	LDAPRemoveOp *remove_op = g_new (LDAPRemoveOp, 1);
-
-	ldap_op_init ((LDAPOp*)remove_op, backend, book, NULL, 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;
-	char *id;
-	int response;
-	int            ldap_error;
-	LDAPMessage    *res, *e;
-	char *query;
-	GPtrArray *mod_array;
-	LDAPMod **ldap_mods;
-	LDAP *ldap;
-
-	new_ecard = e_card_new (modify_op->vcard);
-	id = e_card_get_id(new_ecard);
-
-	ldap = bl->priv->ldap;
-
-	/* we don't get sent the original vcard along with the new one
-           in this call, so we have to query the ldap server for the
-           original record so we can compute our delta. */
-	query = g_strdup_printf ("(dn=%s)", id);
-	ldap_error = ldap_search_s (ldap,
-				    bl->priv->ldap_rootdn,
-				    bl->priv->ldap_scope,
-				    query, NULL, 0, &res);
-
-	if (ldap_error == LDAP_RES_SEARCH_ENTRY) {
-		/* get the single card from the list (we're guaranteed
-                   either 1 or 0 since we looked up by dn, which is
-                   unique) */
-		e = ldap_first_entry (ldap, res);
-		if (e)	{
-			ECardSimple *new_card = e_card_simple_new (new_ecard);
-			ECardSimple *current_card = build_card_from_entry (ldap, e);
-			gboolean need_new_dn;
-
-			/* build our mods */
-			mod_array = build_mods_from_ecards (current_card, new_card, &need_new_dn);
-			ldap_mods = (LDAPMod**)mod_array->pdata;
-
-			/* actually perform the ldap modify */
-			ldap_error = ldap_modify_s (ldap, id, ldap_mods);
-			g_print ("ldap_modify_s returned 0x%x (%s) status\n", ldap_error, ldap_err2string(ldap_error));
-
-			/* and clean up */
-			free_mods (mod_array);
-			gtk_object_unref (GTK_OBJECT(new_card));
-			gtk_object_unref (GTK_OBJECT(current_card));
-		}
-
-		ldap_msgfree(res);
-	}
-
-	response = ldap_error_to_response (ldap_error);
-	pas_book_respond_modify (modify_op->op.book,
-				 response);
-
-	/* we're synchronous */
-	return TRUE;
-}
-
-static void
-modify_card_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPModifyOp *modify_op = (LDAPModifyOp*)op;
-
-	g_free (modify_op->vcard);
-	g_free (modify_op);
-}
-
-static void
-pas_backend_ldap_process_modify_card (PASBackend *backend,
-				      PASBook    *book,
-				      PASRequest *req)
-{
-	LDAPModifyOp *modify_op = g_new (LDAPModifyOp, 1);
-
-	ldap_op_init ((LDAPOp*)modify_op, backend, book, NULL, modify_card_handler, modify_card_dtor);
-
-	modify_op->vcard = req->vcard;
-
-	ldap_op_process ((LDAPOp*)modify_op);
-}
-
-
-typedef struct {
-	LDAPOp op;
-	PASBook *book;
-} LDAPGetCursorOp;
-
-static long
-get_length(PASCardCursor *cursor, gpointer data)
-{
-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;
-
-	return cursor_data->num_elements;
-}
-
-static char *
-get_nth(PASCardCursor *cursor, long n, gpointer data)
-{
-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;
-
-	g_return_val_if_fail (n < cursor_data->num_elements, NULL);
-
-	return (char*)g_list_nth (cursor_data->elements, n);
-}
-
-static void
-cursor_destroy(GtkObject *object, gpointer data)
-{
-	CORBA_Environment ev;
-	Evolution_Book corba_book;
-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(cursor_data->book));
-
-	CORBA_exception_init(&ev);
-
-	Evolution_Book_unref(corba_book, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("cursor_destroy: Exception unreffing "
-			  "corba book.\n");
-	}
-
-	CORBA_exception_free(&ev);
-
-	/* free the ldap specific cursor information */
-	g_list_foreach (cursor_data->elements, (GFunc)g_free, NULL);
-	g_list_free (cursor_data->elements);
-
-	g_free(cursor_data);
-}
-
-static void
-pas_backend_ldap_build_all_cards_list(PASBackend *backend,
-				      PASBackendLDAPCursorPrivate *cursor_data)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	LDAP           *ldap = bl->priv->ldap;
-	int            ldap_error;
-	LDAPMessage    *res, *e;
-
-	if ((ldap_error = ldap_search_s (ldap,
-					 bl->priv->ldap_rootdn,
-					 bl->priv->ldap_scope,
-					 "(objectclass=*)",
-					 NULL, 0, &res)) == -1) {
-		g_warning ("ldap error '%s' in "
-			   "pas_backend_ldap_build_all_cards_list\n",
-			   ldap_err2string(ldap_error));
-	}
-
-	cursor_data->elements = NULL;
-
-	cursor_data->num_elements = ldap_count_entries (ldap, res);
-
-	e = ldap_first_entry(ldap, res);
-
-	while (NULL != e) {
-
-		/* for now just make a list of the dn's */
-#if 0
-		for ( a = ldap_first_attribute( ldap, e, &ber ); a != NULL;
-		      a = ldap_next_attribute( ldap, e, ber ) ) {
-		}
-#else
-		cursor_data->elements = g_list_prepend(cursor_data->elements,
-						       g_strdup(ldap_get_dn(ldap, e)));
-#endif
-
-		e = ldap_next_entry(ldap, e);
-	}
-
-	ldap_msgfree(res);
-}
-
-
-static gboolean
-get_cursor_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPGetCursorOp *cursor_op = (LDAPGetCursorOp*)op;
-	CORBA_Environment ev;
-	int            ldap_error = 0;
-	PASCardCursor *cursor;
-	Evolution_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);
-
-	Evolution_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 == 0 
-		 ? Evolution_BookListener_Success 
-		 : Evolution_BookListener_CardNotFound),
-		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);
-}
-
-static void
-email_populate_func(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_func(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++;
-	}
-
-	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[num] = NULL;
-
-	return result;
-}
-
-gboolean
-email_compare_func (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 FALSE;;
-}
-
-static ESExpResult *
-func_and(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	char ** strings;
-
-	if (argc > 0) {
-		int i;
-
-		strings = g_new(char*, argc+3);
-		strings[0] = g_strdup ("(&");
-		strings[argc+3 - 2] = g_strdup (")");
-		strings[argc+3 - 1] = NULL;
-		
-		for (i = 0; i < argc; i ++) {
-			GList *list_head = *list;
-			strings[argc - i] = (*list)->data;
-			*list = g_list_remove_link(*list, *list);
-			g_list_free_1(list_head);
-		}
-
-		*list = g_list_prepend(*list, g_strjoinv(" ", strings));
-
-		for (i = 0 ; i < argc + 2; i ++)
-			g_free (strings[i]);
-
-		g_free (strings);
-	}
-
-	r = e_sexp_result_new(ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_or(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-	char ** strings;
-
-	if (argc > 0) {
-		int i;
-
-		strings = g_new(char*, argc+3);
-		strings[0] = g_strdup ("(|");
-		strings[argc+3 - 2] = g_strdup (")");
-		strings[argc+3 - 1] = NULL;
-		for (i = 0; i < argc; i ++) {
-			GList *list_head = *list;
-			strings[argc - i] = (*list)->data;
-			*list = g_list_remove_link(*list, *list);
-			g_list_free_1(list_head);
-		}
-
-		*list = g_list_prepend(*list, g_strjoinv(" ", strings));
-
-		for (i = 0 ; i < argc + 2; i ++)
-			g_free (strings[i]);
-
-		g_free (strings);
-	}
-
-	r = e_sexp_result_new(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(ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_contains(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = argv[1]->value.string;
-		gboolean one_star = FALSE;
-
-		if (strlen(str) == 0)
-			one_star = TRUE;
-
-		if (!strcmp (propname, "x-evolution-any-field")) {
-			int i;
-			int query_length;
-			char *big_query;
-			char *header, *footer;
-			char *match_str;
-
-			header = g_malloc0((num_prop_infos - 1) * 2 + 1);
-			footer = g_malloc0(num_prop_infos + 1);
-			for (i = 0; i < num_prop_infos - 1; i ++) {
-				strcat (header, "(|");
-				strcat (footer, ")");
-			}
-
-			match_str = g_strdup_printf("=*%s%s)",
-						    str, one_star ? "" : "*");
-
-			query_length = strlen (header);
-
-			for (i = 0; i < num_prop_infos; i ++) {
-				query_length += 1 + strlen(prop_info[i].ldap_attr) + strlen (match_str);
-			}
-
-			big_query = g_malloc0(query_length + 1);
-			strcat (big_query, header);
-			for (i = 0; i < num_prop_infos; i ++) {
-				strcat (big_query, "(");
-				strcat (big_query, prop_info[i].ldap_attr);
-				strcat (big_query, match_str);
-			}
-			strcat (big_query, footer);
-
-			*list = g_list_prepend(*list, big_query);
-
-			g_free (match_str);
-			g_free (header);
-			g_free (footer);
-		}
-		else {
-			char *ldap_attr = query_prop_to_ldap(propname);
-
-			if (ldap_attr)
-				*list = g_list_prepend(*list,
-						       g_strdup_printf("(%s=*%s%s)",
-								       ldap_attr,
-								       str,
-								       one_star ? "" : "*"));
-		}
-	}
-
-	r = e_sexp_result_new(ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_is(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = argv[1]->value.string;
-		char *ldap_attr = query_prop_to_ldap(propname);
-
-		if (ldap_attr)
-			*list = g_list_prepend(*list,
-					       g_strdup_printf("(%s=%s)",
-							       ldap_attr, str));
-	}
-
-	r = e_sexp_result_new(ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_beginswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = argv[1]->value.string;
-		char *ldap_attr = query_prop_to_ldap(propname);
-		gboolean one_star = FALSE;
-
-		if (strlen(str) == 0)
-			one_star = TRUE;
-
-		if (ldap_attr)
-			*list = g_list_prepend(*list,
-					       g_strdup_printf("(%s=%s*)",
-							       ldap_attr,
-							       str));
-	}
-
-	r = e_sexp_result_new(ESEXP_RES_BOOL);
-	r->value.bool = FALSE;
-
-	return r;
-}
-
-static ESExpResult *
-func_endswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)
-{
-	GList **list = data;
-	ESExpResult *r;
-
-	if (argc == 2
-	    && argv[0]->type == ESEXP_RES_STRING
-	    && argv[1]->type == ESEXP_RES_STRING) {
-		char *propname = argv[0]->value.string;
-		char *str = argv[1]->value.string;
-		char *ldap_attr = query_prop_to_ldap(propname);
-		gboolean one_star = FALSE;
-
-		if (strlen(str) == 0)
-			one_star = TRUE;
-
-		if (ldap_attr)
-			*list = g_list_prepend(*list,
-					       g_strdup_printf("(%s=*%s)",
-							       ldap_attr,
-							       str));
-	}
-
-	r = e_sexp_result_new(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);
-
-	gtk_object_unref(GTK_OBJECT(sexp));
-	e_sexp_result_free(r);
-
-	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;
-	}
-
-	g_list_free (list);
-	return retval;
-}
-
-static gchar *
-query_prop_to_ldap(gchar *query_prop)
-{
-	int i;
-
-	for (i = 0; i < num_prop_infos; i ++)
-		if (!strcmp (query_prop, prop_info[i].query_prop))
-			return prop_info[i].ldap_attr;
-
-	return NULL;
-}
-
-
-typedef struct {
-	LDAPOp op;
-	char *ldap_query;
-	PASBackendLDAP *bl;
-	PASBackendLDAPBookView *view;
-} LDAPSearchOp;
-
-static ECardSimple *
-build_card_from_entry (LDAP *ldap, LDAPMessage *e)
-{
-	ECard *ecard = E_CARD(gtk_type_new(e_card_get_type()));
-	ECardSimple *card = e_card_simple_new (ecard);
-	char *dn = ldap_get_dn(ldap, e);
-	char *attr;
-	BerElement *ber = NULL;
-
-	g_print ("build_card_from_entry, dn = %s\n", dn);
-	e_card_simple_set_id (card, dn);
-
-	for (attr = ldap_first_attribute (ldap, e, &ber); attr;
-	     attr = ldap_next_attribute (ldap, e, ber)) {
-		int i;
-		struct prop_info *info = NULL;
-
-		for (i = 0; i < num_prop_infos; i ++)
-			if (!strcmp (attr, prop_info[i].ldap_attr))
-				info = &prop_info[i];
-
-		if (info) {
-			char **values;
-			values = ldap_get_values (ldap, e, attr);
-
-			if (info->prop_type & PROP_TYPE_NORMAL) {
-				/* if it's a normal property just set the string */
-				e_card_simple_set (card, info->field_id, values[0]);
-
-			}
-			else if (info->prop_type & PROP_TYPE_LIST) {
-				/* if it's a list call the ecard-populate function,
-				   which calls gtk_object_set to set the property */
-				info->populate_ecard_func(card,
-							  values);
-			}
-
-			ldap_value_free (values);
-		}
-	}
-
-	/* 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);
-
-	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, "Polling for LDAP search result");
-
-	rc = ldap_result (ldap, view->search_msgid, 0, NULL, &res);
-	
-	if (rc == -1 && received == 0) {
-		pas_book_view_notify_status_message (view->book_view, "Restarting search");
-		/* connection went down and we never got any. */
-		bl->priv->connected = FALSE;
-
-		/* this will reopen the connection */
-		ldap_op_restart ((LDAPOp*)op);
-		return FALSE;
-	}
-
-	if (rc != LDAP_RES_SEARCH_ENTRY) {
-		view->search_idle = 0;
-		pas_book_view_notify_complete (view->book_view);
-		ldap_op_finished ((LDAPOp*)op);
-		received = 0;
-		pas_book_view_notify_status_message (view->book_view, "Search complete");
-		return FALSE;
-	}
-
-	received = 1;
-		
-	e = ldap_first_entry(ldap, res);
-
-	while (NULL != e) {
-		ECardSimple *card = build_card_from_entry (ldap, e);
-
-		cards = g_list_append (cards, e_card_simple_get_vcard (card));
-
-		gtk_object_unref (GTK_OBJECT(card));
-
-		e = ldap_next_entry(ldap, e);
-	}
-
-	if (cards) {
-		pas_book_view_notify_add (view->book_view, cards);
-			
-		g_list_foreach (cards, (GFunc)g_free, NULL);
-		g_list_free (cards);
-		cards = NULL;
-	}
-
-	ldap_msgfree(res);
-
-	return TRUE;
-}
-
-static gboolean
-ldap_search_handler (PASBackend *backend, LDAPOp *op)
-{
-	LDAPSearchOp *search_op = (LDAPSearchOp*) op;
-
-	if (op->view)
-		pas_book_view_notify_status_message (op->view, "Searching...");
-
-	/* it might not be NULL if we've been restarted */
-	if (search_op->ldap_query == NULL)
-		search_op->ldap_query = pas_backend_ldap_build_query(search_op->view->search);
-
-	if (search_op->ldap_query != NULL) {
-		PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-		PASBackendLDAPBookView *view = search_op->view;
-		LDAP *ldap = bl->priv->ldap;
-
-		ldap->ld_sizelimit = LDAP_MAX_SEARCH_RESPONSES;
-		ldap->ld_deref = LDAP_DEREF_ALWAYS;
-
-		if ((view->search_msgid = ldap_search (ldap,
-						       bl->priv->ldap_rootdn,
-						       bl->priv->ldap_scope,
-						       search_op->ldap_query,
-						       NULL, 0)) == -1) {
-			pas_book_view_notify_status_message (view->book_view, ldap_err2string(ldap->ld_errno));
-			return TRUE; /* act synchronous in this case */
-		}
-		else {
-			view->search_idle = g_idle_add((GSourceFunc)poll_ldap, search_op);
-		}
-
-		/* we're async */
-		return FALSE;
-	}
-	else {
-		/* error doing the conversion to an ldap query, let's
-                   end this now by acting like we're synchronous. */
-		g_warning ("LDAP problem converting search query %s\n", search_op->view->search);
-		return TRUE;
-	}
-}
-
-static void
-ldap_search_dtor (PASBackend *backend, LDAPOp *op)
-{
-	LDAPSearchOp *search_op = (LDAPSearchOp*) op;
-
-	g_free (search_op->ldap_query);
-	g_free (search_op);
-}
-
-static void
-pas_backend_ldap_search (PASBackendLDAP  	*bl,
-			 PASBook         	*book,
-			 PASBackendLDAPBookView *view)
-{
-	LDAPSearchOp *op = g_new (LDAPSearchOp, 1);
-
-	ldap_op_init ((LDAPOp*)op, PAS_BACKEND(bl), book, view->book_view, ldap_search_handler, ldap_search_dtor);
-
-	op->ldap_query = NULL;
-	op->view = view;
-	op->bl = bl;
-
-	/* keep track of the search op so we can delete it from the
-           list if the view is destroyed */
-	view->search_op = (LDAPOp*)op;
-
-	ldap_op_process ((LDAPOp*)op);
-}
-
-static void
-pas_backend_ldap_process_get_book_view (PASBackend *backend,
-					PASBook    *book,
-					PASRequest *req)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	CORBA_Environment ev;
-	Evolution_Book    corba_book;
-	PASBookView       *book_view;
-	PASBackendLDAPBookView *view;
-
-	g_return_if_fail (req->listener != NULL);
-
-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));
-
-	CORBA_exception_init(&ev);
-
-	Evolution_Book_ref(corba_book, &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);
-
-	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_book_view (book,
-		(book_view != NULL
-		 ? Evolution_BookListener_Success 
-		 : Evolution_BookListener_CardNotFound /* XXX */),
-		book_view);
-
-	view = g_new0(PASBackendLDAPBookView, 1);
-	view->book_view = book_view;
-	view->search = g_strdup(req->search);
-	view->blpriv = bl->priv;
-
-	bl->priv->book_views = g_list_prepend(bl->priv->book_views, view);
-
-	pas_backend_ldap_search (bl, book, view);
-
-}
-
-static void
-pas_backend_ldap_process_check_connection (PASBackend *backend,
-					   PASBook    *book,
-					   PASRequest *req)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-
-	pas_book_report_connection (book, bl->priv->connected);
-}
-
-static gboolean
-pas_backend_ldap_can_write (PASBook *book)
-{
-	return TRUE; /* XXX */
-}
-
-static gboolean
-pas_backend_ldap_can_write_card (PASBook *book,
-				 const char *id)
-{
-	return TRUE; /* XXX */
-}
-
-static void
-pas_backend_ldap_process_client_requests (PASBook *book)
-{
-	PASBackend *backend;
-	PASRequest *req;
-
-	backend = pas_book_get_backend (book);
-
-	req = pas_book_pop_request (book);
-	if (req == NULL)
-		return;
-
-	switch (req->op) {
-	case CreateCard:
-		pas_backend_ldap_process_create_card (backend, book, req);
-		break;
-
-	case RemoveCard:
-		pas_backend_ldap_process_remove_card (backend, book, req);
-		break;
-
-	case ModifyCard:
-		pas_backend_ldap_process_modify_card (backend, book, req);
-		break;
-
-	case CheckConnection:
-		pas_backend_ldap_process_check_connection (backend, book, req);
-		break;
-
-	case GetCursor:
-		pas_backend_ldap_process_get_cursor (backend, book, req);
-		break;
-
-	case GetBookView:
-		pas_backend_ldap_process_get_book_view (backend, book, req);
-		break;
-	}
-
-	g_free (req);
-}
-
-static void
-pas_backend_ldap_book_destroy_cb (PASBook *book, gpointer data)
-{
-	PASBackendLDAP *backend;
-
-	backend = PAS_BACKEND_LDAP (data);
-
-	pas_backend_remove_client (PAS_BACKEND (backend), book);
-}
-
-static char *
-pas_backend_ldap_get_vcard (PASBook *book, const char *id)
-{
-	PASBackendLDAP *bl;
-	int            ldap_error = LDAP_SUCCESS; /* XXX */
-
-	bl = PAS_BACKEND_LDAP (pas_book_get_backend (book));
-
-	/* XXX use ldap_search */
-
-	if (ldap_error == LDAP_SUCCESS) {
-		/* success */
-		return g_strdup ("");
-	}
-	else {
-		return g_strdup ("");
-	}
-}
-
-static gboolean
-pas_backend_ldap_load_uri (PASBackend             *backend,
-			   const char             *uri)
-{
-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);
-	LDAPURLDesc    *lud;
-	int ldap_error;
-
-	g_assert (bl->priv->connected == FALSE);
-
-	ldap_error = ldap_url_parse ((char*)uri, &lud);
-	if (ldap_error == LDAP_SUCCESS) {
-		g_free(bl->priv->uri);
-		bl->priv->uri = g_strdup (uri);
-		bl->priv->ldap_host = g_strdup(lud->lud_host);
-		bl->priv->ldap_port = lud->lud_port;
-		/* if a port wasn't specified, default to 389 */
-		if (bl->priv->ldap_port == 0)
-			bl->priv->ldap_port = 389;
-		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,
-			     Evolution_BookListener  listener)
-{
-	PASBackendLDAP *bl;
-	PASBook        *book;
-
-	g_assert (backend != NULL);
-	g_assert (PAS_IS_BACKEND_LDAP (backend));
-
-	bl = PAS_BACKEND_LDAP (backend);
-
-	book = pas_book_new (
-		backend, listener,
-		pas_backend_ldap_get_vcard,
-		pas_backend_ldap_can_write,
-		pas_backend_ldap_can_write_card);
-
-	if (!book) {
-		if (!bl->priv->clients)
-			pas_backend_last_client_gone (backend);
-
-		return FALSE;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (book), "destroy",
-		    pas_backend_ldap_book_destroy_cb, backend);
-
-	gtk_signal_connect (GTK_OBJECT (book), "requests_queued",
-		    pas_backend_ldap_process_client_requests, NULL);
-
-	bl->priv->clients = g_list_prepend (
-		bl->priv->clients, book);
-
-	if (bl->priv->connected) {
-		pas_book_respond_open (
-			book, Evolution_BookListener_Success);
-	} else {
-		/* Open the book. */
-		pas_book_respond_open (
-			book, Evolution_BookListener_Success);
-	}
-
-	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);
-
-	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->connected = FALSE;
-	priv->clients   = NULL;
-	priv->uri       = 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 a59cdf3857..0000000000
--- a/addressbook/backend/pas/pas-backend-ldap.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2000, Helix Code, 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 1568918560..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@helixcode.com)
- *
- * Copyright 2000, Helix Code, 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,
-			Evolution_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 4045074284..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
- *    Evolution_Book interface.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, 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, Evolution_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,
-						  Evolution_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 02dedbabe5..0000000000
--- a/addressbook/backend/pas/pas-book-factory.c
+++ /dev/null
@@ -1,595 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <ctype.h>
-#include <gnome.h>
-#include <liboaf/liboaf.h>
-
-#include "addressbook.h"
-#include "pas-book-factory.h"
-
-#define PAS_BOOK_FACTORY_OAF_ID "OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80"
-
-static BonoboObjectClass          *pas_book_factory_parent_class;
-POA_Evolution_BookFactory__vepv   pas_book_factory_vepv;
-
-typedef struct {
-	char                              *uri;
-	Evolution_BookListener             listener;
-} PASBookFactoryQueuedRequest;
-
-struct _PASBookFactoryPrivate {
-	gint        idle_id;
-	GHashTable *backends;
-	GHashTable *active_server_map;
-	GList      *queued_requests;
-};
-
-/* Signal IDs */
-enum {
-	LAST_BOOK_GONE,
-	LAST_SIGNAL
-};
-
-static guint factory_signals[LAST_SIGNAL];
-
-static char *
-pas_book_factory_canonicalize_uri (const char *uri)
-{
-	/* FIXME: What do I do here? */
-
-	return g_strdup (uri);
-}
-
-static char *
-pas_book_factory_extract_proto_from_uri (const char *uri)
-{
-	char *proto;
-	char *p;
-
-	p = strchr (uri, ':');
-
-	if (p == NULL)
-		return NULL;
-
-	proto = g_malloc0 (p - uri + 1);
-
-	strncpy (proto, uri, p - uri);
-
-	return proto;
-}
-
-/**
- * pas_book_factory_register_backend:
- * @factory:
- * @proto:
- * @backend:
- */
-void
-pas_book_factory_register_backend (PASBookFactory      *factory,
-				   const char          *proto,
-				   PASBackendFactoryFn  backend)
-{
-	g_return_if_fail (factory != NULL);
-	g_return_if_fail (PAS_IS_BOOK_FACTORY (factory));
-	g_return_if_fail (proto != NULL);
-	g_return_if_fail (backend != NULL);
-
-	if (g_hash_table_lookup (factory->priv->backends, proto) != NULL) {
-		g_warning ("pas_book_factory_register_backend: "
-			   "Proto \"%s\" already registered!\n", proto);
-	}
-
-	g_hash_table_insert (factory->priv->backends,
-			     g_strdup (proto), backend);
-}
-
-/**
- * pas_book_factory_get_n_backends:
- * @factory: An addressbook factory.
- * 
- * Queries the number of running addressbook backends in an addressbook factory.
- * 
- * Return value: Number of running backends.
- **/
-int
-pas_book_factory_get_n_backends (PASBookFactory *factory)
-{
-	g_return_val_if_fail (factory != NULL, -1);
-	g_return_val_if_fail (PAS_IS_BOOK_FACTORY (factory), -1);
-
-	return g_hash_table_size (factory->priv->active_server_map);
-}
-
-/* Callback used when a backend loses its last connected client */
-static void
-backend_last_client_gone_cb (PASBackend *backend, gpointer data)
-{
-	PASBookFactory *factory;
-	const char *uri;
-	gpointer orig_key;
-	gboolean result;
-	char *orig_uri;
-
-	factory = PAS_BOOK_FACTORY (data);
-
-	/* Remove the backend from the active server map */
-
-	uri = pas_backend_get_uri (backend);
-	g_assert (uri != NULL);
-
-	result = g_hash_table_lookup_extended (factory->priv->active_server_map, uri,
-					       &orig_key, NULL);
-	g_assert (result != FALSE);
-
-	orig_uri = orig_key;
-
-	g_hash_table_remove (factory->priv->active_server_map, orig_uri);
-	g_free (orig_uri);
-
-	gtk_object_unref (GTK_OBJECT (backend));
-
-	/* Notify upstream if there are no more backends */
-
-	if (g_hash_table_size (factory->priv->active_server_map) == 0)
-		gtk_signal_emit (GTK_OBJECT (factory), factory_signals[LAST_BOOK_GONE]);
-}
-
-static PASBackendFactoryFn
-pas_book_factory_lookup_backend_factory (PASBookFactory *factory,
-					 const char     *uri)
-{
-	PASBackendFactoryFn  backend_fn;
-	char                *proto;
-	char                *canonical_uri;
-
-	g_assert (factory != NULL);
-	g_assert (PAS_IS_BOOK_FACTORY (factory));
-	g_assert (uri != NULL);
-
-	canonical_uri = pas_book_factory_canonicalize_uri (uri);
-	if (canonical_uri == NULL)
-		return NULL;
-
-	proto = pas_book_factory_extract_proto_from_uri (canonical_uri);
-	if (proto == NULL) {
-		g_free (canonical_uri);
-		return NULL;
-	}
-
-	backend_fn = g_hash_table_lookup (factory->priv->backends, proto);
-
-	g_free (proto); 
-	g_free (canonical_uri);
-
-	return backend_fn;
-}
-
-static PASBackend *
-pas_book_factory_launch_backend (PASBookFactory              *factory,
-				 Evolution_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);
-		Evolution_BookListener_respond_open_book (
-			listener,
-			Evolution_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);
-		Evolution_BookListener_respond_open_book (
-			listener,
-			Evolution_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;
-	Evolution_BookListener listener;
-	CORBA_Environment ev;
-
-	uri = request->uri;
-	listener = request->listener;
-	g_free (request);
-
-	/* Look up the backend and create one if needed */
-
-	backend = g_hash_table_lookup (factory->priv->active_server_map, uri);
-
-	if (!backend) {
-		backend = pas_book_factory_launch_backend (factory, listener, uri);
-		if (!backend)
-			goto out;
-
-		if (!pas_backend_add_client (backend, listener))
-			goto out;
-
-		pas_backend_load_uri (backend, uri);
-
-		goto out;
-	}
-
-	pas_backend_add_client (backend, listener);
-
- out:
-	g_free (uri);
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("pas_book_factory_process_request(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-}
-
-static gboolean
-pas_book_factory_process_queue (PASBookFactory *factory)
-{
-	/* Process pending Book-creation requests. */
-	if (factory->priv->queued_requests != NULL) {
-		PASBookFactoryQueuedRequest  *request;
-		GList *l;
-
-		l = factory->priv->queued_requests;
-		request = l->data;
-
-		pas_book_factory_process_request (factory, request);
-
-		factory->priv->queued_requests = g_list_remove_link (
-			factory->priv->queued_requests, l);
-		g_list_free_1 (l);
-	}
-
-	if (factory->priv->queued_requests == NULL) {
-
-		factory->priv->idle_id = 0;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-pas_book_factory_queue_request (PASBookFactory               *factory,
-				const char                   *uri,
-				const Evolution_BookListener  listener)
-{
-	PASBookFactoryQueuedRequest *request;
-	Evolution_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_Evolution_BookFactory_open_book (PortableServer_Servant        servant,
-				      const CORBA_char             *uri,
-				      const Evolution_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) {
-		Evolution_BookListener_respond_open_book (
-			listener,
-			Evolution_BookListener_ProtocolNotSupported,
-			CORBA_OBJECT_NIL,
-			ev);
-
-		return;
-	}
-
-	pas_book_factory_queue_request (factory, uri, listener);
-}
-
-static gboolean
-pas_book_factory_construct (PASBookFactory *factory)
-{
-	POA_Evolution_BookFactory  *servant;
-	CORBA_Environment           ev;
-	CORBA_Object                obj;
-
-	g_assert (factory != NULL);
-	g_assert (PAS_IS_BOOK_FACTORY (factory));
-
-	servant = (POA_Evolution_BookFactory *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &pas_book_factory_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_Evolution_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;
-}
-
-static gboolean
-register_factory (CORBA_Object obj)
-{
-	OAF_RegistrationResult result;
-
-	puts ("about to register addressbook");
-
-	result = oaf_active_server_register (PAS_BOOK_FACTORY_OAF_ID, obj);
-
-	switch (result) {
-	case OAF_REG_SUCCESS:
-		return TRUE;
-	case OAF_REG_NOT_LISTED:
-		g_message ("Error registering the PAS factory: not listed");
-		return FALSE;
-	case OAF_REG_ALREADY_ACTIVE:
-		g_message ("Error registering the PAS factory: already active");
-		return FALSE;
-	case OAF_REG_ERROR:
-	default:
-		g_message ("Error registering the PAS factory: generic error");
-		return FALSE;
-	}
-}
-
-/**
- * pas_book_factory_activate:
- */
-void
-pas_book_factory_activate (PASBookFactory *factory)
-{
-	g_return_if_fail (factory != NULL);
-	g_return_if_fail (PAS_IS_BOOK_FACTORY (factory));
-
-	register_factory (bonobo_object_corba_objref (BONOBO_OBJECT (factory)));
-}
-
-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;
-}
-
-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;
-	
-	g_free (factory->priv);
-
-	GTK_OBJECT_CLASS (pas_book_factory_parent_class)->destroy (object);
-}
-
-static POA_Evolution_BookFactory__epv *
-pas_book_factory_get_epv (void)
-{
-	POA_Evolution_BookFactory__epv *epv;
-
-	epv = g_new0 (POA_Evolution_BookFactory__epv, 1);
-
-	epv->open_book = impl_Evolution_BookFactory_open_book;
-
-	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.Evolution_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 7e4690adf1..0000000000
--- a/addressbook/backend/pas/pas-book-factory.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2000, Helix Code, 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_activate         (PASBookFactory               *factory);
-
-GtkType         pas_book_factory_get_type (void);
-
-#define PAS_BOOK_FACTORY_TYPE        (pas_book_factory_get_type ())
-#define PAS_BOOK_FACTORY(o)          (GTK_CHECK_CAST ((o), PAS_BOOK_FACTORY_TYPE, PASBookFactory))
-#define PAS_BOOK_FACTORY_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_FACTORY_TYPE, PASBookFactoryClass))
-#define PAS_IS_BOOK_FACTORY(o)       (GTK_CHECK_TYPE ((o), PAS_BOOK_FACTORY_TYPE))
-#define PAS_IS_BOOK_FACTORY_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_FACTORY_TYPE))
-
-END_GNOME_DECLS
-
-#endif /* ! __PAS_BOOK_FACTORY_H__ */
diff --git a/addressbook/backend/pas/pas-book-view.c b/addressbook/backend/pas/pas-book-view.c
deleted file mode 100644
index 94babf6280..0000000000
--- a/addressbook/backend/pas/pas-book-view.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * pas-book-view.c
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <glib.h>
-#include "pas-book-view.h"
-
-static BonoboObjectClass *pas_book_view_parent_class;
-POA_Evolution_BookView__vepv pas_book_view_vepv;
-
-struct _PASBookViewPrivate {
-	Evolution_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_Evolution_VCard card_sequence;
-
-	length = g_list_length((GList *) cards);
-
-	card_sequence._buffer = CORBA_sequence_Evolution_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);
-
-	Evolution_BookViewListener_signal_card_changed (
-		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);
-
-	Evolution_BookViewListener_signal_card_removed (
-		book_view->priv->listener, (Evolution_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_Evolution_VCard card_sequence;
-
-	length = g_list_length((GList *)cards);
-
-	card_sequence._buffer = CORBA_sequence_Evolution_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);
-
-	Evolution_BookViewListener_signal_card_added (
-		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);
-
-	Evolution_BookViewListener_signal_sequence_complete (
-		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);
-
-	Evolution_BookViewListener_signal_status_message (
-		book_view->priv->listener, message, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("pas_book_view_notify_complete: Exception signaling BookViewListener!\n");
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-static gboolean
-pas_book_view_construct (PASBookView                *book_view,
-			 Evolution_BookViewListener  listener)
-{
-	POA_Evolution_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_Evolution_BookView *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &pas_book_view_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_Evolution_BookView__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	CORBA_Object_duplicate (listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("Unable to duplicate listener object in pas-book-view.c\n");
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	Evolution_BookViewListener_ref (listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("Unable to 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 (Evolution_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);
-
-	Evolution_BookViewListener_unref (book_view->priv->listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("Unable to unref listener object in pas-book-view.c\n");
-		CORBA_exception_free (&ev);
-
-		return;
-	}
-
-	CORBA_Object_release (book_view->priv->listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning("Unable to release listener object in pas-book-view.c\n");
-		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_Evolution_BookView__epv *
-pas_book_view_get_epv (void)
-{
-	POA_Evolution_BookView__epv *epv;
-
-	epv = g_new0 (POA_Evolution_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.Evolution_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 df6aed5bbb..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 Evolution_Book CORBA interface
- * and which maintains a request queue.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, 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                    (Evolution_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 4cd51237a1..0000000000
--- a/addressbook/backend/pas/pas-book.c
+++ /dev/null
@@ -1,692 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * pas-book.c
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "pas-book.h"
-
-static BonoboObjectClass *pas_book_parent_class;
-POA_Evolution_Book__vepv pas_book_vepv;
-
-enum {
-	REQUESTS_QUEUED,
-	LAST_SIGNAL
-};
-
-static guint pas_book_signals [LAST_SIGNAL];
-
-struct _PASBookPrivate {
-	PASBackend             *backend;
-	Evolution_BookListener  listener;
-	PASBookGetVCardFn       get_vcard;
-	PASBookCanWriteFn       can_write;
-	PASBookCanWriteCardFn   can_write_card;
-
-	GList                  *request_queue;
-	gint                    idle_id;
-};
-
-static gboolean
-pas_book_check_queue (PASBook *book)
-{
-	if (book->priv->request_queue != NULL) {
-		gtk_signal_emit (GTK_OBJECT (book),
-				 pas_book_signals [REQUESTS_QUEUED]);
-	}
-
-	if (book->priv->request_queue == NULL) {
-		book->priv->idle_id = 0;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-pas_book_queue_request (PASBook *book, PASRequest *req)
-{
-	book->priv->request_queue =
-		g_list_append (book->priv->request_queue, req);
-
-	if (book->priv->idle_id == 0) {
-		book->priv->idle_id = g_idle_add ((GSourceFunc) pas_book_check_queue, book);
-	}
-}
-
-static void
-pas_book_queue_create_card (PASBook *book, const char *vcard)
-{
-	PASRequest *req;
-
-	req        = g_new0 (PASRequest, 1);
-	req->op    = CreateCard;
-	req->vcard = g_strdup (vcard);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_remove_card (PASBook *book, const char *id)
-{
-	PASRequest *req;
-
-	req     = g_new0 (PASRequest, 1);
-	req->op = RemoveCard;
-	req->id = g_strdup (id);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_modify_card (PASBook *book, const char *vcard)
-{
-	PASRequest *req;
-
-	req        = g_new0 (PASRequest, 1);
-	req->op    = ModifyCard;
-	req->vcard = g_strdup (vcard);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_get_cursor (PASBook *book, const char *search)
-{
-	PASRequest *req;
-
-	req         = g_new0 (PASRequest, 1);
-	req->op     = GetCursor;
-	req->search = g_strdup(search);
-
-	pas_book_queue_request (book, req);
-}
-
-static void
-pas_book_queue_get_book_view (PASBook *book, const Evolution_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 = CORBA_Object_duplicate(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_check_connection (PASBook *book)
-{
-	PASRequest *req;
-
-	req        = g_new0 (PASRequest, 1);
-	req->op    = CheckConnection;
-
-	pas_book_queue_request (book, req);
-}
-
-static CORBA_char *
-impl_Evolution_Book_get_vcard (PortableServer_Servant servant,
-			       const Evolution_CardId id,
-			       CORBA_Environment *ev)
-{
-	PASBook    *book = PAS_BOOK (bonobo_object_from_servant (servant));
-	char       *vcard;
-	CORBA_char *retval;
-
-	vcard = (book->priv->get_vcard) (book, (const char *) id);
-	retval = CORBA_string_dup (vcard);
-	g_free (vcard);
-
-	return retval;
-}
-
-static CORBA_boolean
-impl_Evolution_Book_can_write (PortableServer_Servant servant,
-			       CORBA_Environment *ev)
-{
-	PASBook    *book = PAS_BOOK (bonobo_object_from_servant (servant));
-	CORBA_boolean retval;
-
-	retval = (book->priv->can_write) (book);
-
-	return retval;
-}
-
-static CORBA_boolean
-impl_Evolution_Book_can_write_card (PortableServer_Servant servant,
-				    const Evolution_CardId id,
-				    CORBA_Environment *ev)
-{
-	PASBook    *book = PAS_BOOK (bonobo_object_from_servant (servant));
-	CORBA_boolean retval;
-
-	retval = (book->priv->can_write_card) (book, (const char *) id);
-
-	return retval;
-}
-
-static void
-impl_Evolution_Book_create_card (PortableServer_Servant servant,
-				 const Evolution_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_Evolution_Book_remove_card (PortableServer_Servant servant,
-				 const Evolution_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_Evolution_Book_modify_card (PortableServer_Servant servant,
-				 const Evolution_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_Evolution_Book_get_cursor (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_Evolution_Book_get_book_view (PortableServer_Servant servant,
-				   const Evolution_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_Evolution_Book_check_connection (PortableServer_Servant servant,
-				      CORBA_Environment *ev)
-{
-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));
-
-	pas_book_queue_check_connection (book);
-}
-
-static char *
-impl_Evolution_Book_get_static_capabilities (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;
-}
-
-/**
- * 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:
- */
-Evolution_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,
-		       Evolution_BookListener_CallStatus  status)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	if (status == Evolution_BookListener_Success) {
-		Evolution_BookListener_respond_open_book (
-			book->priv->listener, status,
-			bonobo_object_corba_objref (BONOBO_OBJECT (book)),
-			&ev);
-	} else {
-		Evolution_BookListener_respond_open_book (
-			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,
-			 Evolution_BookListener_CallStatus  status,
-			 const char                        *id)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	Evolution_BookListener_respond_create_card (
-		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,
-			 Evolution_BookListener_CallStatus  status)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	Evolution_BookListener_respond_remove_card (
-		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,
-			 Evolution_BookListener_CallStatus  status)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	Evolution_BookListener_respond_modify_card (
-		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_get_cursor:
- */
-void
-pas_book_respond_get_cursor (PASBook                           *book,
-			     Evolution_BookListener_CallStatus  status,
-			     PASCardCursor                     *cursor)
-{
-	CORBA_Environment ev;
-	CORBA_Object      object;
-
-	CORBA_exception_init (&ev);
-	
-	object = bonobo_object_corba_objref(BONOBO_OBJECT(cursor));
-
-	Evolution_BookListener_respond_get_cursor (
-		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_cursor:
- */
-void
-pas_book_respond_get_book_view (PASBook                           *book,
-				Evolution_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));
-
-	Evolution_BookListener_respond_get_view (
-		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_report_connection:
- */
-void
-pas_book_report_connection (PASBook  *book,
-			    gboolean  connected)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	Evolution_BookListener_report_connection_status (
-		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);
-}
-
-static gboolean
-pas_book_construct (PASBook                *book,
-		    PASBackend             *backend,
-		    Evolution_BookListener  listener,
-		    PASBookGetVCardFn       get_vcard,
-		    PASBookCanWriteFn       can_write,
-		    PASBookCanWriteCardFn   can_write_card)
-{
-	POA_Evolution_Book *servant;
-	CORBA_Environment   ev;
-	CORBA_Object        obj;
-
-	g_assert (book      != NULL);
-	g_assert (PAS_IS_BOOK (book));
-	g_assert (listener  != CORBA_OBJECT_NIL);
-	g_assert (get_vcard != NULL);
-	g_assert (can_write != NULL);
-	g_assert (can_write_card != NULL);
-
-	servant = (POA_Evolution_Book *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &pas_book_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_Evolution_Book__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-
-		return FALSE;
-	}
-
-	CORBA_exception_free (&ev);
-
-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (book), servant);
-	if (obj == CORBA_OBJECT_NIL) {
-		g_free (servant);
-
-		return FALSE;
-	}
-
-	bonobo_object_construct (BONOBO_OBJECT (book), obj);
-
-	CORBA_exception_init (&ev);
-	book->priv->listener = CORBA_Object_duplicate (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("pas_book_construct(): could not duplicate the listener");
-
-	CORBA_exception_free (&ev);
-
-	book->priv->listener  = listener;
-	book->priv->get_vcard = get_vcard;
-	book->priv->can_write = can_write;
-	book->priv->can_write_card = can_write_card;
-	book->priv->backend   = backend;
-
-	return TRUE;
-}
-
-/**
- * pas_book_new:
- */
-PASBook *
-pas_book_new (PASBackend             *backend,
-	      Evolution_BookListener  listener,
-	      PASBookGetVCardFn       get_vcard,
-	      PASBookCanWriteFn       can_write,
-	      PASBookCanWriteCardFn   can_write_card)
-{
-	PASBook *book;
-
-	g_return_val_if_fail (listener  != CORBA_OBJECT_NIL, NULL);
-	g_return_val_if_fail (get_vcard != NULL,             NULL);
-
-	book = gtk_type_new (pas_book_get_type ());
-
-	if (! pas_book_construct (book, backend, listener,
-				  get_vcard, can_write, can_write_card)) {
-		gtk_object_unref (GTK_OBJECT (book));
-
-		return NULL;
-	}
-
-	return book;
-}
-
-static void
-pas_book_destroy (GtkObject *object)
-{
-	PASBook *book = PAS_BOOK (object);
-	GList   *l;
-	CORBA_Environment ev;
-
-	for (l = book->priv->request_queue; l != NULL; l = l->next) {
-		PASRequest *req = l->data;
-
-		g_free (req->id);
-		g_free (req->vcard);
-		g_free (req);
-	}
-	g_list_free (book->priv->request_queue);
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (book->priv->listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("pas_book_construct(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-
-	g_free (book->priv);
-
-	GTK_OBJECT_CLASS (pas_book_parent_class)->destroy (object);	
-}
-
-static POA_Evolution_Book__epv *
-pas_book_get_epv (void)
-{
-	POA_Evolution_Book__epv *epv;
-
-	epv = g_new0 (POA_Evolution_Book__epv, 1);
-
-	epv->get_vcard               = impl_Evolution_Book_get_vcard;
-	epv->can_write               = impl_Evolution_Book_can_write;
-	epv->can_write_card          = impl_Evolution_Book_can_write_card;
-	epv->create_card             = impl_Evolution_Book_create_card;
-	epv->remove_card             = impl_Evolution_Book_remove_card;
-	epv->modify_card             = impl_Evolution_Book_modify_card;
-	epv->check_connection        = impl_Evolution_Book_check_connection;
-	epv->get_static_capabilities = impl_Evolution_Book_get_static_capabilities;
-	epv->get_cursor              = impl_Evolution_Book_get_cursor;
-	epv->get_book_view           = impl_Evolution_Book_get_book_view;
-
-	return epv;
-	
-}
-
-static void
-pas_book_corba_class_init (void)
-{
-	pas_book_vepv.Bonobo_Unknown_epv  = bonobo_object_get_epv ();
-	pas_book_vepv.Evolution_Book_epv = pas_book_get_epv ();
-}
-
-static void
-pas_book_class_init (PASBookClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-
-	pas_book_parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	pas_book_signals [REQUESTS_QUEUED] =
-		gtk_signal_new ("requests_queued",
-				GTK_RUN_LAST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (PASBookClass, requests_queued),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, pas_book_signals, LAST_SIGNAL);
-
-	object_class->destroy = pas_book_destroy;
-
-	pas_book_corba_class_init ();
-}
-
-static void
-pas_book_init (PASBook *book)
-{
-	book->priv                = g_new0 (PASBookPrivate, 1);
-	book->priv->idle_id       = 0;
-	book->priv->request_queue = NULL;
-}
-
-/**
- * pas_book_get_type:
- */
-GtkType
-pas_book_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (! type) {
-		GtkTypeInfo info = {
-			"PASBook",
-			sizeof (PASBook),
-			sizeof (PASBookClass),
-			(GtkClassInitFunc)  pas_book_class_init,
-			(GtkObjectInitFunc) pas_book_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_object_get_type (), &info);
-	}
-
-	return type;
-}
-
diff --git a/addressbook/backend/pas/pas-book.h b/addressbook/backend/pas/pas-book.h
deleted file mode 100644
index 9ca81eb25d..0000000000
--- a/addressbook/backend/pas/pas-book.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * A wrapper object which exports the Evolution_Book CORBA interface
- * and which maintains a request queue.
- *
- * Author:
- *   Nat Friedman (nat@helixcode.com)
- *
- * Copyright 2000, Helix Code, 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>
-
-typedef struct _PASBook        PASBook;
-typedef struct _PASBookPrivate PASBookPrivate;
-
-#include <pas/pas-backend.h>
-#include <pas/pas-card-cursor.h>
-
-typedef enum {
-	CreateCard,
-	RemoveCard,
-	ModifyCard,
-	GetCursor,
-	GetBookView,
-	CheckConnection
-} PASOperation;
-
-typedef struct {
-	PASOperation               op;
-	char                      *id;
-	char                      *vcard;
-	char                      *search;
-	Evolution_BookViewListener listener;
-} PASRequest;
-
-struct _PASBook {
-	BonoboObject     parent_object;
-	PASBookPrivate *priv;
-};
-
-typedef struct {
-	BonoboObjectClass parent_class;
-
-	/* Signals */
-	void (*requests_queued) (void);
-} PASBookClass;
-
-typedef char *   (*PASBookGetVCardFn)     (PASBook *book, const char *id);
-typedef gboolean (*PASBookCanWriteFn)     (PASBook *book);
-typedef gboolean (*PASBookCanWriteCardFn) (PASBook *book, const char *id);
-
-PASBook                *pas_book_new                    (PASBackend                        *backend,
-							 Evolution_BookListener             listener,
-							 PASBookGetVCardFn                  get_vcard,
-							 PASBookCanWriteFn                  can_write,
-							 PASBookCanWriteCardFn              can_write_card);
-PASBackend             *pas_book_get_backend            (PASBook                           *book);
-Evolution_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,
-							 Evolution_BookListener_CallStatus  status);
-void                    pas_book_respond_create         (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status,
-							 const char                        *id);
-void                    pas_book_respond_remove         (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status);
-void                    pas_book_respond_modify         (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status);
-void                    pas_book_respond_get_cursor     (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status,
-							 PASCardCursor                     *cursor);
-void                    pas_book_respond_get_book_view  (PASBook                           *book,
-							 Evolution_BookListener_CallStatus  status,
-							 PASBookView                       *book_view);
-void                    pas_book_report_connection      (PASBook                           *book,
-							 gboolean                           connected);
-
-gboolean                pas_book_can_write              (PASBook                           *book);
-gboolean                pas_book_can_write_card         (PASBook                           *book,
-							 const char                        *id);
-GtkType                 pas_book_get_type               (void);
-
-#define PAS_BOOK_TYPE        (pas_book_get_type ())
-#define PAS_BOOK(o)          (GTK_CHECK_CAST ((o), PAS_BOOK_TYPE, PASBook))
-#define PAS_BOOK_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_FACTORY_TYPE, PASBookClass))
-#define PAS_IS_BOOK(o)       (GTK_CHECK_TYPE ((o), PAS_BOOK_TYPE))
-#define PAS_IS_BOOK_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_TYPE))
-
-#endif /* ! __PAS_BOOK_H__ */
diff --git a/addressbook/backend/pas/pas-card-cursor.c b/addressbook/backend/pas/pas-card-cursor.c
deleted file mode 100644
index c2bbe1c9b0..0000000000
--- a/addressbook/backend/pas/pas-card-cursor.c
+++ /dev/null
@@ -1,227 +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@helixcode.com.
- */
-
-#include <config.h>
-#include <bonobo.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_Evolution_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_Evolution_CardCursor__epv *
-pas_card_cursor_get_epv (void)
-{
-	POA_Evolution_CardCursor__epv *epv;
-
-	epv = g_new0 (POA_Evolution_CardCursor__epv, 1);
-
-	/*
-	 * This is the method invoked by CORBA
-	 */
-	epv->get_length = impl_pas_card_cursor_get_length;
-	epv->get_nth    = 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.Evolution_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,
-			   Evolution_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 Evolution_CardCursor
-create_cursor (BonoboObject *cursor)
-{
-	POA_Evolution_CardCursor *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_Evolution_CardCursor *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &cursor_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_Evolution_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 (Evolution_CardCursor) bonobo_object_activate_servant (cursor, servant);
-}
-
-PASCardCursor *
-pas_card_cursor_new (PASCardCursorLengthFunc  get_length,
-		     PASCardCursorNthFunc     get_nth,
-		     gpointer data)
-{
-	PASCardCursor *cursor;
-	Evolution_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 300e3e3ce1..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@helixcode.com)
- *
- * Copyright 2000, Helix Code, 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,
-					  Evolution_CardCursor     corba_cursor,
-					  PASCardCursorLengthFunc  get_length,
-					  PASCardCursorNthFunc     get_nth,
-					  gpointer data);
-
-GtkType        pas_card_cursor_get_type  (void);
-POA_Evolution_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 6f302c2ac7..0000000000
--- a/addressbook/conduit/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-*.lo
-Makefile.in
-Makefile
-libaddress_conduit.la
-address-conduit-control-applet
-address.conduit
-\ No newline at end of file
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
deleted file mode 100644
index da094e6a72..0000000000
--- a/addressbook/conduit/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook		\
-	-I$(top_srcdir)/addressbook/backend	\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(GNOME_PILOT_CFLAGS)
-
-bin_PROGRAMS = address-conduit-control-applet
-
-address_conduit_control_applet_SOURCES = address-conduit-control-applet.c
-
-address_conduit_control_applet_LDADD = \
-		$(CAPPLET_LIBS)  \
-		$(GNOME_LIBDIR) \
-		-lgpilotdcm \
-		-lgpilotd \
-		-lgpilotdconduit \
-		$(GNOME_CAPPLET_LIBS) \
-		$(BONOBO_VFS_GNOME_LIBS) \
-		$(GNOME_XML_LIB) \
-	        $(GNOMEUI_LIBS) \
-		$(PISOCK_LIBDIR) $(PISOCK_LIBS) \
-                $(INTLLIBS)
-
-
-# address_conduit
-address_conduitsdir=$(libdir)/gnome-pilot/conduits
-address_conduits_LTLIBRARIES = libaddress_conduit.la
-
-libaddress_conduit_la_SOURCES = \
-	address-conduit.c \
-	address-conduit.h
-
-# address-conduit.c: my_gnomecal_idl
-
-address.conduit: address.conduit.in Makefile
-	sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/address.conduit.in > address.conduit.tmp \
-	&& mv address.conduit.tmp address.conduit
-
-#
-# conduit
-#
-
-libaddress_conduit_la_LDFLAGS = \
-	-rpath $(libdir)
-
-libaddress_conduit_la_LIBADD = 					\
-	$(top_builddir)/addressbook/backend/ebook/libebook-static.la	\
-	$(top_builddir)/e-util/libeutil-static.la			\
-	$(top_builddir)/addressbook/ename/libename-static.la		\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/libical/src/libical/libical-static.la		\
-	$(BONOBO_VFS_GNOME_LIBS)					\
-	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 				\
-	$(GNOME_LIBDIR) 						\
-	$(GNOME_LIBS)
-
-ccenterdir = $(datadir)/control-center
-ccenterPalmPilotdir = $(ccenterdir)/Peripherals
-ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
-ccenterConduits_DATA = address-conduit-control-applet.desktop 
-
-panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-panelConduits_DATA = $(ccenterConduits_DATA)
-
-Conduitdir = $(datadir)/gnome-pilot/conduits/
-Conduit_DATA = address.conduit
-
-EXTRA_DIST = \
-	address.conduit.in \
-        $(ccenterConduits_DATA)
-
-install-data-local:
-	$(mkinstalldirs) $(ccenterConduitsdir)
-	$(mkinstalldirs) $(Conduitdir)
diff --git a/addressbook/conduit/address-conduit-control-applet.c b/addressbook/conduit/address-conduit-control-applet.c
deleted file mode 100644
index 07a6e0042f..0000000000
--- a/addressbook/conduit/address-conduit-control-applet.c
+++ /dev/null
@@ -1,386 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Control applet ("capplet") for the gnome-pilot address conduit,             */
-/* based on                                                                 */
-/* gpilotd control applet ('capplet') for use with the GNOME control center */
-
-#include <pwd.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <gnome.h>
-
-#include <config.h>
-#include <capplet-widget.h>
-
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-#include <gpilotd/gnome-pilot-client.h>
-
-#include "address-conduit.h"
-
-
-/* tell changes callbacks to ignore changes or not */
-static gboolean ignore_changes=FALSE;
-
-/* capplet widget */
-static GtkWidget *capplet=NULL;
-
-/* host/device/pilot configuration windows */
-GtkWidget *cfgOptionsWindow=NULL;
-GtkWidget *cfgStateWindow=NULL;
-GtkWidget *dialogWindow=NULL;
-
-gboolean activated,org_activation_state;
-GnomePilotConduitManagement *conduit;
-GnomePilotConduitConfig *conduit_config;
-AddressbookConduitCfg *origState = NULL;
-AddressbookConduitCfg *curState = NULL;
-
-static void doTrySettings(GtkWidget *widget, AddressbookConduitCfg *cfg);
-static void doRevertSettings(GtkWidget *widget, AddressbookConduitCfg *cfg);
-static void doSaveSettings(GtkWidget *widget, AddressbookConduitCfg *cfg);
-
-//static void readStateCfg (GtkWidget *w, AddressbookConduitCfg *c);
-static void setStateCfg (GtkWidget *w, AddressbookConduitCfg *c);
-
-gint pilotId;
-CORBA_Environment ev;
-static GnomePilotClient *gpc;
-
-
-/* This array must be in the same order as enumerations
-   in GnomePilotConduitSyncType as they are used as index.
-   Custom type implies Disabled state.
-*/
-static gchar* sync_options[] ={ N_("Disabled"),
-				N_("Synchronize"),
-				N_("Copy From Pilot"),
-				N_("Copy To Pilot"),
-				N_("Merge From Pilot"),
-				N_("Merge To Pilot")};
-#define SYNC_OPTIONS_COUNT 6
-
-
-
-
-/* Saves the configuration data. */
-static void 
-addressbookconduit_save_configuration(AddressbookConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf(prefix,255,"/gnome-pilot.d/address-conduit/Pilot_%u/",c->pilotId);
-
-	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();
-}
-
-/* Creates a duplicate of the configuration data */
-static AddressbookConduitCfg*
-gcalconduit_dupe_configuration(AddressbookConduitCfg *c) {
-	AddressbookConduitCfg *retval;
-	g_return_val_if_fail(c!=NULL,NULL);
-	retval = g_new0(AddressbookConduitCfg,1);
-	retval->sync_type = c->sync_type;
-	retval->open_secret = c->open_secret;
-	retval->pilotId = c->pilotId;
-	return retval;
-}
-
-
-static void
-doTrySettings(GtkWidget *widget, AddressbookConduitCfg *c)
-{
-	/*
-	readStateCfg (cfgStateWindow, curState);
-	if (activated)
-		gnome_pilot_conduit_config_enable (conduit_config, GnomePilotConduitSyncTypeCustom);
-	else
-		gnome_pilot_conduit_config_disable (conduit_config);
-	*/
-
-	if (c->sync_type!=GnomePilotConduitSyncTypeCustom)
-		gnome_pilot_conduit_config_enable_with_first_sync (conduit_config,
-								   c->sync_type,
-								   c->sync_type,
-								   TRUE);
-	else
-		gnome_pilot_conduit_config_disable (conduit_config);
-
-	addressbookconduit_save_configuration (c);
-}
-
-
-static void
-doSaveSettings(GtkWidget *widget, AddressbookConduitCfg *cfg)
-{
-	doTrySettings(widget, cfg);
-	addressbookconduit_save_configuration(cfg);
-}
-
-
-static void
-doCancelSettings(GtkWidget *widget, AddressbookConduitCfg *c)
-{
-	doSaveSettings (widget, c);
-}
-
-
-static void
-doRevertSettings(GtkWidget *widget, AddressbookConduitCfg *cfg)
-{
-	activated = org_activation_state;
-	setStateCfg (cfgStateWindow, curState);
-}
-
-static void 
-about_cb (GtkWidget *widget, gpointer data) 
-{
-	GtkWidget *about;
-	const gchar *authors[] = {_("Eskil Heyn Olsen <deity@eskil.dk>"),NULL};
-  
-	about = gnome_about_new (_("Gpilotd address conduit"), VERSION,
-				 _("(C) 1998 the Free Software Foundation"),
-				 authors,
-				 _("Configuration utility for the address conduit.\n"),
-				 _("gnome-unknown.xpm"));
-	gtk_widget_show (about);
-  
-	return;
-}
-
-
-/* called by the sync_type GtkOptionMenu */
-static void
-sync_action_selection(GtkMenuShell *widget, gpointer unused) 
-{
-	if (!ignore_changes) {
-		capplet_widget_state_changed(CAPPLET_WIDGET (capplet), TRUE);
-	}
-}
-
-
-/* called by the sync_type GtkOptionMenu */
-static void
-activate_sync_type(GtkMenuItem *widget, gpointer data)
-{
-	curState->sync_type = GPOINTER_TO_INT(data);
-	if(!ignore_changes)
-		capplet_widget_state_changed(CAPPLET_WIDGET(capplet), TRUE);
-}
-
-
-static GtkWidget
-*createStateCfgWindow(void)
-{
-	GtkWidget *vbox, *table;
-	GtkWidget *label;
-	GtkWidget *optionMenu,*menuItem;
-	GtkMenu   *menu;
-	gint i;
-	
-	vbox = gtk_vbox_new(FALSE, GNOME_PAD);
-
-	table =  gtk_hbox_new(FALSE, 0); 
-	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, GNOME_PAD);
-
-	label = gtk_label_new(_("Synchronize Action"));
-	gtk_box_pack_start(GTK_BOX(table), label, FALSE, FALSE, GNOME_PAD);    
-
-	optionMenu=gtk_option_menu_new();
-	gtk_object_set_data(GTK_OBJECT(vbox), "conduit_state", optionMenu);
-	menu = GTK_MENU(gtk_menu_new());
-
-	for (i=0; i<SYNC_OPTIONS_COUNT;i++) {
-		sync_options[i]=_(sync_options[i]);
-		menuItem = gtk_menu_item_new_with_label(sync_options[i]);
-		gtk_widget_show(menuItem);
-		gtk_signal_connect(GTK_OBJECT(menuItem),"activate",
-				   GTK_SIGNAL_FUNC(activate_sync_type),
-				   GINT_TO_POINTER(i));
-		gtk_menu_append(menu,menuItem);
-	}
-
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optionMenu),GTK_WIDGET(menu));
-	gtk_signal_connect(GTK_OBJECT(menu), "selection-done",
-			   GTK_SIGNAL_FUNC(sync_action_selection),
-			   NULL);
-  
-	gtk_box_pack_start(GTK_BOX(table), optionMenu, FALSE, FALSE, 0);    
-	
-	return vbox;
-}
-
-
-static void
-setStateCfg (GtkWidget *w, AddressbookConduitCfg *c)
-{
-	GtkOptionMenu *optionMenu;
-	GtkMenu *menu;
-	
-	optionMenu = gtk_object_get_data (GTK_OBJECT(w), "conduit_state");
-	g_assert (optionMenu != NULL);
-	menu = GTK_MENU (gtk_option_menu_get_menu (optionMenu));
-  
-	ignore_changes = TRUE;
-	/* Here were are relying on the items in menu being the same 
-	   order as in GnomePilotConduitSyncType. */
-	gtk_option_menu_set_history (optionMenu, (int) c->sync_type);
-	ignore_changes = FALSE;
-}
-
-
-#if 0
-static void
-readStateCfg (GtkWidget *w, AddressbookConduitCfg *c)
-{
-	/*
-	GtkWidget *button;
-	button  = gtk_object_get_data(GTK_OBJECT(cfg), "conduit_on_off");
-	g_assert(button!=NULL);
-	activated = GTK_TOGGLE_BUTTON(button)->active;
-	*/
-}
-#endif /* 0 */
-
-
-static void
-pilot_capplet_setup(void)
-{
-	GtkWidget *frame, *table;
-
-	capplet = capplet_widget_new();
-
-	table = gtk_table_new(1, 2, FALSE);
-	gtk_container_border_width(GTK_CONTAINER(table), GNOME_PAD);
-	gtk_container_add(GTK_CONTAINER(capplet), table); 
-
-	frame = gtk_frame_new(_("Conduit state"));
-	gtk_container_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);
-	gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 1, 0, 1);
-	cfgStateWindow = createStateCfgWindow();
-	gtk_container_add(GTK_CONTAINER(frame), cfgStateWindow);
-
-	gtk_signal_connect(GTK_OBJECT(capplet), "try",
-			   GTK_SIGNAL_FUNC(doTrySettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "revert",
-			   GTK_SIGNAL_FUNC(doRevertSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "ok",
-			   GTK_SIGNAL_FUNC(doSaveSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "cancel",
-			   GTK_SIGNAL_FUNC(doCancelSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "help",
-			   GTK_SIGNAL_FUNC(about_cb), NULL);
-
-
-	setStateCfg (cfgStateWindow, curState);
-
-	gtk_widget_show_all (capplet);
-}
-
-
-static void 
-run_error_dialog(gchar *mesg,...) 
-{
-	char tmp[80];
-	va_list ap;
-
-	va_start(ap,mesg);
-	vsnprintf(tmp,79,mesg,ap);
-	dialogWindow = gnome_message_box_new(mesg,GNOME_MESSAGE_BOX_ERROR,GNOME_STOCK_BUTTON_OK,NULL);
-	gnome_dialog_run_and_close(GNOME_DIALOG(dialogWindow));
-	va_end(ap);
-}
-
-
-static gint 
-get_pilot_id_from_gpilotd() 
-{
-	GList *pilots=NULL;
-	gint pilot;
-	int i,err;
-  
-	i=0;
-	/* we don't worry about leaking here, so pilots isn't freed */
-	switch(err = gnome_pilot_client_get_pilots(gpc,&pilots)) {
-	case GPILOTD_OK: {
-		if(pilots) {
-			for(i=0;i<g_list_length(pilots);i++) {
-				g_message("pilot %d = \"%s\"",i,(gchar*)g_list_nth(pilots,i)->data); 
-			}
-			if(i==0) {
-				run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));
-				return -1;
-			} else {
-				gnome_pilot_client_get_pilot_id_by_name(gpc,
-									pilots->data,  /* this is the first pilot */
-									&pilot);
-				if(i>1) {
-					g_message("too many pilots...");
-					/* need a choose here */
-				}
-				return pilot;
-			}
-		} else {
-			run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));
-			return -1;
-		}    
-		break;
-	}
-	case GPILOTD_ERR_NOT_CONNECTED:
-		run_error_dialog(_("Not connected to the gnome-pilot daemon"));
-		return -1;
-		break;
-	default:
-		g_warning("gnome_pilot_client_get_pilot_ids(...) = %d",err);
-		run_error_dialog(_("An error occured when trying to fetch\npilot list from the gnome-pilot daemon"));
-		return -1;
-		break;
-	}
-}
-
-
-int
-main (int argc, char *argv[])
-{
-	g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
-				G_LOG_LEVEL_CRITICAL |
-				G_LOG_LEVEL_WARNING);
-	
-	/* we're a capplet */
-	gnome_capplet_init ("address conduit control applet", NULL, argc, argv, 
-			    NULL, 0, NULL);
-
-   
-	gpc = gnome_pilot_client_new();
-	gnome_pilot_client_connect_to_daemon(gpc);
-	pilotId = get_pilot_id_from_gpilotd();
-	if(!pilotId) return -1;
-
-	/* put all code to set things up in here */
-	conduit_load_configuration (&origState, pilotId);
-
-	conduit = gnome_pilot_conduit_management_new ("address_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	if (conduit == NULL) return -1;
-	conduit_config = gnome_pilot_conduit_config_new (conduit, pilotId);
-	org_activation_state = gnome_pilot_conduit_config_is_enabled (conduit_config,
-								      &origState->sync_type);
-	activated = org_activation_state;
-
-	//gpilotd_conduit_mgmt_get_sync_type (conduit, pilotId, &origState->sync_type);
-
-	curState = gcalconduit_dupe_configuration(origState);
-    
-	pilot_capplet_setup ();
-
-
-	/* done setting up, now run main loop */
-	capplet_gtk_main();
-    
-	gnome_pilot_conduit_management_destroy(conduit);
-
-	return 0;
-}    
diff --git a/addressbook/conduit/address-conduit-control-applet.desktop b/addressbook/conduit/address-conduit-control-applet.desktop
deleted file mode 100644
index 86828ccbca..0000000000
--- a/addressbook/conduit/address-conduit-control-applet.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Name=Address conduit 
-Name[da]=Udst�ende
-Name[es]=Enlace de direcciones
-Name[fr]=Conduit Adresses
-Name[no]=Oppgaver
-Name[sv]=Adresser
-Name[tr]=Adres par�as�
-Comment=Configure the address conduit
-Comment[da]=Konfigur�r Udst�ende
-Comment[es]=Configurar el enlace de direcciones
-Comment[fr]=Configuration du conduit Adresses
-Comment[no]=Konfigur�r oppgavelisten
-Comment[sv]=Konfigurera adresskanalen
-Comment[tr]=Adres par�as�n�n ayarlar�
-Exec=address-conduit-control-applet --cap-id=1
-Terminal=0
-Type=Application
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
deleted file mode 100644
index d863d22af4..0000000000
--- a/addressbook/conduit/address-conduit.c
+++ /dev/null
@@ -1,1274 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-#include <sys/stat.h>
-#include <utime.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <signal.h>
-#include <errno.h>
-
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-file.h>
-#include <pi-dlp.h>
-#include <libgnorba/gnorba.h>
-#include <libgnorba/gnome-factory.h>
-#include <pi-version.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-standard-abs.h>
-#include <address-conduit.h>
-#include "ebook/e-book-types.h"
-
-#include <bonobo.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-void local_record_from_ecard (AddressbookLocalRecord *local, ECard *ecard);
-
-#define CONDUIT_VERSION "0.1"
-#ifdef G_LOG_DOMAIN
-#undef G_LOG_DOMAIN
-#endif
-#define G_LOG_DOMAIN "addressconduit" 
-
-/* #define SUPPORT_ARCHIVING 1 */
-#define NEED_OAF_INIT_HACK 1
-#define DEBUG_ADDRESSBOOKCONDUIT 1
-
-#ifdef DEBUG_ADDRESSBOOKCONDUIT
-#define show_exception(e) g_warning ("Exception: %s\n", CORBA_exception_id (e))
-#define LOG(e...) g_log(G_LOG_DOMAIN,G_LOG_LEVEL_MESSAGE, e)
-#else
-#define show_exception(e)
-#define LOG(e...)
-#endif
-
-#define WARN(e...) g_log(G_LOG_DOMAIN,G_LOG_LEVEL_WARNING, e)
-#define INFO(e...) g_log(G_LOG_DOMAIN,G_LOG_LEVEL_MESSAGE, e)
-
-#define catch_ret_val(_env,ret)                                                                 \
-  if (_env._major != CORBA_NO_EXCEPTION) {                                                      \
-        g_log(G_LOG_DOMAIN,G_LOG_LEVEL_MESSAGE,"%s:%d: Caught exception",__FILE__,__LINE__);    \
-        g_warning ("Exception: %s\n", CORBA_exception_id (&(_env)));                               \
-	CORBA_exception_free(&(_env));                                                             \
-	return ret;                                                                             \
-  }
-
-
-static void
-status_cb (EBook *ebook, EBookStatus status, gpointer closure)
-{
-	(*(EBookStatus*)closure) = status;
-	gtk_main_quit();
-}
-
-
-/* Destroys any data allocated by gcalconduit_load_configuration
-   and deallocates the given configuration. */
-static void 
-conduit_destroy_configuration(AddressbookConduitCfg **c) 
-{
-	g_return_if_fail(c!=NULL);
-	g_return_if_fail(*c!=NULL);
-	//g_free(*c); FIX ME
-	*c = NULL;
-}
-
-
-/* Given a AddressbookConduitContext**, allocates the structure */
-static void
-conduit_new_context(AddressbookConduitContext **ctxt,
-		    AddressbookConduitCfg *c) 
-{
-	*ctxt = g_new0(AddressbookConduitContext,1);
-	g_assert(ctxt!=NULL);
-	(*ctxt)->cfg = c;
-	CORBA_exception_init (&((*ctxt)->ev));
-}
-
-
-/* Destroys any data allocated by conduit_new_context
-   and deallocates its data. */
-static void
-conduit_destroy_context(AddressbookConduitContext **ctxt)
-{
-	g_return_if_fail(ctxt!=NULL);
-	g_return_if_fail(*ctxt!=NULL);
-
-	if ((*ctxt)->cfg!=NULL)
-		conduit_destroy_configuration(&((*ctxt)->cfg));
-
-	g_free(*ctxt);
-	*ctxt = NULL;
-}
-
-
-static void
-cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure)
-{
-	AddressbookConduitContext *ctxt = (AddressbookConduitContext*)closure;
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		long length;
-		int i;
-
-		// ctxt->cursor = cursor;
-		ctxt->address_load_success = TRUE;
-
-		length = e_card_cursor_get_length (cursor);
-		ctxt->cards = NULL;
-		for (i = 0; i < length; i ++)
-			ctxt->cards = g_list_append (ctxt->cards, e_card_cursor_get_nth (cursor, i));
-
-		gtk_main_quit(); /* end the sub event loop */
-	}
-	else {
-		WARN (_("BLARG\n"));
-		gtk_main_quit(); /* end the sub event loop */
-	}
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	AddressbookConduitContext *ctxt = (AddressbookConduitContext*)closure;
-
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		e_book_get_cursor (book, "(contains \"full_name\" \"\")", cursor_cb, ctxt);
-	}
-	else {
-		WARN (_("BLARG\n"));
-		gtk_main_quit(); /* end the sub event loop */
-	}
-}
-
-static int
-start_address_server (GnomePilotConduitStandardAbs *conduit,
-		      AddressbookConduitContext *ctxt)
-{
-	gchar *uri, *path;
-
-	g_return_val_if_fail(conduit!=NULL,-2);
-	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;
-}
-
-/*
- * converts a ECard to a AddressbookLocalRecord
- */
-void
-local_record_from_ecard(AddressbookLocalRecord *local,
-			ECard *ecard)
-{
-	guint32 current_status;
-
-	g_return_if_fail(local!=NULL);
-	g_return_if_fail(ecard!=NULL);
-
-	local->ecard = ecard;
-	local->local.ID = local->ecard->pilot_id;
-
-	gtk_object_get (GTK_OBJECT(ecard),
-			"pilot_status", &current_status, NULL);
-
-	switch(current_status) {
-	case E_CARD_PILOT_STATUS_NONE: 
-		local->local.attr = GnomePilotRecordNothing; 
-		break;
-	case E_CARD_PILOT_STATUS_MOD:
-		local->local.attr = GnomePilotRecordModified; 
-		break;
-	case E_CARD_PILOT_STATUS_DEL: 
-		local->local.attr = GnomePilotRecordDeleted; 
-		break;
-	}
-
-	/* Records without a pilot_id are new */
-	if(local->local.ID == 0) 
-		local->local.attr = GnomePilotRecordNew; 
-  
-	local->local.secret = 0;
-#if 0
-	if(obj->class!=NULL) 
-		if(strcmp(obj->class,"PRIVATE")==0)
-			local->local.secret = 1;
-#endif
- 
-	local->local.archived = 0;  
-}
-
-static ECard *
-get_ecard_by_pilot_id (GList *card_list, recordid_t id)
-{
-	GList *l;
-
-	for (l = card_list; l; l = l->next) {
-		guint32 pilot_id;
-		ECard *card = l->data;
-
-		if (!card)
-			continue;
-
-		gtk_object_get (GTK_OBJECT(card),
-				"pilot_id", &pilot_id, NULL);
-
-		if (pilot_id == id)
-			return card;
-	}
-
-	return NULL;
-}
-
-/*
- * Given a PilotRecord, find the matching record in
- * the addressbook. If no match, return NULL
- */
-static AddressbookLocalRecord *
-find_record_in_ebook(GnomePilotConduitStandardAbs *conduit,
-		     PilotRecord *remote,
-		     AddressbookConduitContext *ctxt) 
-{
-	AddressbookLocalRecord *loc;
-	ECard *ecard;
-  
-	g_return_val_if_fail(conduit!=NULL,NULL);
-	g_return_val_if_fail(remote!=NULL,NULL);
-  
-	LOG ("requesting %ld", remote->ID);
-
-	ecard = get_ecard_by_pilot_id (ctxt->cards, remote->ID);
-
-	if (NULL != ecard) {
-		LOG ("Found");
-		loc = g_new0(AddressbookLocalRecord,1);
-		/* memory allocated in new_from_string is freed in free_match */
-		local_record_from_ecard (loc, ecard);
-		return loc;
-	}
-
-	INFO ("Object did not exist");
-	return NULL;
-}
-
-static ECard *
-ecard_from_remote_record(AddressbookConduitContext *ctxt,
-			 PilotRecord *remote)
-{
-	struct Address address;
-	ECard *ecard;
-	ECardSimple *simple;
-	int i;
-	char *string;
-	char *stringparts[4];
-	char *commaparts[3];
-	char *spaceparts[3];
-	char *commastring, *spacestring;
-
-	g_return_val_if_fail(remote!=NULL,NULL);
-	memset (&address, 0, sizeof (struct Address));
-	unpack_Address (&address, remote->record, remote->length);
-
-
-	ecard = e_card_new("");
-	simple = e_card_simple_new(ecard);
-
-#define get(pilotprop) \
-        (address.entry [(pilotprop)])
-#define check(pilotprop) \
-        (address.entry [(pilotprop)] && *address.entry [(pilotprop)])
-
-	i = 0;
-	if (check(entryFirstname))
-		stringparts[i++] = get(entryFirstname);
-	if (check(entryLastname))
-		stringparts[i++] = get(entryLastname);
-	stringparts[i] = NULL;
-	string = g_strjoinv(" ", stringparts);
-	e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_FULL_NAME, string);
-	g_free(string);
-
-	i = 0;
-	if (check (entryAddress))
-		spaceparts[i++] = get (entryAddress);
-	if (check (entryZip))
-		spaceparts[i++] = get (entryZip);
-	spaceparts[i] = 0;
-	spacestring = g_strjoinv(" ", spaceparts);
-
-	i = 0;
-	if (check (entryCity))
-		commaparts[i++] = get (entryCity);
-	if (spacestring && *spacestring)
-		commaparts[i++] = spacestring;
-	commaparts[i] = 0;
-	commastring = g_strjoinv(", ", commaparts);
-
-	i = 0;
-	if (check (entryAddress))
-		stringparts[i++] = get (entryAddress);
-	if (commastring && *commastring)
-		stringparts[i++] = commastring;
-	if (check (entryCountry))
-		stringparts[i++] = get (entryCountry);
-	stringparts[i] = NULL;
-	string = g_strjoinv("\n", stringparts);
-	e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_ADDRESS_HOME, string);
-
-	g_free(spacestring);
-	g_free(commastring);
-	g_free(string);
-
-	if (check (entryTitle))
-		e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_TITLE, get (entryTitle));
-
-	if (check (entryCompany))
-		e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_ORG, get (entryCompany));
-
-	for (i = entryPhone1; i <= entryPhone5; i ++) {
-		if (address.entry [i] && *(address.entry [i])) {
-			char *phonelabel = ctxt->ai.phoneLabels[address.phoneLabel[i - entryPhone1]];
-			if (!strcmp (phonelabel, "E-mail"))
-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_EMAIL, address.entry[i]);
-			else if (!strcmp (phonelabel, "Home"))
-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_HOME, address.entry[i]);
-			else if (!strcmp (phonelabel, "Work"))
-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS, address.entry[i]);
-			else if (!strcmp (phonelabel, "Fax"))
-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX, address.entry[i]);
-			else if (!strcmp (phonelabel, "Other"))
-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_OTHER, address.entry[i]);
-			else if (!strcmp (phonelabel, "Main"))
-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_PRIMARY, address.entry[i]);
-			else if (!strcmp (phonelabel, "Pager"))
-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_PAGER, address.entry[i]);
-			else if (!strcmp (phonelabel, "Mobile"))
-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_MOBILE, address.entry[i]);
-		}
-	}
-#undef get
-#undef set
-
-	free_Address(&address);
-
-	gtk_object_set (GTK_OBJECT(ecard), "pilot_id", remote->ID, NULL);
-
-	gtk_object_unref(GTK_OBJECT(simple));
-
-	return ecard;
-}
-
-static ECard*
-merge_ecard_with_remote_record (AddressbookConduitContext *ctxt,
-				ECard *ecard,
-				PilotRecord *remote)
-{
-	return ecard;
-}
-
-typedef struct {
-	EBookStatus status;
-	char *id;
-} add_card_cons;
-
-static void
-add_card_cb (EBook *ebook, EBookStatus status, const char *id, gpointer closure)
-{
-	add_card_cons *cons = (add_card_cons*)closure;
-
-	cons->status = status;
-	cons->id = g_strdup (id);
-
-	gtk_main_quit();
-}
-
-static gint
-update_record (GnomePilotConduitStandardAbs *conduit,
-	       PilotRecord *remote,
-	       AddressbookConduitContext *ctxt)
-{
-	struct Address address;
-	ECard *ecard;
-	add_card_cons cons;
-
-	g_return_val_if_fail(remote!=NULL,-1);
-
-	memset (&address, 0, sizeof (struct Address));
-	unpack_Address (&address, remote->record, remote->length);
-
-	LOG ("requesting %ld [%s %s]", remote->ID, address.entry[entryFirstname], address.entry[entryLastname]);
-	printf ("requesting %ld [%s %s]\n", remote->ID, address.entry[entryFirstname], address.entry[entryLastname]);
-
-	ecard = get_ecard_by_pilot_id (ctxt->cards, remote->ID);
-
-	if (ecard == NULL) {
-
-		LOG ("Object did not exist, creating a new one");
-		printf ("Object did not exist, creating a new one\n");
-
-		ecard = ecard_from_remote_record (ctxt, remote);
-
-		/* 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) {
-			ctxt->cards = g_list_append (ctxt->cards,
-				     e_book_get_card (ctxt->ebook, cons.id));
-			g_free (cons.id);
-		}
-		else
-			WARN ("update_record: failed to add card to ebook\n");
-	} else {
-		EBookStatus commit_status;
-
-		ecard = merge_ecard_with_remote_record (ctxt, ecard, remote);
-
-		e_book_commit_card (ctxt->ebook, ecard, status_cb, &commit_status);
-
-		gtk_main (); /* enter sub mainloop */
-
-		if (commit_status != E_BOOK_STATUS_SUCCESS)
-			WARN ("update_record: failed to update card in ebook\n");
-	}
-
-	free_Address(&address);
-
-	return 0;
-}
-
-#if 0
-static void
-check_for_slow_setting (GnomePilotConduit *c, AddressbookConduitContext *ctxt)
-{
-	GList *uids;
-	unsigned long int entry_number;
-
-	uids = cal_client_get_uids (ctxt->client, CALOBJ_TYPE_ADDRESS);
-
-	entry_number = g_list_length (uids);
-
-	LOG (_("Address holds %ld address entries"), entry_number);
-	/* If the local base is empty, do a slow sync */
-	if (entry_number == 0) {
-		GnomePilotConduitStandard *conduit;
-		conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-		gnome_pilot_conduit_standard_set_slow (conduit);
-	}
-}
-#endif /* 0 */
-
-static gint
-pre_sync (GnomePilotConduit *c,
-	  GnomePilotDBInfo *dbi,
-	  AddressbookConduitContext *ctxt)
-{
-	int l;
-	unsigned char *buf;
-	GnomePilotConduitStandardAbs *conduit;
-
-	conduit = GNOME_PILOT_CONDUIT_STANDARD_ABS(c);
-  
-	g_message ("Evolution Addressbook Conduit v.%s",CONDUIT_VERSION);
-
-	ctxt->ebook = NULL;
-	
-	if (start_address_server (GNOME_PILOT_CONDUIT_STANDARD_ABS(c), ctxt) != 0) {
-		WARN(_("Could not start addressbook server"));
-		gnome_pilot_conduit_error(GNOME_PILOT_CONDUIT(c),
-					  _("Could not start addressbook server"));
-		return -1;
-	}
-
-
-	/* Set the counters for the progress bar crap */
-
-	gtk_object_set_data (GTK_OBJECT(c),"dbinfo",dbi);
-  
-	/* load_records(c); */
-
-	buf = (unsigned char*)g_malloc(0xffff);
-	if((l=dlp_ReadAppBlock(dbi->pilot_socket,dbi->db_handle,0,(unsigned char *)buf,0xffff)) < 0) {
-		WARN(_("Could not read pilot's Address application block"));
-		WARN("dlp_ReadAppBlock(...) = %d",l);
-		gnome_pilot_conduit_error(GNOME_PILOT_CONDUIT(c),
-			     _("Could not read pilot's Address application block"));
-		return -1;
-	}
-	unpack_AddressAppInfo(&(ctxt->ai),buf,l);
-	g_free(buf);
-
-#if 0
-	check_for_slow_setting(c,ctxt);
-#else
-	/* for now just always use the slow sync method */
-	gnome_pilot_conduit_standard_set_slow (GNOME_PILOT_CONDUIT_STANDARD (c));
-#endif
-
-	return 0;
-}
-
-/**
- * Find (if possible) the local record which matches
- * the given PilotRecord.
- * if successfull, return non-zero and set *local to
- * a non-null value (the located local record),
- * otherwise return 0 and set *local = NULL;
- */
-
-static gint
-match_record	(GnomePilotConduitStandardAbs *conduit,
-		 AddressbookLocalRecord **local,
-		 PilotRecord *remote,
-		 AddressbookConduitContext *ctxt)
-{
-	LOG ("in match_record");
-
-	g_return_val_if_fail(local!=NULL,-1);
-	g_return_val_if_fail(remote!=NULL,-1);
-
-	*local = find_record_in_ebook(conduit,remote,ctxt);
-  
-	if (*local==NULL) return -1;
-	return 0;
-}
-
-/**
- * Free the data allocated by a previous match_record call.
- * If successfull, return non-zero and ser *local=NULL, otherwise
- * return 0.
- */
-static gint
-free_match	(GnomePilotConduitStandardAbs *conduit,
-		 AddressbookLocalRecord **local,
-		 AddressbookConduitContext *ctxt)
-{
-	LOG ("entering free_match");
-
-	g_return_val_if_fail(local!=NULL,-1);
-	g_return_val_if_fail(*local!=NULL,-1);
-
-	g_free(*local);
-	
-        *local = NULL;
-	return 0;
-}
-
-#if SUPPORT_ARCHIVING
-/*
-  Move to archive and set status to Nothing
- */
-static gint
-archive_local (GnomePilotConduitStandardAbs *conduit,
-	       AddressbookLocalRecord *local,
-	       AddressbookConduitContext *ctxt)
-{
-	LOG ("entering archive_local");
-
-	g_return_val_if_fail(local!=NULL,-1);
-
-	return -1;
-}
-
-/*
-** used when copying information from the pilot to the desktop.  if
-** the archived flag is set to true in the PilotRecord, this method is
-** called.
-**
-** Store in archive and set status to Nothing
-*/
-static gint
-archive_remote (GnomePilotConduitStandardAbs *conduit,
-		AddressbookLocalRecord *local,
-		PilotRecord *remote,
-		AddressbookConduitContext *ctxt)
-{
-	LOG ("entering archive_remote");
-
-        //g_return_val_if_fail(remote!=NULL,-1);
-	//g_return_val_if_fail(local!=NULL,-1);
-
-	return -1;
-}
-
-/*
-** Called when copying records to the pilot.
-**
-** XXX more here.
-*/
-static gint
-clear_status_archive_local (GnomePilotConduitStandardAbs *conduit,
-			    AddressbookLocalRecord *local,
-			    AddressbookConduitContext *ctxt)
-{
-	LOG ("entering clear_status_archive_local");
-
-	g_return_val_if_fail(local!=NULL,-1);
-
-        return -1;
-}
-
-/*
-** presumably used to set the archived flag on a local record.  not
-** actually used in the gnome-pilot source.
-*/
-static gint
-set_archived (GnomePilotConduitStandardAbs *conduit,
-	      AddressbookLocalRecord *local,
-	      gint archived,
-	      AddressbookConduitContext *ctxt)
-{
-	LOG ("entering set_archived");
-
-	g_return_val_if_fail(local!=NULL,-1);
-	g_assert(local->ecard!=NULL);
-
-	local->local.archived = archived;
-	update_address_entry_in_repository (conduit, local->ical, ctxt);
-        return 0;
-}
-
-#endif
-
-/*
-** used when copying information from the pilot to the desktop.  if
-** the archived flags and deleted flags are not set to true in the
-** PilotRecord, this method is called.
-**
-** Store and set status to Nothing
-*/
-static gint
-store_remote (GnomePilotConduitStandardAbs *conduit,
-	      PilotRecord *remote,
-	      AddressbookConduitContext *ctxt)
-{
-	LOG ("entering store_remote");
-
-	g_return_val_if_fail(remote!=NULL,-1);
-	remote->attr = GnomePilotRecordNothing;
-
-	return update_record(conduit,remote,ctxt);
-}
-
-/*
-** Used when looping over records on the local side of things.
-** function should maintain state such that *local moves along the
-** list of records.
-**
-** return value is 0 if we're done, 1 to continue iterating, and -1 on
-** error.
-*/
-static gint
-iterate (GnomePilotConduitStandardAbs *conduit,
-	 AddressbookLocalRecord **local,
-	 AddressbookConduitContext *ctxt)
-{
-	static GList *iterator;
-	static int num;
-
-	g_return_val_if_fail(local!=NULL,-1);
-
-	if (*local==NULL) {
-		LOG ("beginning iteration");
-
-		iterator = ctxt->cards;
-		num = 0;
-		
-		LOG ("iterating over %d records", g_list_length (ctxt->cards));
-		*local = g_new0(AddressbookLocalRecord, 1);
-		local_record_from_ecard (*local, (ECard*)iterator->data);
-	} else {
-		/* printf ("continuing iteration\n"); */
-		num++;
-		if(g_list_next(iterator)==NULL) {
-			LOG ("ending");
-			/** free stuff allocated for iteration */
-			g_free((*local));
-
-			LOG ("iterated over %d records", num);
-
-			/* ends iteration */
-			(*local) = NULL;
-			return 0;
-		} else {
-			iterator = g_list_next (iterator);
-			local_record_from_ecard (*local,(ECard*)(iterator->data));
-		}
-	}
-	return 1;
-}
-
-
-/*
-** similar to iterate, except the list of records we iterate over have
-** to have FLAG set and ARCHIVE should match the state of the local
-** record.
-**
-** return value is 0 if we're done, 1 to continue iterating, and -1 on
-** error.
-*/
-static gint
-iterate_specific (GnomePilotConduitStandardAbs *conduit,
-		  AddressbookLocalRecord **local,
-		  gint flag,
-		  gint archived,
-		  AddressbookConduitContext *ctxt)
-{
-#ifdef DEBUG_ADDRESSBOOKCONDUIT
-	{
-		gchar *tmp;
-		switch (flag) {
-		case GnomePilotRecordNothing: tmp = g_strdup("RecordNothing"); break;
-		case GnomePilotRecordModified: tmp = g_strdup("RecordModified"); break;
-		case GnomePilotRecordDeleted: tmp = g_strdup("RecordDeleted"); break;
-		case GnomePilotRecordNew: tmp = g_strdup("RecordNew"); break;
-		default: tmp = g_strdup_printf("0x%x",flag); break;
-		}
-		printf ("entering iterate_specific(flag = %s)\n", tmp);
-		g_free(tmp);
-	}
-#endif
-	g_return_val_if_fail(local!=NULL,-1);
-
-	/* iterate until a record meets the criteria */
-	while(gnome_pilot_conduit_standard_abs_iterate(conduit,(LocalRecord**)local)) {
-		if((*local)==NULL) break;
-#if SUPPORT_ARCHIVING
-		if(archived && ((*local)->local.archived==archived)) break;
-#endif
-		if(((*local)->local.attr == flag)) break;
-	}
-
-	return (*local)==NULL?0:1;
-}
-
-/*
-** actually remove the records flagged as deleted from the local
-** store.
-**
-** XXX return value isn't checked by gnome-pilot source.
-*/
-static gint
-purge (GnomePilotConduitStandardAbs *conduit,
-       AddressbookConduitContext *ctxt)
-{
-	GList *it;
-	gint retval = 0;
-
-	for (it=ctxt->cards; it;) {
-		guint32 current_status;
-
-		gtk_object_get (GTK_OBJECT (it->data), "pilot_status",
-				&current_status, NULL);
-
-		if (current_status == E_CARD_PILOT_STATUS_DEL) {
-			EBookStatus remove_status;
-
-			e_book_remove_card (ctxt->ebook, it->data, status_cb, &remove_status);
-			gtk_main(); /* enter sub loop */
-
-			if (remove_status == E_BOOK_STATUS_SUCCESS) {
-				GList *l = it;
-				it = g_list_next (it);
-				gtk_object_unref (GTK_OBJECT (it->data));
-				ctxt->cards = g_list_remove_link(ctxt->cards, l);
-				g_list_free_1 (l);
-			}
-			else {
-				retval = -1;
-				it = g_list_next (it);
-			}
-		}
-		else
-			it = g_list_next (it);
-	}
-
-	return retval;
-}
-
-
-/*
-** sets the value of the status flag on the local record (deleted,
-** nothing, modified, etc.)
-**
-** XXX return value not checked by gnome-pilot source.
-*/
-static gint
-set_status (GnomePilotConduitStandardAbs *conduit,
-	    AddressbookLocalRecord *local,
-	    gint status,
-	    AddressbookConduitContext *ctxt)
-{
-	EBookStatus commit_status;
-	guint32 ecard_status;
-
-	LOG ("entering set_status(status=%d)",status);
-
-	g_return_val_if_fail(local!=NULL,-1);
-	g_assert(local->ecard!=NULL);
-	
-	local->local.attr = status;
-	switch(status) {
-	case GnomePilotRecordDeleted:
-		ecard_status = E_CARD_PILOT_STATUS_DEL;
-		break;
-	case GnomePilotRecordNew:
-	case GnomePilotRecordModified:
-		ecard_status = E_CARD_PILOT_STATUS_MOD;
-		break;
-	default:
-		ecard_status = E_CARD_PILOT_STATUS_NONE;
-		break;
-	}
-	
-	gtk_object_set (GTK_OBJECT (local->ecard),
-			"pilot_status", ecard_status, NULL);
-
-	e_book_commit_card (ctxt->ebook, local->ecard, status_cb,
-			    &commit_status);
-
-	gtk_main (); /* enter sub loop */
-
-	if (commit_status != E_BOOK_STATUS_SUCCESS) {
-		WARN (_("Error while communicating with address server"));
-	}
-
-        return 0;
-}
-
-/*
-** used when writing a record to the pilot.  the id is the one
-** assigned to the remote record.  storing it in the local record
-** makes it easier to match up local and remote records later on.
-**
-** this should not change the state of the local entry to modified.
-**
-** XXX return value not checked by gnome-pilot source.
-*/
-static gint
-set_pilot_id (GnomePilotConduitStandardAbs *conduit,
-	      AddressbookLocalRecord *local,
-	      guint32 ID,
-	      AddressbookConduitContext *ctxt)
-{
-	EBookStatus commit_status;
-
-	LOG ("entering set_pilot_id(id=%d)",ID);
-
-	g_return_val_if_fail(local!=NULL,-1);
-	g_assert(local->ecard!=NULL);
-
-	local->local.ID = ID;
-
-	gtk_object_set (GTK_OBJECT(local->ecard),
-			"pilot_id", local->local.ID, NULL);
-	e_book_commit_card (ctxt->ebook, local->ecard, status_cb, &commit_status);
-
-	gtk_main (); /* enter sub loop */
-
-	if (commit_status == E_BOOK_STATUS_SUCCESS) {
-		return 0;
-	}
-	else {
-		WARN ("set_pilot_id failed.\n");
-		return -1;
-	}
-}
-
-static int
-get_phone_label_by_name (struct AddressAppInfo *ai,
-			 const char *name)
-{
-	int i;
-
-	for (i = 0; i < 8 /* the number of pilot address labels */; i ++) {
-		if (!strcmp(name, ai->phoneLabels[i]))
-			return i;
-	}
-
-	WARN ("couldn't find pilot label '%s'.\n", name);
-	return 0;
-}
-
-static int
-get_phone_label_by_flag (struct AddressAppInfo *ai,
-			 int flags)
-{
-	char *label_to_find;
-
-	if (flags & E_CARD_PHONE_PREF) label_to_find = "Main";
-	else if (flags & E_CARD_PHONE_WORK) label_to_find = "Work";
-	else if (flags & E_CARD_PHONE_HOME) label_to_find = "Home";
-	else if (flags & E_CARD_PHONE_FAX) label_to_find = "Fax";
-	else if (flags & E_CARD_PHONE_PAGER) label_to_find = "Pager";
-	else if (flags & E_CARD_PHONE_CELL) label_to_find = "Mobile";
-	else label_to_find = "Other";
-
-	return get_phone_label_by_name (ai, label_to_find);
-}
-
-/*
-** used to convert between a local record and a remote record.  memory
-** allocated during this process should be freed in free_transmit
-** below.
-**
-** XXX return value not checked by gnome-pilot source, but setting
-** *remote to NULL triggers an error.
-*/
-static gint
-transmit (GnomePilotConduitStandardAbs *conduit,
-	  AddressbookLocalRecord *local,
-	  PilotRecord **remote,
-	  AddressbookConduitContext *ctxt)
-{
-	PilotRecord *p;
-	ECardName *ecard_name;
-	EList *ecard_phones;
-	EList *ecard_emails;
-	char *ecard_org, *ecard_note, *ecard_title;
-	int phone_entry = entryPhone1;
-	
-	LOG ("entering transmit");
-
-	g_return_val_if_fail(local!=NULL,-1);
-	g_return_val_if_fail(remote!=NULL,-1);
-	g_assert(local->ecard!=NULL);
-
-	p = g_new0(PilotRecord,1);
-
-	p->ID = local->local.ID;
-	p->attr = local->local.attr;
-	p->archived = local->local.archived;
-	p->secret = local->local.secret;
-
-	local->address = g_new0(struct Address,1);
-
-	gtk_object_get (GTK_OBJECT (local->ecard),
-			"name", &ecard_name,
-			"org", &ecard_org,
-			"note", &ecard_note,
-			"title", &ecard_title,
-			"phone", &ecard_phones,
-			"email", &ecard_emails,
-			NULL);
-
-	/* use strdup instead of g_strdup since free_transmit uses free, not g_free. */
-	if (ecard_name) {
-		if (ecard_name->given)
-			local->address->entry [ entryFirstname ] = strdup (ecard_name->given);
-		if (ecard_name->family)
-			local->address->entry [ entryLastname ] = strdup (ecard_name->family);
-		// e_card_name_free (ecard_name);
-	}
-
-	if (ecard_org) {
-		local->address->entry [ entryCompany ] = strdup (ecard_org);
-	}
-	if (ecard_title) {
-		local->address->entry [ entryTitle ] = strdup (ecard_title);
-	}
-	if (ecard_emails) {
-		EIterator *iterator = e_list_get_iterator (ecard_emails);
-		char *email;
-
-		if ((email = (char *)e_iterator_get(iterator))) {
-			local->address->phoneLabel[phone_entry - entryPhone1] =
-				get_phone_label_by_name (&ctxt->ai, "E-mail");
-			local->address->entry [ phone_entry ] = strdup (email);
-
-			phone_entry++;
-		}
-	}
-	if (ecard_phones) {
-		int phone_entry = entryPhone1;
-		EIterator *iterator = e_list_get_iterator (ecard_phones);
-		ECardPhone *phone;
-
-		while ((phone = (ECardPhone*)e_iterator_get(iterator))) {
-
-			local->address->phoneLabel[phone_entry - entryPhone1] =
-				get_phone_label_by_flag (&ctxt->ai, phone->flags);
-			local->address->entry [ phone_entry ] = strdup (phone->number);
-
-			/* only store a maximum of 5 numbers (4 if
-                           there was an email address) */
-			if (phone_entry == entryPhone5)
-				break;
-
-			if (e_iterator_next (iterator) == FALSE)
-				break;
-
-			phone_entry++;
-		}
-	}
-
-	if (ecard_note) {
-		local->address->entry [ entryNote ] = strdup (ecard_note);
-	}
-#if 0
-	printf ("transmitting address to pilot [%s] complete=%d/%ld\n",
-		local->ical->summary==NULL?"NULL":local->ical->summary,
-		local->address->complete, local->ical->completed);
-#endif
-
-	/* Generate pilot record structure */
-	p->record = g_new0(char,0xffff);
-	p->length = pack_Address(local->address,p->record,0xffff);
-
-	*remote = p;
-
-	return 0;
-}
-
-/*
-** free memory allocated in the transmit signal.
-**
-** XXX return value not checked.
-*/
-static gint
-free_transmit (GnomePilotConduitStandardAbs *conduit,
-	       AddressbookLocalRecord *local,
-	       PilotRecord **remote,
-	       AddressbookConduitContext *ctxt)
-{
-	LOG ("entering free_transmit");
-
-	g_return_val_if_fail(local!=NULL,-1);
-	g_return_val_if_fail(remote!=NULL,-1);
-
-	free_Address(local->address);
-	g_free((*remote)->record);
-	*remote = NULL;
-        return 0;
-}
-
-/*
-** used when synching.  compare the local and remove record data and
-** determine equality.
-**
-** retval is similar to strcmp: 0 for equality, anything else for
-** inequality (no ordering is imposed).
-*/
-static gint
-compare (GnomePilotConduitStandardAbs *conduit,
-	 AddressbookLocalRecord *local,
-	 PilotRecord *remote,
-	 AddressbookConduitContext *ctxt)
-{
-#if 0
-	/* used by the quick compare */
-	PilotRecord *remoteOfLocal;
-	int err;
-	int retval;
-
-	g_message ("entering compare");
-	printf ("entering compare\n");
-
-	g_return_val_if_fail (local!=NULL,-1);
-	g_return_val_if_fail (remote!=NULL,-1);
-
-	err = transmit(conduit,local,&remoteOfLocal,ctxt);
-	if (err != 0) return err;
-
-	retval = 0;
-	if (remote->length == remoteOfLocal->length) {
-		if (memcmp(remoteOfLocal->record,remote->record,remote->length)!=0) {
-			g_message("compare failed on contents");
-			printf ("compare failed on contents\n");
-			retval = 1;
-
-			/* debug spew */
-			{
-				struct Address foolocal;
-				struct Address fooremote;
-
-				unpack_Address (&foolocal,
-					     remoteOfLocal->record,
-					     remoteOfLocal->length);
-				unpack_Address (&fooremote,
-					     remote->record,
-					     remote->length);
-
-				printf (" local:[%d %ld %d %d '%s' '%s']\n",
-					foolocal.indefinite,
-					mktime (& foolocal.due),
-					foolocal.priority,
-					foolocal.complete,
-					foolocal.description,
-					foolocal.note);
-
-				printf ("remote:[%d %ld %d %d '%s' '%s']\n",
-					fooremote.indefinite,
-					mktime (& fooremote.due),
-					fooremote.priority,
-					fooremote.complete,
-					fooremote.description,
-					fooremote.note);
-			}
-		}
-	} else {
-		g_message("compare failed on length");
-		printf("compare failed on length\n");
-		retval = 1;
-	}
-
-	free_transmit(conduit,local,&remoteOfLocal,ctxt);	
-	return retval;
-#endif /* 0 */
-	return 0;
-}
-
-/*
-** XXX not actually called from the gnome-pilot source
-*/
-static gint
-compare_backup (GnomePilotConduitStandardAbs *conduit,
-		AddressbookLocalRecord *local,
-		PilotRecord *remote,
-		AddressbookConduitContext *ctxt)
-{
-	LOG ("entering compare_backup");
-
-	g_return_val_if_fail(local!=NULL,-1);
-	g_return_val_if_fail(remote!=NULL,-1);
-
-        return -1;
-}
-
-/*
-** used when copying from the pilot.
-**
-** delete all records in the local database.  this doesn't actually
-** remove the records, merely sets their status to DELETED.
-**
-** return value is < 0 on error, >= 0 on success.
-*/
-static gint
-delete_all (GnomePilotConduitStandardAbs *conduit,
-	    AddressbookConduitContext *ctxt)
-{
-	GList *it;
-
-	for (it=ctxt->cards; it; it = g_list_next (it)) {
-		gtk_object_set (GTK_OBJECT (it->data),
-				"pilot_status", E_CARD_PILOT_STATUS_DEL, NULL);
-	}
-
-        return 0;
-}
-
-#ifdef NEED_OAF_INIT_HACK
-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;
-}
-#endif
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilotId)
-{
-	GtkObject *retval;
-	AddressbookConduitCfg *cfg;
-	AddressbookConduitContext *ctxt;
-
-	printf ("in address's conduit_get_gpilot_conduit\n");
-
-#ifdef NEED_OAF_INIT_HACK
-#ifndef NO_WARNINGS
-#warning "need a better way to do this"
-#endif
-	/* 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);
-	}
-#endif
-
-	retval = gnome_pilot_conduit_standard_abs_new ("AddressDB",
-						       0x61646472);
-	g_assert (retval != NULL);
-	gnome_pilot_conduit_construct(GNOME_PILOT_CONDUIT(retval),"AddressConduit");
-
-	conduit_load_configuration(&cfg,pilotId);
-	gtk_object_set_data (retval,"addressconduit_cfg",cfg);
-
-	conduit_new_context(&ctxt,cfg);
-	gtk_object_set_data(GTK_OBJECT(retval),"addressconduit_context",ctxt);
-
-	gtk_signal_connect (retval, "match_record", (GtkSignalFunc) match_record, ctxt);
-	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);
-#ifdef SUPPORT_ARCHIVING
-	gtk_signal_connect (retval, "archive_local", (GtkSignalFunc) archive_local, ctxt);
-	gtk_signal_connect (retval, "archive_remote", (GtkSignalFunc) archive_remote, ctxt);
-	gtk_signal_connect (retval, "set_archived", (GtkSignalFunc) set_archived, ctxt);
-	gtk_signal_connect (retval, "clear_status_archive_local", (GtkSignalFunc) clear_status_archive_local, ctxt);
-#endif
-	gtk_signal_connect (retval, "store_remote", (GtkSignalFunc) store_remote, ctxt);
-	gtk_signal_connect (retval, "iterate", (GtkSignalFunc) iterate, ctxt);
-	gtk_signal_connect (retval, "iterate_specific", (GtkSignalFunc) iterate_specific, ctxt);
-	gtk_signal_connect (retval, "purge", (GtkSignalFunc) purge, ctxt);
-	gtk_signal_connect (retval, "set_status", (GtkSignalFunc) set_status, ctxt);
-	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
-	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
-	gtk_signal_connect (retval, "compare_backup", (GtkSignalFunc) compare_backup, ctxt);
-	gtk_signal_connect (retval, "free_transmit", (GtkSignalFunc) free_transmit, ctxt);
-	gtk_signal_connect (retval, "delete_all", (GtkSignalFunc) delete_all, ctxt);
-	gtk_signal_connect (retval, "transmit", (GtkSignalFunc) transmit, ctxt);
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-        AddressbookConduitCfg *cc;
-	AddressbookConduitContext *ctxt;
-
-        cc = GET_CONDUITCFG(conduit);
-	ctxt = GET_CONDUITCONTEXT(conduit);
-
-	if (ctxt->ebook != NULL) {
-		gtk_object_unref (GTK_OBJECT (ctxt->ebook));
-	}
-
-        conduit_destroy_configuration (&cc);
-
-	conduit_destroy_context (&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 427e6b8c91..0000000000
--- a/addressbook/conduit/address-conduit.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#ifndef __ADDRESS_CONDUIT_H__
-#define __ADDRESS_CONDUIT_H__
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <gnome.h>
-#include <liboaf/liboaf.h>
-#include <pi-address.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-standard-abs.h>
-#include "ebook/e-card.h"
-#include "ebook/e-card-simple.h"
-#include "ebook/e-book.h"
-#include "ebook/e-book-view.h"
-
-
-/* This is the local record structure for the GnomeCal conduit. */
-typedef struct _AddressbookLocalRecord AddressbookLocalRecord;
-struct _AddressbookLocalRecord {
-	/* 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.
-	*/
-	LocalRecord local;
-	/* The corresponding Evolution addressbook object. */
-	ECard *ecard;
-        /* pilot-link address structure, used for implementing Transmit. */	
-	struct Address *address;
-};
-#define ADDRESSBOOK_LOCALRECORD(s) ((AddressbookLocalRecord*)(s))
-
-/* This is the configuration of the GnomeCal conduit. */
-typedef struct _AddressbookConduitCfg AddressbookConduitCfg;
-struct _AddressbookConduitCfg {
-	gboolean open_secret;
-	guint32 pilotId;
-	GnomePilotConduitSyncType  sync_type;   /* only used by capplet */
-};
-#define GET_CONDUITCFG(c) ((AddressbookConduitCfg*)gtk_object_get_data(GTK_OBJECT(c),"addressconduit_cfg"))
-
-/* This is the context for all the Addressbook conduit methods. */
-typedef struct _AddressbookConduitContext AddressbookConduitContext;
-struct _AddressbookConduitContext {
-	struct AddressAppInfo ai;
-	AddressbookConduitCfg *cfg;
-	EBook *ebook;
-	// ECardCursor *cursor;
-	GList *cards;
-	/*	CalClient *client;*/
-	CORBA_Environment ev;
-	CORBA_ORB orb;
-	gboolean address_load_tried;
-	gboolean address_load_success;
-
-	char *address_file;
-};
-#define GET_CONDUITCONTEXT(c) ((AddressbookConduitContext*)gtk_object_get_data(GTK_OBJECT(c),"addressconduit_context"))
-
-
-/* Given a GCalConduitCfg*, allocates the structure and 
-   loads the configuration data for the given pilot.
-   this is defined in the header file because it is used by
-   both address-conduit and address-conduit-control-applet,
-   and we don't want to export any symbols we don't have to. */
-static void 
-conduit_load_configuration(AddressbookConduitCfg **c,
-			   guint32 pilotId) 
-{
-	gchar prefix[256];
-	g_snprintf(prefix,255,"/gnome-pilot.d/address-conduit/Pilot_%u/",pilotId);
-	
-	*c = g_new0(AddressbookConduitCfg,1);
-	g_assert(*c != NULL);
-	gnome_config_push_prefix(prefix);
-	(*c)->open_secret = gnome_config_get_bool("open_secret=FALSE");
-	(*c)->sync_type = GnomePilotConduitSyncTypeCustom; /* set in capplets main */
-	gnome_config_pop_prefix();
-	
-	(*c)->pilotId = pilotId;
-}
-
-
-#endif __ADDRESS_CONDUIT_H__ 
diff --git a/addressbook/conduit/address.conduit.in b/addressbook/conduit/address.conduit.in
deleted file mode 100644
index 3a0416fac8..0000000000
--- a/addressbook/conduit/address.conduit.in
+++ /dev/null
@@ -1,8 +0,0 @@
-<gnome-pilot-conduit version="1.0">
-<conduit id="address_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libaddress_conduit.so"/>
-<name value="address"/>
-<conduit-attribute name="description" value="Synchronizes with Evolution"/>
-<conduit-attribute name="default-synctype" value="synchronize"/>
-<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-calendar-conduit.png"/>
-<conduit-attribute name="settings" value="TRUE"/>
-</gnome-pilot-conduit>
diff --git a/addressbook/contact-editor/.cvsignore b/addressbook/contact-editor/.cvsignore
deleted file mode 100644
index 6fd0b5075c..0000000000
--- a/addressbook/contact-editor/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-contact-editor-test
diff --git a/addressbook/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am
deleted file mode 100644
index 1016d38301..0000000000
--- a/addressbook/contact-editor/Makefile.am
+++ /dev/null
@@ -1,68 +0,0 @@
-INCLUDES =					\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)			\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook/		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_srcdir)/widgets/e-table		\
-	-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-categories.c		\
-	e-contact-editor-categories.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
-
-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			\
-	categories.glade		\
-	e-contact-editor-confirm-delete.glade
-
-EXTRA_DIST = $(evolution_DATA)		\
-	$(glade_DATA)			\
-	e-contact-editor-strings.h	\
-	fulladdr.glade.h		\
-	fullname-strings.h		\
-	categories-strings.h		\
-	e-contact-editor-confirm-delete.glade.h
diff --git a/addressbook/contact-editor/arrow.png b/addressbook/contact-editor/arrow.png
deleted file mode 100644
index b102356c78..0000000000
--- a/addressbook/contact-editor/arrow.png
+++ /dev/null
diff --git a/addressbook/contact-editor/briefcase.png b/addressbook/contact-editor/briefcase.png
deleted file mode 100644
index dd59b8fd39..0000000000
--- a/addressbook/contact-editor/briefcase.png
+++ /dev/null
diff --git a/addressbook/contact-editor/categories-strings.h b/addressbook/contact-editor/categories-strings.h
deleted file mode 100644
index 813018a00e..0000000000
--- a/addressbook/contact-editor/categories-strings.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("categories");
-gchar *s = N_("Item(s) belong to these categories:");
-gchar *s = N_("Available Categories:");
diff --git a/addressbook/contact-editor/categories.glade b/addressbook/contact-editor/categories.glade
deleted file mode 100644
index bf78008940..0000000000
--- a/addressbook/contact-editor/categories.glade
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>categories</name>
-  <program_name>categories</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>False</gettext_support>
-  <use_widget_names>False</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>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>categories-strings.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>categories</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <title>categories</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-categories</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <rows>4</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>GtkAccelLabel</class>
-	<name>accellabel1</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Item(s) belong to these categories:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkAccelLabel</class>
-	<name>accellabel2</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Available Categories:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-categories</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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/contact-editor/contact-editor.glade b/addressbook/contact-editor/contact-editor.glade
deleted file mode 100644
index 5d49fd06ff..0000000000
--- a/addressbook/contact-editor/contact-editor.glade
+++ /dev/null
@@ -1,2455 +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>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>e-contact-editor-strings.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog2</name>
-  <border_width>2</border_width>
-  <cxx_use_heap>True</cxx_use_heap>
-  <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>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table2</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Add</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button32</name>
-	  <border_width>2</border_width>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Delete</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow1</name>
-	<height>200</height>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area2</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-add-phone</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <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>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame-add-phone</name>
-      <border_width>4</border_width>
-      <cxx_use_heap>True</cxx_use_heap>
-      <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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xscale>1</xscale>
-	<yscale>1</yscale>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-add-phone</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeApp</class>
-  <name>contact editor</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <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>
-    <cxx_use_heap>True</cxx_use_heap>
-    <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>
-      <cxx_use_heap>True</cxx_use_heap>
-      <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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Full Name...</label>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAccelLabel</class>
-	  <name>accellabel-fileas</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>File As:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAccelLabel</class>
-	  <name>accellabel-web</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>Web page address:</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-fullname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>8</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>Wants to receive _HTML mail</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>_Business</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>B_usiness</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>text-address</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <label>C_ontacts...</label>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment15</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>alignment14</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>GtkEntry</class>
-	    <name>entry-contacts</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <label>Ca_tegories...</label>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>label34</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>evolution-contacts.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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>label35</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Company:</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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Address...</label>
-	  <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>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label15</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<rows>9</rows>
-	<columns>6</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label21</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Department:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-department</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label22</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>label23</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Profession:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-profession</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label24</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>label25</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Spouse:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-spouse</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label31</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Birthday:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label30</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Assistant's name:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-assistant</focus_target>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label29</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>label32</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>Anni_versary:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-spouse</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>GnomeDateEdit</class>
-	  <name>dateedit-anniversary</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <show_time>False</show_time>
-	  <use_24_format>False</use_24_format>
-	  <week_start_monday>False</week_start_monday>
-	  <lower_hour>7</lower_hour>
-	  <upper_hour>19</upper_hour>
-	  <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>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GnomeDateEdit</class>
-	  <name>dateedit-birthday</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <show_time>False</show_time>
-	  <use_24_format>False</use_24_format>
-	  <week_start_monday>False</week_start_monday>
-	  <lower_hour>7</lower_hour>
-	  <upper_hour>19</upper_hour>
-	  <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>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-assistant</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>label33</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>No_tes:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>8</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom9</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label16</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Details</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-
-  <widget>
-    <class>GnomeAppBar</class>
-    <child_name>GnomeApp:appbar</child_name>
-    <name>appbar1</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <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/contact-editor/e-contact-editor-address.c b/addressbook/contact-editor/e-contact-editor-address.c
deleted file mode 100644
index 7df9cb8cb4..0000000000
--- a/addressbook/contact-editor/e-contact-editor-address.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-address.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-contact-editor-address.h>
-
-static void e_contact_editor_address_init		(EContactEditorAddress		 *card);
-static void e_contact_editor_address_class_init	(EContactEditorAddressClass	 *klass);
-static void e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_address_destroy (GtkObject *object);
-
-static void fill_in_info(EContactEditorAddress *editor);
-static void extract_info(EContactEditorAddress *editor);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_ADDRESS
-};
-
-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);
- 
-	object_class->set_arg = e_contact_editor_address_set_arg;
-	object_class->get_arg = e_contact_editor_address_get_arg;
-	object_class->destroy = e_contact_editor_address_destroy;
-}
-
-static void
-e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_address), FALSE, TRUE, FALSE);
-
-	e_contact_editor_address->address = NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fulladdr.glade", NULL);
-	e_contact_editor_address->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "table-checkaddress");
-	gtk_widget_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-}
-
-void
-e_contact_editor_address_destroy (GtkObject *object)
-{
-	EContactEditorAddress *e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS(object);
-
-	if (e_contact_editor_address->gui)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor_address->gui));
-	e_card_delivery_address_free(e_contact_editor_address->address);
-}
-
-GtkWidget*
-e_contact_editor_address_new (const ECardDeliveryAddress *address)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_address_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"address", address,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (o);
-	
-	switch (arg_id){
-	case ARG_ADDRESS:
-		if (e_contact_editor_address->address)
-			e_card_delivery_address_free(e_contact_editor_address->address);
-		e_contact_editor_address->address = e_card_delivery_address_copy(GTK_VALUE_POINTER (*arg));
-		fill_in_info(e_contact_editor_address);
-		break;
-	}
-}
-
-static void
-e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (object);
-
-	switch (arg_id) {
-	case ARG_ADDRESS:
-		extract_info(e_contact_editor_address);
-		GTK_VALUE_POINTER (*arg) = e_card_delivery_address_copy(e_contact_editor_address->address);
-		break;
-	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/contact-editor/e-contact-editor-address.h b/addressbook/contact-editor/e-contact-editor-address.h
deleted file mode 100644
index a74e1bd967..0000000000
--- a/addressbook/contact-editor/e-contact-editor-address.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-address.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_ADDRESS_H__
-#define __E_CONTACT_EDITOR_ADDRESS_H__
-
-#include <gnome.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;
-	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/contact-editor/e-contact-editor-categories.c b/addressbook/contact-editor/e-contact-editor-categories.c
deleted file mode 100644
index 045f128b48..0000000000
--- a/addressbook/contact-editor/e-contact-editor-categories.c
+++ /dev/null
@@ -1,452 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-categories.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <e-contact-editor-categories.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-table-simple.h>
-#include <gal/widgets/e-unicode.h>
-
-static void e_contact_editor_categories_init		(EContactEditorCategories		 *card);
-static void e_contact_editor_categories_class_init	(EContactEditorCategoriesClass	 *klass);
-static void e_contact_editor_categories_set_arg         (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_categories_get_arg         (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_categories_destroy         (GtkObject *object);
-static int e_contact_editor_categories_col_count (ETableModel *etc, gpointer data);
-static int e_contact_editor_categories_row_count (ETableModel *etc, gpointer data);
-static void *e_contact_editor_categories_value_at (ETableModel *etc, int col, int row, gpointer data);
-static void e_contact_editor_categories_set_value_at (ETableModel *etc, int col, int row, const void *val, gpointer data);
-static gboolean e_contact_editor_categories_is_cell_editable (ETableModel *etc, int col, int row, gpointer data);
-static void *e_contact_editor_categories_duplicate_value (ETableModel *etc, int col, const void *value, gpointer data);
-static void e_contact_editor_categories_free_value (ETableModel *etc, int col, void *value, gpointer data);
-static void *e_contact_editor_categories_initialize_value (ETableModel *etc, int col, gpointer data);
-static gboolean e_contact_editor_categories_value_is_empty (ETableModel *etc, int col, const void *value, gpointer data);
-static char * e_contact_editor_categories_value_to_string (ETableModel *etc, int col, const void *value, gpointer data);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_CATEGORIES
-};
-
-GtkType
-e_contact_editor_categories_get_type (void)
-{
-	static GtkType contact_editor_categories_type = 0;
-
-	if (!contact_editor_categories_type)
-		{
-			static const GtkTypeInfo contact_editor_categories_info =
-			{
-				"EContactEditorCategories",
-				sizeof (EContactEditorCategories),
-				sizeof (EContactEditorCategoriesClass),
-				(GtkClassInitFunc) e_contact_editor_categories_class_init,
-				(GtkObjectInitFunc) e_contact_editor_categories_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			contact_editor_categories_type = gtk_type_unique (gnome_dialog_get_type (), &contact_editor_categories_info);
-		}
-
-	return contact_editor_categories_type;
-}
-
-static void
-e_contact_editor_categories_class_init (EContactEditorCategoriesClass *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 ("EContactEditorCategories::categories", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_CATEGORIES);
- 
-	object_class->set_arg = e_contact_editor_categories_set_arg;
-	object_class->get_arg = e_contact_editor_categories_get_arg;
-	object_class->destroy = e_contact_editor_categories_destroy;
-}
-
-gchar *builtin_categories[] = {
-	"Business",
-	"Competition",
-	"Favorites",
-	"Gifts",
-	"Goals/Objectives",
-	"Holiday",
-	"Holiday Cards",
-	"Hot Contacts",
-	"Ideas",
-	"International",
-	"Key Customer",
-	"Miscellaneous",
-	"Personal",
-	"Phone Calls",
-	"Status",
-	"Strategies",
-	"Suppliers",
-	"Time & Expenses",
-	"VIP",
-	"Waiting",
-};
-
-#define BUILTIN_CATEGORY_COUNT (sizeof(builtin_categories) / sizeof(builtin_categories[0]))
-
-static void
-add_list_unique(EContactEditorCategories *categories, char *string)
-{
-	int k;
-	char *temp = e_strdup_strip(string);
-	char **list = categories->category_list;
-
-	if (!*temp) {
-		g_free(temp);
-		return;
-	}
-	for (k = 0; k < categories->list_length; k++) {
-		if (!strcmp(list[k], temp)) {
-			categories->selected_list[k] = TRUE;
-			break;
-		}
-	}
-	if (k == categories->list_length) {
-		categories->selected_list[categories->list_length] = TRUE;
-		list[categories->list_length++] = temp;
-	} else {
-		g_free(temp);
-	}
-}
-
-static void
-do_parse_categories(EContactEditorCategories *categories)
-{
-	char *str = categories->categories;
-	int length = strlen(str);
-	char *copy = g_new(char, length + 1);
-	int i, j;
-	char **list;
-	int count = 1;
-
-	e_table_model_pre_change(categories->model);
-
-	for (i = 0; i < categories->list_length; i++)
-		g_free(categories->category_list[i]);
-	g_free(categories->category_list);
-	g_free(categories->selected_list);
-
-	for (i = 0; str[i]; i++) {
-		switch (str[i]) {
-		case '\\':
-			i++;
-			if (!str[i])
-				i--;
-			break;
-		case ',':
-			count ++;
-			break;
-		}
-	}
-	list = g_new(char *, count + 1 + BUILTIN_CATEGORY_COUNT);
-	categories->category_list = list;
-
-	categories->selected_list = g_new(gboolean, count + 1 + BUILTIN_CATEGORY_COUNT);
-
-	for (count = 0; count < BUILTIN_CATEGORY_COUNT; count++) {
-		list[count] = g_strdup(builtin_categories[count]);
-		categories->selected_list[count] = 0;
-	}
-
-	categories->list_length = count;
-
-	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(categories, copy);
-			j = -1;
-			break;
-		default:
-			copy[j] = str[i];
-			break;
-		}
-	}
-	copy[j] = 0;
-	add_list_unique(categories, copy);
-	g_free(copy);
-	e_table_model_changed(categories->model);
-}
-
-static void
-e_contact_editor_categories_entry_change (GtkWidget *entry, 
-					  EContactEditorCategories *categories)
-{
-	g_free(categories->categories);
-	categories->categories = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry));
-	do_parse_categories(categories);
-}
-
-#define INITIAL_SPEC "<ETableSpecification no-headers=\"true\" draw-grid=\"true\" cursor-mode=\"line\">\
-  <ETableColumn model_col=\"0\" _title=\" \" expansion=\"0.0\" minimum_width=\"20\" resizable=\"false\" cell=\"checkbox\"       compare=\"integer\"/> \
-  <ETableColumn model_col=\"1\" _title=\"Category\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-        <ETableState> \
-		<column source=\"0\"/>						\
-		<column source=\"1\"/>						\
-        	<grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping>	\
-        </ETableState> \
-</ETableSpecification>"
-
-static void
-e_contact_editor_categories_init (EContactEditorCategories *categories)
-{
-	GladeXML *gui;
-	GtkWidget *table;
-	GtkWidget *e_table;
-
-	categories->list_length = 0;
-	categories->category_list = NULL;
-	categories->selected_list = NULL;
-	categories->categories = NULL;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(categories),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(categories),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(categories), FALSE, TRUE, FALSE);
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/categories.glade", NULL);
-	categories->gui = gui;
-
-	table = glade_xml_get_widget(gui, "table-categories");
-	gtk_widget_ref(table);
-	gtk_container_remove(GTK_CONTAINER(table->parent), table);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (categories)->vbox), table, TRUE, TRUE, 0);
-	gtk_widget_unref(table);
-
-	categories->entry = glade_xml_get_widget(gui, "entry-categories");
-	
-	gtk_signal_connect(GTK_OBJECT(categories->entry), "changed",
-			   GTK_SIGNAL_FUNC(e_contact_editor_categories_entry_change), categories);
-
-	categories->model = e_table_simple_new(e_contact_editor_categories_col_count, 
-					       e_contact_editor_categories_row_count,
-					       e_contact_editor_categories_value_at,
-					       e_contact_editor_categories_set_value_at,
-					       e_contact_editor_categories_is_cell_editable,
-					       e_contact_editor_categories_duplicate_value,
-					       e_contact_editor_categories_free_value,
-					       e_contact_editor_categories_initialize_value,
-					       e_contact_editor_categories_value_is_empty,
-					       e_contact_editor_categories_value_to_string,
-					       categories);
-
-	e_table = e_table_scrolled_new (categories->model, NULL, INITIAL_SPEC, NULL);
-
-	gtk_object_sink(GTK_OBJECT(categories->model));
-	
-	gtk_widget_show(e_table);
-
-	gtk_table_attach_defaults(GTK_TABLE(table),
-				  e_table, 
-				  0, 1,
-				  3, 4);
-}
-
-void
-e_contact_editor_categories_destroy (GtkObject *object)
-{
-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(object);
-	int i;
-
-	if (categories->gui)
-		gtk_object_unref(GTK_OBJECT(categories->gui));
-
-	g_free(categories->categories);
-	for (i = 0; i < categories->list_length; i++)
-		g_free(categories->category_list[i]);
-	g_free(categories->category_list);
-	g_free(categories->selected_list);
-}
-
-GtkWidget*
-e_contact_editor_categories_new (char *categories)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_categories_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"categories", categories,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_categories_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorCategories *e_contact_editor_categories;
-
-	e_contact_editor_categories = E_CONTACT_EDITOR_CATEGORIES (o);
-	
-	switch (arg_id){
-	case ARG_CATEGORIES:
-		e_utf8_gtk_entry_set_text(GTK_ENTRY(e_contact_editor_categories->entry), GTK_VALUE_STRING (*arg));
-		break;
-	}
-}
-
-static void
-e_contact_editor_categories_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditorCategories *e_contact_editor_categories;
-
-	e_contact_editor_categories = E_CONTACT_EDITOR_CATEGORIES (object);
-
-	switch (arg_id) {
-	case ARG_CATEGORIES:
-		GTK_VALUE_STRING (*arg) = g_strdup(e_contact_editor_categories->categories);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-e_contact_editor_categories_col_count (ETableModel *etc, gpointer data)
-{
-	return 2;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-e_contact_editor_categories_row_count (ETableModel *etc, gpointer data)
-{
-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(data);
-	return categories->list_length;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-e_contact_editor_categories_value_at (ETableModel *etc, int col, int row, gpointer data)
-{
-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(data);
-	if (col == 0)
-		return (void *) categories->selected_list[row];
-	else
-		return categories->category_list[row];
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-e_contact_editor_categories_set_value_at (ETableModel *etc, int col, int row, const void *val, gpointer data)
-{
-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(data);
-	if ( col == 0 ) {
-		char **strs;
-		int i, j;
-		char *string;
-		categories->selected_list[row] = (gboolean) val;
-		strs = g_new(char *, categories->list_length + 1);
-		for (i = 0, j = 0; i < categories->list_length; i++) {
-			if (categories->selected_list[i])
-				strs[j++] = categories->category_list[i];
-		}
-		strs[j] = 0;
-		string = g_strjoinv(", ", strs);
-		e_utf8_gtk_entry_set_text(GTK_ENTRY(categories->entry), string);
-		g_free(string);
-		g_free(strs);
-	}
-	if ( col == 1 )
-		return;
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-e_contact_editor_categories_is_cell_editable (ETableModel *etc, int col, int row, gpointer data)
-{
-	return col == 0;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-e_contact_editor_categories_duplicate_value (ETableModel *etc, int col, const void *value, gpointer data)
-{
-	if (col == 0)
-		return (void *)value;
-	else
-		return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-e_contact_editor_categories_free_value (ETableModel *etc, int col, void *value, gpointer data)
-{
-	if (col == 0)
-		return;
-	else
-		g_free(value);
-}
-
-static void *
-e_contact_editor_categories_initialize_value (ETableModel *etc, int col, gpointer data)
-{
-	if (col == 0)
-		return NULL;
-	else
-		return g_strdup("");
-}
-
-static gboolean
-e_contact_editor_categories_value_is_empty (ETableModel *etc, int col, const void *value, gpointer data)
-{
-	if (col == 0)
-		return value == NULL;
-	else
-		return !(value && *(char *)value);
-}
-
-static char *
-e_contact_editor_categories_value_to_string (ETableModel *etc, int col, const void *value, gpointer data)
-{
-	if (col == 0)
-		return g_strdup_printf("%d", (int) value);
-	else
-		return g_strdup(value);
-}
diff --git a/addressbook/contact-editor/e-contact-editor-categories.h b/addressbook/contact-editor/e-contact-editor-categories.h
deleted file mode 100644
index 3edff76b4b..0000000000
--- a/addressbook/contact-editor/e-contact-editor-categories.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-categories.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_CATEGORIES_H__
-#define __E_CONTACT_EDITOR_CATEGORIES_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <ebook/e-card.h>
-#include <gal/e-table/e-table-model.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditorCategories - 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_CATEGORIES_TYPE			(e_contact_editor_categories_get_type ())
-#define E_CONTACT_EDITOR_CATEGORIES(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_CATEGORIES_TYPE, EContactEditorCategories))
-#define E_CONTACT_EDITOR_CATEGORIES_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_CATEGORIES_TYPE, EContactEditorCategoriesClass))
-#define E_IS_CONTACT_EDITOR_CATEGORIES(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_CATEGORIES_TYPE))
-#define E_IS_CONTACT_EDITOR_CATEGORIES_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_CATEGORIES_TYPE))
-
-
-typedef struct _EContactEditorCategories       EContactEditorCategories;
-typedef struct _EContactEditorCategoriesClass  EContactEditorCategoriesClass;
-
-struct _EContactEditorCategories
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	char *categories;
-	GtkWidget *entry;
-	ETableModel *model;
-
-	int list_length;
-	char **category_list;
-	gboolean *selected_list;
-
-	GladeXML *gui;
-};
-
-struct _EContactEditorCategoriesClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_categories_new(char *categories);
-GtkType    e_contact_editor_categories_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_CATEGORIES_H__ */
diff --git a/addressbook/contact-editor/e-contact-editor-confirm-delete.glade b/addressbook/contact-editor/e-contact-editor-confirm-delete.glade
deleted file mode 100644
index 7f52321021..0000000000
--- a/addressbook/contact-editor/e-contact-editor-confirm-delete.glade
+++ /dev/null
@@ -1,85 +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>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>e-contact-editor-confirm-delete.glade.h</translatable_strings_file>
-</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/contact-editor/e-contact-editor-confirm-delete.glade.h b/addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h
deleted file mode 100644
index 7168db0a5c..0000000000
--- a/addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Are you sure you want\n"
-              "to delete this contact?");
-gchar *s = N_("Delete Contact?");
diff --git a/addressbook/contact-editor/e-contact-editor-fullname.c b/addressbook/contact-editor/e-contact-editor-fullname.c
deleted file mode 100644
index 05e8d45702..0000000000
--- a/addressbook/contact-editor/e-contact-editor-fullname.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-fullname.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-contact-editor-fullname.h>
-
-static void e_contact_editor_fullname_init		(EContactEditorFullname		 *card);
-static void e_contact_editor_fullname_class_init	(EContactEditorFullnameClass	 *klass);
-static void e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_fullname_destroy (GtkObject *object);
-
-static void fill_in_info(EContactEditorFullname *editor);
-static void extract_info(EContactEditorFullname *editor);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_NAME
-};
-
-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);
- 
-	object_class->set_arg = e_contact_editor_fullname_set_arg;
-	object_class->get_arg = e_contact_editor_fullname_get_arg;
-	object_class->destroy = e_contact_editor_fullname_destroy;
-}
-
-static void
-e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullname)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_fullname), TRUE, TRUE, FALSE);
-
-	e_contact_editor_fullname->name = NULL;
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fullname.glade", NULL);
-	e_contact_editor_fullname->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "table-checkfullname");
-	gtk_widget_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-}
-
-void
-e_contact_editor_fullname_destroy (GtkObject *object)
-{
-	EContactEditorFullname *e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME(object);
-
-	if (e_contact_editor_fullname->gui)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor_fullname->gui));
-	e_card_name_free(e_contact_editor_fullname->name);
-}
-
-GtkWidget*
-e_contact_editor_fullname_new (const ECardName *name)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_fullname_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"name", name,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (o);
-	
-	switch (arg_id){
-	case ARG_NAME:
-		if (e_contact_editor_fullname->name)
-			e_card_name_free(e_contact_editor_fullname->name);
-		e_contact_editor_fullname->name = e_card_name_copy(GTK_VALUE_POINTER (*arg));
-		fill_in_info(e_contact_editor_fullname);
-		break;
-	}
-}
-
-static void
-e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (object);
-
-	switch (arg_id) {
-	case ARG_NAME:
-		extract_info(e_contact_editor_fullname);
-		GTK_VALUE_POINTER (*arg) = e_card_name_copy(e_contact_editor_fullname->name);
-		break;
-	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/contact-editor/e-contact-editor-fullname.h b/addressbook/contact-editor/e-contact-editor-fullname.h
deleted file mode 100644
index bde6733976..0000000000
--- a/addressbook/contact-editor/e-contact-editor-fullname.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-fullname.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_FULLNAME_H__
-#define __E_CONTACT_EDITOR_FULLNAME_H__
-
-#include <gnome.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;
-};
-
-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/contact-editor/e-contact-editor-strings.h b/addressbook/contact-editor/e-contact-editor-strings.h
deleted file mode 100644
index bb9c0b5b30..0000000000
--- a/addressbook/contact-editor/e-contact-editor-strings.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("_Add");
-gchar *s = N_("_Delete");
-gchar *s = N_("Phone Types");
-gchar *s = N_("New phone type");
-gchar *s = N_("Add");
-gchar *s = N_("New phone type");
-gchar *s = N_("Contact Editor");
-gchar *s = N_("_Full Name...");
-gchar *s = N_("File As:");
-gchar *s = N_("Web page address:");
-gchar *s = N_("Wants to receive _HTML mail");
-gchar *s = N_("_Business");
-gchar *s = N_("_Home");
-gchar *s = N_("Business _Fax");
-gchar *s = N_("_Mobile");
-gchar *s = N_("Primary Email");
-gchar *s = N_("B_usiness");
-gchar *s = N_("_This is the mailing address");
-gchar *s = N_("C_ontacts...");
-gchar *s = N_("Ca_tegories...");
-gchar *s = N_("_Job title:");
-gchar *s = N_("_Company:");
-gchar *s = N_("_Address...");
-gchar *s = N_("General");
-gchar *s = N_("_Department:");
-gchar *s = N_("_Office:");
-gchar *s = N_("_Profession:");
-gchar *s = N_("_Nickname:");
-gchar *s = N_("_Spouse:");
-gchar *s = N_("_Birthday:");
-gchar *s = N_("_Assistant's name:");
-gchar *s = N_("_Manager's Name:");
-gchar *s = N_("Anni_versary:");
-gchar *s = N_("No_tes:");
-gchar *s = N_("Details");
diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c
deleted file mode 100644
index cbff738340..0000000000
--- a/addressbook/contact-editor/e-contact-editor.c
+++ /dev/null
@@ -1,1732 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-contact-editor.h"
-#include <e-contact-editor-fullname.h>
-#include <e-contact-editor-address.h>
-#include <e-contact-editor-categories.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include "e-util/e-gui-utils.h"
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-contact-save-as.h>
-#include "addressbook/printing/e-contact-print.h"
-
-/* Signal IDs */
-enum {
-	ADD_CARD,
-	COMMIT_CARD,
-	DELETE_CARD,
-	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 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 GtkObjectClass *parent_class = NULL;
-
-static guint contact_editor_signals[LAST_SIGNAL];
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_CARD,
-	ARG_IS_NEW_CARD
-};
-
-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;
-}
-
-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::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);
-
-  contact_editor_signals[ADD_CARD] =
-	  gtk_signal_new ("add_card",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, add_card),
-			  gtk_marshal_NONE__OBJECT,
-			  GTK_TYPE_NONE, 1,
-			  GTK_TYPE_OBJECT);
-
-  contact_editor_signals[COMMIT_CARD] =
-	  gtk_signal_new ("commit_card",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, commit_card),
-			  gtk_marshal_NONE__OBJECT,
-			  GTK_TYPE_NONE, 1,
-			  GTK_TYPE_OBJECT);
-
-  contact_editor_signals[DELETE_CARD] =
-	  gtk_signal_new ("delete_card",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, delete_card),
-			  gtk_marshal_NONE__OBJECT,
-			  GTK_TYPE_NONE, 1,
-			  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);
-}
-
-static void
-phone_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int which;
-	gchar *string;
-	GtkEntry *entry = GTK_ENTRY(widget);
-	ECardPhone *phone;
-
-	if ( widget == glade_xml_get_widget(editor->gui, "entry-phone1") ) {
-		which = 1;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone2") ) {
-		which = 2;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone3") ) {
-		which = 3;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone4") ) {
-		which = 4;
-	} else
-		return;
-	string = e_utf8_gtk_entry_get_text(entry);
-	phone = e_card_phone_new();
-	phone->number = string;
-	e_card_simple_set_phone(editor->simple, editor->phone_choice[which - 1], phone);
-#if 0
-	phone->number = NULL;
-#endif
-	e_card_phone_free(phone);
-	set_fields(editor);
-}
-
-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);
-}
-
-static void
-address_text_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	GtkEditable *editable = GTK_EDITABLE(widget);
-	ECardAddrLabel *address;
-
-	if (editor->address_choice == -1)
-		return;
-
-	address = e_card_address_label_new();
-
-	address->data = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-	e_card_simple_set_address(editor->simple, editor->address_choice, address);
-	e_card_address_label_free(address);
-}
-
-/* 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;
-
-	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 (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)
-{
-	GtkWidget *file_as;
-	int style = 0;
-	char *string;
-
-	file_as = glade_xml_get_widget(editor->gui, "entry-file-as");
-
-	if (file_as && GTK_IS_ENTRY(file_as)) {
-		style = file_as_get_style(editor);
-	}
-	
-	e_card_name_free(editor->name);
-
-	string = e_utf8_gtk_entry_get_text (GTK_ENTRY(widget));
-	editor->name = e_card_name_from_string(string);
-	g_free (string);
-	
-	if (file_as && GTK_IS_ENTRY(file_as)) {
-		file_as_set_style(editor, style);
-	}
-}
-
-static void
-company_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int style = 0;
-	GtkWidget *file_as;
-
-	file_as = glade_xml_get_widget(editor->gui, "entry-file-as");
-
-	if (file_as && GTK_IS_ENTRY(file_as)) {
-		style = file_as_get_style(editor);
-	}
-	
-	g_free(editor->company);
-	
-	editor->company = e_utf8_gtk_entry_get_text(GTK_ENTRY(widget));
-	
-	if (file_as && GTK_IS_ENTRY(file_as)) {
-		file_as_set_style(editor, style);
-	}
-}
-
-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
-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);
-	}
-}
-
-static void
-full_name_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	GnomeDialog *dialog = GNOME_DIALOG(e_contact_editor_fullname_new(editor->name));
-	int result;
-	gtk_widget_show(GTK_WIDGET(dialog));
-	result = gnome_dialog_run (dialog);
-	if (result == 0) {
-		ECardName *name;
-		GtkWidget *fname_widget;
-
-		gtk_object_get(GTK_OBJECT(dialog),
-			       "name", &name,
-			       NULL);
-		e_card_name_free(editor->name);
-		editor->name = e_card_name_copy(name);
-
-		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);
-		}
-	}
-	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_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);
-		e_card_simple_set_delivery_address(editor->simple, editor->address_choice, new_address);
-
-		address_widget = glade_xml_get_widget(editor->gui, "text-address");
-		if (address_widget && GTK_IS_EDITABLE(address_widget)) {
-			char *string = e_card_delivery_address_to_string(new_address);
-			e_utf8_gtk_editable_set_text(GTK_EDITABLE(address_widget), string);
-			g_free(string);
-		} else {
-			ECardAddrLabel *address = e_card_delivery_address_to_label(new_address);
-			e_card_simple_set_address(editor->simple, editor->address_choice, address);
-			e_card_address_label_free(address);
-		}
-		e_card_delivery_address_free(new_address);
-	}
-	gtk_object_unref(GTK_OBJECT(dialog));
-}
-
-static void
-categories_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	char *categories;
-	GnomeDialog *dialog;
-	int result;
-	GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories");
-	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_contact_editor_categories_new(categories));
-	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));
-#if 0
-	if (!entry)
-		g_free(categories);
-#endif
-}
-
-/* Emits the signal to request saving a card */
-static void
-save_card (EContactEditor *ce)
-{
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	if (ce->is_new_card)
-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[ADD_CARD],
-				 ce->card);
-	else
-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[COMMIT_CARD],
-				 ce->card);
-
-	/* FIXME: should we set the ce->is_new_card here or have the client code
-	 * set the "is_new_card" argument on the contact editor object?
-	 */
-
-	ce->is_new_card = FALSE;
-}
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (EContactEditor *ce)
-{
-	g_assert (ce->app != NULL);
-
-	gtk_widget_destroy (ce->app);
-	ce->app = NULL;
-
-	gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[EDITOR_CLOSED]);
-}
-
-/* Menu callbacks */
-
-/* File/Save callback */
-static void
-file_save_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_card (ce);
-}
-
-/* File/Close callback */
-static void
-file_close_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	close_dialog (ce);
-}
-
-static void
-file_save_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-	ECard *card;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	card = ce->card;
-	e_contact_save_as("Save as VCard", card);
-}
-
-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
-delete_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce = E_CONTACT_EDITOR (data);
-
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(ce->app))) {
-
-		extract_info (ce);
-		e_card_simple_sync_card (ce->simple);
-		
-		if (!ce->is_new_card)
-			gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[DELETE_CARD],
-					 ce->card);
-		
-		file_close_cb(widget, data);
-	}
-}
-
-/* Emits the signal to request printing a card */
-static void
-print_cb (BonoboUIHandler *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));
-}
-
-/* Toolbar/Save and Close callback */
-static void
-tb_save_and_close_cb (BonoboUIHandler *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_card (ce);
-	close_dialog (ce);
-}
-
-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 ("ContactEditorDelete", delete_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrint", print_cb),
-	/*	BONOBO_UI_UNSAFE_VERB ("ContactEditorPageSetup", file_page_setup_menu), */
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorClose", file_close_cb),
-	
-	BONOBO_UI_VERB_END
-};
-
-static void
-create_ui (EContactEditor *ce)
-{
-	bonobo_ui_component_add_verb_list_with_data (
-		ce->uic, verbs, ce);
-
-	bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR,
-			       "evolution-contact-editor.xml",
-			       "evolution-contact-editor");
-}
-
-/* Callback used when the dialog box is destroyed */
-static gint
-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	close_dialog (ce);
-	return TRUE;
-}
-
-static GList *
-add_to_tab_order(GList *list, GladeXML *gui, char *name)
-{
-	GtkWidget *widget = glade_xml_get_widget(gui, name);
-	return g_list_prepend(list, widget);
-}
-
-static void
-setup_tab_order(GladeXML *gui)
-{
-	GtkWidget *container;
-	GList *list = NULL;
-
-	container = glade_xml_get_widget(gui, "table-contact-editor-general");
-
-	if (container) {
-		list = add_to_tab_order(list, gui, "entry-fullname");
-		list = add_to_tab_order(list, gui, "entry-jobtitle");
-		list = add_to_tab_order(list, gui, "entry-company");
-		list = add_to_tab_order(list, gui, "combo-file-as");
-		list = add_to_tab_order(list, gui, "entry-phone1");
-		list = add_to_tab_order(list, gui, "entry-phone2");
-		list = add_to_tab_order(list, gui, "entry-phone3");
-		list = add_to_tab_order(list, gui, "entry-phone4");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-
-		list = NULL;
-		list = add_to_tab_order(list, gui, "entry-email1");
-		list = add_to_tab_order(list, gui, "entry-web");
-		list = add_to_tab_order(list, gui, "text-address");
-		list = add_to_tab_order(list, gui, "alignment-contacts");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-	}
-}
-
-static void
-e_contact_editor_init (EContactEditor *e_contact_editor)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-	GtkWidget *bonobo_win;
-	GtkWidget *wants_html;
-	BonoboUIContainer *container;
-
-	e_contact_editor->email_info = NULL;
-	e_contact_editor->phone_info = NULL;
-	e_contact_editor->address_info = NULL;
-	e_contact_editor->email_popup = NULL;
-	e_contact_editor->phone_popup = NULL;
-	e_contact_editor->address_popup = NULL;
-	e_contact_editor->email_list = NULL;
-	e_contact_editor->phone_list = NULL;
-	e_contact_editor->address_list = NULL;
-	e_contact_editor->name = e_card_name_new();
-	e_contact_editor->company = g_strdup("");
-	
-	e_contact_editor->email_choice = 0;
-	e_contact_editor->phone_choice[0] = E_CARD_SIMPLE_PHONE_ID_BUSINESS;
-	e_contact_editor->phone_choice[1] = E_CARD_SIMPLE_PHONE_ID_HOME;
-	e_contact_editor->phone_choice[2] = E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX;
-	e_contact_editor->phone_choice[3] = E_CARD_SIMPLE_PHONE_ID_MOBILE;
-	e_contact_editor->address_choice = 0;
-
-	e_contact_editor->arbitrary_fields = NULL;
-	
-	e_contact_editor->simple = e_card_simple_new(NULL);
-
-	e_contact_editor->card = NULL;
-
-	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);
-	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);
-
-
-	/* Construct the app */
-	bonobo_win = bonobo_win_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_win_set_contents (BONOBO_WIN (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_WIN (e_contact_editor->app));
-
-	e_contact_editor->uic = bonobo_ui_component_new_default ();
-	if (!e_contact_editor->uic) {
-		g_message ("e_contact_editor_init(): eeeeek, could not create the UI handler!");
-		return;
-	}
-	bonobo_ui_component_set_container (e_contact_editor->uic,
-					   bonobo_object_corba_objref (
-						   BONOBO_OBJECT (container)));
-
-	create_ui (e_contact_editor);
-
-	/* Connect to the deletion of the dialog */
-
-	gtk_signal_connect (GTK_OBJECT (e_contact_editor->app), "delete_event",
-			    GTK_SIGNAL_FUNC (app_delete_event_cb), e_contact_editor);
-}
-
-void
-e_contact_editor_destroy (GtkObject *object) {
-	EContactEditor *e_contact_editor = E_CONTACT_EDITOR(object);
-	
-	if (e_contact_editor->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->name)
-		e_card_name_free(e_contact_editor->name);
-
-	g_free (e_contact_editor->company);
-
-	gtk_object_unref(GTK_OBJECT(e_contact_editor->gui));
-}
-
-EContactEditor *
-e_contact_editor_new (ECard *card, gboolean is_new_card)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (gtk_type_new (E_CONTACT_EDITOR_TYPE));
-
-	gtk_object_set (GTK_OBJECT (ce),
-			"card", card,
-			"is_new_card", is_new_card,
-			NULL);
-
-	gtk_widget_show (ce->app);
-	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_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);
-		break;
-
-	case ARG_IS_NEW_CARD:
-		editor->is_new_card = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		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_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;
-
-	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;
-}
-
-#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);
-
-	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);
-	}
-	
-	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);
-	}
-
-	g_free(label);
-	g_free(entry);
-}
-
-static void
-_email_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int i;
-	int result;
-	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);
-	}
-	
-	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);
-	}
-}
-
-static void
-_address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int i;
-	int result;
-	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);
-	}
-	
-	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);
-	}
-}
-
-static void
-set_field(GtkEntry *entry, const char *string)
-{
-	char *oldstring = e_utf8_gtk_entry_get_text(entry);
-	if (!string)
-		string = "";
-	if (strcmp(string, oldstring))
-		e_utf8_gtk_entry_set_text(entry, string);
-	g_free (oldstring);
-}
-
-static void
-set_phone_field(GtkWidget *entry, const ECardPhone *phone)
-{
-	set_field(GTK_ENTRY(entry), phone ? phone->number : "");
-}
-
-static void
-set_fields(EContactEditor *editor)
-{
-	GtkWidget *entry;
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone1");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[0]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone2");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[1]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone3");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[2]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone4");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[3]));
-	
-	entry = glade_xml_get_widget(editor->gui, "entry-email1");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_field(GTK_ENTRY(entry), e_card_simple_get_email(editor->simple, editor->email_choice));
-	
-	set_address_field(editor, -1);
-}
-
-static void
-set_address_field(EContactEditor *editor, int result)
-{
-	GtkWidget *widget;
-	
-	widget = glade_xml_get_widget(editor->gui, "text-address");
-
-	if (widget && GTK_IS_TEXT(widget)) {
-		int position;
-		GtkEditable *editable;
-		const ECardAddrLabel *address;
-
-		if (result == -1)
-			result = editor->address_choice;
-		editor->address_choice = -1;
-
-		position = 0;
-		editable = GTK_EDITABLE(widget);
-		gtk_editable_delete_text(editable, 0, -1);
-		address = e_card_simple_get_address(editor->simple, result);
-		if (address && address->data) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, address->data);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-
-		editor->address_choice = result;
-	}
-}
-
-static void
-add_field_callback(GtkWidget *widget, EContactEditor *editor)
-{
-	const char *name;
-	int i;
-	static const char *builtins[] = {
-		"entry-fullname",
-		"entry-web",
-		"entry-company",
-		"entry-department",
-		"entry-office",
-		"entry-jobtitle",
-		"entry-profession",
-		"entry-manager",
-		"entry-assistant",
-		"entry-nickname",
-		"entry-spouse",
-		"text-comments",
-		"entry-categories",
-		"entry-contacts",
-		"entry-file-as",
-		"dateedit-anniversary",
-		"dateedit-birthday",
-		"entry-phone1",
-		"entry-phone2",
-		"entry-phone3",
-		"entry-phone4",
-		"entry-email1",
-		"text-address",
-		"checkbutton-mailingaddress",
-		"checkbutton-htmlmail",
-		NULL
-	};
-	name = glade_get_widget_name(widget);
-	if (name) {
-		for (i = 0; builtins[i]; i++) {
-			if (!strcmp(name, builtins[i]))
-				return;
-		}
-		if (GTK_IS_ENTRY(widget) || GTK_IS_TEXT(widget)) {
-			editor->arbitrary_fields = g_list_prepend(editor->arbitrary_fields, g_strdup(name));
-		}
-	}
-}
-
-struct {
-	char *id;
-	char *key;
-} field_mapping [] = {
-	{ "entry-fullname", "full_name" },
-	{ "entry-web", "url" },
-	{ "entry-company", "org" },
-	{ "entry-department", "org_unit" },
-	{ "entry-office", "office" },
-	{ "entry-jobtitle", "title" },
-	{ "entry-profession", "role" },
-	{ "entry-manager", "manager" },
-	{ "entry-assistant", "assistant" },
-	{ "entry-nickname", "nickname" },
-	{ "entry-spouse", "spouse" },
-	{ "text-comments", "note" },
-	{ "entry-categories", "categories" },
-};
-
-static void
-fill_in_field(EContactEditor *editor, char *id, char *value)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, id);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		int position = 0;
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		gtk_editable_delete_text(editable, 0, -1);
-		if (value) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, value);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-	}
-}
-
-static void
-fill_in_card_field(EContactEditor *editor, ECard *card, char *id, char *key)
-{
-	char *string;
-	gtk_object_get(GTK_OBJECT(card),
-		       key, &string,
-		       NULL);
-	fill_in_field(editor, id, string);
-}
-
-static void
-fill_in_single_field(EContactEditor *editor, char *name)
-{
-	ECardSimple *simple = editor->simple;
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, name);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		int position = 0;
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		const ECardArbitrary *arbitrary;
-
-		gtk_editable_delete_text(editable, 0, -1);
-		arbitrary = e_card_simple_get_arbitrary(simple,
-							name);
-		if (arbitrary && arbitrary->value) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, arbitrary->value);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-	}
-}
-
-static void
-fill_in_info(EContactEditor *editor)
-{
-	ECard *card = editor->card;
-	if (card) {
-		char *file_as;
-		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,
-			       "name",          &name,
-			       "anniversary",   &anniversary,
-			       "birth_date",    &bday,
-			       "wants_html_set",&wants_html_set,
-			       "wants_html",    &wants_html,
-			       NULL);
-	
-		for (i = 0; i < sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {
-			fill_in_card_field(editor, card, field_mapping[i].id, field_mapping[i].key);
-		}
-
-		for (list = editor->arbitrary_fields; list; list = list->next) {
-			fill_in_single_field(editor, list->data);
-		}
-
-		if (wants_html_set) {
-			GtkWidget *widget = glade_xml_get_widget(editor->gui, "checkbutton-htmlmail");
-			if (widget && GTK_IS_CHECK_BUTTON(widget)) {
-				gtk_object_set(GTK_OBJECT(widget),
-					       "active", wants_html,
-					       NULL);
-			}
-		}
-
-		/* File as has to come after company and name or else it'll get messed up when setting them. */
-		fill_in_field(editor, "entry-file-as", file_as);
-		
-		e_card_name_free(editor->name);
-		editor->name = e_card_name_copy(name);
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (anniversary && widget && GNOME_IS_DATE_EDIT(widget)) {
-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};
-			time_t time_val;
-			GnomeDateEdit *dateedit;
-
-			time_struct.tm_mday = anniversary->day;
-			time_struct.tm_mon = anniversary->month - 1;
-			time_struct.tm_year = anniversary->year - 1900;
-			time_val = mktime(&time_struct);
-			dateedit = GNOME_DATE_EDIT(widget);
-			gnome_date_edit_set_time(dateedit, time_val);
-		}
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (bday && widget && GNOME_IS_DATE_EDIT(widget)) {
-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};
-			time_t time_val;
-			GnomeDateEdit *dateedit;
-			time_struct.tm_mday = bday->day;
-			time_struct.tm_mon = bday->month - 1;
-			time_struct.tm_year = bday->year - 1900;
-			time_val = mktime(&time_struct);
-			dateedit = GNOME_DATE_EDIT(widget);
-			gnome_date_edit_set_time(dateedit, time_val);
-		}
-
-		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;
-		struct tm time_struct;
-		time_t time_val;
-		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->name)
-			gtk_object_set(GTK_OBJECT(card),
-				       "name", editor->name,
-				       NULL);
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (widget && GNOME_IS_DATE_EDIT(widget)) {
-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));
-			gmtime_r(&time_val,
-				 &time_struct);
-			anniversary = g_new(ECardDate, 1);
-			anniversary->day   = time_struct.tm_mday;
-			anniversary->month = time_struct.tm_mon + 1;
-			anniversary->year  = time_struct.tm_year + 1900;
-			gtk_object_set(GTK_OBJECT(card),
-				       "anniversary", anniversary,
-				       NULL);
-		}
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (widget && GNOME_IS_DATE_EDIT(widget)) {
-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));
-			gmtime_r(&time_val,
-				 &time_struct);
-			bday = g_new(ECardDate, 1);
-			bday->day   = time_struct.tm_mday;
-			bday->month = time_struct.tm_mon + 1;
-			bday->year  = time_struct.tm_year + 1900;
-			gtk_object_set(GTK_OBJECT(card),
-				       "birth_date", bday,
-				       NULL);
-		}
-	}
-}
diff --git a/addressbook/contact-editor/e-contact-editor.h b/addressbook/contact-editor/e-contact-editor.h
deleted file mode 100644
index fae6939595..0000000000
--- a/addressbook/contact-editor/e-contact-editor.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_H__
-#define __E_CONTACT_EDITOR_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <bonobo.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 */
-	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;
-
-	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;
-};
-
-struct _EContactEditorClass
-{
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* add_card) (EContactEditor *ce, ECard *card);
-	void (* commit_card) (EContactEditor *ce, ECard *card);
-	void (* delete_card) (EContactEditor *ce, ECard *card);
-	void (* editor_closed) (EContactEditor *ce);
-};
-
-
-EContactEditor *e_contact_editor_new (ECard *card, gboolean is_new_card);
-GtkType    e_contact_editor_get_type (void);
-
-
-gboolean e_contact_editor_confirm_delete(GtkWindow *parent);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_H__ */
diff --git a/addressbook/contact-editor/e-contact-save-as.c b/addressbook/contact-editor/e-contact-save-as.c
deleted file mode 100644
index 7209c5e8f8..0000000000
--- a/addressbook/contact-editor/e-contact-save-as.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <e-contact-save-as.h>
-#include <gal/util/e-util.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-typedef struct {
-	GtkFileSelection *filesel;
-	ECard *card;
-} SaveAsInfo;
-
-static void
-save_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	char *vcard = e_card_get_vcard(info->card);
-	const char *filename = gtk_file_selection_get_filename(info->filesel);
-	e_write_file(filename, vcard, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(info->card));
-	gtk_widget_destroy(GTK_WIDGET(info->filesel));
-	g_free(info);
-}
-
-static void
-close_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	gtk_object_unref(GTK_OBJECT(info->card));
-	gtk_widget_destroy(GTK_WIDGET(info->filesel));
-	g_free(info);
-}
-
-static void
-delete_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	gtk_object_unref(GTK_OBJECT(info->card));
-	g_free(info);
-}
-
-void
-e_contact_save_as(char *title, ECard *card)
-{
-	GtkFileSelection *filesel;
-	SaveAsInfo *info = g_new(SaveAsInfo, 1);
-	
-	filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title));
-
-	info->filesel = filesel;
-	info->card = e_card_duplicate(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));
-}
diff --git a/addressbook/contact-editor/e-contact-save-as.h b/addressbook/contact-editor/e-contact-save-as.h
deleted file mode 100644
index d1c84dc596..0000000000
--- a/addressbook/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  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_SAVE_AS_H__
-#define __E_CONTACT_SAVE_AS_H__
-
-#include <gnome.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);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_H__ */
diff --git a/addressbook/contact-editor/email.png b/addressbook/contact-editor/email.png
deleted file mode 100644
index f3ff02e343..0000000000
--- a/addressbook/contact-editor/email.png
+++ /dev/null
diff --git a/addressbook/contact-editor/fulladdr.glade b/addressbook/contact-editor/fulladdr.glade
deleted file mode 100644
index e46064bb92..0000000000
--- a/addressbook/contact-editor/fulladdr.glade
+++ /dev/null
@@ -1,477 +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>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>fulladdr.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-checkaddress</name>
-  <visible>False</visible>
-  <title>Check Address</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox-container</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-checkaddress</name>
-      <border_width>8</border_width>
-      <rows>4</rows>
-      <columns>4</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>6</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>_Address:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-street</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<label>_City:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-city</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-city</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-ext</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label8</name>
-	<label>_PO Box:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-po</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>Address _2:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-ext</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-po</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-street</name>
-	<can_focus>True</can_focus>
-	<has_focus>True</has_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label5</name>
-	<label>_State/Province:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-region</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-region</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>combo-country</name>
-	<width>100</width>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>USA
-Canada
-Finland
-</items>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>entry-country</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-code</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label6</name>
-	<label>_ZIP Code:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-code</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label7</name>
-	<label>Countr_y:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-country</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/contact-editor/fulladdr.glade.h b/addressbook/contact-editor/fulladdr.glade.h
deleted file mode 100644
index 7db13fcf4d..0000000000
--- a/addressbook/contact-editor/fulladdr.glade.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Check Address");
-gchar *s = N_("_Address:");
-gchar *s = N_("_City:");
-gchar *s = N_("_PO Box:");
-gchar *s = N_("Address _2:");
-gchar *s = N_("_State/Province:");
-gchar *s = N_("USA");
-gchar *s = N_("Canada");
-gchar *s = N_("Finland");
-gchar *s = N_("_ZIP Code:");
-gchar *s = N_("Countr_y:");
diff --git a/addressbook/contact-editor/fullname-strings.h b/addressbook/contact-editor/fullname-strings.h
deleted file mode 100644
index 4d4303270a..0000000000
--- a/addressbook/contact-editor/fullname-strings.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Check Full Name");
-gchar *s = N_("\n"
-              "Mr.\n"
-              "Mrs.\n"
-              "Dr.\n"
-              "");
-gchar *s = N_("\n"
-              "Sr.\n"
-              "Jr.\n"
-              "I\n"
-              "II\n"
-              "III\n"
-              "Esq.\n"
-              "");
-gchar *s = N_("_First:");
-gchar *s = N_("_Title:");
-gchar *s = N_("_Middle:");
-gchar *s = N_("_Last:");
-gchar *s = N_("_Suffix:");
diff --git a/addressbook/contact-editor/fullname.glade b/addressbook/contact-editor/fullname.glade
deleted file mode 100644
index f2dfa23834..0000000000
--- a/addressbook/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>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>fullname-strings.h</translatable_strings_file>
-</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.
-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/contact-editor/head.png b/addressbook/contact-editor/head.png
deleted file mode 100644
index ca00b75f92..0000000000
--- a/addressbook/contact-editor/head.png
+++ /dev/null
diff --git a/addressbook/contact-editor/netfreebusy.png b/addressbook/contact-editor/netfreebusy.png
deleted file mode 100644
index 09ec8a2a5c..0000000000
--- a/addressbook/contact-editor/netfreebusy.png
+++ /dev/null
diff --git a/addressbook/contact-editor/netmeeting.png b/addressbook/contact-editor/netmeeting.png
deleted file mode 100644
index 4cb90c121e..0000000000
--- a/addressbook/contact-editor/netmeeting.png
+++ /dev/null
diff --git a/addressbook/contact-editor/phone.png b/addressbook/contact-editor/phone.png
deleted file mode 100644
index ebec84ba0b..0000000000
--- a/addressbook/contact-editor/phone.png
+++ /dev/null
diff --git a/addressbook/contact-editor/snailmail.png b/addressbook/contact-editor/snailmail.png
deleted file mode 100644
index 647ae8f68c..0000000000
--- a/addressbook/contact-editor/snailmail.png
+++ /dev/null
diff --git a/addressbook/contact-editor/test-editor.c b/addressbook/contact-editor/test-editor.c
deleted file mode 100644
index 80db2fe848..0000000000
--- a/addressbook/contact-editor/test-editor.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * test-editor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <gnome.h>
-#include <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@helixcode.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, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the contact editor canvas item" ),
-		      NULL);
-  gtk_widget_show (about);
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-	char *cardstr;
-	EContactEditor *ce;
-
-	/*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-	    textdomain (PACKAGE);*/
-
-	gnome_init( "Contact Editor Test", VERSION, argc, argv);
-
-	glade_gnome_init ();
-
-	cardstr = NULL;
-	if (argc == 2)
-		cardstr = read_file (argv [1]);
-
-	if (cardstr == NULL)
-		cardstr = TEST_VCARD;
-
-	ce = e_contact_editor_new (e_card_new (cardstr), TRUE);
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	ce = e_contact_editor_new (e_card_new (cardstr), TRUE);
-	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/contact-editor/web.png b/addressbook/contact-editor/web.png
deleted file mode 100644
index 3211a11b19..0000000000
--- a/addressbook/contact-editor/web.png
+++ /dev/null
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 cd8fe38705..0000000000
--- a/addressbook/gui/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = widgets search component
diff --git a/addressbook/gui/component/.cvsignore b/addressbook/gui/component/.cvsignore
deleted file mode 100644
index a8ecb5d170..0000000000
--- a/addressbook/gui/component/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-evolution-addressbook
-evolution-addressbook.pure
-test-addressbook
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 a41848b25b..0000000000
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in
+++ /dev/null
@@ -1,92 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the Addressbook Minicard control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9"
-            type="factory"
-            location="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595">
-
-	<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="Factory for the Evolution addressbook minicard control."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the sample Addressbook control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:addressbook:851f883b-2fe7-4c94-a1e3-a1f2a7a03c49"
-            type="factory"
-            location="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17">
-
-	<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:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution addressbook component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:addressbook:b7a26547-7014-4bb5-98ab-2bcac2bb55ca"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL: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_info>
diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo b/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo
deleted file mode 100644
index a41848b25b..0000000000
--- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo
+++ /dev/null
@@ -1,92 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the Addressbook Minicard control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9"
-            type="factory"
-            location="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595">
-
-	<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="Factory for the Evolution addressbook minicard control."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the sample Addressbook control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:addressbook:851f883b-2fe7-4c94-a1e3-a1f2a7a03c49"
-            type="factory"
-            location="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17">
-
-	<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:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution addressbook component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:addressbook:b7a26547-7014-4bb5-98ab-2bcac2bb55ca"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL: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_info>
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
deleted file mode 100644
index 642c7f91c7..0000000000
--- a/addressbook/gui/component/Makefile.am
+++ /dev/null
@@ -1,78 +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/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_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"	\
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
-
-bin_PROGRAMS =	\
-	evolution-addressbook
-
-evolution_addressbook_SOURCES = 	\
-	addressbook-component.c		\
-	addressbook-component.h		\
-	addressbook-factory.c		\
-	addressbook.c			\
-	addressbook.h			\
-	e-cardlist-model.c		\
-	e-cardlist-model.h		\
-	e-ldap-server-dialog.c          \
-	e-ldap-server-dialog.h		\
-	e-ldap-storage.c		\
-	e-ldap-storage.h
-
-evolution_addressbook_LDADD =						\
-	select-names/libeselectnames.la					\
-	$(top_builddir)/shell/libeshell.a				\
-	$(EXTRA_GNOME_LIBS)						\
-	$(BONOBO_HTML_GNOME_LIBS)					\
-	$(top_builddir)/addressbook/gui/widgets/libeminicard.a		\
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/e-util/ename/libename.la			\
-	$(top_builddir)/addressbook/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)/filter/libfilter.la				\
-	$(top_builddir)/e-util/libeutil.la
-
-evolution_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf` -export-dynamic
-
-oafdir = $(datadir)/oaf
-oaf_DATA = addressbook.oafinfo
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = ldap-server-dialog.glade ldap-server-dialog.glade.h
-
-EXTRA_DIST = 			\
-	$(glade_DATA)		\
-	$(oaf_DATA)
-
-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 5b52b8337b..0000000000
--- a/addressbook/gui/component/addressbook-component.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-component.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-
-#include "evolution-shell-component.h"
-#include "evolution-storage.h"
-
-#include "addressbook-component.h"
-#include "addressbook.h"
-#include "e-ldap-storage.h"
-
-
-
-#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"
-
-/* Nasty hack for filters to be able to find folders */
-/* Not even used with addressbook??? */
-EvolutionShellClient *global_shell_client;
-
-static BonoboGenericFactory *factory = NULL;
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "contacts", "evolution-contacts.png" },
-	{ NULL, NULL }
-};
-
-
-/* EvolutionShellComponent methods and signals.  */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *type,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	BonoboControl *control;
-
-	if (g_strcasecmp (type, "contacts") != 0)
-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-
-	control = addressbook_factory_new_control ();
-	bonobo_control_set_property (control, "folder_uri", physical_uri, NULL);
-
-	*control_return = control;
-
-	return EVOLUTION_SHELL_COMPONENT_OK;
-}
-
-static 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;
-	
-	setup_ldap_storage (shell_component, evolution_homedir);
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component,
-		Evolution_Shell shell_interface,
-		gpointer user_data)
-{
-	owner_count --;
-	if (owner_count == 0)
-		gtk_main_quit();
-}
-
-
-/* The factory function.  */
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory,
-	    void *closure)
-{
-	EvolutionShellComponent *shell_component;
-
-	shell_component = evolution_shell_component_new (folder_types, create_view, NULL, NULL, NULL, NULL);
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
-
-	return BONOBO_OBJECT (shell_component);
-}
-
-
-void
-addressbook_component_factory_init (void)
-{
-	if (factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);
-
-	if (factory == NULL)
-		g_error ("Cannot initialize the Evolution addressbook factory.");
-}
-
diff --git a/addressbook/gui/component/addressbook-component.h b/addressbook/gui/component/addressbook-component.h
deleted file mode 100644
index ec37da694a..0000000000
--- a/addressbook/gui/component/addressbook-component.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* addressbook-component.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _ADDRESSBOOK_COMPONENT_H
-#define _ADDRESSBOOK_COMPONENT_H
-
-void  addressbook_component_factory_init  (void);
-
-#endif /* _ADDRESSBOOK_COMPONENT_H */
diff --git a/addressbook/gui/component/addressbook-factory.c b/addressbook/gui/component/addressbook-factory.c
deleted file mode 100644
index 6b2d194a42..0000000000
--- a/addressbook/gui/component/addressbook-factory.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * sample-control-factory.c
- *
- * Copyright 1999, Helix Code, Inc.
- * 
- * Author:
- *   Nat Friedman (nat@nat.org)
- *
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include <glade/glade.h>
-#include <gal/widgets/e-cursors.h>
-#include <unicode.h>
-
-#include "addressbook.h"
-#include "addressbook-component.h"
-#include "addressbook/gui/widgets/e-minicard-control.h"
-#include "select-names/e-select-names-factory.h"
-
-
-static void
-init_corba (int *argc, char **argv)
-{
-	gnome_init_with_popt_table ("evolution-addressbook", "0.0",
-				    *argc, argv, oaf_popt_options, 0, NULL);
-
-	oaf_init (*argc, argv);
-}
-
-static void
-init_bonobo (int argc, char **argv)
-{
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-
-	glade_gnome_init ();
-}
-
-int
-main (int argc, char **argv)
-{
-	init_corba (&argc, argv);
-
-	init_bonobo (argc, argv);
-
-	/* FIXME: Messy names here.  This file should be `main.c'.  `addressbook.c' should
-           be `addressbook-control-factory.c' and the functions should be called
-           `addressbook_control_factory_something()'.  And `addressbook-component.c'
-           should be `addressbook-component-factory.c'.  */
-
-	addressbook_factory_init ();
-	addressbook_component_factory_init ();
-
-	e_select_names_factory_init ();
-	
-	e_minicard_control_factory_init ();
-
-	e_cursors_init();
-
-	unicode_init();
-
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
deleted file mode 100644
index b096b2bde7..0000000000
--- a/addressbook/gui/component/addressbook.c
+++ /dev/null
@@ -1,618 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * addressbook.c: 
- *
- * Author:
- *   Chris Lahey (clahey@helixcode.com)
- *
- * (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-
-#include <gnome.h>
-#include <libgnorba/gnorba.h>
-#include <bonobo.h>
-
-#include "addressbook.h"
-
-#include <ebook/e-book.h>
-#include <gal/util/e-util.h>
-#include <gal/widgets/e-unicode.h>
-#include "addressbook/gui/search/e-addressbook-search-dialog.h"
-
-#include "addressbook/gui/widgets/e-addressbook-view.h"
-
-#include <select-names/e-select-names.h>
-#include <select-names/e-select-names-manager.h>
-
-#include "e-contact-editor.h"
-#include "e-contact-save-as.h"
-#include "e-ldap-server-dialog.h"
-
-#include <addressbook/printing/e-contact-print.h>
-
-#define CONTROL_FACTORY_ID "OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"
-
-#define PROPERTY_FOLDER_URI          "folder_uri"
-
-#define PROPERTY_FOLDER_URI_IDX      1
-
-typedef struct {
-	EAddressbookView *view;
-	GtkWidget *vbox;
-	BonoboControl *control;
-	BonoboPropertyBag *properties;
-	char *uri;
-} AddressbookView;
-
-static void
-card_added_cb (EBook* book, EBookStatus status, const char *id,
-	    gpointer user_data)
-{
-	g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__);
-}
-
-static void
-card_modified_cb (EBook* book, EBookStatus status,
-		  gpointer user_data)
-{
-	g_print ("%s: %s(): a card was modified\n", __FILE__, __FUNCTION__);
-}
-
-/* Callback for the add_card signal from the contact editor */
-static void
-add_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_add_card (book, card, card_added_cb, NULL);
-}
-
-/* Callback for the commit_card signal from the contact editor */
-static void
-commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_commit_card (book, card, card_modified_cb, NULL);
-}
-
-/* Callback for the delete_card signal from the contact editor */
-static void
-delete_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_remove_card (book, card, card_modified_cb, NULL);
-}
-
-/* Callback used when the contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	gtk_object_unref (GTK_OBJECT (ce));
-}
-
-static void
-new_contact_cb (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	ECard *card;
-	EBook *book;
-	EContactEditor *ce;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	card = e_card_new("");
-
-	gtk_object_get(GTK_OBJECT(view->view),
-		       "book", &book,
-		       NULL);
-
-	g_assert (E_IS_BOOK (book));
-
-	ce = e_contact_editor_new (card, TRUE);
-
-	gtk_signal_connect (GTK_OBJECT (ce), "add_card",
-			    GTK_SIGNAL_FUNC (add_card_cb), book);
-	gtk_signal_connect (GTK_OBJECT (ce), "commit_card",
-			    GTK_SIGNAL_FUNC (commit_card_cb), book);
-	gtk_signal_connect (GTK_OBJECT (ce), "delete_card",
-			    GTK_SIGNAL_FUNC (delete_card_cb), book);
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	gtk_object_sink(GTK_OBJECT(card));
-}
-
-#ifdef HAVE_LDAP
-static void
-null_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-}
-
-static void
-new_server_cb (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	ELDAPServer *server = g_new (ELDAPServer, 1);
-	EBook *book;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	/* fill in the defaults */
-	server->name = g_strdup("");
-	server->host = g_strdup("");
-	server->port = g_strdup_printf("%d", 389);
-	server->description = g_strdup("");
-	server->rootdn = g_strdup("");
-	server->uri = g_strdup_printf ("ldap://%s:%s/%s", server->host, server->port, server->rootdn);
-	e_ldap_server_editor_show (server);
-
-	gtk_object_get(GTK_OBJECT(view->view),
-		       "book", &book,
-		       NULL);
-
-	g_assert (E_IS_BOOK (book));
-	
-	/* write out the new server info */
-	e_ldap_storage_add_server (server);
-
-	/* now update the view */
-	e_book_unload_uri (book);
-	if (! e_book_load_uri (book, server->uri, null_cb, NULL)) {
-		g_warning ("error calling load_uri!\n");
-	}
-}
-#endif
-
-static void
-search_cb (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	EBook *book;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	gtk_object_get(GTK_OBJECT(view->view),
-		       "book", &book,
-		       NULL);
-	g_assert (E_IS_BOOK (book));
-
-	gtk_widget_show(e_addressbook_search_dialog_new(book));
-}
-
-#if 0
-static void
-find_contact_cb (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	gint result;
-	GtkWidget* search_entry = gtk_entry_new();
-	gchar* search_text;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	GtkWidget* dlg = gnome_dialog_new ("Search Contacts", "Find",
-					   GNOME_STOCK_BUTTON_CANCEL, NULL);
-
-	gtk_object_get (view->view,
-			"query", &search_text,
-			NULL);
-	e_utf8_gtk_entry_set_text(GTK_ENTRY(search_entry), search_text);
-	g_free (search_text);
-
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dlg)->vbox),
-			    search_entry, TRUE, TRUE, 0);
-
-	gtk_widget_show_all (dlg);
-
-	gnome_dialog_close_hides (GNOME_DIALOG (dlg), TRUE);
-	result = gnome_dialog_run_and_close (GNOME_DIALOG (dlg));
-
-	/* If the user clicks "okay"...*/
-	if (result == 0) {
-		search_text = e_utf8_gtk_entry_get_text(GTK_ENTRY(search_entry));
-		gtk_object_set (view->view, 
-				"query", query, 
-				NULL);
-		g_free (search_text);
-	}
-}
-#endif
-
-static void
-delete_contact_cb (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	e_addressbook_view_delete_selection(view->view);
-}
-
-static void
-print_cb (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	e_addressbook_view_print(view->view);
-}
-
-static void
-search_entry_activated (GtkWidget* widget, gpointer user_data)
-{
-	char* search_word = e_utf8_gtk_entry_get_text(GTK_ENTRY(widget));
-	char* search_query;
-	AddressbookView *view = (AddressbookView *) user_data;
-
-	if (search_word && strlen (search_word))
-		search_query = g_strdup_printf (
-			"(contains \"x-evolution-any-field\" \"%s\")",
-			search_word);
-	else
-		search_query = g_strdup (
-			"(contains \"full_name\" \"\")");
-
-	gtk_object_set (GTK_OBJECT(view->view),
-			"query", search_query,
-			NULL);
-
-	g_free (search_query);
-	g_free (search_word);
-}
-
-static GtkWidget*
-make_quick_search_widget (GtkSignalFunc start_search_func,
-			  gpointer user_data_for_search)
-{
-	GtkWidget *search_vbox = gtk_vbox_new (FALSE, 0);
-	GtkWidget *search_entry = gtk_entry_new ();
-
-	if (start_search_func)
-	{
-		gtk_signal_connect (GTK_OBJECT (search_entry), "activate",
-				    (GtkSignalFunc) search_entry_activated,
-				    user_data_for_search);
-	}
-	
-	/* add the search entry to the our search_vbox */
-	gtk_box_pack_start (GTK_BOX (search_vbox), search_entry,
-			    FALSE, TRUE, 3);
-	gtk_box_pack_start (GTK_BOX (search_vbox),
-			    gtk_label_new("Quick Search"),
-			    FALSE, TRUE, 0);
-
-	return search_vbox;
-}
-
-static void
-show_all_contacts_cb (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	e_addressbook_view_show_all(view->view);
-}
-
-static void
-stop_loading_cb (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = (AddressbookView *) user_data;
-	e_addressbook_view_stop(view->view);
-}
-
-static void
-update_view_type (AddressbookView *view)
-{
-	BonoboUIComponent *uic = bonobo_control_get_ui_component (view->control);
-	EAddressbookViewType view_type;
-
-	if (!uic || bonobo_ui_component_get_container (uic) == CORBA_OBJECT_NIL)
-		return;
-
-	gtk_object_get (GTK_OBJECT (view->view), "type", &view_type, NULL);
-
-	switch (view_type) {
-	case E_ADDRESSBOOK_VIEW_TABLE:
-		if (uic)
-			bonobo_ui_component_set_prop (uic, "/menu/View/AsTable",
-						      "label", N_("As _Minicards"), NULL);
-
-		break;
-	case E_ADDRESSBOOK_VIEW_MINICARD:
-		if (uic)
-			bonobo_ui_component_set_prop (uic, "/menu/View/AsTable",
-						      "label", N_("As _Table"), NULL);
-		break;
-	default:
-		g_warning ("view_type must be either TABLE or MINICARD\n");
-		return;
-	}	
-}
-
-static void
-change_view_type (AddressbookView *view, EAddressbookViewType view_type)
-{
-	gtk_object_set (GTK_OBJECT (view->view), "type", view_type, NULL);
-
-	update_view_type (view);
-}
-
-static void
-toggle_view_as_cb (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	AddressbookView *view = user_data;
-	EAddressbookViewType view_type;
-
-	gtk_object_get (GTK_OBJECT (view->view), "type", &view_type, NULL);
-
-	if (view_type == E_ADDRESSBOOK_VIEW_TABLE)
-		change_view_type (view, E_ADDRESSBOOK_VIEW_MINICARD);
-	else
-		change_view_type (view, E_ADDRESSBOOK_VIEW_TABLE);
-}
-
-BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("ContactsPrint", print_cb),
-	BONOBO_UI_UNSAFE_VERB ("ViewAsTable", toggle_view_as_cb),
-	BONOBO_UI_UNSAFE_VERB ("ViewNewContact", new_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ToolSearch", search_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("ContactNew", new_contact_cb),
-/*	BONOBO_UI_UNSAFE_VERB ("ContactFind", find_contact_cb),*/
-	BONOBO_UI_UNSAFE_VERB ("ContactDelete", delete_contact_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactViewAll", show_all_contacts_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactStop", stop_loading_cb),
-#ifdef HAVE_LDAP
-	BONOBO_UI_UNSAFE_VERB ("ContactNewServer", new_server_cb),
-#endif
-	
-	BONOBO_UI_VERB_END
-};
-
-static void
-control_activate (BonoboControl     *control,
-		  BonoboUIComponent *uic,
-		  AddressbookView   *view)
-{
-	Bonobo_UIContainer remote_ui_container;
-	GtkWidget *quick_search_widget;
-	BonoboControl *search_control;
-
-	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");
-#ifdef HAVE_LDAP
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
-			       "evolution-addressbook-ldap.xml",
-			       "evolution-addressbook");
-#endif
-
-	quick_search_widget = make_quick_search_widget (
-		search_entry_activated, view);
-		
-	gtk_widget_show_all (quick_search_widget);
-	search_control = bonobo_control_new (quick_search_widget);
-
-	bonobo_ui_component_object_set (
-		uic, "/Toolbar/QuickSearch",
-		bonobo_object_corba_objref (BONOBO_OBJECT (search_control)),
-		NULL);
-
-	update_view_type (view);
-
-	bonobo_ui_component_thaw (uic, NULL);
-}
-
-static void
-control_activate_cb (BonoboControl *control, 
-		     gboolean activate, 
-		     AddressbookView *view)
-{
-	BonoboUIComponent *uic;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-	
-	if (activate)
-		control_activate (control, uic, view);
-	else
-		bonobo_ui_component_unset_container (uic);
-}
-
-static void
-addressbook_view_free(AddressbookView *view)
-{
-	if (view->properties)
-		bonobo_object_unref(BONOBO_OBJECT(view->properties));
-	g_free(view->uri);
-	g_free(view);
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	if (status == E_BOOK_STATUS_SUCCESS) {
-		AddressbookView *view = closure;
-
-		gtk_object_set(GTK_OBJECT(view->view),
-			       "book", book,
-			       NULL);
-	} else {
-		GtkWidget *warning_dialog, *label, *href;
-        	warning_dialog = gnome_dialog_new (
-        		_("Unable to open addressbook"),
-			GNOME_STOCK_BUTTON_CLOSE,
-        		NULL);
-        
-        	label = gtk_label_new (
-        		_("We were unable to open this addressbook.  This either\n"
-			  "means you have entered an incorrect URI, or have tried\n"
-			  "to access an LDAP server and don't have LDAP support\n"
-			  "compiled in.  If you've entered a URI, check the URI for\n"
-			  "correctness and reenter.  If not, you probably have\n"
-			  "attempted to access an LDAP server.  If you wish to be\n"
-			  "able to use LDAP, you'll need to download and install\n"
-			  "OpenLDAP and recompile and install evolution.\n"));
-		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);
-
-		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);
-
-		gnome_dialog_run (GNOME_DIALOG (warning_dialog));
-		
-		gtk_object_destroy (GTK_OBJECT (warning_dialog));
-	}
-}
-
-static void destroy_callback(GtkWidget *widget, gpointer data)
-{
-	AddressbookView *view = data;
-	addressbook_view_free(view);
-}
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  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);
-	}
-}
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg   *arg,
-	  guint              arg_id,
-	  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));
-		
-		if (!strncmp (view->uri, "file:", 5)) {
-			char *file_name = g_concat_dir_and_file(view->uri + 7, "addressbook.db");
-			uri_data = g_strdup_printf("file://%s", file_name);
-			g_free(file_name);
-		}
-		else {
-			uri_data = g_strdup (view->uri);
-		}
-
-		if (! e_book_load_uri (book, uri_data, book_open_cb, view))
-			printf ("error calling load_uri!\n");
-
-		g_free(uri_data);
-
-		break;
-		
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-BonoboControl *
-addressbook_factory_new_control (void)
-{
-	AddressbookView *view;
-
-	view = g_new0 (AddressbookView, 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->view = E_ADDRESSBOOK_VIEW(e_addressbook_view_new());
-
-	gtk_box_pack_start(GTK_BOX(view->vbox), GTK_WIDGET(view->view),
-			   TRUE, TRUE, 0);
-
-	/* create the initial view */
-	change_view_type (view, E_ADDRESSBOOK_VIEW_MINICARD);
-
-	gtk_widget_show( view->vbox );
-	gtk_widget_show( GTK_WIDGET(view->view) );
-
-	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_property_bag (view->control,
-					 view->properties);
-
-	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 (CONTROL_FACTORY_ID,
-								  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 66c5a7e4e6..0000000000
--- a/addressbook/gui/component/addressbook.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __ADDRESSBOOK_H__
-#define __ADDRESSBOOK_H__
-
-#include <bonobo/bonobo-control.h>
-
-BonoboControl *addressbook_factory_new_control  (void);
-void           addressbook_factory_init         (void);
-
-#endif /* __ADDRESSBOOK_H__ */
diff --git a/addressbook/gui/component/addressbook.oafinfo b/addressbook/gui/component/addressbook.oafinfo
deleted file mode 100644
index a41848b25b..0000000000
--- a/addressbook/gui/component/addressbook.oafinfo
+++ /dev/null
@@ -1,92 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the Addressbook Minicard control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9"
-            type="factory"
-            location="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595">
-
-	<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="Factory for the Evolution addressbook minicard control."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the sample Addressbook control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:addressbook:851f883b-2fe7-4c94-a1e3-a1f2a7a03c49"
-            type="factory"
-            location="OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17">
-
-	<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:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution addressbook component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:addressbook:b7a26547-7014-4bb5-98ab-2bcac2bb55ca"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL: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_info>
diff --git a/addressbook/gui/component/e-cardlist-model.c b/addressbook/gui/component/e-cardlist-model.c
deleted file mode 100644
index 23b61d58be..0000000000
--- a/addressbook/gui/component/e-cardlist-model.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Christopher James Lahey <clahey@helixcode.com>
- *
- * (C) 1999 Helix Code, Inc.
- */
-
-#include <config.h>
-#include "e-cardlist-model.h"
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <gnome.h>
-
-#define PARENT_TYPE e_table_model_get_type()
-
-static void
-e_cardlist_model_destroy(GtkObject *object)
-{
-	ECardlistModel *model = E_CARDLIST_MODEL(object);
-	int i;
-
-	for ( i = 0; i < model->data_count; i++ ) {
-		gtk_object_unref(GTK_OBJECT(model->data[i]));
-	}
-	g_free(model->data);
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-e_cardlist_model_col_count (ETableModel *etc)
-{
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-e_cardlist_model_row_count (ETableModel *etc)
-{
-	ECardlistModel *e_cardlist_model = E_CARDLIST_MODEL(etc);
-	return e_cardlist_model->data_count;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-e_cardlist_model_value_at (ETableModel *etc, int col, int row)
-{
-	ECardlistModel *e_cardlist_model = E_CARDLIST_MODEL(etc);
-	const char *value;
-	if ( col >= E_CARD_SIMPLE_FIELD_LAST - 1|| row >= e_cardlist_model->data_count )
-		return NULL;
-	value = e_card_simple_get_const(e_cardlist_model->data[row], 
-					col + 1);
-	return (void *)(value ? value : "");
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-e_cardlist_model_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-	ECardlistModel *e_cardlist_model = E_CARDLIST_MODEL(etc);
-	ECard *card;
-	if ( col >= E_CARD_SIMPLE_FIELD_LAST - 1|| row >= e_cardlist_model->data_count )
-		return;
-	e_card_simple_set(e_cardlist_model->data[row],
-			  col + 1,
-			  val);
-	gtk_object_get(GTK_OBJECT(e_cardlist_model->data[row]),
-		       "card", &card,
-		       NULL);
-
-	e_table_model_cell_changed(etc, col, row);
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-e_cardlist_model_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	return TRUE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-e_cardlist_model_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-e_cardlist_model_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-e_cardlist_model_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-e_cardlist_model_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-e_cardlist_model_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-void
-e_cardlist_model_add(ECardlistModel *model,
-		     ECard **cards,
-		     int count)
-{
-	int i;
-	model->data = g_realloc(model->data, model->data_count + count * sizeof(ECard *));
-	for (i = 0; i < count; i++) {
-		gboolean found = FALSE;
-		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;
-			}
-		}
-		if (!found) {
-			gtk_object_ref(GTK_OBJECT(cards[i]));
-			model->data[model->data_count++] = e_card_simple_new (cards[i]);
-			e_table_model_row_inserted(E_TABLE_MODEL(model), model->data_count - 1);
-		}
-	}
-}
-
-void
-e_cardlist_model_remove(ECardlistModel *model,
-			const char *id)
-{
-	int i;
-	for ( i = 0; i < model->data_count; i++) {
-		if ( !strcmp(e_card_simple_get_id(model->data[i]), id) ) {
-			gtk_object_unref(GTK_OBJECT(model->data[i]));
-			memmove(model->data + i, model->data + i + 1, (model->data_count - i - 1) * sizeof (ECard *));
-			e_table_model_row_deleted(E_TABLE_MODEL(model), i);
-		}
-	}
-}
-
-static void
-e_cardlist_model_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) object_class;
-	
-	object_class->destroy = e_cardlist_model_destroy;
-
-	model_class->column_count = e_cardlist_model_col_count;
-	model_class->row_count = e_cardlist_model_row_count;
-	model_class->value_at = e_cardlist_model_value_at;
-	model_class->set_value_at = e_cardlist_model_set_value_at;
-	model_class->is_cell_editable = e_cardlist_model_is_cell_editable;
-	model_class->duplicate_value = e_cardlist_model_duplicate_value;
-	model_class->free_value = e_cardlist_model_free_value;
-	model_class->initialize_value = e_cardlist_model_initialize_value;
-	model_class->value_is_empty = e_cardlist_model_value_is_empty;
-	model_class->value_to_string = e_cardlist_model_value_to_string;
-}
-
-static void
-e_cardlist_model_init (GtkObject *object)
-{
-	ECardlistModel *model = E_CARDLIST_MODEL(object);
-	model->data = NULL;
-	model->data_count = 0;
-}
-
-ECard *
-e_cardlist_model_get(ECardlistModel *model,
-		     int                row)
-{
-	if (model->data && row < model->data_count) {
-		ECard *card;
-		gtk_object_get(GTK_OBJECT(model->data[row]),
-			       "card", &card,
-			       NULL);
-		gtk_object_ref(GTK_OBJECT(card));
-		return card;
-	}
-	return NULL;
-}
-
-GtkType
-e_cardlist_model_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ECardlistModel",
-			sizeof (ECardlistModel),
-			sizeof (ECardlistModelClass),
-			(GtkClassInitFunc) e_cardlist_model_class_init,
-			(GtkObjectInitFunc) e_cardlist_model_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (PARENT_TYPE, &info);
-	}
-
-	return type;
-}
-
-ETableModel *
-e_cardlist_model_new (void)
-{
-	ECardlistModel *et;
-
-	et = gtk_type_new (e_cardlist_model_get_type ());
-	
-	return E_TABLE_MODEL(et);
-}
diff --git a/addressbook/gui/component/e-cardlist-model.h b/addressbook/gui/component/e-cardlist-model.h
deleted file mode 100644
index 0b9a7a2265..0000000000
--- a/addressbook/gui/component/e-cardlist-model.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _E_CARDLIST_MODEL_H_
-#define _E_CARDLIST_MODEL_H_
-
-#include <gal/e-table/e-table-model.h>
-#include <ebook/e-book.h>
-#include <ebook/e-book-view.h>
-#include <ebook/e-card-simple.h>
-
-#define E_CARDLIST_MODEL_TYPE        (e_cardlist_model_get_type ())
-#define E_CARDLIST_MODEL(o)          (GTK_CHECK_CAST ((o), E_CARDLIST_MODEL_TYPE, ECardlistModel))
-#define E_CARDLIST_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CARDLIST_MODEL_TYPE, ECardlistModelClass))
-#define E_IS_CARDLIST_MODEL(o)       (GTK_CHECK_TYPE ((o), E_CARDLIST_MODEL_TYPE))
-#define E_IS_CARDLIST_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CARDLIST_MODEL_TYPE))
-
-typedef struct {
-	ETableModel parent;
-
-	/* item specific fields */
-	ECardSimple **data;
-	int data_count;
-} ECardlistModel;
-
-
-typedef struct {
-	ETableModelClass parent_class;
-} ECardlistModelClass;
-
-
-GtkType e_cardlist_model_get_type (void);
-ETableModel *e_cardlist_model_new (void);
-
-/* Returns object with an extra ref count. */
-ECard *e_cardlist_model_get  (ECardlistModel  *model,
-			      int              row);
-void e_cardlist_model_add    (ECardlistModel  *model,
-			      ECard          **card,
-			      int              count);
-void e_cardlist_model_remove (ECardlistModel  *model,
-			      const char      *id);
-
-#endif /* _E_CARDLIST_MODEL_H_ */
diff --git a/addressbook/gui/component/e-ldap-server-dialog.c b/addressbook/gui/component/e-ldap-server-dialog.c
deleted file mode 100644
index 172f43280b..0000000000
--- a/addressbook/gui/component/e-ldap-server-dialog.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-ldap-server-dialog.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Toshok <toshok@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include "e-ldap-server-dialog.h"
-
-typedef struct {
-	GladeXML *gui;
-	GtkWidget *dialog;
-	ELDAPServer *server;
-} ELDAPServerDialog;
-
-static void
-fill_in_server_info (ELDAPServerDialog *dialog)
-{
-	ELDAPServer *ldap_server = dialog->server;
-	GtkEditable *editable;
-	int position;
-
-	/* the name */
-	position = 0;
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "name-entry"));
-	gtk_editable_delete_text (editable, 0, -1);
-	gtk_editable_insert_text (editable, ldap_server->name, strlen (ldap_server->name), &position);
-
-	/* the server description */
-	position = 0;
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "description-entry"));
-	gtk_editable_delete_text (editable, 0, -1);
-	gtk_editable_insert_text (editable, ldap_server->description, strlen (ldap_server->description), &position);
-
-	/* the server hostname */
-	position = 0;
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "server-entry"));
-	gtk_editable_delete_text (editable, 0, -1);
-	gtk_editable_insert_text (editable, ldap_server->host, strlen (ldap_server->host), &position);
-
-	/* the server port */
-	position = 0;
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "port-entry"));
-	gtk_editable_delete_text (editable, 0, -1);
-	gtk_editable_insert_text (editable, ldap_server->port, strlen (ldap_server->port), &position);
-
-	/* the root dn */
-	position = 0;
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "root-dn-entry"));
-	gtk_editable_delete_text (editable, 0, -1);
-	gtk_editable_insert_text (editable, ldap_server->rootdn, strlen (ldap_server->rootdn), &position);
-}
-
-static void
-extract_server_info (ELDAPServerDialog *dialog)
-{
-	ELDAPServer *ldap_server = dialog->server;
-	GtkEditable *editable;
-	char *description, *server, *port, *rootdn, *name;
-
-	/* the server name */
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "name-entry"));
-	name = gtk_editable_get_chars(editable, 0, -1);
-	if (name && *name) {
-		if (ldap_server->name)
-			g_free(ldap_server->name);
-		ldap_server->name = name;
-	}
-
-	/* the server description */
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "description-entry"));
-	description = gtk_editable_get_chars(editable, 0, -1);
-	if (description && *description) {
-		if (ldap_server->description)
-			g_free(ldap_server->description);
-		ldap_server->description = description;
-	}
-
-	/* the server hostname */
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "server-entry"));
-	server = gtk_editable_get_chars(editable, 0, -1);
-	if (server && *server) {
-		if (ldap_server->host)
-			g_free(ldap_server->host);
-		ldap_server->host = server;
-	}
-
-	/* the server port */
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "port-entry"));
-	port = gtk_editable_get_chars(editable, 0, -1);
-	if (port && *port) {
-		if (ldap_server->port)
-			g_free (ldap_server->port);
-		ldap_server->port = port;
-	}
-
-	/* the root dn */
-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog->gui, "root-dn-entry"));
-	rootdn = gtk_editable_get_chars(editable, 0, -1);
-	if (rootdn && *rootdn) {
-		if (ldap_server->rootdn)
-			g_free (ldap_server->rootdn);
-		ldap_server->rootdn = rootdn;
-	}
-}
-
-void
-e_ldap_server_editor_show(ELDAPServer *server)
-{
-	ELDAPServerDialog *dialog = g_new0 (ELDAPServerDialog, 1);
-
-	dialog->server = server;
-	dialog->gui = glade_xml_new (EVOLUTION_GLADEDIR "/ldap-server-dialog.glade", NULL);
-
-	dialog->dialog = glade_xml_get_widget(dialog->gui, "ldap-server-dialog");
-
-	fill_in_server_info (dialog);
-
-	gnome_dialog_run (GNOME_DIALOG(dialog->dialog));
-
-	extract_server_info (dialog);
-
-	gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-}
diff --git a/addressbook/gui/component/e-ldap-server-dialog.h b/addressbook/gui/component/e-ldap-server-dialog.h
deleted file mode 100644
index e5ae169f5c..0000000000
--- a/addressbook/gui/component/e-ldap-server-dialog.h
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#ifndef __E_LDAP_SERVER_DIALOG_H__
-#define __E_LDAP_SERVER_DIALOG_H__
-
-#include "e-ldap-storage.h"
-
-void e_ldap_server_editor_show(ELDAPServer *server);
-
-#endif /* __E_LDAP_SERVER_DIALOG_H__ */
diff --git a/addressbook/gui/component/e-ldap-storage.c b/addressbook/gui/component/e-ldap-storage.c
deleted file mode 100644
index 11861b0ac2..0000000000
--- a/addressbook/gui/component/e-ldap-storage.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-ldap-storage.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Chris Toshok
- */
-
-/* The ldap server file goes like this:
-
-   <?xml version="1.0"?>
-   <contactservers>
-     <contactserver>
-           <name>LDAP Server</name>
-	   <description>This is my company address book.</description>
-	   <host>ldap.server.com</host>
-	   <port>389</port>
-	   <rootdn></rootdn>
-     </contactserver>
-   </contactservers>
-
-   FIXME: Do we want to use a namespace for this?
-   FIXME: Do we want to have an internationalized description?
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-
-#include "evolution-shell-component.h"
-#include "evolution-storage.h"
-
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "e-ldap-storage.h"
-#include "e-ldap-server-dialog.h"
-
-#include <gal/util/e-util.h>
-#include <gal/util/e-xml-utils.h>
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-#define LDAPSERVER_XML "ldapservers.xml"
-
-static gboolean load_ldap_data (EvolutionStorage *storage, const char *file_path);
-static gboolean save_ldap_data (const char *file_path);
-
-GHashTable *servers;
-EvolutionStorage *storage;
-static char *ldapservers;
-
-void
-setup_ldap_storage (EvolutionShellComponent *shell_component,
-		    const char *evolution_homedir)
-{
-	EvolutionShellClient *shell_client;
-	Evolution_Shell corba_shell;
-
-	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));
-
-	storage = evolution_storage_new (_("External Directories"));
-	if (evolution_storage_register_on_shell (storage, corba_shell) != EVOLUTION_STORAGE_OK) {
-		g_warning ("Cannot register storage");
-		return;
-	}
-
-	/* save the storage for later */
-	servers = g_hash_table_new (g_str_hash, g_str_equal);
-
-	gtk_object_set_data (GTK_OBJECT (shell_component), "e-storage", storage);
-
-	if (ldapservers)
-		g_free (ldapservers);
-	ldapservers = g_strdup_printf ("%s/" LDAPSERVER_XML, evolution_homedir);
-	load_ldap_data (storage, ldapservers);
-}
-
-static char *
-get_string_value (xmlNode *node,
-		  const char *name)
-{
-	xmlNode *p;
-	xmlChar *xml_string;
-	char *retval;
-
-	p = e_xml_get_child_by_name (node, (xmlChar *) name);
-	if (p == NULL)
-		return NULL;
-
-	p = e_xml_get_child_by_name (p, (xmlChar *) "text");
-	if (p == NULL) /* there's no text between the tags, return the empty string */
-		return g_strdup("");
-
-	xml_string = xmlNodeListGetString (node->doc, p, 1);
-	retval = g_strdup ((char *) xml_string);
-	xmlFree (xml_string);
-
-	return retval;
-}
-
-static gboolean
-load_ldap_data (EvolutionStorage *storage,
-		const char *file_path)
-{
-	xmlDoc *doc;
-	xmlNode *root;
-	xmlNode *child;
-
- tryagain:
-	doc = xmlParseFile (file_path);
-	if (doc == NULL) {
-		/* check to see if a ldapserver.xml.new file is
-                   there.  if it is, rename it and run with it */
-		char *new_path = g_strdup_printf ("%s.new", file_path);
-		struct stat sb;
-
-		if (stat (new_path, &sb) == 0) {
-			int rv;
-
-			rv = rename (new_path, file_path);
-			g_free (new_path);
-
-			if (0 > rv) {
-				g_error ("Failed to rename ldapserver.xml: %s\n", strerror(errno));
-				return FALSE;
-			}
-			else {
-				goto tryagain;
-			}
-		}
-
-		g_free (new_path);
-		return TRUE;
-	}
-
-	root = xmlDocGetRootElement (doc);
-	if (root == NULL || strcmp (root->name, "contactservers") != 0) {
-		xmlFreeDoc (doc);
-		return FALSE;
-	}
-
-	for (child = root->childs; child; child = child->next) {
-		char *path;
-		ELDAPServer *server;
-
-		if (strcmp (child->name, "contactserver")) {
-			g_warning ("unknown node '%s' in %s", child->name, file_path);
-			continue;
-		}
-
-		server = g_new (ELDAPServer, 1);
-
-		server->name = get_string_value (child, "name");
-		server->description = get_string_value (child, "description");
-		server->port = get_string_value (child, "port");
-		server->host = get_string_value (child, "host");
-		server->rootdn = get_string_value (child, "rootdn");
-		server->scope = get_string_value (child, "scope");
-		server->uri = g_strdup_printf ("ldap://%s:%s/%s??%s", server->host, server->port, server->rootdn, server->scope);
-
-		path = g_strdup_printf ("/%s", server->name);
-		evolution_storage_new_folder (storage, path, server->name,
-					      "contacts", server->uri, server->description);
-
-		g_hash_table_insert (servers, server->name, server);
-
-		g_free (path);
-	}
-
-	xmlFreeDoc (doc);
-
-	return TRUE;
-}
-
-static void
-ldap_server_foreach(gpointer key, gpointer value, gpointer user_data)
-{
-	ELDAPServer *server = (ELDAPServer*)value;
-	xmlNode *root = (xmlNode*)user_data;
-	xmlNode *server_root = xmlNewNode (NULL,
-					   (xmlChar *) "contactserver");
-
-	xmlAddChild (root, server_root);
-
-	xmlNewChild (server_root, NULL, (xmlChar *) "name",
-		     (xmlChar *) server->name);
-	xmlNewChild (server_root, NULL, (xmlChar *) "description",
-		     (xmlChar *) server->description);
-
-	xmlNewChild (server_root, NULL, (xmlChar *) "port",
-		     (xmlChar *) server->port);
-	xmlNewChild (server_root, NULL, (xmlChar *) "host",
-		     (xmlChar *) server->host);
-	xmlNewChild (server_root, NULL, (xmlChar *) "rootdn",
-		     (xmlChar *) server->rootdn);
-	xmlNewChild (server_root, NULL, (xmlChar *) "scope",
-		     (xmlChar *) server->scope);
-}
-
-static gboolean
-save_ldap_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 *) "contactservers", NULL);
-	xmlDocSetRootElement (doc, root);
-
-	g_hash_table_foreach (servers, ldap_server_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 ldapserver.xml: xmlBufferCreate() == NULL");
-		return FALSE;
-	}
-
-	rv = write (fd, buf, buf_size);
-	xmlFree (buf);
-	close (fd);
-
-	if (0 > rv) {
-		g_error ("Failed to write new ldapserver.xml: %s\n", strerror(errno));
-		unlink (new_path);
-		return FALSE;
-	}
-	else {
-		if (0 > rename (new_path, file_path)) {
-			g_error ("Failed to rename ldapserver.xml: %s\n", strerror(errno));
-			unlink (new_path);
-			return FALSE;
-		}
-		return TRUE;
-	}
-}
-
-void
-e_ldap_storage_add_server (ELDAPServer *server)
-{
-	char *path;
-	/* add it to our hashtable */
-	g_hash_table_insert (servers, server->name, server);
-
-	/* and then to the ui */
-	path = g_strdup_printf ("/%s", server->name);
-	evolution_storage_new_folder (storage, path, server->name, "contacts", server->uri, server->description);
-
-	g_free (path);
-
-	save_ldap_data (ldapservers);
-}
-
-void
-e_ldap_storage_remove_server (char *name)
-{
-	char *path;
-	ELDAPServer *server;
-
-	/* remove it from our hashtable */
-	server = (ELDAPServer*)g_hash_table_lookup (servers, name);
-	g_hash_table_remove (servers, name);
-
-	g_free (server->name);
-	g_free (server->description);
-	g_free (server->host);
-	g_free (server->port);
-	g_free (server->rootdn);
-	g_free (server->scope);
-	g_free (server->uri);
-
-	g_free (server);
-
-	/* and then from the ui */
-	path = g_strdup_printf ("/%s", name);
-	evolution_storage_removed_folder (storage, path);
-
-	g_free (path);
-
-	save_ldap_data (ldapservers);
-}
diff --git a/addressbook/gui/component/e-ldap-storage.h b/addressbook/gui/component/e-ldap-storage.h
deleted file mode 100644
index 9d3e35b4db..0000000000
--- a/addressbook/gui/component/e-ldap-storage.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-ldap-storage.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Chris Toshok
- */
-
-#ifndef __E_LDAP_STORAGE_H__
-#define __E_LDAP_STORAGE_H__
-
-#include "evolution-shell-component.h"
-
-typedef struct {
-	char *name;
-	char *description;
-	char *host;
-	char *port;
-	char *rootdn;
-	char *scope;
-	char *uri; /* filled in from the above */
-} ELDAPServer;
-
-void setup_ldap_storage (EvolutionShellComponent *shell_component,
-			 const char *evolution_homedir);
-void e_ldap_storage_add_server (ELDAPServer *server);
-void e_ldap_storage_remove_server (char *name);
-
-#endif /* __E_LDAP_STORAGE_H__ */
diff --git a/addressbook/gui/component/ldap-server-dialog.glade b/addressbook/gui/component/ldap-server-dialog.glade
deleted file mode 100644
index a4dad9c2c2..0000000000
--- a/addressbook/gui/component/ldap-server-dialog.glade
+++ /dev/null
@@ -1,400 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>newserver</name>
-  <program_name>newserver</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_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>ldap-server-dialog.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>ldap-server-dialog</name>
-  <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>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>vbox1</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkTable</class>
-	<name>table2</name>
-	<rows>5</rows>
-	<columns>2</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>GtkEntry</class>
-	  <name>description-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>GtkEntry</class>
-	  <name>server-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>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>port-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>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>GtkEntry</class>
-	  <name>root-dn-entry</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment1</name>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>1</yscale>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label1</name>
-	    <label>Description:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment2</name>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>1</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>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label2</name>
-	    <label>LDAP Server:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment3</name>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>1</yscale>
-	  <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>
-	    <class>GtkLabel</class>
-	    <name>label3</name>
-	    <label>Port Number:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment4</name>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>1</yscale>
-	  <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>
-	    <class>GtkLabel</class>
-	    <name>label4</name>
-	    <label>Root DN:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>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>GtkAlignment</class>
-	  <name>alignment5</name>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xscale>1</xscale>
-	  <yscale>1</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>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label5</name>
-	    <label>Name:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/component/ldap-server-dialog.glade.h b/addressbook/gui/component/ldap-server-dialog.glade.h
deleted file mode 100644
index c99dfa3cb5..0000000000
--- a/addressbook/gui/component/ldap-server-dialog.glade.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Description:");
-gchar *s = N_("LDAP Server:");
-gchar *s = N_("Port Number:");
-gchar *s = N_("Root DN:");
-gchar *s = N_("Name:");
diff --git a/addressbook/gui/component/select-names/.cvsignore b/addressbook/gui/component/select-names/.cvsignore
deleted file mode 100644
index 1d8db60890..0000000000
--- a/addressbook/gui/component/select-names/.cvsignore
+++ /dev/null
@@ -1,11 +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
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 2bc8154daf..0000000000
--- a/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
+++ /dev/null
@@ -1,37 +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@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <Bonobo.idl>
-
-module Evolution {
-module Addressbook {
-
-	interface SelectNames : Bonobo::Unknown {
-		struct Section {
-			string id;
-			string title;
-		};
-
-		typedef sequence<Section> SectionList;
-
-		exception DuplicateID {};
-		exception SectionNotFound {};
-
-		void add_section (in string id, in string title)
-			raises (DuplicateID);
-
-		Bonobo::Control get_entry_for_section (in string section_id)
-			raises (SectionNotFound);
-
-		void activate_dialog (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 e66c3aa38a..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:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the Addressbook's name selection interface"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:addressbook:select-names:39301deb-174b-40d1-8a6e-5edc300f7b61"
-            type="factory"
-            location="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL: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/GNOME_Evolution_Addressbook_SelectNames.oafinfo b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo
deleted file mode 100644
index e66c3aa38a..0000000000
--- a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the Addressbook's name selection interface"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:addressbook:select-names:39301deb-174b-40d1-8a6e-5edc300f7b61"
-            type="factory"
-            location="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL: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 ef8d0bf14f..0000000000
--- a/addressbook/gui/component/select-names/Makefile.am
+++ /dev/null
@@ -1,71 +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 $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
-		-I $(srcdir) $(srcdir)/Evolution-Addressbook-SelectNames.idl
-
-oafdir = $(datadir)/oaf
-oaf_DATA = evolution-addressbook-select-names.oafinfo
-
-#
-
-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_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"	\
-	-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-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-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)		\
-	select-names.glade.h	\
-	$(oaf_DATA)		\
-	$(IDLS)
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 8c0e868bb1..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.c
+++ /dev/null
@@ -1,294 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-bonobo.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-
-#include <bonobo/bonobo-property-bag.h>
-#include <bonobo/bonobo-control.h>
-
-#include "Evolution-Addressbook-SelectNames.h"
-
-#include <gal/util/e-util.h>
-#include "e-select-names-manager.h"
-
-#include "e-select-names-bonobo.h"
-
-
-#define PARENT_TYPE bonobo_object_get_type ()
-static BonoboObjectClass *parent_class = NULL;
-
-struct _ESelectNamesBonoboPrivate {
-	ESelectNamesManager *manager;
-};
-
-enum _EntryPropertyID {
-	ENTRY_PROPERTY_ID_TEXT
-};
-typedef enum _EntryPropertyID EntryPropertyID;
-
-
-/* PropertyBag implementation for the entry widgets.  */
-
-static void
-entry_get_property_fn (BonoboPropertyBag *bag,
-		       BonoboArg *arg,
-		       unsigned int arg_id,
-		       void *user_data)
-{
-	GtkWidget *widget;
-	char *text;
-
-	widget = GTK_WIDGET (user_data);
-
-	switch (arg_id) {
-	case ENTRY_PROPERTY_ID_TEXT:
-		gtk_object_get (GTK_OBJECT (widget), "text", &text, NULL);
-		BONOBO_ARG_SET_STRING (arg, text);
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-entry_set_property_fn (BonoboPropertyBag *bag,
-		       const BonoboArg *arg,
-		       guint arg_id,
-		       gpointer user_data)
-{
-	GtkWidget *widget;
-	const char *text;
-
-	widget = GTK_WIDGET (user_data);
-
-	switch (arg_id) {
-	case ENTRY_PROPERTY_ID_TEXT:
-		text = BONOBO_ARG_GET_STRING (arg);
-		gtk_object_set (GTK_OBJECT (widget), "text", text, NULL);
-		break;
-	default:
-		break;
-	}
-}
-
-
-/* CORBA interface implementation.  */
-
-static POA_Evolution_Addressbook_SelectNames__vepv SelectNames_vepv;
-
-static POA_Evolution_Addressbook_SelectNames *
-create_servant (void)
-{
-	POA_Evolution_Addressbook_SelectNames *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_Evolution_Addressbook_SelectNames *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &SelectNames_vepv;
-
-	CORBA_exception_init (&ev);
-
-	POA_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 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_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_control_set_property_bag (control, property_bag);
-
-	return bonobo_object_corba_objref (BONOBO_OBJECT (control));
-}
-
-static void
-impl_SelectNames_activate_dialog (PortableServer_Servant servant,
-				  const CORBA_char *section_id,
-				  CORBA_Environment *ev)
-{
-	BonoboObject *bonobo_object;
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-
-	bonobo_object = bonobo_object_from_servant (servant);
-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object);
-	priv = select_names->priv;
-
-	e_select_names_manager_activate_dialog (priv->manager, section_id);
-}
-
-
-/* GtkObject methods.  */
-
-static void
-impl_destroy (GtkObject *object)
-{
-	ESelectNamesBonobo *select_names;
-	ESelectNamesBonoboPrivate *priv;
-
-	select_names = E_SELECT_NAMES_BONOBO (object);
-	priv = select_names->priv;
-
-	gtk_object_unref (GTK_OBJECT (priv->manager));
-
-	g_free (priv);
-}
-
-
-static void
-corba_class_init ()
-{
-	POA_Evolution_Addressbook_SelectNames__vepv *vepv;
-	POA_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_Evolution_Addressbook_SelectNames__epv, 1);
-	epv->add_section           = impl_SelectNames_add_section;
-	epv->get_entry_for_section = impl_SelectNames_get_entry_for_section;
-	epv->activate_dialog       = impl_SelectNames_activate_dialog;
-
-	vepv = &SelectNames_vepv;
-	vepv->Bonobo_Unknown_epv                    = bonobo_object_get_epv ();
-	vepv->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 ();
-
-	select_names->priv = priv;
-}
-
-
-void
-e_select_names_bonobo_construct (ESelectNamesBonobo *select_names,
-				 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);
-}
-
-ESelectNamesBonobo *
-e_select_names_bonobo_new (void)
-{
-	POA_Evolution_Addressbook_SelectNames *servant;
-	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 4531c1e024..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-bonobo.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-bonobo.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef __E_SELECT_NAMES_BONOBO_H__
-#define __E_SELECT_NAMES_BONOBO_H__
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo/bonobo-object.h>
-
-#include "Evolution-Addressbook-SelectNames.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_SELECT_NAMES_BONOBO			(e_select_names_bonobo_get_type ())
-#define E_SELECT_NAMES_BONOBO(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_BONOBO, ESelectNamesBonobo))
-#define E_SELECT_NAMES_BONOBO_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_BONOBO, ESelectNamesBonoboClass))
-#define E_IS_SELECT_NAMES_BONOBO(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_BONOBO))
-#define E_IS_SELECT_NAMES_BONOBO_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), 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,
-						      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-factory.c b/addressbook/gui/component/select-names/e-select-names-factory.c
deleted file mode 100644
index 9a45692071..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-factory.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-
-#include "e-select-names-bonobo.h"
-
-#include "e-select-names-factory.h"
-
-
-#define COMPONENT_FACTORY_ID "OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e"
-
-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 f65d5aaa9e..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-select-names-factory.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _E_SECELT_NAMES_FACTORY_H
-#define _E_SECELT_NAMES_FACTORY_H
-
-#include <glib.h>
-
-gboolean e_select_names_factory_init (void);
-
-#endif
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c
deleted file mode 100644
index 55c5ae1608..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-manager.c
+++ /dev/null
@@ -1,360 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.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 <gal/e-text/e-entry.h>
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_CARD,
-};
-
-
-typedef struct {
-	char *id;
-	char *title;
-	ESelectNamesModel *model;
-} ESelectNamesManagerSection;
-
-typedef struct {
-	char *id;
-	EEntry *entry;
-} ESelectNamesManagerEntry;
-
-static void e_select_names_manager_init (ESelectNamesManager *manager);
-static void e_select_names_manager_class_init (ESelectNamesManagerClass *klass);
-
-static void e_select_names_manager_destroy (GtkObject *object);
-static void e_select_names_manager_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_select_names_manager_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-
-/**
- * e_select_names_manager_get_type:
- * @void: 
- * 
- * Registers the &ESelectNamesManager class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ESelectNamesManager class.
- **/
-GtkType
-e_select_names_manager_get_type (void)
-{
-	static GtkType manager_type = 0;
-
-	if (!manager_type) {
-		GtkTypeInfo manager_info = {
-			"ESelectNamesManager",
-			sizeof (ESelectNamesManager),
-			sizeof (ESelectNamesManagerClass),
-			(GtkClassInitFunc) e_select_names_manager_class_init,
-			(GtkObjectInitFunc) e_select_names_manager_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		manager_type = gtk_type_unique (gtk_object_get_type (), &manager_info);
-	}
-
-	return manager_type;
-}
-
-/**
- * e_select_names_manager_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ESelectNamesManager that wraps the @VCard.
- */
-ESelectNamesManager *
-e_select_names_manager_new (void)
-{
-	ESelectNamesManager *manager = E_SELECT_NAMES_MANAGER(gtk_type_new(e_select_names_manager_get_type()));
-	return manager;
-}
-
-static void
-e_select_names_manager_class_init (ESelectNamesManagerClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	gtk_object_add_arg_type ("ESelectNamesManager::card",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CARD);
-
-	object_class->destroy = e_select_names_manager_destroy;
-	object_class->get_arg = e_select_names_manager_get_arg;
-	object_class->set_arg = e_select_names_manager_set_arg;
-}
-
-/*
- * ESelectNamesManager lifecycle management and vcard loading/saving.
- */
-
-static void
-e_select_names_manager_destroy (GtkObject *object)
-{
-	ESelectNamesManager *manager;
-	
-	manager = E_SELECT_NAMES_MANAGER (object);
-
-	gtk_object_unref(GTK_OBJECT(manager->sections));
-	gtk_object_unref(GTK_OBJECT(manager->entries));
-}
-
-
-/* Set_arg handler for the manager */
-static void
-e_select_names_manager_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesManager *manager;
-	
-	manager = E_SELECT_NAMES_MANAGER (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the manager */
-static void
-e_select_names_manager_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesManager *manager;
-
-	manager = E_SELECT_NAMES_MANAGER (object);
-
-	switch (arg_id) {
-	case ARG_CARD:
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void *
-section_copy(const void *sec, void *data)
-{
-	const ESelectNamesManagerSection *section = sec;
-	ESelectNamesManagerSection *newsec;
-	
-	newsec = g_new(ESelectNamesManagerSection, 1);
-	newsec->id = g_strdup(section->id);
-	newsec->title = g_strdup(section->title);
-	newsec->model = section->model;
-	if (newsec->model)
-		gtk_object_ref(GTK_OBJECT(newsec->model));
-	return newsec;
-}
-
-static void
-section_free(void *sec, void *data)
-{
-	ESelectNamesManagerSection *section = sec;
-	g_free(section->id);
-	g_free(section->title);
-	if (section->model)
-		gtk_object_unref(GTK_OBJECT(section->model));
-	g_free(section);
-}
-
-static void *
-entry_copy(const void *ent, void *data)
-{
-	const ESelectNamesManagerEntry *entry = ent;
-	ESelectNamesManagerEntry *newent;
-	
-	newent = g_new(ESelectNamesManagerEntry, 1);
-	newent->id = g_strdup(entry->id);
-	newent->entry = entry->entry;
-	if (newent->entry)
-		gtk_object_ref(GTK_OBJECT(newent->entry));
-	return newent;
-}
-
-static void
-entry_free(void *ent, void *data)
-{
-	ESelectNamesManagerEntry *entry = ent;
-	g_free(entry->id);
-	if (entry->entry)
-		gtk_object_unref(GTK_OBJECT(entry->entry));
-	g_free(entry);
-}
-
-/**
- * e_select_names_manager_init:
- */
-static void
-e_select_names_manager_init (ESelectNamesManager *manager)
-{
-	manager->sections = e_list_new(section_copy, section_free, manager);
-	manager->entries  = e_list_new(entry_copy, entry_free, manager);
-}
-
-void                          e_select_names_manager_add_section               (ESelectNamesManager *manager,
-										const char *id,
-										const char *title)
-{
-	ESelectNamesManagerSection *section;
-	
-	section = g_new(ESelectNamesManagerSection, 1);
-	section->id = g_strdup(id);
-	section->title = g_strdup(title);
-	section->model = e_select_names_model_new();
-	e_list_append(manager->sections, section);
-	section_free(section, manager);
-}
-
-static void
-entry_destroyed(EEntry *entry, ESelectNamesManager *manager)
-{
-	if(!GTK_OBJECT_DESTROYED(manager)) {
-		EIterator *iterator = e_list_get_iterator(manager->entries);
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ESelectNamesManagerEntry *this_entry = e_iterator_get(iterator);
-			if(entry == this_entry->entry) {
-				e_iterator_delete(iterator);
-				break;
-			}
-		}
-	}
-	gtk_object_unref(GTK_OBJECT(manager));
-}
-
-GtkWidget                    *e_select_names_manager_create_entry              (ESelectNamesManager *manager,
-										const char *id)
-{
-	ETextModel *model;
-	EIterator *iterator;
-	iterator = e_list_get_iterator(manager->sections);
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const ESelectNamesManagerSection *section = e_iterator_get(iterator);
-		if (!strcmp(section->id, id)) {
-			ESelectNamesManagerEntry *entry;
-			EEntry *eentry;
-			eentry = E_ENTRY(e_entry_new());
-
-			entry = g_new(ESelectNamesManagerEntry, 1);
-			entry->entry = eentry;
-			entry->id = (char *)id;
-			model = e_select_names_text_model_new(section->model);
-			e_list_append(manager->entries, entry);
-			g_free(entry);
-
-			gtk_object_set(GTK_OBJECT(eentry),
-				       "model", model,
-				       "editable", TRUE,
-				       "use_ellipsis", TRUE,
-				       NULL);
-			gtk_signal_connect(GTK_OBJECT(eentry), "destroy",
-					   GTK_SIGNAL_FUNC(entry_destroyed), manager);
-			gtk_object_ref(GTK_OBJECT(manager));
-			return GTK_WIDGET(eentry);
-		}
-	}
-	return NULL;
-}
-
-static void
-e_select_names_clicked(ESelectNames *dialog, gint button, ESelectNamesManager *manager)
-{
-	switch(button) {
-	case 0: {
-		EList *list = manager->sections;
-		EIterator *iterator = e_list_get_iterator(list);
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			ESelectNamesManagerSection *section = (void *) e_iterator_get(iterator);
-			ESelectNamesModel *source = e_select_names_get_source(dialog, section->id);
-			if (section->model)
-				gtk_object_unref(GTK_OBJECT(section->model));
-			section->model = source;
-			/* Don't ref because get_source returns a conceptual ref_count of 1. */
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-
-		list = manager->entries;
-		iterator = e_list_get_iterator(list);
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			ESelectNamesManagerEntry *entry = (void *) e_iterator_get(iterator);
-			ESelectNamesModel *source = e_select_names_get_source(dialog, entry->id);
-			if (source) {
-				ETextModel *model = e_select_names_text_model_new(source);
-				if (model) {
-					gtk_object_set(GTK_OBJECT(entry->entry),
-						       "model", model,
-						       NULL);
-					gtk_object_unref(GTK_OBJECT(source));
-				}
-				gtk_object_unref(GTK_OBJECT(model));
-			}
-		}
-		gtk_object_unref(GTK_OBJECT(iterator));
-		break;
-	}
-	}
-	gnome_dialog_close(GNOME_DIALOG(dialog));
-}
-
-void                          e_select_names_manager_activate_dialog           (ESelectNamesManager *manager,
-										const char *id)
-{
-	EIterator *iterator;
-	
-	if (manager->names) {
-		g_assert (GTK_WIDGET_REALIZED (GTK_WIDGET (manager->names)));
-		gdk_window_show (GTK_WIDGET (manager->names)->window);
-		gdk_window_raise (GTK_WIDGET (manager->names)->window);
-	} else {
-		manager->names = E_SELECT_NAMES (e_select_names_new ());
-
-		iterator = e_list_get_iterator(manager->sections);
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ESelectNamesManagerSection *section = e_iterator_get(iterator);
-			ESelectNamesModel *newmodel = e_select_names_model_duplicate(section->model);
-			e_select_names_add_section(manager->names, section->id, section->title, newmodel);
-			gtk_object_unref(GTK_OBJECT(newmodel));
-		}
-		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));
-	}
-}
-
-/* Of type ECard */
-EList                    *e_select_names_manager_get_cards                 (ESelectNamesManager *manager,
-									    const char *id)
-{
-	EIterator *iterator;
-	iterator = e_list_get_iterator(manager->sections);
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const ESelectNamesManagerSection *section = e_iterator_get(iterator);
-		if (!strcmp(section->id, id)) {
-			return e_select_names_model_get_cards(section->model);
-		}
-	}
-	return NULL;
-}
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 13cddaac7d..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-manager.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_MANAGER_H__
-#define __E_SELECT_NAMES_MANAGER_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <e-util/e-list.h>
-#include "e-select-names.h"
-
-#define E_TYPE_SELECT_NAMES_MANAGER            (e_select_names_manager_get_type ())
-#define E_SELECT_NAMES_MANAGER(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_MANAGER, ESelectNamesManager))
-#define E_SELECT_NAMES_MANAGER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_MANAGER, ESelectNamesManagerClass))
-#define E_IS_SELECT_NAMES_MANAGER(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_MANAGER))
-#define E_IS_SELECT_NAMES_MANAGER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_MANAGER))
-
-typedef struct _ESelectNamesManager ESelectNamesManager;
-typedef struct _ESelectNamesManagerClass ESelectNamesManagerClass;
-
-struct _ESelectNamesManager {
-	GtkObject object;
-	
-	EList *sections;
-	EList *entries;
-
-	ESelectNames *names;
-};
-
-struct _ESelectNamesManagerClass {
-	GtkObjectClass parent_class;
-};
-
-ESelectNamesManager *e_select_names_manager_new               (void);
-void                 e_select_names_manager_add_section       (ESelectNamesManager *manager,
-							       const char *id,
-							       const char *title);
-GtkWidget           *e_select_names_manager_create_entry      (ESelectNamesManager *manager,
-							       const char *id);
-void                 e_select_names_manager_activate_dialog   (ESelectNamesManager *manager,
-							       const char *id);
-
-/* Of type ECard */
-EList               *e_select_names_manager_get_cards         (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 0bbbe588a6..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-model.c
+++ /dev/null
@@ -1,441 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include "e-select-names-model.h"
-#include <gal/util/e-util.h>
-#include "addressbook/backend/ebook/e-card-simple.h"
-
-enum {
-	E_SELECT_NAMES_MODEL_CHANGED,
-	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,
-};
-
-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);
-
-/**
- * e_select_names_model_get_type:
- * @void: 
- * 
- * Registers the &ESelectNamesModel class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the &ESelectNamesModel class.
- **/
-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;
-}
-
-/**
- * e_select_names_model_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ESelectNamesModel that wraps the @VCard.
- */
-ESelectNamesModel *
-e_select_names_model_new (void)
-{
-	ESelectNamesModel *model = E_SELECT_NAMES_MODEL(gtk_type_new(e_select_names_model_get_type()));
-	return model;
-}
-
-/**
- * e_select_names_model_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ESelectNamesModel that wraps the @VCard.
- */
-ESelectNamesModel *
-e_select_names_model_duplicate (ESelectNamesModel *old)
-{
-	ESelectNamesModel *model = E_SELECT_NAMES_MODEL(gtk_type_new(e_select_names_model_get_type()));
-	model->data = e_list_duplicate(old->data);
-	model->id = g_strdup(old->id);
-	model->title = g_strdup(old->title);
-	return model;
-}
-
-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);
-
-	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;
-}
-
-/*
- * ESelectNamesModel lifecycle management and vcard loading/saving.
- */
-
-static void
-e_select_names_model_destroy (GtkObject *object)
-{
-	ESelectNamesModel *model;
-	
-	model = E_SELECT_NAMES_MODEL (object);
-
-	gtk_object_unref(GTK_OBJECT(model->data));
-}
-
-
-/* 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 *
-data_copy(const void *sec, void *data)
-{
-	const ESelectNamesModelData *section = sec;
-	ESelectNamesModelData *newsec;
-	
-	newsec = g_new(ESelectNamesModelData, 1);
-	newsec->type = section->type;
-	newsec->card = section->card;
-	if (newsec->card)
-		gtk_object_ref(GTK_OBJECT(newsec->card));
-	newsec->string = g_strdup(section->string);
-	return newsec;
-}
-
-static void
-data_free(void *sec, void *data)
-{
-	ESelectNamesModelData *section = sec;
-	if (section->card)
-		gtk_object_unref(GTK_OBJECT(section->card));
-	g_free(section->string);
-	g_free(section);
-}
-
-/**
- * e_select_names_model_init:
- */
-static void
-e_select_names_model_init (ESelectNamesModel *model)
-{
-	model->data = e_list_new(data_copy, data_free, model);
-}
-
-static void *
-copy_func(const void *data, void *user_data)
-{
-	GtkObject *object = (void *) data;
-	if (object)
-		gtk_object_ref(object);
-	return object;
-}
-
-static void
-free_func(void *data, void *user_data)
-{
-	GtkObject *object = data;
-	if (object)
-		gtk_object_unref(object);
-}
-
-/* Of type ECard */
-EList                    *e_select_names_model_get_cards                 (ESelectNamesModel *model)
-{
-	EList *list = e_list_new(copy_func, free_func, NULL);
-	EIterator *iterator = e_list_get_iterator(model->data);
-	EIterator *new_iterator = e_list_get_iterator(list);
-
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		ESelectNamesModelData *node = (void *) e_iterator_get(iterator);
-		ECard *card;
-		ECardSimple *simple;
-		if (node->card) {
-			card = node->card;
-			gtk_object_ref(GTK_OBJECT(card));
-		} else {
-			card = e_card_new("");
-		}
-		simple = e_card_simple_new(card);
-		e_card_simple_set_arbitrary(simple, "text_version", "string", node->string);
-		e_iterator_insert(new_iterator, card, FALSE);
-		gtk_object_unref(GTK_OBJECT(card));
-		gtk_object_unref(GTK_OBJECT(simple));
-	}
-	return list;
-}
-
-EList                    *e_select_names_model_get_data                 (ESelectNamesModel *model)
-{
-	return model->data;
-}
-
-static void
-e_select_names_model_changed           (ESelectNamesModel *model)
-{
-	gtk_signal_emit(GTK_OBJECT(model),
-			e_select_names_model_signals[E_SELECT_NAMES_MODEL_CHANGED]);
-}
-
-void
-e_select_names_model_insert            (ESelectNamesModel *model,
-					EIterator *iterator, /* Must be one of the iterators in the model, or NULL if the list is empty. */
-					int index,
-					char *data)
-{
-	gchar **strings = e_strsplit(data, ",", -1);
-	int i;
-	if (iterator == NULL) {
-		ESelectNamesModelData new = {E_SELECT_NAMES_MODEL_DATA_TYPE_STRING_ADDRESS, NULL, ""};
-
-		e_list_append(model->data, &new);
-		iterator = e_list_get_iterator(model->data);
-
-		index = 0;
-	} else {
-		gtk_object_ref(GTK_OBJECT(iterator));
-	}
-	if (strings[0]) {
-		ESelectNamesModelData *node = (void *) e_iterator_get(iterator);
-		gchar *temp = g_strdup_printf("%.*s%s%s", index, node->string, strings[0], node->string + index);
-		g_free(node->string);
-		node->string = temp;
-		index += strlen(strings[0]);
-
-		for (i = 1; strings[i]; i++) {
-			ESelectNamesModelData *node = (void *) e_iterator_get(iterator);
-			gchar *temp = g_strdup_printf("%.*s", index, node->string);
-			gchar *temp2 = g_strdup_printf("%s%s", strings[i], node->string + index);
-
-			g_free(node->string);
-			node->type = E_SELECT_NAMES_MODEL_DATA_TYPE_STRING_ADDRESS;
-			node->string = temp;
-			if (node->card)
-				gtk_object_unref(GTK_OBJECT(node->card));
-			node->card = NULL;
-
-			node = g_new(ESelectNamesModelData, 1);
-			node->type = E_SELECT_NAMES_MODEL_DATA_TYPE_STRING_ADDRESS;
-			node->card = NULL;
-			node->string = temp2;
-			e_iterator_insert(iterator, node, 0);
-			index = strlen(strings[i]);
-			g_free(node->string);
-			g_free(node);
-		}
-	}
-	e_select_names_model_changed(model);
-	gtk_object_unref(GTK_OBJECT(iterator));
-}
-
-void
-e_select_names_model_insert_length     (ESelectNamesModel *model,
-					EIterator *iterator, /* Must be one of the iterators in the model. */
-					int index,
-					char *data,
-					int length)
-{
-	gchar *string = g_new(char, length + 1);
-	strncpy(string, data, length);
-	string[length] = 0;
-	e_select_names_model_insert(model, iterator, index, string);
-	g_free(string);
-}
-
-void
-e_select_names_model_delete            (ESelectNamesModel *model,
-					EIterator *iterator, /* Must be one of the iterators in the model. */
-					int index,
-					int length)
-{
-	while (length > 0 && e_iterator_is_valid(iterator)) {
-		ESelectNamesModelData *node = (void *) e_iterator_get(iterator);
-		int this_length = strlen(node->string);
-		if (this_length <= index + length) {
-			gchar *temp = g_strdup_printf("%.*s", index, node->string);
-			g_free(node->string);
-			node->string = temp;
-			length -= this_length - index;
-		} else {
-			gchar *temp = g_strdup_printf("%.*s%s", index, node->string, node->string + index + length);
-			g_free(node->string);
-			node->string = temp;
-			break;
-		}
-		
-		if (length > 0) {
-			e_iterator_next(iterator);
-			if (e_iterator_is_valid(iterator)) {
-				ESelectNamesModelData *node2 = (void *) e_iterator_get(iterator);
-				gchar *temp = g_strdup_printf("%s%s", node->string, node2->string);
-				g_free(node2->string);
-				node2->string = temp;
-				e_iterator_prev(iterator);
-				e_iterator_delete(iterator);
-				length --;
-			}
-		}
-	}
-	e_select_names_model_changed(model);
-}
-
-void
-e_select_names_model_replace           (ESelectNamesModel *model,
-					EIterator *iterator, /* Must be one of the iterators in the model. */
-					int index,
-					int length,
-					char *data)
-{
-	if (iterator == NULL) {
-		ESelectNamesModelData new = {E_SELECT_NAMES_MODEL_DATA_TYPE_STRING_ADDRESS, NULL, ""};
-
-		e_list_append(model->data, &new);
-		iterator = e_list_get_iterator(model->data);
-
-		index = 0;
-	} else {
-		gtk_object_ref(GTK_OBJECT(iterator));
-	}
-	while (length > 0 && e_iterator_is_valid(iterator)) {
-		ESelectNamesModelData *node = (void *) e_iterator_get(iterator);
-		int this_length = strlen(node->string);
-		if (this_length <= index + length) {
-			gchar *temp = g_strdup_printf("%.*s", index, node->string);
-			g_free(node->string);
-			node->string = temp;
-			length -= this_length - index;
-		} else {
-			gchar *temp = g_strdup_printf("%.*s%s", index, node->string, node->string + index + length);
-			g_free(node->string);
-			node->string = temp;
-			length = 0;
-		}
-
-		if (length > 0) {
-			e_iterator_next(iterator);
-			if (e_iterator_is_valid(iterator)) {
-				ESelectNamesModelData *node2 = (void *) e_iterator_get(iterator);
-				gchar *temp = g_strdup_printf("%s%s", node->string, node2->string);
-				g_free(node2->string);
-				node2->string = temp;
-				e_iterator_prev(iterator);
-				e_iterator_delete(iterator);
-			}
-		}
-	}
-	if (!e_iterator_is_valid(iterator)) {
-		ESelectNamesModelData *node;
-		e_iterator_last(iterator);
-		if (e_iterator_is_valid(iterator)) {
-			node = (void *) e_iterator_get(iterator);
-			index = strlen(node->string);
-		} else
-			index = 0;
-	}
-	e_select_names_model_insert (model, iterator, index, data);
-	gtk_object_unref(GTK_OBJECT(iterator));
-}
-
-
-void
-e_select_names_model_add_item          (ESelectNamesModel *model,
-					EIterator *iterator, /* NULL for at the beginning. */
-					ESelectNamesModelData *data)
-{
-	e_iterator_insert(iterator, data, FALSE);
-	e_select_names_model_changed(model);
-}
-
-void
-e_select_names_model_remove_item       (ESelectNamesModel *model,
-					EIterator *iterator)
-{
-	e_iterator_delete(iterator);
-	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 4ea1bdc8db..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-model.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_MODEL_H__
-#define __E_SELECT_NAMES_MODEL_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <e-util/e-list.h>
-#include <addressbook/backend/ebook/e-card.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 enum   _ESelectNamesModelDataType ESelectNamesModelDataType;
-typedef struct _ESelectNamesModelData ESelectNamesModelData;
-typedef struct _ESelectNamesModel ESelectNamesModel;
-typedef struct _ESelectNamesModelClass ESelectNamesModelClass;
-
-enum _ESelectNamesModelDataType {
-	E_SELECT_NAMES_MODEL_DATA_TYPE_CARD,
-	E_SELECT_NAMES_MODEL_DATA_TYPE_STRING_ADDRESS,
-};
-
-struct _ESelectNamesModelData {
-	ESelectNamesModelDataType type;
-	ECard *card;
-	char *string;
-};
-
-struct _ESelectNamesModel {
-	GtkObject object;
-
-	char *id;
-	char *title;
-	
-	EList *data; /* Of type ESelectNamesModelData. */
-};
-
-struct _ESelectNamesModelClass {
-	GtkObjectClass parent_class;
-
-	void (*changed) (ESelectNamesModel *model);
-};
-
-ESelectNamesModel *e_select_names_model_new               (void);
-ESelectNamesModel *e_select_names_model_duplicate         (ESelectNamesModel *old);
-
-/* These lengths are allowed to go over objects and act just like the text model does. */
-void               e_select_names_model_insert            (ESelectNamesModel *model,
-							   EIterator *iterator, /* Must be one of the iterators in the model. */
-							   int index,
-							   char *data);
-void               e_select_names_model_insert_length     (ESelectNamesModel *model,
-							   EIterator *iterator, /* Must be one of the iterators in the model. */
-							   int index,
-							   char *data,
-							   int length);
-void               e_select_names_model_delete            (ESelectNamesModel *model,
-							   EIterator *iterator, /* Must be one of the iterators in the model. */
-							   int index,
-							   int length);
-void               e_select_names_model_replace           (ESelectNamesModel *model,
-							   EIterator *iterator, /* Must be one of the iterators in the model. */
-							   int index,
-							   int replacement_length,
-							   char *data);
-
-void               e_select_names_model_add_item          (ESelectNamesModel *model,
-							   EIterator *iterator, /* NULL for at the beginning. */
-							   ESelectNamesModelData *data);
-void               e_select_names_model_remove_item       (ESelectNamesModel *model,
-							   EIterator *iterator);
-
-/* Of type ECard */
-EList             *e_select_names_model_get_cards         (ESelectNamesModel *model);
-
-/* Of type ESelectNamesModelData */
-EList             *e_select_names_model_get_data          (ESelectNamesModel *model);
-
-/* Standard Gtk function */			      
-GtkType            e_select_names_model_get_type          (void);
-
-#endif /* ! __E_SELECT_NAMES_MODEL_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 37abcddc70..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-table-model.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.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) {
-		EList *list = e_select_names_model_get_data(model->source);
-		EIterator *iterator = e_list_get_iterator(list);
-		int count = 0;
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			count ++;
-		}
-		model->count = count;
-		model->data = g_new(ESelectNamesTableModelData, count);
-		count = 0;
-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-			const ESelectNamesModelData *data = e_iterator_get(iterator);
-			switch (data->type) {
-			case E_SELECT_NAMES_MODEL_DATA_TYPE_CARD: {
-				ECardSimple *simple = e_card_simple_new(data->card);
-				model->data[count].name =  e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);
-				if ((model->data[count].name == 0) || *model->data[count].name == 0) {
-					model->data[count].name =  e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);
-				}
-				if (model->data[count].name == 0)
-					model->data[count].name = g_strdup("");
-				model->data[count].email = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_EMAIL);
-				if (model->data[count].email == 0)
-					model->data[count].email = g_strdup("");
-				gtk_object_unref(GTK_OBJECT(simple));
-				count ++;
-				break;
-			}
-			case E_SELECT_NAMES_MODEL_DATA_TYPE_STRING_ADDRESS:
-				model->data[count].name =  e_strdup_strip(data->string);
-				model->data[count].email = e_strdup_strip(data->string);
-				count ++;
-				break;
-			}
-		}
-	} else {
-		model->count = 0;
-	}
-}
-
-static void
-clear_info (ESelectNamesTableModel *model)
-{
-	int i;
-	for (i = 0; i < model->count; i++) {
-		g_free(model->data[i].name);
-		g_free(model->data[i].email);
-	}
-	g_free(model->data);
-	model->data = NULL;
-	model->count = -1;
-}
-
-/*
- * ESelectNamesTableModel lifecycle management and vcard loading/saving.
- */
-
-static void
-e_select_names_table_model_destroy (GtkObject *object)
-{
-	ESelectNamesTableModel *model;
-	
-	model = E_SELECT_NAMES_TABLE_MODEL (object);
-
-	e_select_names_table_model_drop_source (model);
-	clear_info(model);
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-e_select_names_table_model_col_count (ETableModel *etc)
-{
-	return 2;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-e_select_names_table_model_row_count (ETableModel *etc)
-{
-	ESelectNamesTableModel *e_select_names_table_model = E_SELECT_NAMES_TABLE_MODEL(etc);
-	if (e_select_names_table_model->count == -1) {
-		if (e_select_names_table_model->source) {
-			fill_in_info(e_select_names_table_model);
-		} else {
-			return 0;
-		}
-	}
-	return e_select_names_table_model->count;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-e_select_names_table_model_value_at (ETableModel *etc, int col, int row)
-{
-	ESelectNamesTableModel *e_select_names_table_model = E_SELECT_NAMES_TABLE_MODEL(etc);
-	if (e_select_names_table_model->data == NULL) {
-		fill_in_info(e_select_names_table_model);
-	}
-	switch (col) {
-	case 0:
-		if (e_select_names_table_model->data[row].name == NULL) {
-			fill_in_info(e_select_names_table_model);
-		}
-		return e_select_names_table_model->data[row].name;
-		break;
-	case 1:
-		if (e_select_names_table_model->data[row].email == NULL) {
-			fill_in_info(e_select_names_table_model);
-		}
-		return e_select_names_table_model->data[row].email;
-		break;
-	}
-	return "";
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-e_select_names_table_model_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-e_select_names_table_model_is_cell_editable (ETableModel *etc, int col, int row)
-{
-	return FALSE;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-e_select_names_table_model_duplicate_value (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-e_select_names_table_model_free_value (ETableModel *etc, int col, void *value)
-{
-	g_free(value);
-}
-
-static void *
-e_select_names_table_model_initialize_value (ETableModel *etc, int col)
-{
-	return g_strdup("");
-}
-
-static gboolean
-e_select_names_table_model_value_is_empty (ETableModel *etc, int col, const void *value)
-{
-	return !(value && *(char *)value);
-}
-
-static char *
-e_select_names_table_model_value_to_string (ETableModel *etc, int col, const void *value)
-{
-	return g_strdup(value);
-}
-
-static void
-e_select_names_table_model_model_changed (ESelectNamesModel     *source,
-					  ESelectNamesTableModel *model)
-{
-	clear_info(model);
-	e_table_model_changed(E_TABLE_MODEL(model));
-}
-
-/* Set_arg handler for the model */
-static void
-e_select_names_table_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesTableModel *model;
-	
-	model = E_SELECT_NAMES_TABLE_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_SOURCE:
-		e_select_names_table_model_drop_source (model);
-		e_select_names_table_model_add_source (model, E_SELECT_NAMES_MODEL(GTK_VALUE_OBJECT (*arg)));
-		break;
-	default:
-		return;
-	}
-}
-
-/* Get_arg handler for the model */
-static void
-e_select_names_table_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	ESelectNamesTableModel *model;
-
-	model = E_SELECT_NAMES_TABLE_MODEL (object);
-
-	switch (arg_id) {
-	case ARG_SOURCE:
-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(model->source);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-/**
- * e_select_names_table_model_init:
- */
-static void
-e_select_names_table_model_init (ESelectNamesTableModel *model)
-{
-	model->source = NULL;
-	model->source_changed_id = 0;
-
-	model->count = -1;
-	model->data = NULL;
-}
-
-static void
-e_select_names_table_model_class_init (ESelectNamesTableModelClass *klass)
-{
-	GtkObjectClass *object_class;
-	ETableModelClass *table_model_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-	table_model_class = E_TABLE_MODEL_CLASS(klass);
-
-	gtk_object_add_arg_type ("ESelectNamesTableModel::source",
-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_SOURCE);
-
-	object_class->destroy = e_select_names_table_model_destroy;
-	object_class->get_arg = e_select_names_table_model_get_arg;
-	object_class->set_arg = e_select_names_table_model_set_arg;
-
-	table_model_class->column_count = e_select_names_table_model_col_count;
-	table_model_class->row_count = e_select_names_table_model_row_count;
-	table_model_class->value_at = e_select_names_table_model_value_at;
-	table_model_class->set_value_at = e_select_names_table_model_set_value_at;
-	table_model_class->is_cell_editable = e_select_names_table_model_is_cell_editable;
-	table_model_class->duplicate_value = e_select_names_table_model_duplicate_value;
-	table_model_class->free_value = e_select_names_table_model_free_value;
-	table_model_class->initialize_value = e_select_names_table_model_initialize_value;
-	table_model_class->value_is_empty = e_select_names_table_model_value_is_empty;
-	table_model_class->value_to_string = e_select_names_table_model_value_to_string;
-}
diff --git a/addressbook/gui/component/select-names/e-select-names-table-model.h b/addressbook/gui/component/select-names/e-select-names-table-model.h
deleted file mode 100644
index 7a051d337c..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@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_TABLE_MODEL_H__
-#define __E_SELECT_NAMES_TABLE_MODEL_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include "e-select-names-model.h"
-#include <gal/e-table/e-table-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 71934c46dc..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-text-model.c
+++ /dev/null
@@ -1,357 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: 
- *   Chris Lahey     <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include "e-select-names-text-model.h"
-
-/* Object argument IDs */
-enum {
-	ARG_0,
-	ARG_SOURCE,
-};
-
-static void e_select_names_text_model_init       (ESelectNamesTextModel *model);
-static void e_select_names_text_model_class_init (ESelectNamesTextModelClass *klass);
-
-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_text      (ETextModel *model, gchar *text);
-static void  e_select_names_text_model_insert        (ETextModel *model, gint position, gchar *text);
-static void  e_select_names_text_model_insert_length (ETextModel *model, gint position, gchar *text, gint length);
-static void  e_select_names_text_model_delete        (ETextModel *model, gint position, gint length);
-
-static void e_select_names_text_model_model_changed (ESelectNamesModel *source,
-						     ESelectNamesTextModel *model);
-
-
-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;
-}
-
-/**
- * e_select_names_text_model_new:
- * @VCard: a string in vCard format
- *
- * Returns: a new #ESelectNamesTextModel that wraps the @VCard.
- */
-ETextModel *
-e_select_names_text_model_new (ESelectNamesModel *source)
-{
-	ETextModel *model = E_TEXT_MODEL(gtk_type_new(e_select_names_text_model_get_type()));
-	gtk_object_set(GTK_OBJECT(model),
-		       "source", source,
-		       NULL);
-	e_select_names_text_model_model_changed (source, E_SELECT_NAMES_TEXT_MODEL(model));
-	return model;
-}
-
-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->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;
-}
-
-static int
-get_length(EIterator *iterator)
-{
-	const ESelectNamesModelData *data = e_iterator_get(iterator);
-	return strlen(data->string);
-}
-
-static void
-e_select_names_text_model_set_text    	(ETextModel *model, gchar *text)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL(model)->source;
-	EIterator *iterator = e_list_get_iterator(e_select_names_model_get_data(source));
-	int length = 0;
-	if (model->text) {
-		length = strlen(model->text);
-	}
-	
-	e_iterator_reset(iterator);
-	if (!e_iterator_is_valid(iterator)) {
-		gtk_object_unref(GTK_OBJECT(iterator));
-		iterator = NULL;
-	}
-	e_select_names_model_replace(source,
-				     iterator,
-				     0,
-				     length,
-				     text);
-	if (iterator)
-		gtk_object_unref(GTK_OBJECT(iterator));
-}
-
-static void
-e_select_names_text_model_insert      	(ETextModel *model, gint position, gchar *text)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL(model)->source;
-	EIterator *iterator = e_list_get_iterator(e_select_names_model_get_data(source));
-
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		int this_length = get_length(iterator);
-		if (position <= this_length) {
-			break;
-		} else {
-			position -= this_length + 1;
-		}
-	}
-	if (!e_iterator_is_valid(iterator)) {
-		gtk_object_unref(GTK_OBJECT(iterator));
-		iterator = NULL;
-	}
-	e_select_names_model_insert(source,
-				    iterator,
-				    position,
-				    text);
-	if (iterator)
-		gtk_object_unref(GTK_OBJECT(iterator));
-}
-
-static void
-e_select_names_text_model_insert_length (ETextModel *model, gint position, gchar *text, gint length)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL(model)->source;
-	EIterator *iterator = e_list_get_iterator(e_select_names_model_get_data(source));
-
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		int this_length = get_length(iterator);
-		if (position <= this_length) {
-			break;
-		} else {
-			position -= this_length + 1;
-		}
-	}
-	if (!e_iterator_is_valid(iterator)) {
-		gtk_object_unref(GTK_OBJECT(iterator));
-		iterator = NULL;
-	}
-	e_select_names_model_insert_length(source,
-					   iterator,
-					   position,
-					   text,
-					   length);
-	if (iterator)
-		gtk_object_unref(GTK_OBJECT(iterator));
-}
-
-static void
-e_select_names_text_model_delete        (ETextModel *model, gint position, gint length)
-{
-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL(model)->source;
-	EIterator *iterator = e_list_get_iterator(e_select_names_model_get_data(source));
-
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		int this_length = get_length(iterator);
-		if (position <= this_length) {
-			e_select_names_model_delete(source,
-						    iterator,
-						    position,
-						    length);
-			break;
-		} else {
-			position -= this_length + 1;
-		}
-	}
-	if (iterator)
-		gtk_object_unref(GTK_OBJECT(iterator));
-}
-
-static void
-e_select_names_text_model_model_changed (ESelectNamesModel     *source,
-					 ESelectNamesTextModel *model)
-{
-	EList *list = e_select_names_model_get_data(source);
-	EIterator *iterator = e_list_get_iterator(list);
-	int length = 0;
-	int length_count = 0;
-	int *lengthsp;
-	char *string;
-	char *stringp;
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const ESelectNamesModelData *data = e_iterator_get(iterator);
-		length += strlen(data->string);
-		length ++;
-		length_count++;
-	}
-	if (length > 0)
-		length --;
-
-	g_free(model->lengths);
-	model->lengths = g_new(int, length_count + 1);
-	lengthsp = model->lengths;
-
-	string = g_new(char, length + 1);
-	stringp = string;
-	*stringp = 0;
-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {
-		const ESelectNamesModelData *data = e_iterator_get(iterator);
-		int this_length;
-
-		strcpy(stringp, data->string);
-		this_length = strlen(stringp);
-		stringp += this_length;
-		*(stringp++) = ',';
-		*(lengthsp++) = this_length;
-	}
-	if (stringp != string) {
-		stringp --;
-		*stringp = 0;
-	}
-	*lengthsp = -1;
-	g_free(E_TEXT_MODEL(model)->text);
-	E_TEXT_MODEL(model)->text = string;
-	e_text_model_changed(E_TEXT_MODEL(model));
-}
-
-
-static void
-e_select_names_text_model_add_source (ESelectNamesTextModel *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_text_model_model_changed),
-						      model);
-}
-
-static void
-e_select_names_text_model_drop_source (ESelectNamesTextModel *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;
-}
-
-/*
- * ESelectNamesTextModel lifecycle management and vcard loading/saving.
- */
-
-static void
-e_select_names_text_model_destroy (GtkObject *object)
-{
-	ESelectNamesTextModel *model;
-	
-	model = E_SELECT_NAMES_TEXT_MODEL (object);
-	
-	e_select_names_text_model_drop_source(model);
-	g_free(model->lengths);
-	
-	if (GTK_OBJECT_CLASS(parent_class)->destroy)
-		GTK_OBJECT_CLASS(parent_class)->destroy(object);
-}
-
-
-/* Set_arg handler for the model */
-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_drop_source(model);
-		e_select_names_text_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_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;
-	}
-}
-
-/**
- * e_select_names_text_model_init:
- */
-static void
-e_select_names_text_model_init (ESelectNamesTextModel *model)
-{
-	model->source = NULL;
-	model->source_changed_id = 0;
-	model->lengths = NULL;
-}
-
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 3d6bed468e..0000000000
--- a/addressbook/gui/component/select-names/e-select-names-text-model.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors:
- *   Chris Lahey <clahey@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc.
- */
-
-#ifndef __E_SELECT_NAMES_TEXT_MODEL_H__
-#define __E_SELECT_NAMES_TEXT_MODEL_H__
-
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include "e-select-names-model.h"
-#include <gal/e-text/e-text-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;
-	int source_changed_id;
-	int *lengths;
-};
-
-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 e0ff5f6519..0000000000
--- a/addressbook/gui/component/select-names/e-select-names.c
+++ /dev/null
@@ -1,398 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-select-names.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-select-names.h"
-#include <gal/e-table/e-table-simple.h>
-#include <addressbook/gui/widgets/e-addressbook-model.h>
-#include <addressbook/gui/component/e-cardlist-model.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include "e-select-names-table-model.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;
-} 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= \"35\" _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, ETableModel *model)
-{
-	gtk_object_set(GTK_OBJECT(model),
-		       "book", book,
-		       "query", "(contains \"email\" \"\")",
-		       NULL);
-	gtk_object_unref(GTK_OBJECT(book));
-}
-
-GtkWidget *
-e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int num1, int num2)
-{
-	ETableModel *model;
-	EBook *book;
-	GtkWidget *table;
-	char *filename;
-	char *uri;
-
-	model = e_addressbook_model_new();
-	gtk_object_set(GTK_OBJECT(model),
-		       "editable", FALSE,
-		       NULL);
-
-	book = e_book_new();
-	gtk_object_ref(GTK_OBJECT(model));
-	gtk_object_ref(GTK_OBJECT(book));
-	filename = gnome_util_prepend_user_home("evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf("file://%s", filename);
-	e_book_load_uri(book, uri, (EBookCallback) set_book, model);
-	g_free(uri);
-	g_free(filename);
-	table = e_table_scrolled_new (model, NULL, SPEC, NULL);
-
-	gtk_object_set_data(GTK_OBJECT(table), "model", model);
-	return table;
-}
-
-static void
-set_current_selection(ETableScrolled *table, int row, ESelectNames *names)
-{
-	names->currently_selected = row;
-}
-
-static void
-e_select_names_init (ESelectNames *e_select_names)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/select-names.glade", NULL);
-	e_select_names->gui = gui;
-
-	e_select_names->children = g_hash_table_new(g_str_hash, g_str_equal);
-	e_select_names->child_count = 0;
-
-	widget = glade_xml_get_widget(gui, "table-top");
-	if (!widget) {
-		return;
-	}
-	gtk_widget_ref(widget);
-	gtk_widget_unparent(widget);
-	gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(e_select_names)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-
-	gnome_dialog_append_buttons(GNOME_DIALOG(e_select_names),
-				    GNOME_STOCK_BUTTON_OK,
-				    GNOME_STOCK_BUTTON_CANCEL,
-				    NULL);
-	
-	gtk_window_set_policy(GTK_WINDOW(e_select_names), FALSE, TRUE, FALSE);
-
-	e_select_names->table = E_TABLE_SCROLLED(glade_xml_get_widget(gui, "table-source"));
-	e_select_names->model = gtk_object_get_data(GTK_OBJECT(e_select_names->table), "model");
-
-	e_select_names->currently_selected = -1;
-
-	gtk_signal_connect(GTK_OBJECT(e_select_names->table), "cursor_change",
-			   GTK_SIGNAL_FUNC(set_current_selection), e_select_names);
-}
-
-static void e_select_names_child_free(char *key, ESelectNamesChild *child, ESelectNames *e_select_names)
-{
-	g_free(child->title);
-	gtk_object_unref(GTK_OBJECT(child->model));
-	gtk_object_unref(GTK_OBJECT(child->source));
-	g_free(key);
-}
-
-static void
-e_select_names_destroy (GtkObject *object) {
-	ESelectNames *e_select_names = E_SELECT_NAMES(object);
-	
-	gtk_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);
-}
-
-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)
-{
-	ESelectNames *names = child->names;
-	int row = names->currently_selected;
-	if (row != -1) {
-		ECard *card = e_addressbook_model_get_card(E_ADDRESSBOOK_MODEL(names->model), row);
-		ESelectNamesModelData new = {E_SELECT_NAMES_MODEL_DATA_TYPE_CARD,
-					     card,
-					     NULL};
-		char *name, *email;
-		ECardSimple *simple = e_card_simple_new(card);
-		EIterator *iterator;
-
-		name = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);
-		email = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_EMAIL);
-		if (name && *name && email && *email) {
-			new.string = g_strdup_printf("%s <%s>", name, email);
-		} else if (email && *email) {
-			new.string = g_strdup_printf("%s", email);
-		} else if (name && *name) {
-			new.string = g_strdup_printf("%s <>", name);
-		} else {
-			new.string = g_strdup("");
-		}
-
-		iterator = e_list_get_iterator(e_select_names_model_get_data(child->source));
-		e_iterator_last(iterator);
-		e_select_names_model_add_item(child->source, iterator, &new);
-
-		gtk_object_unref(GTK_OBJECT(simple));
-		gtk_object_unref(GTK_OBJECT(card));
-		g_free(email);
-		g_free(name);
-		g_free(new.string);
-	}
-}
-
-static void
-remove_address(ETableScrolled *table, int row, ESelectNamesChild *child)
-{
-	EIterator *iterator = e_list_get_iterator(e_select_names_model_get_data(child->source));
-	e_iterator_reset(iterator);
-	for (; row > 0; row--) {
-		e_iterator_next(iterator);
-	}
-	e_select_names_model_remove_item(child->source, iterator);
-}
-
-void
-e_select_names_add_section(ESelectNames *e_select_names, char *name, char *id, ESelectNamesModel *source)
-{
-	ESelectNamesChild *child;
-	GtkWidget *button;
-	GtkWidget *alignment;
-	GtkTable *table;
-	char *label;
-
-	ETableModel *model;
-	GtkWidget *etable;
-
-	if (g_hash_table_lookup(e_select_names->children, id)) {
-		return;
-	}
-
-	table = GTK_TABLE(glade_xml_get_widget (e_select_names->gui, "table-recipients"));
-
-	child = g_new(ESelectNamesChild, 1);
-
-	child->names = e_select_names;
-	child->title = g_strdup(_(name));
-
-	e_select_names->child_count++;
-
-	alignment = gtk_alignment_new(0, 0, 1, 0);
-	label = g_strdup_printf("%s ->", child->title);
-	button = gtk_button_new_with_label(label);
-	g_free(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(etable), "double_click",
-			   GTK_SIGNAL_FUNC(remove_address), child);
-
-	child->model = model;
-	child->source = source;
-	gtk_object_ref(GTK_OBJECT(child->model));
-	gtk_object_ref(GTK_OBJECT(child->source));
-	
-	gtk_widget_show(etable);
-	
-	gtk_table_attach(table, etable,
-			 1, 2,
-			 e_select_names->child_count,
-			 e_select_names->child_count + 1,
-			 GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
-			 0, 0);
-
-	g_hash_table_insert(e_select_names->children, g_strdup(id), child);
-}
-
-static void *
-card_copy(const void *value, void *closure)
-{
-	gtk_object_ref(GTK_OBJECT(value));
-	return (void *)value;
-}
-
-static void
-card_free(void *value, void *closure)
-{
-	gtk_object_unref(GTK_OBJECT(value));
-}
-
-EList *
-e_select_names_get_section(ESelectNames *e_select_names, char *id)
-{
-	ESelectNamesChild *child;
-	int i;
-	int rows;
-	EList *list;
-	
-	child = g_hash_table_lookup(e_select_names->children, id);
-	if (!child)
-		return NULL;
-	rows = e_table_model_row_count(child->model);
-	
-	list = e_list_new(card_copy, card_free, NULL);
-	for (i = 0; i < rows; i++) {
-		ECard *card = e_cardlist_model_get(E_CARDLIST_MODEL(child->model), i);
-		e_list_append(list, card);
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-	return list;
-}
-
-ESelectNamesModel *
-e_select_names_get_source(ESelectNames *e_select_names,
-			  char *id)
-{
-	ESelectNamesChild *child = g_hash_table_lookup(e_select_names->children, id);
-	if (child) {
-		if (child->source)
-			gtk_object_ref(GTK_OBJECT(child->source));
-		return child->source;
-	} else
-		return NULL;
-}
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 dba100e8f0..0000000000
--- a/addressbook/gui/component/select-names/e-select-names.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-select-names.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_SELECT_NAMES_H__
-#define __E_SELECT_NAMES_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <e-util/e-list.h>
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include "e-select-names-model.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 *model;
-	int currently_selected;
-};
-
-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);
-/* 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/evolution-addressbook-select-names.oafinfo b/addressbook/gui/component/select-names/evolution-addressbook-select-names.oafinfo
deleted file mode 100644
index e66c3aa38a..0000000000
--- a/addressbook/gui/component/select-names/evolution-addressbook-select-names.oafinfo
+++ /dev/null
@@ -1,29 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e"
-            type="exe"
-            location="evolution-addressbook">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the Addressbook's name selection interface"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:addressbook:select-names:39301deb-174b-40d1-8a6e-5edc300f7b61"
-            type="factory"
-            location="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL: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/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 90ca93bd3a..0000000000
--- a/addressbook/gui/component/select-names/select-names.glade
+++ /dev/null
@@ -1,247 +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>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>select-names.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-top</name>
-  <visible>False</visible>
-  <title>Select Names</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-top</name>
-      <rows>3</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>GtkHBox</class>
-	<name>hbox1</name>
-	<homogeneous>False</homogeneous>
-	<spacing>4</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>GtkEntry</class>
-	  <name>entry-find</name>
-	  <visible>False</visible>
-	  <can_focus>True</can_focus>
-	  <has_focus>True</has_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-find</name>
-	  <visible>False</visible>
-	  <can_focus>True</can_focus>
-	  <label>Find...</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkAccelLabel</class>
-	<name>accellabel1</name>
-	<label>Select name from List:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>Custom</class>
-	<name>table-source</name>
-	<creation_function>e_addressbook_create_ebook_table</creation_function>
-	<int1>0</int1>
-	<int2>0</int2>
-	<last_modification_time>Sat, 10 Jun 2000 22:02:57 GMT</last_modification_time>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>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>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>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>GtkAccelLabel</class>
-	  <name>accellabel2</name>
-	  <label>Message Recipients</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/component/select-names/select-names.glade.h b/addressbook/gui/component/select-names/select-names.glade.h
deleted file mode 100644
index 1cb9702956..0000000000
--- a/addressbook/gui/component/select-names/select-names.glade.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Select Names");
-gchar *s = N_("Find...");
-gchar *s = N_("Select name from List:");
-gchar *s = N_("Message Recipients");
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 1016d38301..0000000000
--- a/addressbook/gui/contact-editor/Makefile.am
+++ /dev/null
@@ -1,68 +0,0 @@
-INCLUDES =					\
-	$(BONOBO_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)			\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/addressbook/		\
-	-I$(top_srcdir)/addressbook/backend	\
-	-I$(top_srcdir)/widgets/e-table		\
-	-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-categories.c		\
-	e-contact-editor-categories.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
-
-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			\
-	categories.glade		\
-	e-contact-editor-confirm-delete.glade
-
-EXTRA_DIST = $(evolution_DATA)		\
-	$(glade_DATA)			\
-	e-contact-editor-strings.h	\
-	fulladdr.glade.h		\
-	fullname-strings.h		\
-	categories-strings.h		\
-	e-contact-editor-confirm-delete.glade.h
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/briefcase.png b/addressbook/gui/contact-editor/briefcase.png
deleted file mode 100644
index dd59b8fd39..0000000000
--- a/addressbook/gui/contact-editor/briefcase.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/categories-strings.h b/addressbook/gui/contact-editor/categories-strings.h
deleted file mode 100644
index 813018a00e..0000000000
--- a/addressbook/gui/contact-editor/categories-strings.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("categories");
-gchar *s = N_("Item(s) belong to these categories:");
-gchar *s = N_("Available Categories:");
diff --git a/addressbook/gui/contact-editor/categories.glade b/addressbook/gui/contact-editor/categories.glade
deleted file mode 100644
index bf78008940..0000000000
--- a/addressbook/gui/contact-editor/categories.glade
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>categories</name>
-  <program_name>categories</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>False</gettext_support>
-  <use_widget_names>False</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>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>categories-strings.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>categories</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <visible>False</visible>
-  <title>categories</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-categories</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <rows>4</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>GtkAccelLabel</class>
-	<name>accellabel1</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Item(s) belong to these categories:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkAccelLabel</class>
-	<name>accellabel2</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Available Categories:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-categories</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>False</yfill>
-	</child>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
deleted file mode 100644
index 5d49fd06ff..0000000000
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ /dev/null
@@ -1,2455 +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>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>e-contact-editor-strings.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog2</name>
-  <border_width>2</border_width>
-  <cxx_use_heap>True</cxx_use_heap>
-  <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>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table2</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Add</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button32</name>
-	  <border_width>2</border_width>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Delete</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkScrolledWindow</class>
-	<name>scrolledwindow1</name>
-	<height>200</height>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area2</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-add-phone</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <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>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkFrame</class>
-      <name>frame-add-phone</name>
-      <border_width>4</border_width>
-      <cxx_use_heap>True</cxx_use_heap>
-      <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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xscale>1</xscale>
-	<yscale>1</yscale>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-add-phone</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeApp</class>
-  <name>contact editor</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <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>
-    <cxx_use_heap>True</cxx_use_heap>
-    <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>
-      <cxx_use_heap>True</cxx_use_heap>
-      <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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Full Name...</label>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAccelLabel</class>
-	  <name>accellabel-fileas</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>File As:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAccelLabel</class>
-	  <name>accellabel-web</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>Web page address:</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>8</top_attach>
-	    <bottom_attach>9</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment3</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment5</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-fullname</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>8</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>2</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment10</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>Wants to receive _HTML mail</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment4</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-
-	    <widget>
-	      <class>Placeholder</class>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox1</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>_Business</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <label>B_usiness</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <focus_target>text-address</focus_target>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment2</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <label>C_ontacts...</label>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkAlignment</class>
-	  <name>alignment15</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>alignment14</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>GtkEntry</class>
-	    <name>entry-contacts</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <label>Ca_tegories...</label>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkEventBox</class>
-	  <name>eventbox7</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>label34</name>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <creation_function>e_create_image_widget</creation_function>
-	  <string1>evolution-contacts.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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>label35</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Company:</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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>_Address...</label>
-	  <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>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label15</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<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>
-	<cxx_use_heap>True</cxx_use_heap>
-	<rows>9</rows>
-	<columns>6</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label21</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Department:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-department</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label22</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>label23</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Profession:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-profession</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label24</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>label25</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Spouse:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-spouse</focus_target>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label31</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Birthday:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>4</top_attach>
-	    <bottom_attach>5</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label30</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>_Assistant's name:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>entry-assistant</focus_target>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label29</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>label32</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>Anni_versary:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>3</left_attach>
-	    <right_attach>4</right_attach>
-	    <top_attach>5</top_attach>
-	    <bottom_attach>6</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-spouse</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>GnomeDateEdit</class>
-	  <name>dateedit-anniversary</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <show_time>False</show_time>
-	  <use_24_format>False</use_24_format>
-	  <week_start_monday>False</week_start_monday>
-	  <lower_hour>7</lower_hour>
-	  <upper_hour>19</upper_hour>
-	  <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>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GnomeDateEdit</class>
-	  <name>dateedit-birthday</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <show_time>False</show_time>
-	  <use_24_format>False</use_24_format>
-	  <week_start_monday>False</week_start_monday>
-	  <lower_hour>7</lower_hour>
-	  <upper_hour>19</upper_hour>
-	  <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>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>entry-assistant</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>label33</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label>No_tes:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>7</top_attach>
-	    <bottom_attach>8</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator8</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-	    <cxx_use_heap>True</cxx_use_heap>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>custom9</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <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>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label16</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Details</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-
-  <widget>
-    <class>GnomeAppBar</class>
-    <child_name>GnomeApp:appbar</child_name>
-    <name>appbar1</name>
-    <cxx_use_heap>True</cxx_use_heap>
-    <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 7df9cb8cb4..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-address.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-address.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-contact-editor-address.h>
-
-static void e_contact_editor_address_init		(EContactEditorAddress		 *card);
-static void e_contact_editor_address_class_init	(EContactEditorAddressClass	 *klass);
-static void e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_address_destroy (GtkObject *object);
-
-static void fill_in_info(EContactEditorAddress *editor);
-static void extract_info(EContactEditorAddress *editor);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_ADDRESS
-};
-
-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);
- 
-	object_class->set_arg = e_contact_editor_address_set_arg;
-	object_class->get_arg = e_contact_editor_address_get_arg;
-	object_class->destroy = e_contact_editor_address_destroy;
-}
-
-static void
-e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_address), FALSE, TRUE, FALSE);
-
-	e_contact_editor_address->address = NULL;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fulladdr.glade", NULL);
-	e_contact_editor_address->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "table-checkaddress");
-	gtk_widget_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-}
-
-void
-e_contact_editor_address_destroy (GtkObject *object)
-{
-	EContactEditorAddress *e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS(object);
-
-	if (e_contact_editor_address->gui)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor_address->gui));
-	e_card_delivery_address_free(e_contact_editor_address->address);
-}
-
-GtkWidget*
-e_contact_editor_address_new (const ECardDeliveryAddress *address)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_address_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"address", address,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (o);
-	
-	switch (arg_id){
-	case ARG_ADDRESS:
-		if (e_contact_editor_address->address)
-			e_card_delivery_address_free(e_contact_editor_address->address);
-		e_contact_editor_address->address = e_card_delivery_address_copy(GTK_VALUE_POINTER (*arg));
-		fill_in_info(e_contact_editor_address);
-		break;
-	}
-}
-
-static void
-e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditorAddress *e_contact_editor_address;
-
-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (object);
-
-	switch (arg_id) {
-	case ARG_ADDRESS:
-		extract_info(e_contact_editor_address);
-		GTK_VALUE_POINTER (*arg) = e_card_delivery_address_copy(e_contact_editor_address->address);
-		break;
-	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 a74e1bd967..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-address.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-address.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_ADDRESS_H__
-#define __E_CONTACT_EDITOR_ADDRESS_H__
-
-#include <gnome.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;
-	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-categories.c b/addressbook/gui/contact-editor/e-contact-editor-categories.c
deleted file mode 100644
index 045f128b48..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-categories.c
+++ /dev/null
@@ -1,452 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-categories.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <e-contact-editor-categories.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/e-table/e-table.h>
-#include <gal/e-table/e-table-simple.h>
-#include <gal/widgets/e-unicode.h>
-
-static void e_contact_editor_categories_init		(EContactEditorCategories		 *card);
-static void e_contact_editor_categories_class_init	(EContactEditorCategoriesClass	 *klass);
-static void e_contact_editor_categories_set_arg         (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_categories_get_arg         (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_categories_destroy         (GtkObject *object);
-static int e_contact_editor_categories_col_count (ETableModel *etc, gpointer data);
-static int e_contact_editor_categories_row_count (ETableModel *etc, gpointer data);
-static void *e_contact_editor_categories_value_at (ETableModel *etc, int col, int row, gpointer data);
-static void e_contact_editor_categories_set_value_at (ETableModel *etc, int col, int row, const void *val, gpointer data);
-static gboolean e_contact_editor_categories_is_cell_editable (ETableModel *etc, int col, int row, gpointer data);
-static void *e_contact_editor_categories_duplicate_value (ETableModel *etc, int col, const void *value, gpointer data);
-static void e_contact_editor_categories_free_value (ETableModel *etc, int col, void *value, gpointer data);
-static void *e_contact_editor_categories_initialize_value (ETableModel *etc, int col, gpointer data);
-static gboolean e_contact_editor_categories_value_is_empty (ETableModel *etc, int col, const void *value, gpointer data);
-static char * e_contact_editor_categories_value_to_string (ETableModel *etc, int col, const void *value, gpointer data);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_CATEGORIES
-};
-
-GtkType
-e_contact_editor_categories_get_type (void)
-{
-	static GtkType contact_editor_categories_type = 0;
-
-	if (!contact_editor_categories_type)
-		{
-			static const GtkTypeInfo contact_editor_categories_info =
-			{
-				"EContactEditorCategories",
-				sizeof (EContactEditorCategories),
-				sizeof (EContactEditorCategoriesClass),
-				(GtkClassInitFunc) e_contact_editor_categories_class_init,
-				(GtkObjectInitFunc) e_contact_editor_categories_init,
-				/* reserved_1 */ NULL,
-				/* reserved_2 */ NULL,
-				(GtkClassInitFunc) NULL,
-			};
-
-			contact_editor_categories_type = gtk_type_unique (gnome_dialog_get_type (), &contact_editor_categories_info);
-		}
-
-	return contact_editor_categories_type;
-}
-
-static void
-e_contact_editor_categories_class_init (EContactEditorCategoriesClass *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 ("EContactEditorCategories::categories", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_CATEGORIES);
- 
-	object_class->set_arg = e_contact_editor_categories_set_arg;
-	object_class->get_arg = e_contact_editor_categories_get_arg;
-	object_class->destroy = e_contact_editor_categories_destroy;
-}
-
-gchar *builtin_categories[] = {
-	"Business",
-	"Competition",
-	"Favorites",
-	"Gifts",
-	"Goals/Objectives",
-	"Holiday",
-	"Holiday Cards",
-	"Hot Contacts",
-	"Ideas",
-	"International",
-	"Key Customer",
-	"Miscellaneous",
-	"Personal",
-	"Phone Calls",
-	"Status",
-	"Strategies",
-	"Suppliers",
-	"Time & Expenses",
-	"VIP",
-	"Waiting",
-};
-
-#define BUILTIN_CATEGORY_COUNT (sizeof(builtin_categories) / sizeof(builtin_categories[0]))
-
-static void
-add_list_unique(EContactEditorCategories *categories, char *string)
-{
-	int k;
-	char *temp = e_strdup_strip(string);
-	char **list = categories->category_list;
-
-	if (!*temp) {
-		g_free(temp);
-		return;
-	}
-	for (k = 0; k < categories->list_length; k++) {
-		if (!strcmp(list[k], temp)) {
-			categories->selected_list[k] = TRUE;
-			break;
-		}
-	}
-	if (k == categories->list_length) {
-		categories->selected_list[categories->list_length] = TRUE;
-		list[categories->list_length++] = temp;
-	} else {
-		g_free(temp);
-	}
-}
-
-static void
-do_parse_categories(EContactEditorCategories *categories)
-{
-	char *str = categories->categories;
-	int length = strlen(str);
-	char *copy = g_new(char, length + 1);
-	int i, j;
-	char **list;
-	int count = 1;
-
-	e_table_model_pre_change(categories->model);
-
-	for (i = 0; i < categories->list_length; i++)
-		g_free(categories->category_list[i]);
-	g_free(categories->category_list);
-	g_free(categories->selected_list);
-
-	for (i = 0; str[i]; i++) {
-		switch (str[i]) {
-		case '\\':
-			i++;
-			if (!str[i])
-				i--;
-			break;
-		case ',':
-			count ++;
-			break;
-		}
-	}
-	list = g_new(char *, count + 1 + BUILTIN_CATEGORY_COUNT);
-	categories->category_list = list;
-
-	categories->selected_list = g_new(gboolean, count + 1 + BUILTIN_CATEGORY_COUNT);
-
-	for (count = 0; count < BUILTIN_CATEGORY_COUNT; count++) {
-		list[count] = g_strdup(builtin_categories[count]);
-		categories->selected_list[count] = 0;
-	}
-
-	categories->list_length = count;
-
-	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(categories, copy);
-			j = -1;
-			break;
-		default:
-			copy[j] = str[i];
-			break;
-		}
-	}
-	copy[j] = 0;
-	add_list_unique(categories, copy);
-	g_free(copy);
-	e_table_model_changed(categories->model);
-}
-
-static void
-e_contact_editor_categories_entry_change (GtkWidget *entry, 
-					  EContactEditorCategories *categories)
-{
-	g_free(categories->categories);
-	categories->categories = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry));
-	do_parse_categories(categories);
-}
-
-#define INITIAL_SPEC "<ETableSpecification no-headers=\"true\" draw-grid=\"true\" cursor-mode=\"line\">\
-  <ETableColumn model_col=\"0\" _title=\" \" expansion=\"0.0\" minimum_width=\"20\" resizable=\"false\" cell=\"checkbox\"       compare=\"integer\"/> \
-  <ETableColumn model_col=\"1\" _title=\"Category\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/> \
-        <ETableState> \
-		<column source=\"0\"/>						\
-		<column source=\"1\"/>						\
-        	<grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping>	\
-        </ETableState> \
-</ETableSpecification>"
-
-static void
-e_contact_editor_categories_init (EContactEditorCategories *categories)
-{
-	GladeXML *gui;
-	GtkWidget *table;
-	GtkWidget *e_table;
-
-	categories->list_length = 0;
-	categories->category_list = NULL;
-	categories->selected_list = NULL;
-	categories->categories = NULL;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(categories),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(categories),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(categories), FALSE, TRUE, FALSE);
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/categories.glade", NULL);
-	categories->gui = gui;
-
-	table = glade_xml_get_widget(gui, "table-categories");
-	gtk_widget_ref(table);
-	gtk_container_remove(GTK_CONTAINER(table->parent), table);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (categories)->vbox), table, TRUE, TRUE, 0);
-	gtk_widget_unref(table);
-
-	categories->entry = glade_xml_get_widget(gui, "entry-categories");
-	
-	gtk_signal_connect(GTK_OBJECT(categories->entry), "changed",
-			   GTK_SIGNAL_FUNC(e_contact_editor_categories_entry_change), categories);
-
-	categories->model = e_table_simple_new(e_contact_editor_categories_col_count, 
-					       e_contact_editor_categories_row_count,
-					       e_contact_editor_categories_value_at,
-					       e_contact_editor_categories_set_value_at,
-					       e_contact_editor_categories_is_cell_editable,
-					       e_contact_editor_categories_duplicate_value,
-					       e_contact_editor_categories_free_value,
-					       e_contact_editor_categories_initialize_value,
-					       e_contact_editor_categories_value_is_empty,
-					       e_contact_editor_categories_value_to_string,
-					       categories);
-
-	e_table = e_table_scrolled_new (categories->model, NULL, INITIAL_SPEC, NULL);
-
-	gtk_object_sink(GTK_OBJECT(categories->model));
-	
-	gtk_widget_show(e_table);
-
-	gtk_table_attach_defaults(GTK_TABLE(table),
-				  e_table, 
-				  0, 1,
-				  3, 4);
-}
-
-void
-e_contact_editor_categories_destroy (GtkObject *object)
-{
-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(object);
-	int i;
-
-	if (categories->gui)
-		gtk_object_unref(GTK_OBJECT(categories->gui));
-
-	g_free(categories->categories);
-	for (i = 0; i < categories->list_length; i++)
-		g_free(categories->category_list[i]);
-	g_free(categories->category_list);
-	g_free(categories->selected_list);
-}
-
-GtkWidget*
-e_contact_editor_categories_new (char *categories)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_categories_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"categories", categories,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_categories_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorCategories *e_contact_editor_categories;
-
-	e_contact_editor_categories = E_CONTACT_EDITOR_CATEGORIES (o);
-	
-	switch (arg_id){
-	case ARG_CATEGORIES:
-		e_utf8_gtk_entry_set_text(GTK_ENTRY(e_contact_editor_categories->entry), GTK_VALUE_STRING (*arg));
-		break;
-	}
-}
-
-static void
-e_contact_editor_categories_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditorCategories *e_contact_editor_categories;
-
-	e_contact_editor_categories = E_CONTACT_EDITOR_CATEGORIES (object);
-
-	switch (arg_id) {
-	case ARG_CATEGORIES:
-		GTK_VALUE_STRING (*arg) = g_strdup(e_contact_editor_categories->categories);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-e_contact_editor_categories_col_count (ETableModel *etc, gpointer data)
-{
-	return 2;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-e_contact_editor_categories_row_count (ETableModel *etc, gpointer data)
-{
-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(data);
-	return categories->list_length;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-e_contact_editor_categories_value_at (ETableModel *etc, int col, int row, gpointer data)
-{
-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(data);
-	if (col == 0)
-		return (void *) categories->selected_list[row];
-	else
-		return categories->category_list[row];
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-e_contact_editor_categories_set_value_at (ETableModel *etc, int col, int row, const void *val, gpointer data)
-{
-	EContactEditorCategories *categories = E_CONTACT_EDITOR_CATEGORIES(data);
-	if ( col == 0 ) {
-		char **strs;
-		int i, j;
-		char *string;
-		categories->selected_list[row] = (gboolean) val;
-		strs = g_new(char *, categories->list_length + 1);
-		for (i = 0, j = 0; i < categories->list_length; i++) {
-			if (categories->selected_list[i])
-				strs[j++] = categories->category_list[i];
-		}
-		strs[j] = 0;
-		string = g_strjoinv(", ", strs);
-		e_utf8_gtk_entry_set_text(GTK_ENTRY(categories->entry), string);
-		g_free(string);
-		g_free(strs);
-	}
-	if ( col == 1 )
-		return;
-}
-
-/* This function returns whether a particular cell is editable. */
-static gboolean
-e_contact_editor_categories_is_cell_editable (ETableModel *etc, int col, int row, gpointer data)
-{
-	return col == 0;
-}
-
-/* This function duplicates the value passed to it. */
-static void *
-e_contact_editor_categories_duplicate_value (ETableModel *etc, int col, const void *value, gpointer data)
-{
-	if (col == 0)
-		return (void *)value;
-	else
-		return g_strdup(value);
-}
-
-/* This function frees the value passed to it. */
-static void
-e_contact_editor_categories_free_value (ETableModel *etc, int col, void *value, gpointer data)
-{
-	if (col == 0)
-		return;
-	else
-		g_free(value);
-}
-
-static void *
-e_contact_editor_categories_initialize_value (ETableModel *etc, int col, gpointer data)
-{
-	if (col == 0)
-		return NULL;
-	else
-		return g_strdup("");
-}
-
-static gboolean
-e_contact_editor_categories_value_is_empty (ETableModel *etc, int col, const void *value, gpointer data)
-{
-	if (col == 0)
-		return value == NULL;
-	else
-		return !(value && *(char *)value);
-}
-
-static char *
-e_contact_editor_categories_value_to_string (ETableModel *etc, int col, const void *value, gpointer data)
-{
-	if (col == 0)
-		return g_strdup_printf("%d", (int) value);
-	else
-		return g_strdup(value);
-}
diff --git a/addressbook/gui/contact-editor/e-contact-editor-categories.h b/addressbook/gui/contact-editor/e-contact-editor-categories.h
deleted file mode 100644
index 3edff76b4b..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-categories.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-categories.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_CATEGORIES_H__
-#define __E_CONTACT_EDITOR_CATEGORIES_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <ebook/e-card.h>
-#include <gal/e-table/e-table-model.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* EContactEditorCategories - 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_CATEGORIES_TYPE			(e_contact_editor_categories_get_type ())
-#define E_CONTACT_EDITOR_CATEGORIES(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_CATEGORIES_TYPE, EContactEditorCategories))
-#define E_CONTACT_EDITOR_CATEGORIES_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_CATEGORIES_TYPE, EContactEditorCategoriesClass))
-#define E_IS_CONTACT_EDITOR_CATEGORIES(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_CATEGORIES_TYPE))
-#define E_IS_CONTACT_EDITOR_CATEGORIES_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_CATEGORIES_TYPE))
-
-
-typedef struct _EContactEditorCategories       EContactEditorCategories;
-typedef struct _EContactEditorCategoriesClass  EContactEditorCategoriesClass;
-
-struct _EContactEditorCategories
-{
-	GnomeDialog parent;
-	
-	/* item specific fields */
-	char *categories;
-	GtkWidget *entry;
-	ETableModel *model;
-
-	int list_length;
-	char **category_list;
-	gboolean *selected_list;
-
-	GladeXML *gui;
-};
-
-struct _EContactEditorCategoriesClass
-{
-	GnomeDialogClass parent_class;
-};
-
-
-GtkWidget *e_contact_editor_categories_new(char *categories);
-GtkType    e_contact_editor_categories_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_CATEGORIES_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 7f52321021..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade
+++ /dev/null
@@ -1,85 +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>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>e-contact-editor-confirm-delete.glade.h</translatable_strings_file>
-</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-confirm-delete.glade.h b/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h
deleted file mode 100644
index 7168db0a5c..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Are you sure you want\n"
-              "to delete this contact?");
-gchar *s = N_("Delete Contact?");
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 05e8d45702..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor-fullname.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-contact-editor-fullname.h>
-
-static void e_contact_editor_fullname_init		(EContactEditorFullname		 *card);
-static void e_contact_editor_fullname_class_init	(EContactEditorFullnameClass	 *klass);
-static void e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_contact_editor_fullname_destroy (GtkObject *object);
-
-static void fill_in_info(EContactEditorFullname *editor);
-static void extract_info(EContactEditorFullname *editor);
-
-static GnomeDialogClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_NAME
-};
-
-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);
- 
-	object_class->set_arg = e_contact_editor_fullname_set_arg;
-	object_class->get_arg = e_contact_editor_fullname_get_arg;
-	object_class->destroy = e_contact_editor_fullname_destroy;
-}
-
-static void
-e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullname)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname),
-				     GNOME_STOCK_BUTTON_OK);
-	
-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_fullname),
-				     GNOME_STOCK_BUTTON_CANCEL);
-
-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_fullname), TRUE, TRUE, FALSE);
-
-	e_contact_editor_fullname->name = NULL;
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fullname.glade", NULL);
-	e_contact_editor_fullname->gui = gui;
-
-	widget = glade_xml_get_widget(gui, "table-checkfullname");
-	gtk_widget_ref(widget);
-	gtk_container_remove(GTK_CONTAINER(widget->parent), widget);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0);
-	gtk_widget_unref(widget);
-}
-
-void
-e_contact_editor_fullname_destroy (GtkObject *object)
-{
-	EContactEditorFullname *e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME(object);
-
-	if (e_contact_editor_fullname->gui)
-		gtk_object_unref(GTK_OBJECT(e_contact_editor_fullname->gui));
-	e_card_name_free(e_contact_editor_fullname->name);
-}
-
-GtkWidget*
-e_contact_editor_fullname_new (const ECardName *name)
-{
-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_fullname_get_type ()));
-	gtk_object_set (GTK_OBJECT(widget),
-			"name", name,
-			NULL);
-	return widget;
-}
-
-static void
-e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (o);
-	
-	switch (arg_id){
-	case ARG_NAME:
-		if (e_contact_editor_fullname->name)
-			e_card_name_free(e_contact_editor_fullname->name);
-		e_contact_editor_fullname->name = e_card_name_copy(GTK_VALUE_POINTER (*arg));
-		fill_in_info(e_contact_editor_fullname);
-		break;
-	}
-}
-
-static void
-e_contact_editor_fullname_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EContactEditorFullname *e_contact_editor_fullname;
-
-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (object);
-
-	switch (arg_id) {
-	case ARG_NAME:
-		extract_info(e_contact_editor_fullname);
-		GTK_VALUE_POINTER (*arg) = e_card_name_copy(e_contact_editor_fullname->name);
-		break;
-	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 bde6733976..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor-fullname.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_FULLNAME_H__
-#define __E_CONTACT_EDITOR_FULLNAME_H__
-
-#include <gnome.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;
-};
-
-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-strings.h b/addressbook/gui/contact-editor/e-contact-editor-strings.h
deleted file mode 100644
index bb9c0b5b30..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-strings.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("_Add");
-gchar *s = N_("_Delete");
-gchar *s = N_("Phone Types");
-gchar *s = N_("New phone type");
-gchar *s = N_("Add");
-gchar *s = N_("New phone type");
-gchar *s = N_("Contact Editor");
-gchar *s = N_("_Full Name...");
-gchar *s = N_("File As:");
-gchar *s = N_("Web page address:");
-gchar *s = N_("Wants to receive _HTML mail");
-gchar *s = N_("_Business");
-gchar *s = N_("_Home");
-gchar *s = N_("Business _Fax");
-gchar *s = N_("_Mobile");
-gchar *s = N_("Primary Email");
-gchar *s = N_("B_usiness");
-gchar *s = N_("_This is the mailing address");
-gchar *s = N_("C_ontacts...");
-gchar *s = N_("Ca_tegories...");
-gchar *s = N_("_Job title:");
-gchar *s = N_("_Company:");
-gchar *s = N_("_Address...");
-gchar *s = N_("General");
-gchar *s = N_("_Department:");
-gchar *s = N_("_Office:");
-gchar *s = N_("_Profession:");
-gchar *s = N_("_Nickname:");
-gchar *s = N_("_Spouse:");
-gchar *s = N_("_Birthday:");
-gchar *s = N_("_Assistant's name:");
-gchar *s = N_("_Manager's Name:");
-gchar *s = N_("Anni_versary:");
-gchar *s = N_("No_tes:");
-gchar *s = N_("Details");
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 cbff738340..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ /dev/null
@@ -1,1732 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-editor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-contact-editor.h"
-#include <e-contact-editor-fullname.h>
-#include <e-contact-editor-address.h>
-#include <e-contact-editor-categories.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include "e-util/e-gui-utils.h"
-#include <gal/widgets/e-gui-utils.h>
-#include <gal/widgets/e-unicode.h>
-#include <e-contact-save-as.h>
-#include "addressbook/printing/e-contact-print.h"
-
-/* Signal IDs */
-enum {
-	ADD_CARD,
-	COMMIT_CARD,
-	DELETE_CARD,
-	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 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 GtkObjectClass *parent_class = NULL;
-
-static guint contact_editor_signals[LAST_SIGNAL];
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_CARD,
-	ARG_IS_NEW_CARD
-};
-
-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;
-}
-
-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::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);
-
-  contact_editor_signals[ADD_CARD] =
-	  gtk_signal_new ("add_card",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, add_card),
-			  gtk_marshal_NONE__OBJECT,
-			  GTK_TYPE_NONE, 1,
-			  GTK_TYPE_OBJECT);
-
-  contact_editor_signals[COMMIT_CARD] =
-	  gtk_signal_new ("commit_card",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, commit_card),
-			  gtk_marshal_NONE__OBJECT,
-			  GTK_TYPE_NONE, 1,
-			  GTK_TYPE_OBJECT);
-
-  contact_editor_signals[DELETE_CARD] =
-	  gtk_signal_new ("delete_card",
-			  GTK_RUN_FIRST,
-			  object_class->type,
-			  GTK_SIGNAL_OFFSET (EContactEditorClass, delete_card),
-			  gtk_marshal_NONE__OBJECT,
-			  GTK_TYPE_NONE, 1,
-			  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);
-}
-
-static void
-phone_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int which;
-	gchar *string;
-	GtkEntry *entry = GTK_ENTRY(widget);
-	ECardPhone *phone;
-
-	if ( widget == glade_xml_get_widget(editor->gui, "entry-phone1") ) {
-		which = 1;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone2") ) {
-		which = 2;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone3") ) {
-		which = 3;
-	} else if ( widget == glade_xml_get_widget(editor->gui, "entry-phone4") ) {
-		which = 4;
-	} else
-		return;
-	string = e_utf8_gtk_entry_get_text(entry);
-	phone = e_card_phone_new();
-	phone->number = string;
-	e_card_simple_set_phone(editor->simple, editor->phone_choice[which - 1], phone);
-#if 0
-	phone->number = NULL;
-#endif
-	e_card_phone_free(phone);
-	set_fields(editor);
-}
-
-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);
-}
-
-static void
-address_text_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	GtkEditable *editable = GTK_EDITABLE(widget);
-	ECardAddrLabel *address;
-
-	if (editor->address_choice == -1)
-		return;
-
-	address = e_card_address_label_new();
-
-	address->data = e_utf8_gtk_editable_get_chars(editable, 0, -1);
-
-	e_card_simple_set_address(editor->simple, editor->address_choice, address);
-	e_card_address_label_free(address);
-}
-
-/* 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;
-
-	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 (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)
-{
-	GtkWidget *file_as;
-	int style = 0;
-	char *string;
-
-	file_as = glade_xml_get_widget(editor->gui, "entry-file-as");
-
-	if (file_as && GTK_IS_ENTRY(file_as)) {
-		style = file_as_get_style(editor);
-	}
-	
-	e_card_name_free(editor->name);
-
-	string = e_utf8_gtk_entry_get_text (GTK_ENTRY(widget));
-	editor->name = e_card_name_from_string(string);
-	g_free (string);
-	
-	if (file_as && GTK_IS_ENTRY(file_as)) {
-		file_as_set_style(editor, style);
-	}
-}
-
-static void
-company_entry_changed (GtkWidget *widget, EContactEditor *editor)
-{
-	int style = 0;
-	GtkWidget *file_as;
-
-	file_as = glade_xml_get_widget(editor->gui, "entry-file-as");
-
-	if (file_as && GTK_IS_ENTRY(file_as)) {
-		style = file_as_get_style(editor);
-	}
-	
-	g_free(editor->company);
-	
-	editor->company = e_utf8_gtk_entry_get_text(GTK_ENTRY(widget));
-	
-	if (file_as && GTK_IS_ENTRY(file_as)) {
-		file_as_set_style(editor, style);
-	}
-}
-
-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
-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);
-	}
-}
-
-static void
-full_name_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	GnomeDialog *dialog = GNOME_DIALOG(e_contact_editor_fullname_new(editor->name));
-	int result;
-	gtk_widget_show(GTK_WIDGET(dialog));
-	result = gnome_dialog_run (dialog);
-	if (result == 0) {
-		ECardName *name;
-		GtkWidget *fname_widget;
-
-		gtk_object_get(GTK_OBJECT(dialog),
-			       "name", &name,
-			       NULL);
-		e_card_name_free(editor->name);
-		editor->name = e_card_name_copy(name);
-
-		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);
-		}
-	}
-	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_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);
-		e_card_simple_set_delivery_address(editor->simple, editor->address_choice, new_address);
-
-		address_widget = glade_xml_get_widget(editor->gui, "text-address");
-		if (address_widget && GTK_IS_EDITABLE(address_widget)) {
-			char *string = e_card_delivery_address_to_string(new_address);
-			e_utf8_gtk_editable_set_text(GTK_EDITABLE(address_widget), string);
-			g_free(string);
-		} else {
-			ECardAddrLabel *address = e_card_delivery_address_to_label(new_address);
-			e_card_simple_set_address(editor->simple, editor->address_choice, address);
-			e_card_address_label_free(address);
-		}
-		e_card_delivery_address_free(new_address);
-	}
-	gtk_object_unref(GTK_OBJECT(dialog));
-}
-
-static void
-categories_clicked(GtkWidget *button, EContactEditor *editor)
-{
-	char *categories;
-	GnomeDialog *dialog;
-	int result;
-	GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories");
-	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_contact_editor_categories_new(categories));
-	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));
-#if 0
-	if (!entry)
-		g_free(categories);
-#endif
-}
-
-/* Emits the signal to request saving a card */
-static void
-save_card (EContactEditor *ce)
-{
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	if (ce->is_new_card)
-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[ADD_CARD],
-				 ce->card);
-	else
-		gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[COMMIT_CARD],
-				 ce->card);
-
-	/* FIXME: should we set the ce->is_new_card here or have the client code
-	 * set the "is_new_card" argument on the contact editor object?
-	 */
-
-	ce->is_new_card = FALSE;
-}
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (EContactEditor *ce)
-{
-	g_assert (ce->app != NULL);
-
-	gtk_widget_destroy (ce->app);
-	ce->app = NULL;
-
-	gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[EDITOR_CLOSED]);
-}
-
-/* Menu callbacks */
-
-/* File/Save callback */
-static void
-file_save_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_card (ce);
-}
-
-/* File/Close callback */
-static void
-file_close_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	close_dialog (ce);
-}
-
-static void
-file_save_as_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce;
-	ECard *card;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	extract_info (ce);
-	e_card_simple_sync_card (ce->simple);
-
-	card = ce->card;
-	e_contact_save_as("Save as VCard", card);
-}
-
-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
-delete_cb (GtkWidget *widget, gpointer data)
-{
-	EContactEditor *ce = E_CONTACT_EDITOR (data);
-
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(ce->app))) {
-
-		extract_info (ce);
-		e_card_simple_sync_card (ce->simple);
-		
-		if (!ce->is_new_card)
-			gtk_signal_emit (GTK_OBJECT (ce), contact_editor_signals[DELETE_CARD],
-					 ce->card);
-		
-		file_close_cb(widget, data);
-	}
-}
-
-/* Emits the signal to request printing a card */
-static void
-print_cb (BonoboUIHandler *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));
-}
-
-/* Toolbar/Save and Close callback */
-static void
-tb_save_and_close_cb (BonoboUIHandler *uih, void *data, const char *path)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-	save_card (ce);
-	close_dialog (ce);
-}
-
-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 ("ContactEditorDelete", delete_cb),
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrint", print_cb),
-	/*	BONOBO_UI_UNSAFE_VERB ("ContactEditorPageSetup", file_page_setup_menu), */
-	BONOBO_UI_UNSAFE_VERB ("ContactEditorClose", file_close_cb),
-	
-	BONOBO_UI_VERB_END
-};
-
-static void
-create_ui (EContactEditor *ce)
-{
-	bonobo_ui_component_add_verb_list_with_data (
-		ce->uic, verbs, ce);
-
-	bonobo_ui_util_set_ui (ce->uic, EVOLUTION_DATADIR,
-			       "evolution-contact-editor.xml",
-			       "evolution-contact-editor");
-}
-
-/* Callback used when the dialog box is destroyed */
-static gint
-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (data);
-
-	close_dialog (ce);
-	return TRUE;
-}
-
-static GList *
-add_to_tab_order(GList *list, GladeXML *gui, char *name)
-{
-	GtkWidget *widget = glade_xml_get_widget(gui, name);
-	return g_list_prepend(list, widget);
-}
-
-static void
-setup_tab_order(GladeXML *gui)
-{
-	GtkWidget *container;
-	GList *list = NULL;
-
-	container = glade_xml_get_widget(gui, "table-contact-editor-general");
-
-	if (container) {
-		list = add_to_tab_order(list, gui, "entry-fullname");
-		list = add_to_tab_order(list, gui, "entry-jobtitle");
-		list = add_to_tab_order(list, gui, "entry-company");
-		list = add_to_tab_order(list, gui, "combo-file-as");
-		list = add_to_tab_order(list, gui, "entry-phone1");
-		list = add_to_tab_order(list, gui, "entry-phone2");
-		list = add_to_tab_order(list, gui, "entry-phone3");
-		list = add_to_tab_order(list, gui, "entry-phone4");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-
-		list = NULL;
-		list = add_to_tab_order(list, gui, "entry-email1");
-		list = add_to_tab_order(list, gui, "entry-web");
-		list = add_to_tab_order(list, gui, "text-address");
-		list = add_to_tab_order(list, gui, "alignment-contacts");
-		list = g_list_reverse(list);
-		e_container_change_tab_order(GTK_CONTAINER(container), list);
-		g_list_free(list);
-	}
-}
-
-static void
-e_contact_editor_init (EContactEditor *e_contact_editor)
-{
-	GladeXML *gui;
-	GtkWidget *widget;
-	GtkWidget *bonobo_win;
-	GtkWidget *wants_html;
-	BonoboUIContainer *container;
-
-	e_contact_editor->email_info = NULL;
-	e_contact_editor->phone_info = NULL;
-	e_contact_editor->address_info = NULL;
-	e_contact_editor->email_popup = NULL;
-	e_contact_editor->phone_popup = NULL;
-	e_contact_editor->address_popup = NULL;
-	e_contact_editor->email_list = NULL;
-	e_contact_editor->phone_list = NULL;
-	e_contact_editor->address_list = NULL;
-	e_contact_editor->name = e_card_name_new();
-	e_contact_editor->company = g_strdup("");
-	
-	e_contact_editor->email_choice = 0;
-	e_contact_editor->phone_choice[0] = E_CARD_SIMPLE_PHONE_ID_BUSINESS;
-	e_contact_editor->phone_choice[1] = E_CARD_SIMPLE_PHONE_ID_HOME;
-	e_contact_editor->phone_choice[2] = E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX;
-	e_contact_editor->phone_choice[3] = E_CARD_SIMPLE_PHONE_ID_MOBILE;
-	e_contact_editor->address_choice = 0;
-
-	e_contact_editor->arbitrary_fields = NULL;
-	
-	e_contact_editor->simple = e_card_simple_new(NULL);
-
-	e_contact_editor->card = NULL;
-
-	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);
-	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);
-
-
-	/* Construct the app */
-	bonobo_win = bonobo_win_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_win_set_contents (BONOBO_WIN (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_WIN (e_contact_editor->app));
-
-	e_contact_editor->uic = bonobo_ui_component_new_default ();
-	if (!e_contact_editor->uic) {
-		g_message ("e_contact_editor_init(): eeeeek, could not create the UI handler!");
-		return;
-	}
-	bonobo_ui_component_set_container (e_contact_editor->uic,
-					   bonobo_object_corba_objref (
-						   BONOBO_OBJECT (container)));
-
-	create_ui (e_contact_editor);
-
-	/* Connect to the deletion of the dialog */
-
-	gtk_signal_connect (GTK_OBJECT (e_contact_editor->app), "delete_event",
-			    GTK_SIGNAL_FUNC (app_delete_event_cb), e_contact_editor);
-}
-
-void
-e_contact_editor_destroy (GtkObject *object) {
-	EContactEditor *e_contact_editor = E_CONTACT_EDITOR(object);
-	
-	if (e_contact_editor->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->name)
-		e_card_name_free(e_contact_editor->name);
-
-	g_free (e_contact_editor->company);
-
-	gtk_object_unref(GTK_OBJECT(e_contact_editor->gui));
-}
-
-EContactEditor *
-e_contact_editor_new (ECard *card, gboolean is_new_card)
-{
-	EContactEditor *ce;
-
-	ce = E_CONTACT_EDITOR (gtk_type_new (E_CONTACT_EDITOR_TYPE));
-
-	gtk_object_set (GTK_OBJECT (ce),
-			"card", card,
-			"is_new_card", is_new_card,
-			NULL);
-
-	gtk_widget_show (ce->app);
-	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_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);
-		break;
-
-	case ARG_IS_NEW_CARD:
-		editor->is_new_card = GTK_VALUE_BOOL (*arg) ? TRUE : FALSE;
-		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_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;
-
-	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;
-}
-
-#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);
-
-	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);
-	}
-	
-	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);
-	}
-
-	g_free(label);
-	g_free(entry);
-}
-
-static void
-_email_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int i;
-	int result;
-	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);
-	}
-	
-	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);
-	}
-}
-
-static void
-_address_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)
-{
-	int i;
-	int result;
-	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);
-	}
-	
-	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);
-	}
-}
-
-static void
-set_field(GtkEntry *entry, const char *string)
-{
-	char *oldstring = e_utf8_gtk_entry_get_text(entry);
-	if (!string)
-		string = "";
-	if (strcmp(string, oldstring))
-		e_utf8_gtk_entry_set_text(entry, string);
-	g_free (oldstring);
-}
-
-static void
-set_phone_field(GtkWidget *entry, const ECardPhone *phone)
-{
-	set_field(GTK_ENTRY(entry), phone ? phone->number : "");
-}
-
-static void
-set_fields(EContactEditor *editor)
-{
-	GtkWidget *entry;
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone1");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[0]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone2");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[1]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone3");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[2]));
-
-	entry = glade_xml_get_widget(editor->gui, "entry-phone4");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_phone_field(entry, e_card_simple_get_phone(editor->simple, editor->phone_choice[3]));
-	
-	entry = glade_xml_get_widget(editor->gui, "entry-email1");
-	if (entry && GTK_IS_ENTRY(entry))
-		set_field(GTK_ENTRY(entry), e_card_simple_get_email(editor->simple, editor->email_choice));
-	
-	set_address_field(editor, -1);
-}
-
-static void
-set_address_field(EContactEditor *editor, int result)
-{
-	GtkWidget *widget;
-	
-	widget = glade_xml_get_widget(editor->gui, "text-address");
-
-	if (widget && GTK_IS_TEXT(widget)) {
-		int position;
-		GtkEditable *editable;
-		const ECardAddrLabel *address;
-
-		if (result == -1)
-			result = editor->address_choice;
-		editor->address_choice = -1;
-
-		position = 0;
-		editable = GTK_EDITABLE(widget);
-		gtk_editable_delete_text(editable, 0, -1);
-		address = e_card_simple_get_address(editor->simple, result);
-		if (address && address->data) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, address->data);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-
-		editor->address_choice = result;
-	}
-}
-
-static void
-add_field_callback(GtkWidget *widget, EContactEditor *editor)
-{
-	const char *name;
-	int i;
-	static const char *builtins[] = {
-		"entry-fullname",
-		"entry-web",
-		"entry-company",
-		"entry-department",
-		"entry-office",
-		"entry-jobtitle",
-		"entry-profession",
-		"entry-manager",
-		"entry-assistant",
-		"entry-nickname",
-		"entry-spouse",
-		"text-comments",
-		"entry-categories",
-		"entry-contacts",
-		"entry-file-as",
-		"dateedit-anniversary",
-		"dateedit-birthday",
-		"entry-phone1",
-		"entry-phone2",
-		"entry-phone3",
-		"entry-phone4",
-		"entry-email1",
-		"text-address",
-		"checkbutton-mailingaddress",
-		"checkbutton-htmlmail",
-		NULL
-	};
-	name = glade_get_widget_name(widget);
-	if (name) {
-		for (i = 0; builtins[i]; i++) {
-			if (!strcmp(name, builtins[i]))
-				return;
-		}
-		if (GTK_IS_ENTRY(widget) || GTK_IS_TEXT(widget)) {
-			editor->arbitrary_fields = g_list_prepend(editor->arbitrary_fields, g_strdup(name));
-		}
-	}
-}
-
-struct {
-	char *id;
-	char *key;
-} field_mapping [] = {
-	{ "entry-fullname", "full_name" },
-	{ "entry-web", "url" },
-	{ "entry-company", "org" },
-	{ "entry-department", "org_unit" },
-	{ "entry-office", "office" },
-	{ "entry-jobtitle", "title" },
-	{ "entry-profession", "role" },
-	{ "entry-manager", "manager" },
-	{ "entry-assistant", "assistant" },
-	{ "entry-nickname", "nickname" },
-	{ "entry-spouse", "spouse" },
-	{ "text-comments", "note" },
-	{ "entry-categories", "categories" },
-};
-
-static void
-fill_in_field(EContactEditor *editor, char *id, char *value)
-{
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, id);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		int position = 0;
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		gtk_editable_delete_text(editable, 0, -1);
-		if (value) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, value);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-	}
-}
-
-static void
-fill_in_card_field(EContactEditor *editor, ECard *card, char *id, char *key)
-{
-	char *string;
-	gtk_object_get(GTK_OBJECT(card),
-		       key, &string,
-		       NULL);
-	fill_in_field(editor, id, string);
-}
-
-static void
-fill_in_single_field(EContactEditor *editor, char *name)
-{
-	ECardSimple *simple = editor->simple;
-	GtkWidget *widget = glade_xml_get_widget(editor->gui, name);
-	if (widget && GTK_IS_EDITABLE(widget)) {
-		int position = 0;
-		GtkEditable *editable = GTK_EDITABLE(widget);
-		const ECardArbitrary *arbitrary;
-
-		gtk_editable_delete_text(editable, 0, -1);
-		arbitrary = e_card_simple_get_arbitrary(simple,
-							name);
-		if (arbitrary && arbitrary->value) {
-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, arbitrary->value);
-			gtk_editable_insert_text(editable, u, strlen(u), &position);
-			g_free (u);
-		}
-	}
-}
-
-static void
-fill_in_info(EContactEditor *editor)
-{
-	ECard *card = editor->card;
-	if (card) {
-		char *file_as;
-		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,
-			       "name",          &name,
-			       "anniversary",   &anniversary,
-			       "birth_date",    &bday,
-			       "wants_html_set",&wants_html_set,
-			       "wants_html",    &wants_html,
-			       NULL);
-	
-		for (i = 0; i < sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {
-			fill_in_card_field(editor, card, field_mapping[i].id, field_mapping[i].key);
-		}
-
-		for (list = editor->arbitrary_fields; list; list = list->next) {
-			fill_in_single_field(editor, list->data);
-		}
-
-		if (wants_html_set) {
-			GtkWidget *widget = glade_xml_get_widget(editor->gui, "checkbutton-htmlmail");
-			if (widget && GTK_IS_CHECK_BUTTON(widget)) {
-				gtk_object_set(GTK_OBJECT(widget),
-					       "active", wants_html,
-					       NULL);
-			}
-		}
-
-		/* File as has to come after company and name or else it'll get messed up when setting them. */
-		fill_in_field(editor, "entry-file-as", file_as);
-		
-		e_card_name_free(editor->name);
-		editor->name = e_card_name_copy(name);
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (anniversary && widget && GNOME_IS_DATE_EDIT(widget)) {
-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};
-			time_t time_val;
-			GnomeDateEdit *dateedit;
-
-			time_struct.tm_mday = anniversary->day;
-			time_struct.tm_mon = anniversary->month - 1;
-			time_struct.tm_year = anniversary->year - 1900;
-			time_val = mktime(&time_struct);
-			dateedit = GNOME_DATE_EDIT(widget);
-			gnome_date_edit_set_time(dateedit, time_val);
-		}
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (bday && widget && GNOME_IS_DATE_EDIT(widget)) {
-			struct tm time_struct = {0,0,0,0,0,0,0,0,0};
-			time_t time_val;
-			GnomeDateEdit *dateedit;
-			time_struct.tm_mday = bday->day;
-			time_struct.tm_mon = bday->month - 1;
-			time_struct.tm_year = bday->year - 1900;
-			time_val = mktime(&time_struct);
-			dateedit = GNOME_DATE_EDIT(widget);
-			gnome_date_edit_set_time(dateedit, time_val);
-		}
-
-		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;
-		struct tm time_struct;
-		time_t time_val;
-		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->name)
-			gtk_object_set(GTK_OBJECT(card),
-				       "name", editor->name,
-				       NULL);
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-anniversary");
-		if (widget && GNOME_IS_DATE_EDIT(widget)) {
-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));
-			gmtime_r(&time_val,
-				 &time_struct);
-			anniversary = g_new(ECardDate, 1);
-			anniversary->day   = time_struct.tm_mday;
-			anniversary->month = time_struct.tm_mon + 1;
-			anniversary->year  = time_struct.tm_year + 1900;
-			gtk_object_set(GTK_OBJECT(card),
-				       "anniversary", anniversary,
-				       NULL);
-		}
-
-		widget = glade_xml_get_widget(editor->gui, "dateedit-birthday");
-		if (widget && GNOME_IS_DATE_EDIT(widget)) {
-			time_val = gnome_date_edit_get_date(GNOME_DATE_EDIT(widget));
-			gmtime_r(&time_val,
-				 &time_struct);
-			bday = g_new(ECardDate, 1);
-			bday->day   = time_struct.tm_mday;
-			bday->month = time_struct.tm_mon + 1;
-			bday->year  = time_struct.tm_year + 1900;
-			gtk_object_set(GTK_OBJECT(card),
-				       "birth_date", bday,
-				       NULL);
-		}
-	}
-}
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 fae6939595..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_EDITOR_H__
-#define __E_CONTACT_EDITOR_H__
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <bonobo.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 */
-	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;
-
-	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;
-};
-
-struct _EContactEditorClass
-{
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* add_card) (EContactEditor *ce, ECard *card);
-	void (* commit_card) (EContactEditor *ce, ECard *card);
-	void (* delete_card) (EContactEditor *ce, ECard *card);
-	void (* editor_closed) (EContactEditor *ce);
-};
-
-
-EContactEditor *e_contact_editor_new (ECard *card, gboolean is_new_card);
-GtkType    e_contact_editor_get_type (void);
-
-
-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-save-as.c b/addressbook/gui/contact-editor/e-contact-save-as.c
deleted file mode 100644
index 7209c5e8f8..0000000000
--- a/addressbook/gui/contact-editor/e-contact-save-as.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-editor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <e-contact-save-as.h>
-#include <gal/util/e-util.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-typedef struct {
-	GtkFileSelection *filesel;
-	ECard *card;
-} SaveAsInfo;
-
-static void
-save_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	char *vcard = e_card_get_vcard(info->card);
-	const char *filename = gtk_file_selection_get_filename(info->filesel);
-	e_write_file(filename, vcard, O_WRONLY | O_CREAT | O_EXCL | O_TRUNC);
-	g_free(vcard);
-	gtk_object_unref(GTK_OBJECT(info->card));
-	gtk_widget_destroy(GTK_WIDGET(info->filesel));
-	g_free(info);
-}
-
-static void
-close_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	gtk_object_unref(GTK_OBJECT(info->card));
-	gtk_widget_destroy(GTK_WIDGET(info->filesel));
-	g_free(info);
-}
-
-static void
-delete_it(GtkWidget *widget, SaveAsInfo *info)
-{
-	gtk_object_unref(GTK_OBJECT(info->card));
-	g_free(info);
-}
-
-void
-e_contact_save_as(char *title, ECard *card)
-{
-	GtkFileSelection *filesel;
-	SaveAsInfo *info = g_new(SaveAsInfo, 1);
-	
-	filesel = GTK_FILE_SELECTION(gtk_file_selection_new(title));
-
-	info->filesel = filesel;
-	info->card = e_card_duplicate(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));
-}
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 d1c84dc596..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  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_CONTACT_SAVE_AS_H__
-#define __E_CONTACT_SAVE_AS_H__
-
-#include <gnome.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);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_CONTACT_EDITOR_H__ */
diff --git a/addressbook/gui/contact-editor/email.png b/addressbook/gui/contact-editor/email.png
deleted file mode 100644
index f3ff02e343..0000000000
--- a/addressbook/gui/contact-editor/email.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade
deleted file mode 100644
index e46064bb92..0000000000
--- a/addressbook/gui/contact-editor/fulladdr.glade
+++ /dev/null
@@ -1,477 +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>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>fulladdr.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>dialog-checkaddress</name>
-  <visible>False</visible>
-  <title>Check Address</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox-container</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkTable</class>
-      <name>table-checkaddress</name>
-      <border_width>8</border_width>
-      <rows>4</rows>
-      <columns>4</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>6</row_spacing>
-      <column_spacing>6</column_spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>_Address:</label>
-	<justify>GTK_JUSTIFY_LEFT</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-street</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<label>_City:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-city</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-city</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-ext</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label8</name>
-	<label>_PO Box:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-po</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>Address _2:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-ext</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-po</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-street</name>
-	<can_focus>True</can_focus>
-	<has_focus>True</has_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label5</name>
-	<label>_State/Province:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-region</focus_target>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-region</name>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>1</left_attach>
-	  <right_attach>2</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>True</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>combo-country</name>
-	<width>100</width>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>USA
-Canada
-Finland
-</items>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>entry-country</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>entry-code</name>
-	<width>100</width>
-	<can_focus>True</can_focus>
-	<editable>True</editable>
-	<text_visible>True</text_visible>
-	<text_max_length>0</text_max_length>
-	<text></text>
-	<child>
-	  <left_attach>3</left_attach>
-	  <right_attach>4</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label6</name>
-	<label>_ZIP Code:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-code</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label7</name>
-	<label>Countr_y:</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>1</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<focus_target>entry-country</focus_target>
-	<child>
-	  <left_attach>2</left_attach>
-	  <right_attach>3</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/contact-editor/fulladdr.glade.h b/addressbook/gui/contact-editor/fulladdr.glade.h
deleted file mode 100644
index 7db13fcf4d..0000000000
--- a/addressbook/gui/contact-editor/fulladdr.glade.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Check Address");
-gchar *s = N_("_Address:");
-gchar *s = N_("_City:");
-gchar *s = N_("_PO Box:");
-gchar *s = N_("Address _2:");
-gchar *s = N_("_State/Province:");
-gchar *s = N_("USA");
-gchar *s = N_("Canada");
-gchar *s = N_("Finland");
-gchar *s = N_("_ZIP Code:");
-gchar *s = N_("Countr_y:");
diff --git a/addressbook/gui/contact-editor/fullname-strings.h b/addressbook/gui/contact-editor/fullname-strings.h
deleted file mode 100644
index 4d4303270a..0000000000
--- a/addressbook/gui/contact-editor/fullname-strings.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Check Full Name");
-gchar *s = N_("\n"
-              "Mr.\n"
-              "Mrs.\n"
-              "Dr.\n"
-              "");
-gchar *s = N_("\n"
-              "Sr.\n"
-              "Jr.\n"
-              "I\n"
-              "II\n"
-              "III\n"
-              "Esq.\n"
-              "");
-gchar *s = N_("_First:");
-gchar *s = N_("_Title:");
-gchar *s = N_("_Middle:");
-gchar *s = N_("_Last:");
-gchar *s = N_("_Suffix:");
diff --git a/addressbook/gui/contact-editor/fullname.glade b/addressbook/gui/contact-editor/fullname.glade
deleted file mode 100644
index f2dfa23834..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>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>fullname-strings.h</translatable_strings_file>
-</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.
-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/head.png b/addressbook/gui/contact-editor/head.png
deleted file mode 100644
index ca00b75f92..0000000000
--- a/addressbook/gui/contact-editor/head.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/netfreebusy.png b/addressbook/gui/contact-editor/netfreebusy.png
deleted file mode 100644
index 09ec8a2a5c..0000000000
--- a/addressbook/gui/contact-editor/netfreebusy.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/netmeeting.png b/addressbook/gui/contact-editor/netmeeting.png
deleted file mode 100644
index 4cb90c121e..0000000000
--- a/addressbook/gui/contact-editor/netmeeting.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/phone.png b/addressbook/gui/contact-editor/phone.png
deleted file mode 100644
index ebec84ba0b..0000000000
--- a/addressbook/gui/contact-editor/phone.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/snailmail.png b/addressbook/gui/contact-editor/snailmail.png
deleted file mode 100644
index 647ae8f68c..0000000000
--- a/addressbook/gui/contact-editor/snailmail.png
+++ /dev/null
diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
deleted file mode 100644
index 80db2fe848..0000000000
--- a/addressbook/gui/contact-editor/test-editor.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * test-editor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <gnome.h>
-#include <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@helixcode.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, Helix Code, Inc." ),
-		      authors,
-		      _( "This should test the contact editor canvas item" ),
-		      NULL);
-  gtk_widget_show (about);
-}
-#endif
-
-int main( int argc, char *argv[] )
-{
-	char *cardstr;
-	EContactEditor *ce;
-
-	/*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-	    textdomain (PACKAGE);*/
-
-	gnome_init( "Contact Editor Test", VERSION, argc, argv);
-
-	glade_gnome_init ();
-
-	cardstr = NULL;
-	if (argc == 2)
-		cardstr = read_file (argv [1]);
-
-	if (cardstr == NULL)
-		cardstr = TEST_VCARD;
-
-	ce = e_contact_editor_new (e_card_new (cardstr), TRUE);
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	ce = e_contact_editor_new (e_card_new (cardstr), TRUE);
-	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-editor/web.png b/addressbook/gui/contact-editor/web.png
deleted file mode 100644
index 3211a11b19..0000000000
--- a/addressbook/gui/contact-editor/web.png
+++ /dev/null
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 c4b23523fe..0000000000
--- a/addressbook/gui/search/Makefile.am
+++ /dev/null
@@ -1,22 +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			\
-	-DSEARCH_RULE_DIR=\"$(ruledir)\"		\
-	$(BONOBO_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 bf64e841b0..0000000000
--- a/addressbook/gui/search/addresstypes.xml
+++ /dev/null
@@ -1,61 +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="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 60f92cfff4..0000000000
--- a/addressbook/gui/search/e-addressbook-search-dialog.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-addressbook-search-dialog.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-addressbook-search-dialog.h"
-#include "addressbook/gui/widgets/e-minicard-view-widget.h"
-#include <gal/widgets/e-scroll-frame.h>
-
-static void e_addressbook_search_dialog_init		 (EAddressbookSearchDialog		 *widget);
-static void e_addressbook_search_dialog_class_init	 (EAddressbookSearchDialogClass	 *klass);
-static void e_addressbook_search_dialog_set_arg       (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_addressbook_search_dialog_get_arg       (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_addressbook_search_dialog_destroy       (GtkObject *object);
-
-static ECanvasClass *parent_class = NULL;
-
-#define PARENT_TYPE (gnome_dialog_get_type())
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-};
-
-GtkType
-e_addressbook_search_dialog_get_type (void)
-{
-  static GtkType type = 0;
-
-  if (!type)
-    {
-      static const GtkTypeInfo info =
-      {
-        "EAddressbookSearchDialog",
-        sizeof (EAddressbookSearchDialog),
-        sizeof (EAddressbookSearchDialogClass),
-        (GtkClassInitFunc) e_addressbook_search_dialog_class_init,
-        (GtkObjectInitFunc) e_addressbook_search_dialog_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      type = gtk_type_unique (PARENT_TYPE, &info);
-    }
-
-  return type;
-}
-
-static void
-e_addressbook_search_dialog_class_init (EAddressbookSearchDialogClass *klass)
-{
-	GtkObjectClass *object_class;
-	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 (PARENT_TYPE);
-
-	gtk_object_add_arg_type ("EAddressbookSearchDialog::book", GTK_TYPE_OBJECT, 
-				 GTK_ARG_READWRITE, ARG_BOOK);
-
-	object_class->set_arg       = e_addressbook_search_dialog_set_arg;
-	object_class->get_arg       = e_addressbook_search_dialog_get_arg;
-	object_class->destroy       = e_addressbook_search_dialog_destroy;
-}
-
-static GtkWidget *
-get_widget (EAddressbookSearchDialog *view)
-{
-	FilterPart *part;
-
-	view->context = rule_context_new();
-	/* FIXME: hide this in a class */
-	rule_context_add_part_set(view->context, "partset", filter_part_get_type(),
-				  rule_context_add_part, rule_context_next_part);
-	rule_context_load(view->context, SEARCH_RULE_DIR "/addresstypes.xml", "");
-	view->rule = filter_rule_new();
-	part = rule_context_next_part(view->context, NULL);
-	if (part == NULL) {
-		g_warning("Problem loading search for addressbook no parts to load");
-		return gtk_entry_new();
-	} else {
-		filter_rule_add_part(view->rule, filter_part_clone(part));
-		return filter_rule_get_widget(view->rule, view->context);
-	}
-}
-
-static char *
-get_query (EAddressbookSearchDialog *view)
-{
-	GString *out = g_string_new("");
-	char *ret;
-
-	filter_rule_build_code(view->rule, out);
-	ret = out->str;
-	printf("Searching using %s\n", ret);
-	g_string_free(out, FALSE);
-	return ret;
-}
-
-static void
-button_press (GtkWidget *widget, EAddressbookSearchDialog *dialog)
-{
-	char *query;
-
-	gtk_widget_show(dialog->scrolled_window);
-	query = get_query(dialog);
-	gtk_object_set(GTK_OBJECT(dialog->view),
-		       "query", query,
-		       NULL);
-	g_free(query);
-}
-
-static void
-e_addressbook_search_dialog_init (EAddressbookSearchDialog *view)
-{
-	GtkWidget *button;
-	GnomeDialog *dialog = GNOME_DIALOG (view);
-
-	gtk_window_set_policy(GTK_WINDOW(view), FALSE, TRUE, FALSE);
-
-	view->search = get_widget(view);
-	gtk_box_pack_start(GTK_BOX(dialog->vbox), view->search, FALSE, FALSE, 0);
-	gtk_widget_show(view->search);
-
-	button = gtk_button_new_with_label(_("Search"));
-	gtk_box_pack_start(GTK_BOX(dialog->vbox), button, FALSE, FALSE, 0);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(button_press), view);
-	gtk_widget_show(button);
-
-	view->view = e_minicard_view_widget_new();
-	gtk_widget_show(view->view);
-
-	view->scrolled_window = e_scroll_frame_new(NULL, NULL);
-	e_scroll_frame_set_policy(E_SCROLL_FRAME(view->scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
-	gtk_container_add(GTK_CONTAINER(view->scrolled_window), view->view);
-	
-	gtk_box_pack_start(GTK_BOX(dialog->vbox), view->scrolled_window, TRUE, TRUE, 0);
-}
-
-GtkWidget *
-e_addressbook_search_dialog_new (EBook *book)
-{
-	EAddressbookSearchDialog *view = gtk_type_new (e_addressbook_search_dialog_get_type ());
-	gtk_object_set(GTK_OBJECT(view->view),
-		       "book", book,
-		       NULL);
-	return GTK_WIDGET(view);
-}
-
-static void
-e_addressbook_search_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EAddressbookSearchDialog *emvw;
-
-	emvw = E_ADDRESSBOOK_SEARCH_DIALOG (o);
-
-	switch (arg_id){
-	case ARG_BOOK:
-		gtk_object_set(GTK_OBJECT(emvw->view),
-			       "book", GTK_VALUE_OBJECT (*arg),
-			       NULL);
-		break;
-	}
-}
-
-static void
-e_addressbook_search_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EAddressbookSearchDialog *emvw;
-
-	emvw = E_ADDRESSBOOK_SEARCH_DIALOG (object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		gtk_object_get(GTK_OBJECT(emvw->view),
-			       "book", &(GTK_VALUE_OBJECT (*arg)),
-			       NULL);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_addressbook_search_dialog_destroy (GtkObject *object)
-{
-	EAddressbookSearchDialog *view;
-
-	view = E_ADDRESSBOOK_SEARCH_DIALOG (object);
-
-	gtk_object_unref((GtkObject *)view->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 dc54275a77..0000000000
--- a/addressbook/gui/search/e-addressbook-search-dialog.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view-widget.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_ADDRESSBOOK_SEARCH_DIALOG_H__
-#define __E_ADDRESSBOOK_SEARCH_DIALOG_H__
-
-#include <gnome.h>
-#include <ebook/e-book.h>
-
-#include "filter/rule-context.h"
-#include "filter/filter-rule.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_ADDRESSBOOK_SEARCH_DIALOG_TYPE			(e_addressbook_search_dialog_get_type ())
-#define E_ADDRESSBOOK_SEARCH_DIALOG(obj)			(GTK_CHECK_CAST ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE, EAddressbookSearchDialog))
-#define E_ADDRESSBOOK_SEARCH_DIALOG_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE, EAddressbookSearchDialogClass))
-#define E_IS_ADDRESSBOOK_SEARCH_DIALOG(obj) 		(GTK_CHECK_TYPE ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE))
-#define E_IS_ADDRESSBOOK_SEARCH_DIALOG_CLASS(klass) 	(GTK_CHECK_CLASS_TYPE ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE))
-
-
-typedef struct _EAddressbookSearchDialog       EAddressbookSearchDialog;
-typedef struct _EAddressbookSearchDialogClass  EAddressbookSearchDialogClass;
-
-struct _EAddressbookSearchDialog
-{
-	GnomeDialog parent;
-
-	GtkWidget *search;
-	GtkWidget *view;
-
-	RuleContext *context;
-	FilterRule *rule;
-	GtkWidget *scrolled_window;
-};
-
-struct _EAddressbookSearchDialogClass
-{
-	GnomeDialogClass parent_class;
-};
-
-GtkType    e_addressbook_search_dialog_get_type (void);
-
-GtkWidget *e_addressbook_search_dialog_new (EBook *book);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __E_ADDRESSBOOK_SEARCH_DIALOG_H__ */
diff --git a/addressbook/gui/widgets/.cvsignore b/addressbook/gui/widgets/.cvsignore
deleted file mode 100644
index 472fd2593f..0000000000
--- a/addressbook/gui/widgets/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-.deps
-.libs
-.pure
-Makefile
-Makefile.in
-*.lo
-*.la
-minicard-label-test
-minicard-test
-minicard-view-test
-minicard-widget-test
-reflow-test
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
deleted file mode 100644
index 03bd9a4d6e..0000000000
--- a/addressbook/gui/widgets/Makefile.am
+++ /dev/null
@@ -1,124 +0,0 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"e-minicard\"			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/addressbook/backend/ebook	\
-	-I$(top_srcdir)/addressbook/contact-editor	\
-	-I$(top_srcdir)/widgets/e-text			\
-	-I$(top_srcdir)/widgets/e-table			\
-	-I$(top_srcdir)/widgets/e-reflow		\
-	-I$(top_srcdir)/widgets/e-table			\
-	-I$(top_srcdir)/widgets/misc			\
-	$(BONOBO_GNOME_CFLAGS)				\
-	$(EXTRA_GNOME_CFLAGS)
-
-noinst_LIBRARIES =				\
-	libeminicard.a
-
-libeminicard_a_SOURCES =			\
-	e-addressbook-model.c			\
-	e-addressbook-model.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
-
-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 =				\
-	$(EXTRA_GNOME_LIBS)				\
-	libeminicard.a					\
-	$(BONOBO_GNOME_LIBS)				\
-	$(top_builddir)/e-util/libeutil.la
-
-minicard_test_SOURCES = 	\
-	test-minicard.c
-
-minicard_test_LDADD =							\
-	$(EXTRA_GNOME_LIBS)						\
-	libeminicard.a							\
-	$(BONOBO_GNOME_LIBS)						\
-	$(GNOME_PRINT_LIBS)						\
-	$(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
-
-reflow_test_SOURCES = 	\
-	test-reflow.c
-
-reflow_test_LDADD =							\
-	$(EXTRA_GNOME_LIBS)						\
-	$(BONOBO_GNOME_LIBS)						\
-	$(GNOME_PRINT_LIBS)						\
-	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
-
-#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 =						\
-	$(EXTRA_GNOME_LIBS)						\
-	$(BONOBO_GNOME_LIBS)						\
-	$(GNOME_PRINT_LIBS)						\
-	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
-
-gladedir   = $(datadir)/evolution/glade
-glade_DATA = alphabet.glade 
-
-EXTRA_DIST = 			\
-	$(glade_DATA)		\
-	alphabet.glade.h
diff --git a/addressbook/gui/widgets/alphabet.glade b/addressbook/gui/widgets/alphabet.glade
deleted file mode 100644
index bc6e5f3798..0000000000
--- a/addressbook/gui/widgets/alphabet.glade
+++ /dev/null
@@ -1,357 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>alphabet</name>
-  <program_name>alphabet</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>True</use_widget_names>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <gnome_help_support>True</gnome_help_support>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>alphabet.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>window2</name>
-  <visible>False</visible>
-  <title>window2</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkScrolledWindow</class>
-    <name>scrolledwindow-top</name>
-    <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-    <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-    <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-    <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-
-    <widget>
-      <class>GtkViewport</class>
-      <name>viewport1</name>
-      <border_width>4</border_width>
-      <shadow_type>GTK_SHADOW_NONE</shadow_type>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox2</name>
-	<width>27</width>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-1</name>
-	  <label>123</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-a</name>
-	  <label>a</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-b</name>
-	  <label>b</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-c</name>
-	  <label>c</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-d</name>
-	  <label>d</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-e</name>
-	  <label>e</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-f</name>
-	  <label>f</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-g</name>
-	  <label>g</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-h</name>
-	  <label>h</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-i</name>
-	  <label>i</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-j</name>
-	  <label>j</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-k</name>
-	  <label>k</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-l</name>
-	  <label>l</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-m</name>
-	  <label>m</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-n</name>
-	  <label>n</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-o</name>
-	  <label>o</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-p</name>
-	  <label>p</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-q</name>
-	  <label>q</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-r</name>
-	  <label>r</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-s</name>
-	  <label>s</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-t</name>
-	  <label>t</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-u</name>
-	  <label>u</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-v</name>
-	  <label>v</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-w</name>
-	  <can_focus>True</can_focus>
-	  <label>w</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-x</name>
-	  <label>x</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-y</name>
-	  <label>y</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>button-z</name>
-	  <label>z</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/gui/widgets/alphabet.glade.h b/addressbook/gui/widgets/alphabet.glade.h
deleted file mode 100644
index 2448eeb4fc..0000000000
--- a/addressbook/gui/widgets/alphabet.glade.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("window2");
-gchar *s = N_("123");
-gchar *s = N_("a");
-gchar *s = N_("b");
-gchar *s = N_("c");
-gchar *s = N_("d");
-gchar *s = N_("e");
-gchar *s = N_("f");
-gchar *s = N_("g");
-gchar *s = N_("h");
-gchar *s = N_("i");
-gchar *s = N_("j");
-gchar *s = N_("k");
-gchar *s = N_("l");
-gchar *s = N_("m");
-gchar *s = N_("n");
-gchar *s = N_("o");
-gchar *s = N_("p");
-gchar *s = N_("q");
-gchar *s = N_("r");
-gchar *s = N_("s");
-gchar *s = N_("t");
-gchar *s = N_("u");
-gchar *s = N_("v");
-gchar *s = N_("w");
-gchar *s = N_("x");
-gchar *s = N_("y");
-gchar *s = N_("z");
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
deleted file mode 100644
index 830b70879c..0000000000
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ /dev/null
@@ -1,444 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *
- * Author:
- *   Christopher James Lahey <clahey@helixcode.com>
- *
- * (C) 1999 Helix Code, 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 e_table_model_get_type()
-ETableModelClass *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,
-};
-
-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);
-
-	model->create_card_id = 0;
-	model->remove_card_id = 0;
-	model->modify_card_id = 0;
-
-	if (model->book_view)
-		gtk_object_unref(GTK_OBJECT(model->book_view));
-
-	model->book_view = NULL;
-}
-
-static void
-addressbook_destroy(GtkObject *object)
-{
-	EAddressbookModel *model = E_ADDRESSBOOK_MODEL(object);
-	int i;
-
-	if (model->get_view_idle)
-		g_source_remove(model->get_view_idle);
-
-	remove_book_view(model);
-
-	if (model->book)
-		gtk_object_unref(GTK_OBJECT(model->book));
-
-	for ( i = 0; i < model->data_count; i++ ) {
-		gtk_object_unref(GTK_OBJECT(model->data[i]));
-	}
-	g_free(model->data);
-}
-
-/* This function returns the number of columns in our ETableModel. */
-static int
-addressbook_col_count (ETableModel *etc)
-{
-	return E_CARD_SIMPLE_FIELD_LAST;
-}
-
-/* This function returns the number of rows in our ETableModel. */
-static int
-addressbook_row_count (ETableModel *etc)
-{
-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etc);
-	return addressbook->data_count;
-}
-
-/* This function returns the value at a particular point in our ETableModel. */
-static void *
-addressbook_value_at (ETableModel *etc, int col, int row)
-{
-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etc);
-	const char *value;
-	if ( col >= E_CARD_SIMPLE_FIELD_LAST - 1 || row >= addressbook->data_count )
-		return NULL;
-
-	value = e_card_simple_get_const(addressbook->data[row], 
-					col + 1);
-	return (void *)(value ? value : "");
-}
-
-/* This function sets the value at a particular point in our ETableModel. */
-static void
-addressbook_set_value_at (ETableModel *etc, int col, int row, const void *val)
-{
-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etc);
-	ECard *card;
-	if (addressbook->editable) {
-		if ( col >= E_CARD_SIMPLE_FIELD_LAST - 1|| row >= addressbook->data_count )
-			return;
-		e_card_simple_set(addressbook->data[row],
-				  col + 1,
-				  val);
-		gtk_object_get(GTK_OBJECT(addressbook->data[row]),
-			       "card", &card,
-			       NULL);
-		e_book_commit_card(addressbook->book, card, NULL, NULL);
-		
-		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)
-{
-	return E_ADDRESSBOOK_MODEL(etc)->editable;
-}
-
-static void
-addressbook_append_row (ETableModel *etm, ETableModel *source, gint row)
-{
-	ECard *card;
-	ECardSimple *simple;
-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etm);
-	int col;
-
-	card = e_card_new("");
-	simple = e_card_simple_new(card);
-
-	for (col = 0; col < E_CARD_SIMPLE_FIELD_LAST - 1; col++) {
-		const void *val = e_table_model_value_at(source, col, row);
-		e_card_simple_set(simple,
-				  col + 1,
-				  val);
-	}
-	e_card_simple_sync_card(simple);
-	e_book_add_card(addressbook->book, 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
-create_card(EBookView *book_view,
-	    const GList *cards,
-	    EAddressbookModel *model)
-{
-	model->data = g_realloc(model->data, (model->data_count + g_list_length((GList *)cards)) * sizeof(ECard *));
-	e_table_model_pre_change(E_TABLE_MODEL(model));
-	for ( ; cards; cards = cards->next) {
-		model->data[model->data_count++] = e_card_simple_new (E_CARD(cards->data));
-		e_table_model_row_inserted(E_TABLE_MODEL(model), model->data_count - 1);
-	}
-}
-
-static void
-remove_card(EBookView *book_view,
-	    const char *id,
-	    EAddressbookModel *model)
-{
-	int i;
-	e_table_model_pre_change(E_TABLE_MODEL(model));
-	for ( i = 0; i < model->data_count; i++) {
-		if ( !strcmp(e_card_simple_get_id(model->data[i]), id) ) {
-			gtk_object_unref(GTK_OBJECT(model->data[i]));
-			memmove(model->data + i, model->data + i + 1, (model->data_count - i - 1) * sizeof (ECard *));
-			e_table_model_row_deleted(E_TABLE_MODEL(model), i);
-		}
-	}
-}
-
-static void
-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_simple_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_simple_new(E_CARD(cards->data));
-				gtk_object_ref(GTK_OBJECT(model->data[i]));
-				e_table_model_row_changed(E_TABLE_MODEL(model), i);
-				break;
-			}
-		}
-	}
-}
-
-static void
-e_addressbook_model_class_init (GtkObjectClass *object_class)
-{
-	ETableModelClass *model_class = (ETableModelClass *) 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);
-	
-	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_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->data = NULL;
-	model->data_count = 0;
-	model->editable = TRUE;
-	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);
-
-	for ( i = 0; i < model->data_count; i++ ) {
-		gtk_object_unref(GTK_OBJECT(model->data[i]));
-	}
-
-	e_table_model_pre_change(E_TABLE_MODEL(model));
-	g_free(model->data);
-	model->data = NULL;
-	model->data_count = 0;
-	e_table_model_changed(E_TABLE_MODEL(model));
-}
-
-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 (strstr(capabilities, "local")) {
-				e_book_get_book_view(model->book, model->query, book_view_loaded, model);
-			}
-			model->first_get_view = FALSE;
-		}
-		else
-			e_book_get_book_view(model->book, model->query, book_view_loaded, model);
-	}
-
-	model->get_view_idle = 0;
-	return FALSE;
-}
-
-ECard *
-e_addressbook_model_get_card(EAddressbookModel *model,
-			     int                row)
-{
-	if (model->data && row < model->data_count) {
-		ECard *card;
-		gtk_object_get(GTK_OBJECT(model->data[row]),
-			       "card", &card,
-			       NULL);
-		gtk_object_ref(GTK_OBJECT(card));
-		return card;
-	}
-	return NULL;
-}
-
-static void
-e_addressbook_model_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	EAddressbookModel *model;
-
-	model = E_ADDRESSBOOK_MODEL (o);
-	
-	switch (arg_id){
-	case ARG_BOOK:
-		if (model->book)
-			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);
-		}
-		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);
-		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;
-}
-
-ETableModel *
-e_addressbook_model_new (void)
-{
-	EAddressbookModel *et;
-
-	et = gtk_type_new (e_addressbook_model_get_type ());
-	
-	return E_TABLE_MODEL(et);
-}
-
-void   e_addressbook_model_stop    (EAddressbookModel *model)
-{
-	remove_book_view(model);
-}
diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h
deleted file mode 100644
index 860fb641ac..0000000000
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ /dev/null
@@ -1,56 +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 <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_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))
-
-/* Virtual Column list:
-   0   Email
-   1   Full Name
-   2   Street
-   3   Phone
-*/
-
-typedef struct {
-	ETableModel parent;
-
-	/* item specific fields */
-	EBook *book;
-	char *query;
-	EBookView *book_view;
-
-	int get_view_idle;
-
-	ECardSimple **data;
-	int data_count;
-
-	int create_card_id, remove_card_id, modify_card_id;
-
-	guint editable : 1;
-	guint first_get_view : 1;
-} EAddressbookModel;
-
-
-typedef struct {
-	ETableModelClass parent_class;
-} EAddressbookModelClass;
-
-
-GtkType e_addressbook_model_get_type (void);
-ETableModel *e_addressbook_model_new (void);
-
-/* Returns object with ref count of 1. */
-ECard *e_addressbook_model_get_card(EAddressbookModel *model,
-				    int                row);
-void   e_addressbook_model_stop    (EAddressbookModel *model);
-
-#endif /* _E_ADDRESSBOOK_MODEL_H_ */
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
deleted file mode 100644
index 27d5d3c5cd..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ /dev/null
@@ -1,723 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-field-chooser.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-
-#include "e-addressbook-view.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 "e-addressbook-model.h"
-
-#include "e-minicard-view-widget.h"
-
-#include "e-contact-editor.h"
-#include "e-contact-save-as.h"
-#include "addressbook/printing/e-contact-print.h"
-#include "e-card-simple.h"
-#include "e-card.h"
-#include "e-book.h"
-
-#include "glade/glade-xml.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>
-
-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 GtkTableClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_QUERY,
-	ARG_TYPE,
-};
-
-GtkType
-e_addressbook_view_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type) {
-		static const GtkTypeInfo info =
-		{
-			"EAddressbookView",
-			sizeof (EAddressbookView),
-			sizeof (EAddressbookViewClass),
-			(GtkClassInitFunc) e_addressbook_view_class_init,
-			(GtkObjectInitFunc) e_addressbook_view_init,
-			/* reserved_1 */ NULL,
-		       	/* reserved_2 */ NULL,
-			(GtkClassInitFunc) NULL,
-		};
-		
-		type = gtk_type_unique (gtk_table_get_type (), &info);
-	}
-
-	return type;
-}
-
-static void
-e_addressbook_view_class_init (EAddressbookViewClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = GTK_OBJECT_CLASS(klass);
-
-	parent_class = gtk_type_class (gtk_table_get_type ());
-
-	object_class->set_arg = e_addressbook_view_set_arg;
-	object_class->get_arg = e_addressbook_view_get_arg;
-	object_class->destroy = e_addressbook_view_destroy;
-
-	gtk_object_add_arg_type ("EAddressbookView::book", GTK_TYPE_OBJECT,
-				 GTK_ARG_READWRITE, ARG_BOOK);
-	gtk_object_add_arg_type ("EAddressbookView::query", GTK_TYPE_STRING,
-				 GTK_ARG_READWRITE, ARG_QUERY);
-	gtk_object_add_arg_type ("EAddressbookView::type", GTK_TYPE_ENUM,
-				 GTK_ARG_READWRITE, ARG_TYPE);
-}
-
-static void
-e_addressbook_view_init (EAddressbookView *eav)
-{
-	eav->view_type = E_ADDRESSBOOK_VIEW_NONE;
-
-	eav->book = NULL;
-	eav->query = g_strdup("(contains \"x-evolution-any-field\" \"\")");
-
-	eav->object = NULL;
-	eav->widget = NULL;
-}
-
-static void
-e_addressbook_view_destroy (GtkObject *object)
-{
-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);
-
-	if (eav->book)
-		gtk_object_unref(GTK_OBJECT(eav->book));
-	g_free(eav->query);
-
-	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
-e_addressbook_view_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);
-
-	switch (arg_id){
-	case ARG_BOOK:
-		if (eav->book)
-			gtk_object_unref(GTK_OBJECT(eav->book));
-		if (GTK_VALUE_OBJECT(*arg)) {
-			eav->book = E_BOOK(GTK_VALUE_OBJECT(*arg));
-			gtk_object_ref(GTK_OBJECT(eav->book));
-		}
-		else
-			eav->book = NULL;
-		if (eav->object)
-			gtk_object_set(GTK_OBJECT(eav->object),
-				       "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\" \"\")");
-		if (eav->object)
-			gtk_object_set(GTK_OBJECT(eav->object),
-				       "query", eav->query,
-				       NULL);
-		break;
-	case ARG_TYPE:
-		change_view_type(eav, GTK_VALUE_ENUM(*arg));
-		break;
-	default:
-		break;
-	}
-}
-
-static void
-e_addressbook_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		if (eav->book)
-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(eav->book);
-		else
-			GTK_VALUE_OBJECT (*arg) = NULL;
-		break;
-	case ARG_QUERY:
-		GTK_VALUE_STRING (*arg) = eav->query;
-		break;
-	case ARG_TYPE:
-		GTK_VALUE_ENUM (*arg) = eav->view_type;
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-
-
-typedef struct {
-	EAddressbookView *view;
-	char letter;
-} LetterClosure;
-
-static void
-jump_to_letter(GtkWidget *button, LetterClosure *closure)
-{
-	if (closure->view->widget && E_IS_MINICARD_VIEW_WIDGET(closure->view->widget))
-		e_minicard_view_widget_jump_to_letter(E_MINICARD_VIEW_WIDGET(closure->view->widget), closure->letter);
-}
-
-static void
-free_closure(GtkWidget *button, LetterClosure *closure)
-{
-	g_free(closure);
-}
-
-static void
-connect_button (EAddressbookView *view, GladeXML *gui, char letter)
-{
-	char *name;
-	GtkWidget *button;
-	LetterClosure *closure;
-	name = g_strdup_printf("button-%c", letter);
-	button = glade_xml_get_widget(gui, name);
-	g_free(name);
-	if (!button)
-		return;
-	closure = g_new(LetterClosure, 1);
-	closure->view = view;
-	closure->letter = letter;
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(jump_to_letter), closure);
-	gtk_signal_connect(GTK_OBJECT(button), "destroy",
-			   GTK_SIGNAL_FUNC(free_closure), closure);
-}
-
-static GtkWidget *
-create_alphabet (EAddressbookView *view)
-{
-	GtkWidget *widget;
-	char letter;
-	GladeXML *gui = glade_xml_new (EVOLUTION_GLADEDIR "/alphabet.glade", NULL);
-
-	widget = glade_xml_get_widget(gui, "scrolledwindow-top");
-	if (!widget) {
-		return NULL;
-	}
-	
-	connect_button(view, gui, '1');
-	for (letter = 'a'; letter <= 'z'; letter ++) {
-		connect_button(view, gui, letter);
-	}
-	
-	gtk_object_unref(GTK_OBJECT(gui));
-	return widget;
-}
-
-static void
-create_minicard_view (EAddressbookView *view)
-{
-	GtkWidget *scrollframe;
-	GtkWidget *alphabet;
-	GtkWidget *minicard_view;
-	GtkWidget *minicard_hbox;
-
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
-	minicard_hbox = gtk_hbox_new(FALSE, 0);
-
-	minicard_view = e_minicard_view_widget_new();
-
-	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 ();
-}
-
-
-static void
-card_added_cb (EBook* book, EBookStatus status, const char *id,
-	    gpointer user_data)
-{
-	g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__);
-}
-
-static void
-card_modified_cb (EBook* book, EBookStatus status,
-		  gpointer user_data)
-{
-	g_print ("%s: %s(): a card was modified\n", __FILE__, __FUNCTION__);
-}
-
-/* Callback for the add_card signal from the contact editor */
-static void
-add_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_add_card (book, card, card_added_cb, NULL);
-}
-
-/* Callback for the commit_card signal from the contact editor */
-static void
-commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_commit_card (book, card, card_modified_cb, NULL);
-}
-
-/* Callback for the delete_card signal from the contact editor */
-static void
-delete_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_remove_card (book, card, card_modified_cb, NULL);
-}
-
-/* Callback used when the contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	gtk_object_unref (GTK_OBJECT (ce));
-}
-
-static void
-table_double_click(ETableScrolled *table, gint row, EAddressbookView *view)
-{
-	if (E_IS_ADDRESSBOOK_MODEL(view->object)) {
-		EAddressbookModel *model = E_ADDRESSBOOK_MODEL(view->object);
-		ECard *card = e_addressbook_model_get_card(model, row);
-		EBook *book;
-		EContactEditor *ce;
-		
-		gtk_object_get(GTK_OBJECT(model),
-			       "book", &book,
-			       NULL);
-		
-		g_assert (E_IS_BOOK (book));
-
-		ce = e_contact_editor_new (card, FALSE);
-
-		gtk_signal_connect (GTK_OBJECT (ce), "add_card",
-				    GTK_SIGNAL_FUNC (add_card_cb), book);
-		gtk_signal_connect (GTK_OBJECT (ce), "commit_card",
-				    GTK_SIGNAL_FUNC (commit_card_cb), book);
-		gtk_signal_connect (GTK_OBJECT (ce), "delete_card",
-				    GTK_SIGNAL_FUNC (delete_card_cb), book);
-		gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-				    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-		gtk_object_unref(GTK_OBJECT(card));
-	}
-}
-
-typedef struct {
-	EBook *book;
-	ECard *card;
-	GtkWidget *widget;
-} 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));
-}
-
-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
-print (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	gtk_widget_show(e_contact_print_card_dialog_new(card_and_book->card));
-	card_and_book_free(card_and_book);
-}
-
-static void
-delete (GtkWidget *widget, CardAndBook *card_and_book)
-{
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(card_and_book->widget)))) {
-		/* Add the card in the contact editor to our ebook */
-		e_book_remove_card (card_and_book->book,
-				    card_and_book->card,
-				    NULL,
-				    NULL);
-	}
-	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_MODEL(view->object)) {
-		EAddressbookModel *model = E_ADDRESSBOOK_MODEL(view->object);
-		CardAndBook *card_and_book;
-		
-		EPopupMenu menu[] = {
-			{"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), 0}, 
-			{"Print", NULL, GTK_SIGNAL_FUNC(print), 0},
-			{"Delete", NULL, GTK_SIGNAL_FUNC(delete), 0}, 
-			{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);
-		gtk_object_get(GTK_OBJECT(model),
-			       "book", &(card_and_book->book),
-			       NULL);
-		
-		gtk_object_ref(GTK_OBJECT(card_and_book->book));
-		
-		e_popup_menu_run (menu, (GdkEventButton *)event, 0, 0, card_and_book);
-		return TRUE;
-	} else
-		return FALSE;
-}
-#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=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"1\" _title=\"Family Name\"   expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"2\" _title=\"Email\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"3\" _title=\"Primary\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"4\" _title=\"Business\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"5\" _title=\"Home\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"6\" _title=\"Organization\"  expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"7\" _title=\"Business\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"8\" _title=\"Home\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col= \"9\" _title=\"Mobile\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"10\" _title=\"Car\"           expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"11\" _title=\"Business Fax\"  expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"12\" _title=\"Home Fax\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"13\" _title=\"Business 2\"    expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"14\" _title=\"Home 2\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"15\" _title=\"ISDN\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"16\" _title=\"Other\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"17\" _title=\"Pager\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"18\" _title=\"Other\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"19\" _title=\"Email 2\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"20\" _title=\"Email 3\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"21\" _title=\"Web Site\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"22\" _title=\"Department\"    expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"23\" _title=\"Office\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"24\" _title=\"Title\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"25\" _title=\"Profession\"    expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"26\" _title=\"Manager\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"27\" _title=\"Assistant\"     expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"28\" _title=\"Nickname\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"29\" _title=\"Spouse\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"30\" _title=\"Note\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableColumn model_col=\"31\" _title=\"Free-busy URL\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/> \
-  <ETableState>                            \
-    <column source=\"0\"/>                 \
-    <column source=\"1\"/>                 \
-    <column source=\"5\"/>                 \
-    <column source=\"3\"/>                 \
-    <column source=\"4\"/>                 \
-    <grouping>                             \
-      <leaf column=\"0\" ascending=\"true\"/> \
-    </grouping>                            \
-  </ETableState>                           \
-</ETableSpecification>"
-
-static void
-create_table_view (EAddressbookView *view)
-{
-	ETableModel *model;
-	ECardSimple *simple;
-	GtkWidget *table;
-	
-	simple = e_card_simple_new(NULL);
-
-	model = e_addressbook_model_new();
-
-	/* 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 (model, NULL, SPEC, NULL);
-
-	view->object = GTK_OBJECT(model);
-	view->widget = table;
-
-	gtk_signal_connect(GTK_OBJECT(table), "double_click",
-			   GTK_SIGNAL_FUNC(table_double_click), view);
-	gtk_signal_connect(GTK_OBJECT(table), "right_click",
-			   GTK_SIGNAL_FUNC(table_right_click), 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;
-
-	gtk_object_set(view->object,
-		       "query", view->query,
-		       "book", view->book,
-		       NULL);
-}
-
-static void
-e_contact_print_destroy(GnomeDialog *dialog, gpointer data)
-{
-	ETableScrolled *table = gtk_object_get_data(GTK_OBJECT(dialog), "table");
-	EPrintable *printable = gtk_object_get_data(GTK_OBJECT(dialog), "printable");
-	gtk_object_unref(GTK_OBJECT(printable));
-	gtk_object_unref(GTK_OBJECT(table));
-}
-
-static void
-e_contact_print_button(GnomeDialog *dialog, gint button, gpointer data)
-{
-	GnomePrintMaster *master;
-	GnomePrintContext *pc;
-	EPrintable *printable = gtk_object_get_data(GTK_OBJECT(dialog), "printable");
-	GtkWidget *preview;
-	switch( button ) {
-	case GNOME_PRINT_PRINT:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-		e_printable_reset(printable);
-		while (e_printable_data_left(printable)) {
-			if (gnome_print_gsave(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_translate(pc, 72, 72) == -1)
-				/* FIXME */;
-			e_printable_print_page(printable,
-					       pc,
-					       6.5 * 72,
-					       5 * 72,
-					       TRUE);
-			if (gnome_print_grestore(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_showpage(pc) == -1)
-				/* FIXME */;
-		}
-		gnome_print_master_close(master);
-		gnome_print_master_print(master);
-		gtk_object_unref(GTK_OBJECT(master));
-		gnome_dialog_close(dialog);
-		break;
-	case GNOME_PRINT_PREVIEW:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-		e_printable_reset(printable);
-		while (e_printable_data_left(printable)) {
-			if (gnome_print_gsave(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_translate(pc, 72, 72) == -1)
-				/* FIXME */;
-			e_printable_print_page(printable,
-					       pc,
-					       6.5 * 72,
-					       9 * 72,
-					       TRUE);
-			if (gnome_print_grestore(pc) == -1)
-				/* FIXME */;
-			if (gnome_print_showpage(pc) == -1)
-				/* FIXME */;
-		}
-		gnome_print_master_close(master);
-		preview = GTK_WIDGET(gnome_print_master_preview_new(master, "Print Preview"));
-		gtk_widget_show_all(preview);
-		gtk_object_unref(GTK_OBJECT(master));
-		break;
-	case GNOME_PRINT_CANCEL:
-		gnome_dialog_close(dialog);
-		break;
-	}
-}
-
-void
-e_addressbook_view_print(EAddressbookView *view)
-{
-	if (view->view_type == E_ADDRESSBOOK_VIEW_MINICARD) {
-		char *query;
-		EBook *book;
-		GtkWidget *print;
-
-		gtk_object_get (view->object,
-				"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;
-
-		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);
-		
-		printable = e_table_scrolled_get_printable(E_TABLE_SCROLLED(view->widget));
-
-		gtk_object_ref(GTK_OBJECT(view->widget));
-
-		gtk_object_set_data(GTK_OBJECT(dialog), "table", view->widget);
-		gtk_object_set_data(GTK_OBJECT(dialog), "printable", printable);
-		
-		gtk_signal_connect(GTK_OBJECT(dialog),
-				   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);
-		gtk_signal_connect(GTK_OBJECT(dialog),
-				   "destroy", GTK_SIGNAL_FUNC(e_contact_print_destroy), NULL);
-		gtk_widget_show(dialog);
-	}
-}
-
-static void
-card_deleted_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	g_print ("%s: %s(): a card was deleted\n", __FILE__, __FUNCTION__);
-}
-
-void
-e_addressbook_view_delete_selection(EAddressbookView *view)
-{
-	if (view->view_type == E_ADDRESSBOOK_VIEW_MINICARD)
-		e_minicard_view_widget_remove_selection (E_MINICARD_VIEW_WIDGET(view->object), card_deleted_cb, NULL);
-}
-
-void
-e_addressbook_view_show_all(EAddressbookView *view)
-{
-	gtk_object_set(GTK_OBJECT(view),
-		       "query", NULL,
-		       NULL);
-}
-
-void
-e_addressbook_view_stop(EAddressbookView *view)
-{
-	switch(view->view_type) {
- 	case E_ADDRESSBOOK_VIEW_MINICARD:
-		e_minicard_view_widget_stop(E_MINICARD_VIEW_WIDGET (view->object));
-		break;
-	case E_ADDRESSBOOK_VIEW_TABLE:
-		e_addressbook_model_stop(E_ADDRESSBOOK_MODEL (view->object));
-		break;
-	case E_ADDRESSBOOK_VIEW_NONE:
-		break;
-	}
-}
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
deleted file mode 100644
index 60da283a75..0000000000
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-addressbook-view.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_ADDRESSBOOK_VIEW_H__
-#define __E_ADDRESSBOOK_VIEW_H__
-
-#include <gnome.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;
-
-	EBook *book;
-	char  *query;
-
-	GtkObject *object;
-	GtkWidget *widget;
-
-	GtkWidget *vbox;
-};
-
-struct _EAddressbookViewClass
-{
-	GtkTableClass parent_class;
-};
-
-GtkWidget *e_addressbook_view_new               (void);
-GtkType    e_addressbook_view_get_type          (void);
-
-void       e_addressbook_view_print             (EAddressbookView *view);
-void       e_addressbook_view_delete_selection  (EAddressbookView *view);
-void       e_addressbook_view_show_all          (EAddressbookView *view);
-void       e_addressbook_view_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 a5d2038a8a..0000000000
--- a/addressbook/gui/widgets/e-minicard-control.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-minicard-control.c
- *
- * Authors:
- *    Chris Lahey <clahey@helixcode.com>
- *
- * Copyright 1999, 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <bonobo.h>
-
-#include "addressbook/backend/ebook/e-book.h"
-
-#include "e-minicard-control.h"
-#include "e-minicard-widget.h"
-#include "addressbook/backend/ebook/e-card.h"
-
-#if 0
-enum {
-	PROP_RUNNING
-} MyArgs;
-
-#define RUNNING_KEY  "Clock::Running"
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  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,
-	  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);
-
-		memcpy (data + length,
-			buffer->_buffer, buffer->_length);
-
-		length += buffer->_length;
-
-		CORBA_free (buffer);
-	} while (1);
-
-	CORBA_free (buffer);
-	CORBA_exception_free (&ev);
-
-	if (data == NULL)
-	  data = g_strdup("");
-
-	return data;
-} /* stream_read */
-
-/*
- * This function implements the Bonobo::PersistStream:load method.
- */
-static void
-pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	ECard *card;
-	char *vcard;
-	GtkWidget *minicard = data;
-
-	if (type && g_strcasecmp (type, "text/vCard") != 0 &&	    
-	    g_strcasecmp (type, "text/x-vCard") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	if ((vcard = stream_read (stream)) == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_FileNotFound, NULL);
-		return;
-	}
-
-	card = e_card_new(vcard);
-	g_free(vcard);
-	gtk_object_set(GTK_OBJECT(minicard),
-		       "card", card,
-		       NULL);
-	gtk_object_unref(GTK_OBJECT(card));
-} /* pstream_load */
-
-/*
- * This function implements the Bonobo::PersistStream:save method.
- */
-static void
-pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	char                *vcard;
-	ECard               *card;
-	EMinicardWidget     *minicard = data;
-	int                  length;
-
-	if (type && g_strcasecmp (type, "text/vCard") != 0 &&	    
-	    g_strcasecmp (type, "text/x-vCard") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	gtk_object_get (GTK_OBJECT (minicard),
-			"card", &card,
-			NULL);
-	vcard = e_card_get_vcard(card);
-	length = strlen (vcard);
-	bonobo_stream_client_write (stream, vcard, length, ev);
-	g_free (vcard);
-} /* pstream_save */
-
-static CORBA_long
-pstream_get_max_size (BonoboPersistStream *ps, void *data,
-		      CORBA_Environment *ev)
-{
-  GtkWidget *minicard = data;
-  ECard *card;
-  char *vcard;
-  gint length;
-  
-  gtk_object_get (GTK_OBJECT (minicard),
-		  "card", &card, NULL);
-  vcard = e_card_get_vcard(card);
-  length = strlen (vcard);
-  g_free (vcard);
-
-  return length;
-}
-
-static Bonobo_Persist_ContentTypeList *
-pstream_get_content_types (BonoboPersistStream *ps, void *closure,
-			   CORBA_Environment *ev)
-{
-	return bonobo_persist_generate_content_types (2, "text/vCard", "text/x-vCard");
-}
-
-static void
-book_open_cb (EBook *book, EBookStatus status, gpointer closure)
-{
-	ECard *card = closure;
-	e_book_add_card(book, card, NULL, NULL);
-	gtk_object_unref(GTK_OBJECT(card));
-}
-
-static void
-save_in_addressbook(GtkWidget *button, EMinicardWidget *minicard)
-{
-	EBook *book;
-	gchar *path, *uri;
-	ECard *card;
-
-	book = e_book_new ();
-
-	if (!book) {
-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",
-			__FILE__,
-			__FUNCTION__);
-		return;
-	}
-
-
-	path = g_concat_dir_and_file (g_get_home_dir (),
-				      "evolution/local/Contacts/addressbook.db");
-	uri = g_strdup_printf ("file://%s", path);
-	g_free (path);
-
-	gtk_object_get(GTK_OBJECT(minicard),
-		       "card", &card,
-		       NULL);
-	gtk_object_ref(GTK_OBJECT(card));
-
-	if (! e_book_load_uri (book, uri, book_open_cb, card)) {
-		printf ("error calling load_uri!\n");
-	}
-	g_free(uri);
-}
-
-static BonoboObject *
-e_minicard_control_factory (BonoboGenericFactory *Factory, void *closure)
-{
-#if 0
-	BonoboPropertyBag  *pb;
-#endif
-	BonoboControl      *control;
-	BonoboPersistStream *stream;
-	GtkWidget	   *minicard;
-	GtkWidget          *button;
-	GtkWidget          *vbox;
-
-	/* Create the control. */
-
-	minicard = e_minicard_widget_new ();
-	gtk_widget_show (minicard);
-
-	button = gtk_button_new_with_label(_("Save in addressbook"));
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(save_in_addressbook), minicard);
-	gtk_widget_show (button);
-
-	vbox = gtk_vbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), minicard, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
-	gtk_widget_show (vbox);
-
-	control = bonobo_control_new (vbox);
-
-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,
-					    pstream_get_max_size,
-					    pstream_get_content_types,
-					    minicard);
-
-#if 0
-	/* Create the properties. */
-	pb = bonobo_property_bag_new (get_prop, set_prop, clock);
-	bonobo_control_set_property_bag (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:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595",
-			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 3bdf1f2c47..0000000000
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ /dev/null
@@ -1,444 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-label.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-minicard-label.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>
-
-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,
-};
-
-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);
- 
-  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);
-		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;
-	}
-}
-
-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;
-	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",
-				 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", TRUE,
-				 NULL );
-	e_canvas_item_move_absolute(e_minicard_label->field, ( e_minicard_label->width / 2 + 2), 1);
-
-	e_canvas_item_request_reflow(item);
-}
-
-static void
-e_minicard_label_unrealize (GnomeCanvasItem *item)
-{
-  EMinicardLabel *e_minicard_label;
-
-  e_minicard_label = E_MINICARD_LABEL (item);
-
-  if (!item->canvas->aa)
-    {
-    }
-
-  if (GNOME_CANVAS_ITEM_CLASS( parent_class )->unrealize)
-    (* GNOME_CANVAS_ITEM_CLASS( parent_class )->unrealize) (item);
-}
-
-static gboolean
-e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-  EMinicardLabel *e_minicard_label;
- 
-  e_minicard_label = E_MINICARD_LABEL (item);
-
-  switch( event->type )
-    {
-    case GDK_FOCUS_CHANGE:
-      {
-	GdkEventFocus *focus_event = (GdkEventFocus *) event;
-	if ( focus_event->in )
-	  {
-	    gnome_canvas_item_set( e_minicard_label->rect, 
-				   "outline_color", "grey50", 
-				   "fill_color", "grey90",
-				   NULL );
-	    e_minicard_label->has_focus = TRUE;
-	  }
-	else
-	  {
-	    gnome_canvas_item_set( e_minicard_label->rect, 
-				   "outline_color", NULL, 
-				   "fill_color", NULL,
-				   NULL );
-	    e_minicard_label->has_focus = FALSE;
-	  }
-      }
-      break;
-    case GDK_BUTTON_PRESS:
-    case GDK_BUTTON_RELEASE: 
-    case GDK_MOTION_NOTIFY:
-    case GDK_ENTER_NOTIFY:
-    case GDK_LEAVE_NOTIFY: {
-	    gboolean return_val;
-#if 0
-	    GnomeCanvasItem *field;
-	    ArtPoint p;
-	    double inv[6], affine[6];
-	    
-	    field = e_minicard_label->field;
-	    art_affine_identity (affine);
-	    
-	    if (field->xform != NULL) {
-		    if (field->object.flags & GNOME_CANVAS_ITEM_AFFINE_FULL) {
-			    art_affine_multiply (affine, affine, field->xform);
-		    } else {
-			    affine[4] += field->xform[0];
-			    affine[5] += field->xform[1];
-		    }
-	    }
-	    
-	    art_affine_invert (inv, affine);
-	    switch(event->type) {
-	    case GDK_MOTION_NOTIFY:
-		    p.x = event->motion.x;
-		    p.y = event->motion.y;
-		    art_affine_point (&p, &p, inv);
-		    event->motion.x = p.x;
-		    event->motion.y = p.y;
-		    break;
-	    case GDK_BUTTON_PRESS:
-	    case GDK_BUTTON_RELEASE:
-		    p.x = event->button.x;
-		    p.y = event->button.y;
-		    art_affine_point (&p, &p, inv);
-		    event->button.x = p.x;
-		    event->button.y = p.y;
-		    break;
-	    case GDK_ENTER_NOTIFY:
-	    case GDK_LEAVE_NOTIFY:
-		    p.x = event->crossing.x;
-		    p.y = event->crossing.y;
-		    art_affine_point (&p, &p, inv);
-		    event->crossing.x = p.x;
-		    event->crossing.y = p.y;
-		    break;
-	    default:
-		    break;
-	    }
-#endif	    
-	    gtk_signal_emit_by_name(GTK_OBJECT(e_minicard_label->field), "event", event, &return_val);
-	    return return_val;
-	    break;
-    }
-    default:
-	    break;
-    }
-  
-  if (GNOME_CANVAS_ITEM_CLASS( parent_class )->event)
-    return (* GNOME_CANVAS_ITEM_CLASS( parent_class )->event) (item, event);
-  else
-    return 0;
-}
-
-static void
-e_minicard_label_resize_children(EMinicardLabel *e_minicard_label)
-{
-	double left_width;
-	if (e_minicard_label->max_field_name_length != -1 && ((e_minicard_label->width / 2) - 4 > e_minicard_label->max_field_name_length))
-		left_width = e_minicard_label->max_field_name_length;
-	else
-		left_width = e_minicard_label->width / 2 - 4;
-
-	gnome_canvas_item_set( e_minicard_label->fieldname,
-			       "clip_width", (double) ( left_width ),
-			       NULL );
-	gnome_canvas_item_set( e_minicard_label->field,
-			       "clip_width", (double) ( e_minicard_label->width - 8 - left_width ),
-			       NULL );
-}
-
-static void
-e_minicard_label_reflow(GnomeCanvasItem *item, int flags)
-{
-	EMinicardLabel *e_minicard_label = E_MINICARD_LABEL(item);
-	
-	gint old_height;
-	gdouble text_height;
-	gdouble left_width;
-
-	old_height = e_minicard_label->height;
-
-	gtk_object_get(GTK_OBJECT(e_minicard_label->fieldname), 
-		       "text_height", &text_height,
-		       NULL);
-
-	e_minicard_label->height = text_height;
-
-
-	gtk_object_get(GTK_OBJECT(e_minicard_label->field), 
-		       "text_height", &text_height,
-		       NULL);
-
-	if (e_minicard_label->height < text_height)
-		e_minicard_label->height = text_height;
-	e_minicard_label->height += 3;
-
-	gnome_canvas_item_set( e_minicard_label->rect,
-			       "x2", (double) e_minicard_label->width - 1,
-			       "y2", (double) e_minicard_label->height - 1,
-			       NULL );
-
-	if (e_minicard_label->max_field_name_length != -1 && ((e_minicard_label->width / 2) - 4 > e_minicard_label->max_field_name_length))
-		left_width = e_minicard_label->max_field_name_length;
-	else
-		left_width = e_minicard_label->width / 2 - 4;
-
-	e_canvas_item_move_absolute(e_minicard_label->field, left_width + 6, 1);
-
-	if (old_height != e_minicard_label->height)
-		e_canvas_item_request_parent_reflow(item);
-}
-
-GnomeCanvasItem *
-e_minicard_label_new(GnomeCanvasGroup *parent)
-{
-	GnomeCanvasItem *item = gnome_canvas_item_new(parent, e_minicard_label_get_type(), NULL);
-	e_minicard_label_construct(item);
-	return item;
-}
-
diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h
deleted file mode 100644
index 08eb51ee53..0000000000
--- a/addressbook/gui/widgets/e-minicard-label.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-label.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_LABEL_H__
-#define __E_MINICARD_LABEL_H__
-
-#include <gnome.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;
-	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 c6809bf1d0..0000000000
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-view-widget.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-minicard-view-widget.h"
-static void e_minicard_view_widget_init		 (EMinicardViewWidget		 *widget);
-static void e_minicard_view_widget_class_init	 (EMinicardViewWidgetClass	 *klass);
-static void e_minicard_view_widget_set_arg       (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_minicard_view_widget_get_arg       (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_minicard_view_widget_destroy       (GtkObject *object);
-static void e_minicard_view_widget_reflow        (ECanvas *canvas);
-static void e_minicard_view_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static void e_minicard_view_widget_realize       (GtkWidget *widget);
-
-static ECanvasClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_QUERY
-};
-
-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);
-
-	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;
-}
-
-GtkWidget *
-e_minicard_view_widget_new (void)
-{
-	return GTK_WIDGET (gtk_type_new (e_minicard_view_widget_get_type ()));
-}
-
-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;
-	}
-}
-
-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;
-	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_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),
-		       "book", view->book,
-		       "query", view->query,
-		       NULL);
-
-	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 );	
-}
-
-void
-e_minicard_view_widget_remove_selection(EMinicardViewWidget *view,
-					EBookCallback  cb,
-					gpointer       closure)
-{
-	if (view->emv)
-		e_minicard_view_remove_selection(E_MINICARD_VIEW(view->emv), cb, closure);
-}
-
-void       e_minicard_view_widget_jump_to_letter   (EMinicardViewWidget *view,
-						    char           letter)
-{
-	if (view->emv)
-		e_minicard_view_jump_to_letter(E_MINICARD_VIEW(view->emv), letter);
-}
-
-void
-e_minicard_view_widget_stop(EMinicardViewWidget *view)
-{
-	e_minicard_view_stop(E_MINICARD_VIEW(view->emv));
-}
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 cf20c9a4df..0000000000
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view-widget.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_VIEW_WIDGET_H__
-#define __E_MINICARD_VIEW_WIDGET_H__
-
-#include <gnome.h>
-#include "e-minicard-view.h"
-#include <gal/widgets/e-canvas.h>
-#include "addressbook/backend/ebook/e-book.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;
-
-	EBook *book;
-	char *query;
-};
-
-struct _EMinicardViewWidgetClass
-{
-	ECanvasClass parent_class;
-};
-
-GtkType    e_minicard_view_widget_get_type (void);
-void       e_minicard_view_widget_remove_selection (EMinicardViewWidget *view,
-						    EBookCallback  cb,
-						    gpointer       closure);
-void       e_minicard_view_widget_jump_to_letter   (EMinicardViewWidget *view,
-						    char           letter);
-void       e_minicard_view_widget_stop             (EMinicardViewWidget *view);						    
-
-GtkWidget *e_minicard_view_widget_new (void);
-
-#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 7169e41542..0000000000
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ /dev/null
@@ -1,453 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard-view.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-canvas.h>
-#include "e-minicard-view.h"
-#include "e-minicard.h"
-#include "e-contact-editor.h"
-static void e_minicard_view_init		(EMinicardView		 *reflow);
-static void e_minicard_view_class_init	(EMinicardViewClass	 *klass);
-static void e_minicard_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
-static void e_minicard_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void e_minicard_view_destroy (GtkObject *object);
-static gboolean e_minicard_view_event (GnomeCanvasItem *item, GdkEvent *event);
-static void canvas_destroy (GtkObject *object, EMinicardView *view);
-static void disconnect_signals (EMinicardView *view);
-
-static EReflowSortedClass *parent_class = NULL;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_BOOK,
-	ARG_QUERY
-};
-
-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 (e_reflow_sorted_get_type (), &reflow_info);
-    }
-
-  return reflow_type;
-}
-
-static void
-e_minicard_view_class_init (EMinicardViewClass *klass)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-	
-	object_class = (GtkObjectClass*) klass;
-	item_class = (GnomeCanvasItemClass *) klass;
-	
-	parent_class = gtk_type_class (e_reflow_sorted_get_type ());
-	
-	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);
-	
-	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;
-	
-	/* GnomeCanvasItem method overrides */
-}
-
-static void
-e_minicard_view_init (EMinicardView *view)
-{
-	view->book = NULL;
-	view->query = g_strdup("(contains \"x-evolution-any-field\" \"\")");
-	view->book_view = NULL;
-	view->get_view_idle = 0;
-	view->create_card_id = 0;
-	view->remove_card_id = 0;
-	view->modify_card_id = 0;
-	view->canvas_destroy_id = 0;
-	view->first_get_view = TRUE;
-	
-	gtk_object_set(GTK_OBJECT(view),
-		       "empty_message", _("\n\nThere are no items to show in this view\n\n"
-					  "Double-click here to create a new Contact."),
-		       NULL);
-
-	E_REFLOW_SORTED(view)->compare_func = (GCompareFunc) e_minicard_compare;
-	E_REFLOW_SORTED(view)->string_func  = (EReflowStringFunc) e_minicard_get_card_id;
-}
-
-static void
-create_card(EBookView *book_view, const GList *cards, EMinicardView *view)
-{
-	for (; cards; cards = g_list_next(cards)) {
-		GnomeCanvasItem *item = gnome_canvas_item_new(GNOME_CANVAS_GROUP(view),
-							      e_minicard_get_type(),
-							      "card", cards->data,
-							      NULL);
-		e_reflow_add_item(E_REFLOW(view), item);
-	}
-}
-
-static void
-modify_card(EBookView *book_view, const GList *cards, EMinicardView *view)
-{
-	for (; cards; cards = g_list_next(cards)) {
-		ECard *card = cards->data;
-		gchar *id = e_card_get_id(card);
-		GnomeCanvasItem *item = e_reflow_sorted_get_item(E_REFLOW_SORTED(view), id);
-		if (item && !GTK_OBJECT_DESTROYED(item)) {
-			gnome_canvas_item_set(item,
-					      "card", card,
-					      NULL);
-			e_reflow_sorted_reorder_item(E_REFLOW_SORTED(view), id);
-		}
-	}
-}
-
-static void
-remove_card(EBookView *book_view, const char *id, EMinicardView *view)
-{
-	e_reflow_sorted_remove_item(E_REFLOW_SORTED(view), id);
-}
-
-static void
-book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure)
-{
-	EMinicardView *view = closure;
-	disconnect_signals(view);
-	if (view->book_view)
-		gtk_object_unref(GTK_OBJECT(view->book_view));
-
-	if (!view->canvas_destroy_id)
-		view->canvas_destroy_id = 
-			gtk_signal_connect(GTK_OBJECT(GNOME_CANVAS_ITEM(view)->canvas),
-					   "destroy", GTK_SIGNAL_FUNC(canvas_destroy),
-					   view);
-
-	view->book_view = book_view;
-	if (view->book_view)
-		gtk_object_ref(GTK_OBJECT(view->book_view));
-	
-
-	view->create_card_id = gtk_signal_connect(GTK_OBJECT(view->book_view),
-						  "card_added",
-						  GTK_SIGNAL_FUNC(create_card),
-						  view);
-	view->remove_card_id = gtk_signal_connect(GTK_OBJECT(view->book_view),
-						  "card_removed",
-						  GTK_SIGNAL_FUNC(remove_card),
-						  view);
-	view->modify_card_id = gtk_signal_connect(GTK_OBJECT(view->book_view),
-						  "card_changed",
-						  GTK_SIGNAL_FUNC(modify_card),
-						  view);
-
-	g_list_foreach(E_REFLOW(view)->items, (GFunc) gtk_object_unref, NULL);
-	g_list_foreach(E_REFLOW(view)->items, (GFunc) gtk_object_destroy, NULL);
-	g_list_free(E_REFLOW(view)->items);
-	E_REFLOW(view)->items = NULL;
-	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(view));
-}
-
-static gboolean
-get_view(EMinicardView *view)
-{
-	if (view->book && view->query) {
-		if (view->first_get_view) {
-			char *capabilities;
-			capabilities = e_book_get_static_capabilities(view->book);
-			if (strstr(capabilities, "local")) {
-				e_book_get_book_view(view->book, view->query, book_view_loaded, view);
-			}
-			view->first_get_view = FALSE;
-		}
-		else
-			e_book_get_book_view(view->book, view->query, book_view_loaded, view);
-	}
-
-	view->get_view_idle = 0;
-	return FALSE;
-}
-
-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_BOOK:
-		if (view->book)
-			gtk_object_unref(GTK_OBJECT(view->book));
-		if (GTK_VALUE_OBJECT (*arg)) {
-			view->book = E_BOOK(GTK_VALUE_OBJECT (*arg));
-			gtk_object_ref(GTK_OBJECT(view->book));
-			if (view->get_view_idle == 0)
-				view->get_view_idle = g_idle_add((GSourceFunc)get_view, view);
-		}
-		else
-			view->book = NULL;
-		break;
-	case ARG_QUERY:
-		g_free(view->query);
-		view->query = g_strdup(GTK_VALUE_STRING (*arg));
-		if (view->get_view_idle == 0)
-			view->get_view_idle = g_idle_add((GSourceFunc)get_view, view);
-		break;
-	}
-}
-
-static void
-e_minicard_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	EMinicardView *e_minicard_view;
-
-	e_minicard_view = E_MINICARD_VIEW (object);
-
-	switch (arg_id) {
-	case ARG_BOOK:
-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_minicard_view->book);
-		break;
-	case ARG_QUERY:
-		GTK_VALUE_STRING (*arg) = g_strdup(e_minicard_view->query);
-		break;
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-static void
-e_minicard_view_destroy (GtkObject *object)
-{
-	EMinicardView *view = E_MINICARD_VIEW(object);
-
-	if (view->get_view_idle)
-		g_source_remove(view->get_view_idle);
-	if (view->canvas_destroy_id)
-		gtk_signal_disconnect(GTK_OBJECT (GNOME_CANVAS_ITEM(view)->canvas),
-				      view->canvas_destroy_id);
-	disconnect_signals(view);
-	g_free(view->query);
-	if (view->book)
-		gtk_object_unref(GTK_OBJECT(view->book));
-	if (view->book_view)
-		gtk_object_unref(GTK_OBJECT(view->book_view));
-  
-	GTK_OBJECT_CLASS(parent_class)->destroy (object);
-}
-
-static void
-card_added_cb (EBook* book, EBookStatus status, const char *id,
-	    gpointer user_data)
-{
-	g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__);
-}
-
-static void
-card_changed_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	g_print ("%s: %s(): a card was changed with status %d\n", __FILE__, __FUNCTION__, status);
-}
-
-/* Callback for the add_card signal from the contact editor */
-static void
-add_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_add_card (book, card, card_added_cb, NULL);
-}
-
-/* Callback for the commit_card signal from the contact editor */
-static void
-commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_commit_card (book, card, card_changed_cb, NULL);
-}
-
-/* Callback used when the contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	gtk_object_unref (GTK_OBJECT (ce));
-}
-
-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)
-		{
-			ECard *card;
-			EContactEditor *ce;
-			EBook *book;
-
-			card = e_card_new("");
-
-			gtk_object_get(GTK_OBJECT(view), "book", &book, NULL);
-			g_assert (E_IS_BOOK (book));
-
-			ce = e_contact_editor_new (card, TRUE);
-
-			gtk_signal_connect (GTK_OBJECT (ce), "add_card",
-					    GTK_SIGNAL_FUNC (add_card_cb), book);
-			gtk_signal_connect (GTK_OBJECT (ce), "commit_card",
-					    GTK_SIGNAL_FUNC (commit_card_cb), book);
-			gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-					    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-			gtk_object_sink(GTK_OBJECT(card));
-		}
-		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 void
-disconnect_signals(EMinicardView *view)
-{
-	if (view->book_view && view->create_card_id)
-		gtk_signal_disconnect(GTK_OBJECT (view->book_view),
-				      view->create_card_id);
-	if (view->book_view && view->remove_card_id)
-		gtk_signal_disconnect(GTK_OBJECT (view->book_view),
-				      view->remove_card_id);
-	if (view->book_view && view->modify_card_id)
-		gtk_signal_disconnect(GTK_OBJECT (view->book_view),
-				      view->modify_card_id);
-
-	view->create_card_id = 0;
-	view->remove_card_id = 0;
-	view->modify_card_id = 0;
-}
-
-static void
-canvas_destroy(GtkObject *object, EMinicardView *view)
-{
-	disconnect_signals(view);
-}
-
-void
-e_minicard_view_remove_selection(EMinicardView *view,
-				 EBookCallback  cb,
-				 gpointer       closure)
-{
-	if (view->book) {
-		EReflow *reflow = E_REFLOW(view);
-		GList *list;
-		for (list = reflow->items; list; list = g_list_next(list)) {
-			GnomeCanvasItem *item = list->data;
-			gboolean has_focus;
-			gtk_object_get(GTK_OBJECT(item),
-				       "has_focus", &has_focus,
-				       NULL);
-			if (has_focus) {
-				ECard *card;
-				gtk_object_get(GTK_OBJECT(item),
-					       "card", &card,
-					       NULL);
-				e_book_remove_card(view->book, card, cb, closure);
-				return;
-			}
-		}
-	}
-}
-
-static int
-compare_to_letter(EMinicard *card, char *letter)
-{
-	g_return_val_if_fail(card != NULL, 0);
-	g_return_val_if_fail(E_IS_MINICARD(card), 0);
-
-	if (*letter == '1')
-		return 1;
-
-	if (card->card) {
-		char *file_as;
-		gtk_object_get(GTK_OBJECT(card->card),
-			       "file_as", &file_as,
-			       NULL);
-		if (file_as)
-			return strncasecmp(file_as, letter, 1);
-		else
-			return 0;
-	} else {
-		return 0;
-	}
-}
-
-void
-e_minicard_view_jump_to_letter   (EMinicardView *view,
-					     char           letter)
-{
-	e_reflow_sorted_jump(E_REFLOW_SORTED(view),
-			     (GCompareFunc) compare_to_letter,
-			     &letter);
-}
-
-void
-e_minicard_view_stop             (EMinicardView *view)
-{
-	disconnect_signals(view);
-	if (view->book_view)
-		gtk_object_unref(GTK_OBJECT(view->book_view));
-	view->book_view = NULL;
-}
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
deleted file mode 100644
index e4c1be870a..0000000000
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard-view.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_VIEW_H__
-#define __E_MINICARD_VIEW_H__
-
-#include <gnome.h>
-#include <gal/widgets/e-reflow-sorted.h>
-#include "addressbook/backend/ebook/e-book.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
-{
-	EReflowSorted parent;
-	
-	/* item specific fields */
-	EBook *book;
-	char *query;
-	EBookView *book_view;
-
-	int get_view_idle;
-
-	int canvas_destroy_id;
-
-	int create_card_id, remove_card_id, modify_card_id;
-
-	guint first_get_view : 1;
-};
-
-struct _EMinicardViewClass
-{
-	EReflowSortedClass parent_class;
-};
-
-GtkType    e_minicard_view_get_type (void);
-void       e_minicard_view_remove_selection (EMinicardView *view,
-					     EBookCallback  cb,
-					     gpointer       closure);
-void       e_minicard_view_jump_to_letter   (EMinicardView *view,
-					     char           letter);
-void       e_minicard_view_stop             (EMinicardView *view);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_MINICARD_VIEW_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-widget-test.c b/addressbook/gui/widgets/e-minicard-widget-test.c
deleted file mode 100644
index f6489f2a6a..0000000000
--- a/addressbook/gui/widgets/e-minicard-widget-test.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-minicard.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"ORG:Helix Code, 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@helixcode.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 <gnome.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, Helix Code, 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 3f765425e4..0000000000
--- a/addressbook/gui/widgets/e-minicard-widget.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-table-field-chooser.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-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);
-
-	switch (arg_id){
-	case ARG_CARD:
-		if (emw->card)
-			gtk_object_unref(GTK_OBJECT(emw->card));
-		if (GTK_VALUE_OBJECT(*arg)) {
-		  emw->card = E_CARD(GTK_VALUE_OBJECT(*arg));
-			gtk_object_ref(GTK_OBJECT(emw->card));
-		}
-		else
-			emw->card = NULL;
-		if (emw->item)
-			gtk_object_set(GTK_OBJECT(emw->item),
-				       "card", emw->card,
-				       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;
-	}
-}
diff --git a/addressbook/gui/widgets/e-minicard-widget.h b/addressbook/gui/widgets/e-minicard-widget.h
deleted file mode 100644
index 95b56cf3de..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  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_WIDGET_H__
-#define __E_MINICARD_WIDGET_H__
-
-#include <gnome.h>
-#include "addressbook/backend/ebook/e-card.h"
-#include <gal/widgets/e-canvas.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);
-
-#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 c57e7adde7..0000000000
--- a/addressbook/gui/widgets/e-minicard.c
+++ /dev/null
@@ -1,805 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-minicard.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "e-minicard.h"
-#include "e-minicard-label.h"
-#include "addressbook/backend/ebook/e-book.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/widgets/e-popup-menu.h>
-#include "addressbook/printing/e-contact-print.h"
-#include "e-contact-editor.h"
-#include "e-contact-save-as.h"
-#include "e-minicard-view.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 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 GnomeCanvasGroupClass *parent_class = NULL;
-
-typedef struct _EMinicardField EMinicardField;
-
-struct _EMinicardField {
-	ECardSimpleField field;
-	GnomeCanvasItem *label;
-};
-
-#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_CARD
-};
-
-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::card", GTK_TYPE_OBJECT, 
-			   GTK_ARG_READWRITE, ARG_CARD);
- 
-  object_class->set_arg = e_minicard_set_arg;
-  object_class->get_arg = e_minicard_get_arg;
-  object_class->destroy = e_minicard_destroy;
-  
-  /* GnomeCanvasItem method overrides */
-  item_class->realize     = e_minicard_realize;
-  item_class->unrealize   = e_minicard_unrealize;
-  item_class->event       = e_minicard_event;
-}
-
-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->card = NULL;
-	minicard->simple = e_card_simple_new(NULL);
-
-	minicard->changed = FALSE;
-
-	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard), e_minicard_reflow);
-}
-
-static void
-e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EMinicard *e_minicard;
-
-	item = GNOME_CANVAS_ITEM (o);
-	e_minicard = E_MINICARD (o);
-	
-	switch (arg_id){
-	case ARG_WIDTH:
-		if (e_minicard->width != GTK_VALUE_DOUBLE (*arg)) {
-			e_minicard->width = GTK_VALUE_DOUBLE (*arg);
-			e_minicard_resize_children(e_minicard);
-			if ( GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED )
-				e_canvas_item_request_reflow(item);
-		}
-	  break;
-	case ARG_HAS_FOCUS:
-		if (e_minicard->fields) {
-			if ( GTK_VALUE_ENUM(*arg) == E_FOCUS_START ||
-			     GTK_VALUE_ENUM(*arg) == E_FOCUS_CURRENT) {
-				gnome_canvas_item_set(E_MINICARD_FIELD(e_minicard->fields->data)->label,
-						      "has_focus", GTK_VALUE_ENUM(*arg),
-						      NULL);
-			} else if ( GTK_VALUE_ENUM(*arg) == E_FOCUS_END ) {
-				gnome_canvas_item_set(E_MINICARD_FIELD(g_list_last(e_minicard->fields)->data)->label,
-						      "has_focus", GTK_VALUE_ENUM(*arg),
-						      NULL);
-			}
-		}
-		else
-			e_canvas_item_grab_focus(item);
-		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_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);
-
-	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)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (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", "",
-				 NULL );
-	e_canvas_item_move_absolute(e_minicard->header_text, 6, 6);
-
-	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_added_cb (EBook* book, EBookStatus status, const char *id, gpointer user_data)
-{
-	g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__);
-}
-
-static void
-card_changed_cb (EBook* book, EBookStatus status, gpointer user_data)
-{
-	g_print ("%s: %s(): a card was changed with status %d\n", __FILE__, __FUNCTION__, status);
-}
-
-static void
-save_as (GtkWidget *widget, EMinicard *minicard)
-{
-	e_card_simple_sync_card(minicard->simple);
-	e_contact_save_as(_("Save as VCard"), minicard->card);
-}
-
-static void
-delete (GtkWidget *widget, EMinicard *minicard)
-{
-	EBook *book;
-	
-	if (e_contact_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(GNOME_CANVAS_ITEM(minicard)->canvas))))) {
-		e_card_simple_sync_card(minicard->simple);
-		
-		gtk_object_get(GTK_OBJECT(GNOME_CANVAS_ITEM(minicard)->parent),
-			       "book", &book,
-			       NULL);
-		
-		/* Add the card in the contact editor to our ebook */
-		e_book_remove_card (book,
-				    minicard->card,
-				    card_changed_cb,
-				    NULL);
-	}
-}
-
-static void
-print (GtkWidget *widget, EMinicard *minicard)
-{
-	e_card_simple_sync_card(minicard->simple);
-				
-	gtk_widget_show(e_contact_print_card_dialog_new(minicard->card));
-}
-
-/* Callback for the add_card signal from the contact editor */
-static void
-add_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_add_card (book, card, card_added_cb, NULL);
-}
-
-/* Callback for the commit_card signal from the contact editor */
-static void
-commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_commit_card (book, card, card_changed_cb, NULL);
-}
-
-/* Callback for the commit_card signal from the contact editor */
-static void
-delete_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_remove_card (book, card, card_changed_cb, NULL);
-}
-
-/* Callback used when the contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	gtk_object_unref (GTK_OBJECT (ce));
-}
-
-static gboolean
-e_minicard_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EMinicard *e_minicard;
-	GtkWidget *canvas;
-	
-	e_minicard = E_MINICARD (item);
-	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (item)->canvas);
-	
-	switch( event->type ) {
-	case GDK_FOCUS_CHANGE:
-		{
-			GdkEventFocus *focus_event = (GdkEventFocus *) event;
-			if ( focus_event->in ) {
-				gnome_canvas_item_set( e_minicard->rect, 
-						       "outline_color_gdk", &canvas->style->bg[GTK_STATE_NORMAL], 
-						       NULL );
-				gnome_canvas_item_set( e_minicard->header_rect, 
-						       "fill_color_gdk", &canvas->style->bg[GTK_STATE_SELECTED],
-						       NULL );
-				gnome_canvas_item_set( e_minicard->header_text, 
-						       "fill_color_gdk", &canvas->style->text[GTK_STATE_SELECTED],
-						       NULL );
-				e_minicard->has_focus = TRUE;
-			} 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_book_commit_card (book,
-								    e_minicard->card,
-								    card_changed_cb,
-								    NULL);
-					} else {
-						remodel(e_minicard);
-						e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(e_minicard));
-					}
-					e_minicard->changed = FALSE;
-				}
-					
-				gnome_canvas_item_set( e_minicard->rect, 
-						       "outline_color", NULL, 
-						       NULL );
-				gnome_canvas_item_set( e_minicard->header_rect, 
-						       "fill_color_gdk", 
-						       &canvas->style->bg[GTK_STATE_NORMAL],
-						       NULL );
-				gnome_canvas_item_set( e_minicard->header_text, 
-						       "fill_color_gdk", 
-						       &canvas->style->fg[GTK_STATE_NORMAL],
-						       NULL );
-				e_minicard->has_focus = FALSE;
-			}
-		}
-		break;
-	case GDK_BUTTON_PRESS:
-		if (event->button.button == 1) {
-			e_canvas_item_grab_focus(item);
-		} else if (event->button.button == 3) {
-			if (E_IS_MINICARD_VIEW(item->parent)) {
-				EPopupMenu menu[] = { {"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), 0}, 
-						      {"Print", NULL, GTK_SIGNAL_FUNC(print), 0},
-						      {"Delete", NULL, GTK_SIGNAL_FUNC(delete), 0},
-						      {NULL, NULL, NULL, 0}};
-				e_popup_menu_run (menu, (GdkEventButton *)event, 0, 0, e_minicard);
-			} else {
-				EPopupMenu menu[] = { {"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), 0}, 
-						      {"Print", NULL, GTK_SIGNAL_FUNC(print), 0},
-						      {NULL, NULL, NULL, 0}};
-				e_popup_menu_run (menu, (GdkEventButton *)event, 0, 0, e_minicard);
-			}
-		}
-		break;
-
-	case GDK_2BUTTON_PRESS:
-		if (event->button.button == 1 && E_IS_MINICARD_VIEW(item->parent)) {
-			EContactEditor *ce;
-			EBook *book = NULL;
-			if (E_IS_MINICARD_VIEW(item->parent)) {
-				
-				gtk_object_get(GTK_OBJECT(item->parent),
-					       "book", &book,
-					       NULL);
-			}
-			ce = e_contact_editor_new (e_minicard->card, FALSE);
-
-			if (book != NULL) {
-				gtk_signal_connect (GTK_OBJECT (ce), "add_card",
-						    GTK_SIGNAL_FUNC (add_card_cb), book);
-				gtk_signal_connect (GTK_OBJECT (ce), "commit_card",
-						    GTK_SIGNAL_FUNC (commit_card_cb), book);
-				gtk_signal_connect (GTK_OBJECT (ce), "delete_card",
-						    GTK_SIGNAL_FUNC (delete_card_cb), book);
-			}
-
-			gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-					    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-			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,
-				       NULL );
-	}
-	for ( list = e_minicard->fields; list; list = g_list_next( list ) ) {
-		gnome_canvas_item_set( E_MINICARD_FIELD( list->data )->label,
-				       "width", (double) e_minicard->width - 4.0,
-				       NULL );
-	}
-}
-
-static void
-field_changed (EText *text, EMinicard *e_minicard)
-{
-	ECardSimpleType type;
-	char *string;
-
-	type = GPOINTER_TO_INT
-		(gtk_object_get_data(GTK_OBJECT(text),
-				     "EMinicard:field"));
-	gtk_object_get(GTK_OBJECT(text),
-		       "text", &string,
-		       NULL);
-	e_card_simple_set(e_minicard->simple,
-			  type,
-			  string);
-	g_free(string);
-	e_minicard->changed = TRUE;
-}
-
-static void
-add_field (EMinicard *e_minicard, ECardSimpleField field, gdouble left_width)
-{
-	GnomeCanvasItem *new_item;
-	GnomeCanvasGroup *group;
-	ECardSimpleType type;
-	EMinicardField *minicard_field;
-	char *name;
-	char *string;
-	
-	group = GNOME_CANVAS_GROUP( e_minicard );
-	
-	type = e_card_simple_type(e_minicard->simple, field);
-	name = g_strdup_printf("%s:", e_card_simple_get_name(e_minicard->simple, field));
-	string = e_card_simple_get(e_minicard->simple, field);
-
-	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,
-			       NULL );
-	gtk_signal_connect(GTK_OBJECT(E_MINICARD_LABEL(new_item)->field),
-			   "changed", GTK_SIGNAL_FUNC(field_changed), e_minicard);
-	gtk_object_set_data(GTK_OBJECT(E_MINICARD_LABEL(new_item)->field),
-			    "EMinicard:field",
-			    GINT_TO_POINTER(field));
-
-	minicard_field = g_new(EMinicardField, 1);
-	minicard_field->field = field;
-	minicard_field->label = new_item;
-
-	e_minicard->fields = g_list_append( e_minicard->fields, minicard_field);
-	e_canvas_item_move_absolute(new_item, 2, e_minicard->height);
-	g_free(name);
-	g_free(string);
-}
-
-static gdouble
-get_left_width(EMinicard *e_minicard)
-{
-	gchar *name;
-	ECardSimpleField field;
-	gdouble width = -1;
-	GdkFont *font;
-
-	font = ((GtkWidget *) ((GnomeCanvasItem *) e_minicard)->canvas)->style->font;
-
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {
-		gdouble this_width;
-		name = g_strdup_printf("%s:", e_card_simple_get_name(e_minicard->simple, field));
-		this_width = gdk_text_width(font, name, strlen(name));
-		if (width < this_width)
-			width = this_width;
-		g_free(name);
-	}
-	return width;
-}
-
-static void
-remodel( EMinicard *e_minicard )
-{
-	int count = 0;
-	if (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);
-		}
-		
-		list = e_minicard->fields;
-		e_minicard->fields = NULL;
-
-		for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST - 2 && count < 5; field++) {
-			EMinicardField *minicard_field = NULL;
-
-			if (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) {
-					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);
-	}
-}
-
-char *
-e_minicard_get_card_id (EMinicard *minicard)
-{
-	g_return_val_if_fail(minicard != NULL, NULL);
-	g_return_val_if_fail(E_IS_MINICARD(minicard), NULL);
-
-	if (minicard->card) {
-		return e_card_get_id(minicard->card);
-	} else {
-		return "";
-	}
-}
-
-int
-e_minicard_compare (EMinicard *minicard1, EMinicard *minicard2)
-{
-	g_return_val_if_fail(minicard1 != NULL, 0);
-	g_return_val_if_fail(E_IS_MINICARD(minicard1), 0);
-	g_return_val_if_fail(minicard2 != NULL, 0);
-	g_return_val_if_fail(E_IS_MINICARD(minicard2), 0);
-
-	if (minicard1->card && minicard2->card) {
-		char *file_as1, *file_as2;
-		gtk_object_get(GTK_OBJECT(minicard1->card),
-			       "file_as", &file_as1,
-			       NULL);
-		gtk_object_get(GTK_OBJECT(minicard2->card),
-			       "file_as", &file_as2,
-			       NULL);
-		if (file_as1 && file_as2)
-			return strcasecmp(file_as1, file_as2);
-		if (file_as1)
-			return -1;
-		if (file_as2)
-			return 1;
-		return strcmp(e_minicard_get_card_id(minicard1), e_minicard_get_card_id(minicard2));
-	} else {
-		return 0;
-	}
-}
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
deleted file mode 100644
index a0272ee58b..0000000000
--- a/addressbook/gui/widgets/e-minicard.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-minicard.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __E_MINICARD_H__
-#define __E_MINICARD_H__
-
-#include <gnome.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;
-
-	GList *fields; /* Of type EMinicardField */
-	guint needs_remodeling : 1;
-
-	guint changed : 1;
-	
-	gboolean has_focus;
-	
-	double width;
-	double height;
-};
-
-struct _EMinicardClass
-{
-	GnomeCanvasGroupClass parent_class;
-
-	void (* resize) (EMinicard *minicard);
-};
-
-
-GtkType    e_minicard_get_type    (void);
-char      *e_minicard_get_card_id (EMinicard *minicard);
-int        e_minicard_compare     (EMinicard *minicard1, EMinicard *minicard2);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __E_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 0566a85760..0000000000
--- a/addressbook/gui/widgets/test-minicard-label.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-minicard-label.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-
-
-#include "config.h"
-
-#include <gnome.h>
-#include "e-minicard-label.h"
-#include <gal/widgets/e-canvas.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, Helix Code, 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 c03d11d07e..0000000000
--- a/addressbook/gui/widgets/test-minicard-view.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-reflow.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "config.h"
-
-#include <gnome.h>
-#include <libgnorba/gnorba.h>
-#include <bonobo.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, Helix Code, 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 e16ca675b3..0000000000
--- a/addressbook/gui/widgets/test-minicard.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-minicard.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-
-
-#include "config.h"
-
-#include <gnome.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, Helix Code, 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 2a8e7093fe..0000000000
--- a/addressbook/gui/widgets/test-reflow.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* test-reflow.c
- *
- * Copyright (C) 2000 Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"TITLE:Head Geek
-"                  \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@helixcode.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 <gnome.h>
-#include <gal/widgets/e-canvas.h>
-#include <gal/widgets/e-reflow.h>
-#include "e-minicard.h"
-#include <gal/widgets/e-scroll-frame.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, Helix Code, 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);
-    }
-  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 a3156db610..0000000000
--- a/addressbook/printing/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-ecpsdir    = $(datadir)/evolution/ecps
-
-ecps_DATA  =				\
-	smallbook.ecps			\
-	medbook.ecps			\
-	phonelist.ecps
-
-gladedir   = $(datadir)/evolution/glade
-
-glade_DATA = 				\
-	e-contact-print.glade		\
-	e-contact-print.glade.h
-
-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)
-
-noinst_LIBRARIES =				\
-	libecontactprint.a
-
-libecontactprint_a_SOURCES = 			\
-	e-contact-print.c			\
-	e-contact-print.h			\
-	e-contact-print-style-editor.c		\
-	e-contact-print-style-editor.h		\
-	e-contact-print-types.h
-
-noinst_PROGRAMS =	\
-	contact-print-test	\
-	contact-print-style-editor-test
-
-contact_print_test_SOURCES = 	\
-	test-print.c
-
-contact_print_test_LDADD =	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(BONOBO_GNOME_LIBS)    \
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	libecontactprint.a	\
-	$(GNOME_PRINT_LIBS) 
-
-contact_print_style_editor_test_SOURCES = 	\
-	test-contact-print-style-editor.c
-
-contact_print_style_editor_test_LDADD =	\
-	$(EXTRA_GNOME_LIBS)	\
-	$(BONOBO_GNOME_LIBS)    \
-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\
-	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/e-util/ename/libename.la			\
-	libecontactprint.a	\
-	$(GNOME_PRINT_LIBS)
-
-EXTRA_DIST = $(glade_DATA) $(ecps_DATA)
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 5eb5cadacf..0000000000
--- a/addressbook/printing/e-contact-print-style-editor.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-style-editor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gnome.h>
-#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 cf0f17f889..0000000000
--- a/addressbook/printing/e-contact-print-style-editor.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* e-contact-print-style-editor.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_CONTACT_PRINT_STYLE_EDITOR_H__
-#define __E_CONTACT_PRINT_STYLE_EDITOR_H__
-
-#include <gnome.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 e99cfe6d39..0000000000
--- a/addressbook/printing/e-contact-print-types.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print-types.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CONTACT_PRINT_TYPES_H
-#define E_CONTACT_PRINT_TYPES_H
-
-#include <gnome.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 f2cf9ac8f0..0000000000
--- a/addressbook/printing/e-contact-print.c
+++ /dev/null
@@ -1,1113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#include "e-contact-print.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 <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
-#include <ctype.h>
-#include <gal/widgets/e-unicode.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include <addressbook/backend/ebook/e-card.h>
-#include <addressbook/backend/ebook/e-card-simple.h>
-
-#define SCALE 5
-#define HYPHEN_PIXELS 20
-#define HYPHEN_PENALTY ( (SCALE) * (SCALE) * (HYPHEN_PIXELS) * (HYPHEN_PIXELS) )
-
-typedef struct _EContactPrintContext EContactPrintContext;
-
-struct _EContactPrintContext
-{
-	GnomePrintContext *pc;
-	GnomePrintMaster *master;
-	gdouble x;
-	gdouble y;
-	gint column;
-	EContactPrintStyle *style;
-	gboolean first_section;
-	gchar first_char_on_page;
-	gchar last_char_on_page;
-	GnomeFont *letter_heading_font;
-	GnomeFont *letter_tab_font;
-	char *character;
-	gboolean first_contact;
-
-	gboolean uses_book;
-	int type;
-	EBook *book;
-	gchar *query;
-
-	GList *cards;
-};
-
-static gint
-e_contact_divide_text(GnomePrintContext *pc, GnomeFont *font, double width, const gchar *text, GList **return_val /* Of type char[] */)
-{
-	if ( width == -1 || gnome_font_get_width_string(font, text) <= width ) {
-		if ( return_val ) {
-			*return_val = g_list_append(*return_val, g_strdup(text));
-		}
-		return 1;
-	} else {
-#if 1
-		int i, l;
-		double x = 0;
-		int lastend = 0;
-		int linestart = 0;
-		int firstword = 1;
-		int linecount = 0;
-		l = strlen(text);
-		for ( i = 0; i < l; i++ ) {
-			if ( text[i] == ' ' ) {
-				if ( (!firstword) && x + gnome_font_get_width_string_n(font, text + lastend, i - lastend) > width ) {
-					if (return_val) {
-						*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-					}
-					x = gnome_font_get_width_string(font, "    ");
-					linestart = lastend + 1;
-					x += gnome_font_get_width_string_n(font, text + linestart, i - linestart);
-					lastend = i;
-					linecount ++;
-				} else {
-					x += gnome_font_get_width_string_n(font, text + lastend, i - lastend);
-					lastend = i;
-				}
-				firstword = 0;
-			} else if ( text[i] == '\n' ) {
-				if ( (!firstword) && x + gnome_font_get_width_string_n(font, text + lastend, i - lastend) > width ) {
-					if (return_val) {
-						*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-					}
-					linestart = lastend + 1;
-					lastend = i;
-					linecount ++;
-				}
-				if (return_val) {
-					*return_val = g_list_append(*return_val, g_strndup(text + linestart, i - linestart));
-				}
-				linestart = i + 1;
-				lastend = i + 1;
-				linecount ++;
-				x = gnome_font_get_width_string(font, "    ");
-
-				firstword = 1;
-			}
-		}
-		if ( (!firstword) && x + gnome_font_get_width_string_n(font, text + lastend, i - lastend) > width ) {
-			if (return_val) {
-				*return_val = g_list_append(*return_val, g_strndup(text + linestart, lastend - linestart));
-			}
-			linestart = lastend + 1;
-			lastend = i;
-			linecount ++;
-		}
-		if (return_val) {
-			*return_val = g_list_append(*return_val, g_strndup(text + linestart, i - linestart));
-		}
-		linecount ++;
-		return(linecount);
-#else
-		HnjBreak *breaks;
-		gint *result;
-		gint *is;
-		gint n_breaks = 0, n_actual_breaks = 0;
-		gint i;
-		gint l;
-		gchar *hyphenation;
-		double x = - gnome_font_get_width_string(font, "    ") * SCALE;
-		HnjParams hnjparams;
-
-		hnjparams.set_width = width * SCALE + x;
-		hnjparams.max_neg_space = 0;
-		hnjparams.tab_width = 0;
-
-		l = strlen(text);
-	
-		/* find possible line breaks. */
-		for (i = 0; i < l; i++) {
-			if (text[i] == '-')
-				n_breaks++;
-			else if (text[i] == ' ')
-				n_breaks++;
-#if 0
- 			else if (hyphenation[i] & 1)
-				n_breaks++;
-#endif
-		}
-
-		breaks = g_new( HnjBreak, n_breaks + 1 );
-		result = g_new( gint, n_breaks + 1 );
-		is = g_new( gint, n_breaks + 1 );
-		n_breaks = 0;
-		/* find possible line breaks. */
-	
-		for (i = 0; i < l; i++) {
-			if ( text[i] == '-' ) {
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-				breaks[n_breaks].x0 = x;
-				breaks[n_breaks].x1 = x;
-				breaks[n_breaks].penalty = HYPHEN_PENALTY;
-				breaks[n_breaks].flags = HNJ_JUST_FLAG_ISHYPHEN;
-				is[n_breaks] = i + 1;
-				n_breaks++;
-			} else if ( text[i] == ' ' ) {
-				breaks[ n_breaks ].x0 = x;
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-				breaks[ n_breaks ].x1 = x;
-				breaks[ n_breaks ].penalty = 0;
-				breaks[ n_breaks ].flags = HNJ_JUST_FLAG_ISSPACE;
-				is[ n_breaks ] = i + 1;
-				n_breaks++;
-#if 0
-			} else if (word->hyphenation[i] & 1) {
-				breaks[n_breaks].x0 = x + gnome_font_get_width(font, '-') * SCALE;
-				breaks[n_breaks].x1 = x;
-				breaks[n_breaks].penalty = HYPHEN_PENALTY;
-				breaks[n_breaks].flags = HNJ_JUST_FLAG_ISHYPHEN;
-				is[n_breaks] = i + 1;
-				n_breaks++;
-#endif
-			} else
-				x += gnome_font_get_width(font, text[i]) * SCALE;
-
-		}
-		is[n_breaks] = i;
-		breaks[n_breaks].flags = 0;
-		n_breaks++;
-
-		/* Calculate optimal line breaks. */
-		n_actual_breaks = hnj_hs_just (breaks, n_breaks,
-					       &hnjparams, result);
-
-		if ( return_val ) {
-			gchar *next_val;
-			if ( breaks[result[0]].flags == HNJ_JUST_FLAG_ISHYPHEN && text[is[result[0]]] != '-' ) {
-				next_val = g_new(gchar, is[result[0]] + 2);
-				strncpy(next_val, text, is[result[0]]);
-				next_val[is[result[0]]] = 0;
-				strcat(next_val, "-");
-			} else {
-				next_val = g_new(gchar, is[result[0]] + 1);
-				strncpy(next_val, text, is[result[0]]);
-				next_val[is[result[0]]] = 0;
-			}
-			*return_val = g_list_append(*return_val, next_val);
-			
-			for ( i = 1; i < n_actual_breaks; i++ ) {
-				if ( (breaks[result[i]].flags & HNJ_JUST_FLAG_ISHYPHEN) && (text[is[result[i]]] != '-') ) {
-					next_val = g_new(gchar, is[result[i]] - is[result[i - 1]] + 2);
-					strncpy(next_val, text + is[result[i - 1]], is[result[i]] - is[result[i - 1]]);
-					next_val[is[result[i]] - is[result[i - 1]]] = 0;
-					strcat(next_val, "-");
-				} else {
-					next_val = g_new(gchar, is[result[i]] - is[result[i - 1]] + 1);
-					strncpy(next_val, text + is[result[i - 1]], is[result[i]] - is[result[i - 1]]);
-					next_val[is[result[i]] - is[result[i - 1]]] = 0;
-				}
-				*return_val = g_list_append(*return_val, next_val);
-			}
-		}
-		
-		g_free (breaks);
-		g_free (result);
-		g_free (is);
-		return n_actual_breaks;
-#endif
-	}
-}
-
-static void
-e_contact_output(GnomePrintContext *pc, GnomeFont *font, double x, double y, double width, const gchar *text)
-{
-	GList *list = NULL, *list_start;
-	int first_line = 1;
-	gnome_print_gsave(pc);
-	gnome_print_setfont(pc, font);
-	e_contact_divide_text(pc, font, width, text, &list);
-	for ( list_start = list; list; list = g_list_next(list)) {
-		y -= gnome_font_get_ascender(font);
-		gnome_print_moveto(pc, x, y);
-		gnome_print_show(pc, (char *)list->data);
-		y -= gnome_font_get_descender(font);
-		y -= .2 * gnome_font_get_size (font);
-		if ( first_line ) {
-			x += gnome_font_get_width_string(font, "    ");
-			first_line = 0;
-		}
-	}
-	g_list_foreach( list_start, (GFunc) g_free, NULL );
-	g_list_free( list_start );
-	gnome_print_grestore(pc);
-}
-
-static gdouble
-e_contact_text_height(GnomePrintContext *pc, GnomeFont *font, double width, gchar *text)
-{
-	int line_count = e_contact_divide_text(pc, font, width, text, NULL);
-	return line_count * (gnome_font_get_ascender(font) + gnome_font_get_descender(font)) +
-		(line_count - 1) * .2 * gnome_font_get_size (font);
-}
-
-#if 0
-static void
-e_contact_output_and_advance(EContactPrintContext *ctxt, GnomeFont *font, double x, double width, gchar *text)
-{
-	ctxt->y -= .1 * gnome_font_get_size (font);
-	e_contact_output(ctxt->pc, font, x, ctxt->y, width, text);
-	ctxt->y -= e_contact_text_height(ctxt->pc, font, width, text);
-	ctxt->y -= .1 * gnome_font_get_size (font);
-}
-#endif
-
-static void
-e_contact_rectangle(GnomePrintContext *pc, 
-		   gdouble x0,
-		   gdouble y0,
-		   gdouble x1,
-		   gdouble y1,
-		   gdouble r,
-		   gdouble g,
-		   gdouble b)
-{
-	gnome_print_gsave(pc);
-	gnome_print_setrgbcolor(pc, r, g, b);
-	gnome_print_moveto(pc, x0, y0);
-	gnome_print_lineto(pc, x1, y0);
-	gnome_print_lineto(pc, x1, y1);
-	gnome_print_lineto(pc, x0, y1);
-	gnome_print_lineto(pc, x0, y0);
-	gnome_print_fill(pc);
-	gnome_print_grestore(pc);
-}
-
-static double
-e_contact_get_letter_tab_width (EContactPrintContext *ctxt)
-{
-	return gnome_font_get_width_string(ctxt->letter_tab_font, "123") + 4 + 18;
-}
-
-static double
-e_contact_print_letter_tab (EContactPrintContext *ctxt)
-{
-	char character;
-	gdouble x, y;
-	gdouble page_width = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble tab_height, tab_width;
-	gdouble font_size;
-	tab_height = 72 * (ctxt->style->page_height - ctxt->style->top_margin - ctxt->style->bottom_margin) / 27.0;
-	font_size = tab_height / 2;
-	tab_width = e_contact_get_letter_tab_width(ctxt) - 18;
-	x = page_width + 72 * (ctxt->style->left_margin) - tab_width;
-	y = 72 * (ctxt->style->page_height - ctxt->style->top_margin);
-
-
-	gnome_print_gsave( ctxt->pc );
-	if ( ctxt->style->print_using_grey )
-		e_contact_rectangle( ctxt->pc, x, 72 * (ctxt->style->page_height - ctxt->style->top_margin), x + tab_width, ctxt->style->bottom_margin * 72, .85, .85, .85 );
-	for ( character = 'A' - 1; character <= 'Z'; character ++ ) {
-		char string[] = "123";
-		if ( character >= 'A' ) {
-			string[0] = tolower(character);
-			string[1] = 0;
-		}
-		if ( character >= ctxt->first_char_on_page && character <= ctxt->last_char_on_page ) {
-			e_contact_rectangle( ctxt->pc, x + 1, y - 1, x + tab_width - 1, y - (tab_height - 1), 0, 0, 0 );
-			gnome_print_setrgbcolor( ctxt->pc, 1, 1, 1 );
-			e_contact_output( ctxt->pc, ctxt->letter_tab_font, x + tab_width / 2 - gnome_font_get_width_string(ctxt->letter_tab_font, string) / 2, y - (tab_height - font_size) / 2, -1, string );
-		} else {
-			gnome_print_setrgbcolor( ctxt->pc, 0, 0, 0 );
-			e_contact_output( ctxt->pc, ctxt->letter_tab_font, x + tab_width / 2 - gnome_font_get_width_string(ctxt->letter_tab_font, string) / 2, y - (tab_height - font_size) / 2, -1, string );
-		}
-		y -= tab_height;
-	}
-	gnome_print_grestore( ctxt->pc );
-	return gnome_font_get_width_string(ctxt->style->body_font, "123") + gnome_font_get_size (ctxt->style->body_font) / 5;
-}
-
-static double
-e_contact_get_letter_heading_height (EContactPrintContext *ctxt)
-{
-	gdouble ascender, descender;
-	ascender = gnome_font_get_ascender(ctxt->letter_heading_font);
-	descender = gnome_font_get_descender(ctxt->letter_heading_font);
-	return ascender + descender + 9;
-}
-
-static void
-e_contact_print_letter_heading (EContactPrintContext *ctxt, gchar *character)
-{
-	gdouble ascender, descender;
-	gdouble width;
-
-	width = gnome_font_get_width_string(ctxt->letter_heading_font, "m") * 1.7;
-	ascender = gnome_font_get_ascender(ctxt->letter_heading_font);
-	descender = gnome_font_get_descender(ctxt->letter_heading_font);
-	gnome_print_gsave( ctxt->pc );
-	e_contact_rectangle( ctxt->pc, ctxt->x, ctxt->y, ctxt->x + width, ctxt->y - (ascender + descender + 6), 0, 0, 0);
-	gnome_print_setrgbcolor(ctxt->pc, 1, 1, 1);
-	ctxt->y -= 4;
-	e_contact_output(ctxt->pc, ctxt->letter_heading_font, ctxt->x + (width - gnome_font_get_width_string(ctxt->letter_heading_font, character))/ 2, ctxt->y, -1, character);
-	ctxt->y -= ascender + descender;
-	ctxt->y -= 2;
-	ctxt->y -= 3;
-	gnome_print_grestore( ctxt->pc );
-}
-
-static void
-e_contact_start_new_page(EContactPrintContext *ctxt)
-{
-	ctxt->x = ctxt->style->left_margin * 72;
-	ctxt->y = (ctxt->style->page_height - ctxt->style->top_margin) * 72;
-	ctxt->column = 0;
-	if ( ctxt->style->letter_tabs )
-		e_contact_print_letter_tab(ctxt);
-	gnome_print_showpage(ctxt->pc);
-
-	ctxt->first_char_on_page = ctxt->last_char_on_page + 1;
-}
-
-static double
-e_contact_get_card_size(ECardSimple *simple, EContactPrintContext *ctxt)
-{
-	gdouble height = 0;
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	char *file_as;
-	gint field;
-	if ( ctxt->style->letter_tabs )
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	gtk_object_get(GTK_OBJECT(simple->card),
-		       "file_as", &file_as,
-		       NULL);
-	height += e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as);
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-	
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {
-		char *string;
-		string = e_card_simple_get(simple, field);
-		if (string && *string) {
-			double xoff = 0;
-			xoff += gnome_font_get_width_string(ctxt->style->body_font, e_card_simple_get_name(simple, field));
-			xoff += gnome_font_get_width_string(ctxt->style->body_font, ":  ");
-			height += e_contact_text_height(ctxt->pc, ctxt->style->body_font, column_width - xoff, string);
-			height += .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-		g_free(string);
-	}
-	height += gnome_font_get_size (ctxt->style->headings_font) * .4;
-	return height;
-}
-
-
-static void
-e_contact_print_card (ECardSimple *simple, EContactPrintContext *ctxt)
-{
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	char *file_as;
-	int field;
-
-	if ( ctxt->style->letter_tabs )
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-
-	gnome_print_gsave(ctxt->pc);
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	gtk_object_get(GTK_OBJECT(simple->card),
-		       "file_as", &file_as,
-		       NULL);
-	if (ctxt->style->print_using_grey)
-		e_contact_rectangle(ctxt->pc, ctxt->x, ctxt->y + gnome_font_get_size (ctxt->style->headings_font) * .3, ctxt->x + column_width, ctxt->y - e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as) - gnome_font_get_size (ctxt->style->headings_font) * .3, .85, .85, .85);
-	e_contact_output(ctxt->pc, ctxt->style->headings_font, ctxt->x + 2, ctxt->y, column_width - 4, file_as);
-	ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->headings_font, column_width - 4, file_as);
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-	
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {
-		char *string;
-		string = e_card_simple_get(simple, field);
-		if (string && *string) {
-			double xoff = 0;
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, e_card_simple_get_name(simple, field));
-			xoff += gnome_font_get_width_string(ctxt->style->body_font, e_card_simple_get_name(simple, field));
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, ":  ");
-			xoff += gnome_font_get_width_string(ctxt->style->body_font, ":  ");
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, column_width - xoff, string);
-			ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->body_font, column_width - xoff, string);
-			ctxt->y -= .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-		g_free(string);
-	}
-	
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .4;
-	gnome_print_grestore(ctxt->pc);
-}
-
-static void
-e_contact_start_new_column (EContactPrintContext *ctxt)
-{
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_offset;
-	if ( ctxt->style->letter_tabs ) 
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_offset = (page_width + 18) / ctxt->style->num_columns;
-	ctxt->column ++;
-	if (ctxt->column >= ctxt->style->num_columns) {
-		e_contact_start_new_page(ctxt);
-		ctxt->column = 0;
-	}
-	ctxt->x = (72 * ctxt->style->left_margin) + column_offset * ctxt->column;
-	ctxt->y = 72 * (ctxt->style->page_height - ctxt->style->top_margin);
-}
-
-static void
-complete_sequence(EBookView *book_view, EContactPrintContext *ctxt)
-{
-	GList *cards = ctxt->cards;
-
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-
-	ctxt->first_contact = TRUE;
-	ctxt->character = NULL;
-	ctxt->y = (ctxt->style->page_height - ctxt->style->top_margin) * 72;
-	ctxt->x = (ctxt->style->left_margin) * 72;
-	if ( ctxt->style->letter_tabs ) 
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	
-	ctxt->first_char_on_page = 'A' - 1;
-
-	for(; cards; cards = cards->next) {
-		ECard *card = cards->data;
-		ECardSimple *simple = e_card_simple_new(card);
-		gchar *file_as;
-
-		gtk_object_get(GTK_OBJECT(card),
-			       "file_as", &file_as,
-			       NULL);
-		if ( file_as && (!ctxt->character || *ctxt->character != tolower(*file_as)) ) {
-			if (ctxt->style->sections_start_new_page && ! ctxt->first_contact) {
-				e_contact_start_new_page(ctxt);
-			}
-			else if ((!ctxt->first_contact) && (ctxt->y - e_contact_get_letter_heading_height(ctxt) - e_contact_get_card_size(simple, ctxt) < ctxt->style->bottom_margin * 72))
-				e_contact_start_new_column(ctxt);
-			if (!ctxt->character)
-				ctxt->character = g_strdup(" ");
-			*ctxt->character = tolower(*file_as);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, ctxt->character);
-			ctxt->first_section = FALSE;
-		} 
-		else if ( (!ctxt->first_contact) && (ctxt->y - e_contact_get_card_size(simple, ctxt) < ctxt->style->bottom_margin * 72)) {
-			e_contact_start_new_column(ctxt);
-			if ( ctxt->style->letter_headings )
-				e_contact_print_letter_heading(ctxt, ctxt->character);
-		}
-		ctxt->last_char_on_page = toupper(*file_as);
-		if ( ctxt->last_char_on_page < ctxt->first_char_on_page )
-			ctxt->first_char_on_page = ctxt->last_char_on_page;
-		e_contact_print_card(simple, ctxt);
-		ctxt->first_contact = FALSE;
-		gtk_object_unref(GTK_OBJECT(simple));
-	}
-	ctxt->last_char_on_page = 'Z';
-	if ( ctxt->style->letter_tabs )
-		e_contact_print_letter_tab(ctxt);
-	gnome_print_showpage(ctxt->pc);
-	gnome_print_context_close(ctxt->pc);
-	g_free(ctxt->character);
-	if (book_view)
-		gtk_object_unref(GTK_OBJECT(book_view));
-	if (ctxt->type == GNOME_PRINT_PREVIEW) {
-		GtkWidget *preview;
-		preview = GTK_WIDGET(gnome_print_master_preview_new(ctxt->master, "Print Preview"));
-		gtk_widget_show_all(preview);
-	} else {
-		gnome_print_master_print(ctxt->master);
-	}
-	gtk_object_unref(GTK_OBJECT(ctxt->pc));
-	gtk_object_unref(GTK_OBJECT(ctxt->master));
-	if (ctxt->book)
-		gtk_object_unref(GTK_OBJECT(ctxt->book));
-	g_free(ctxt->query);
-	g_list_foreach(ctxt->cards, (GFunc) gtk_object_unref, NULL);
-	g_list_free(ctxt->cards);
-	gtk_object_unref(GTK_OBJECT(ctxt->style->headings_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->style->body_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->style->header_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->style->footer_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->letter_heading_font));
-	gtk_object_unref(GTK_OBJECT(ctxt->letter_tab_font));
-	g_free(ctxt->style);
-	g_free(ctxt);
-}
-
-static int
-card_compare (ECard *card1, ECard *card2) {
-	if (card1 && card2) {
-		char *file_as1, *file_as2;
-		gtk_object_get(GTK_OBJECT(card1),
-			       "file_as", &file_as1,
-			       NULL);
-		gtk_object_get(GTK_OBJECT(card2),
-			       "file_as", &file_as2,
-			       NULL);
-		if (file_as1 && file_as2)
-			return strcasecmp(file_as1, file_as2);
-		if (file_as1)
-			return -1;
-		if (file_as2)
-			return 1;
-		return strcmp(e_card_get_id(card1), e_card_get_id(card2));
-	} else {
-		return 0;
-	}
-}
-
-static void
-create_card(EBookView *book_view, const GList *cards, EContactPrintContext *ctxt)
-{
-	for(; cards; cards = cards->next) {
-		ECard *card = cards->data;
-		gtk_object_ref(GTK_OBJECT(card));
-		ctxt->cards = g_list_insert_sorted(ctxt->cards, card, (GCompareFunc) card_compare);
-	}
-}
-
-static void
-book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, EContactPrintContext *ctxt)
-{
-	gtk_object_ref(GTK_OBJECT(book_view));
-
-	gtk_signal_connect(GTK_OBJECT(book_view),
-			   "card_added",
-			   GTK_SIGNAL_FUNC(create_card),
-			   ctxt);
-
-	gtk_signal_connect(GTK_OBJECT(book_view),
-			   "sequence_complete",
-			   GTK_SIGNAL_FUNC(complete_sequence),
-			   ctxt);
-}
-
-static void
-e_contact_do_print_cards (EBook *book, char *query, EContactPrintContext *ctxt)
-{
-	e_book_get_book_view(book, query, (EBookBookViewCallback) book_view_loaded, ctxt);
-}
-
-#if 0
-static double
-e_contact_get_phone_list_size(ECardSimple *simple, EContactPrintContext *ctxt)
-{
-	double height = 0;
-	int field;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	height += gnome_font_get_size (ctxt->style->headings_font) * .2;
-	
-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {
-		char *string;
-		string = e_card_simple_get(simple, field);
-		if (string && *string) {
-			if ( 1 ) /* field is a phone field. */ {
-				gchar *field = string;
-				height += e_contact_text_height(ctxt->pc, ctxt->style->body_font, 100, field);
-				height += .2 * gnome_font_get_size (ctxt->style->body_font);
-			}
-		}
-		g_free(string);
-	}
-	height += gnome_font_get_size (ctxt->style->headings_font) * .4;
-	return height;
-}
-
-
-static void
-e_contact_print_phone_list (ECard *card, EContactPrintContext *ctxt)
-{
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	double xoff, dotwidth;
-	int dotcount;
-	char *dots;
-	int i;
-	char *file_as;
-	if ( ctxt->style->letter_tabs )
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-
-	gnome_print_gsave(ctxt->pc);
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .2;
-
-	e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x, ctxt->y, -1, e_card_get_string_fileas(card));
-	
-	xoff = column_width - 9 * gnome_font_get_size (ctxt->style->body_font);
-	dotwidth = xoff - 
-		gnome_font_get_width_string(ctxt->style->body_font, e_card_get_string_fileas(card)) - 
-		gnome_font_get_width_string(ctxt->style->body_font, " ");
-	dotcount = dotwidth / gnome_font_get_width(ctxt->style->body_font, '.');
-	dots = g_new(gchar, dotcount + 1);
-	for (i = 0; i < dotcount; i++)
-		dots[i] = '.';
-	dots[dotcount] = 0;
-	e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff - dotcount * gnome_font_get_width(ctxt->style->body_font, '.'), ctxt->y, -1, dots);
-	g_free(dots);
-		
-	for(; shown_fields; shown_fields = g_list_next(shown_fields)) {
-		if ( 1 ) /* field is a phone field. */ {
-			gchar *field = e_card_get_string(card, shown_fields->data);
-			e_contact_output(ctxt->pc, ctxt->style->body_font, ctxt->x + xoff, ctxt->y, -1, shown_fields->data);
-			e_contact_output(ctxt->pc, ctxt->style->body_font, 
-					 ctxt->x + column_width - gnome_font_get_width_string(ctxt->style->body_font, 
-											      field),
-					 ctxt->y,
-					 -1,
-					 field);
-			ctxt->y -= e_contact_text_height(ctxt->pc, ctxt->style->body_font, 100, field);
-			ctxt->y -= .2 * gnome_font_get_size (ctxt->style->body_font);
-		}
-	}
-	ctxt->y -= gnome_font_get_size (ctxt->style->headings_font) * .4;
-	gnome_print_grestore(ctxt->pc);
-}
-
-static void
-e_contact_do_print_phone_list (EBook *book, char *query, EContactPrintContext *ctxt)
-{
-	ECard *card = NULL;
-	int i;
-	gdouble page_width  = 72 * (ctxt->style->page_width - ctxt->style->left_margin - ctxt->style->right_margin);
-	gdouble column_width;
-	ctxt->first_contact = TRUE;
-	ctxt->character = NULL;
-	ctxt->y = (ctxt->style->page_height - ctxt->style->top_margin) * 72;
-	ctxt->x = (ctxt->style->left_margin) * 72;
-	if ( ctxt->style->letter_tabs ) 
-		page_width -= e_contact_get_letter_tab_width(ctxt);
-	
-	ctxt->first_char_on_page = 'A' - 1;
-
-	column_width = (page_width + 18) / ctxt->style->num_columns - 18;
-	/*
-	for(card = e_book_get_first(book); card; card = e_book_get_next(book)) {
-	*/
-	for (i=0; i < 30; i++) {
-		gchar *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(*data);
-}
-
-static gboolean get_bool( char *data )
-{
-	if ( data ) {
-		lowify ( data );
-		return ! strcmp(data, "true");
-	} else
-		return FALSE;
-}
-
-static void get_string( char *data, char **variable )
-{
-	g_free ( *variable );
-	if ( data )
-		*variable = g_strdup( data );
-	else
-		*variable = g_strdup( "" );
-}
-
-static int get_integer( char *data )
-{
-	if ( data )
-		return atoi(data);
-	else 
-		return 0;
-}
-
-static double get_float( char *data )
-{
-	if ( data )
-		return atof(data);
-	else 
-		return 0;
-}
-
-static void get_font( char *data, GnomeFont **variable )
-{
-	if ( data ) {
-		GnomeFont *font = gnome_font_new_from_full_name( data );
-		if ( font ) {
-			gtk_object_unref( GTK_OBJECT(*variable) );
-			*variable = font;
-		}
-	}
-}
-
-
-static void
-e_contact_build_style(EContactPrintStyle *style)
-{
-	xmlDocPtr styledoc;
-	gchar *filename;
-	style->title = g_strdup("");
-	style->type = E_CONTACT_PRINT_TYPE_CARDS;
-	style->sections_start_new_page = TRUE;
-	style->num_columns = 2;
-	style->blank_forms = 2;
-	style->letter_tabs = TRUE;
-	style->letter_headings = FALSE;
-	style->headings_font = gnome_font_new("Helvetica-Bold", 8);
-	style->body_font = gnome_font_new("Helvetica", 6);
-	style->print_using_grey = TRUE;
-	style->paper_type = 0;
-	style->paper_width = 8.5;
-	style->paper_height = 11;
-	style->paper_source = 0;
-	style->top_margin = .5;
-	style->left_margin = .5;
-	style->bottom_margin = .5;
-	style->right_margin = .5;
-	style->page_size = 0;
-	style->page_width = 2.75;
-	style->page_height = 4.25;
-#if 0
-	style->page_width = 4.25;
-	style->page_height = 5.5;
-#endif
-#if 0
-	style->page_width = 5.5;
-	style->page_height = 8.5;
-#endif
-	style->orientation_portrait = FALSE;
-	style->header_font = gnome_font_new("Helvetica", 6);
-	style->left_header = g_strdup("");
-	style->center_header = g_strdup("");
-	style->right_header = g_strdup("");
-	style->footer_font = gnome_font_new("Helvetica", 6);
-	style->left_footer = g_strdup("");
-	style->center_footer = g_strdup("");
-	style->right_footer = g_strdup("");
-	style->reverse_on_even_pages = FALSE;
-	filename = g_concat_dir_and_file(EVOLUTION_ECPSDIR, "medbook.ecps");
-	styledoc = xmlParseFile(filename);
-	g_free(filename);
-	if (styledoc) {
-		xmlNodePtr stylenode = xmlDocGetRootElement(styledoc);
-		xmlNodePtr node;
-		for (node = stylenode->childs; node; node = node->next) {
-			char *data = xmlNodeGetContent ( node );
-			if ( !strcmp( node->name, "title" ) ) {
-				get_string(data, &(style->title));
-			} else if ( !strcmp( node->name, "type" ) ) {
-				lowify( data );
-				if ( !strcmp( data, "cards" ) )
-					style->type = E_CONTACT_PRINT_TYPE_CARDS;
-				else if ( !strcmp( data, "memo_style" ) )
-					style->type = E_CONTACT_PRINT_TYPE_MEMO_STYLE;
-				else if ( !strcmp( data, "phone_list" ) )
-					style->type = E_CONTACT_PRINT_TYPE_PHONE_LIST;
-			} else if ( !strcmp( node->name, "sections_start_new_page" ) ) {
-				style->sections_start_new_page = get_bool(data);
-			} else if ( !strcmp( node->name, "num_columns" ) ) {
-				style->num_columns = get_integer(data);
-			} else if ( !strcmp( node->name, "blank_forms" ) ) {
-				style->blank_forms = get_integer(data);
-			} else if ( !strcmp( node->name, "letter_tabs" ) ) {
-				style->letter_tabs = get_bool(data);
-			} else if ( !strcmp( node->name, "letter_headings" ) ) {
-				style->letter_headings = get_bool(data);
-			} else if ( !strcmp( node->name, "headings_font" ) ) {
-				get_font( data, &(style->headings_font) );
-			} else if ( !strcmp( node->name, "body_font" ) ) {
-				get_font( data, &(style->body_font) );
-			} else if ( !strcmp( node->name, "print_using_grey" ) ) {
-				style->print_using_grey = get_bool(data);
-			} else if ( !strcmp( node->name, "paper_width" ) ) {
-				style->paper_width = get_float(data);
-			} else if ( !strcmp( node->name, "paper_height" ) ) {
-				style->paper_height = get_float(data);
-			} else if ( !strcmp( node->name, "top_margin" ) ) {
-				style->top_margin = get_float(data);
-			} else if ( !strcmp( node->name, "left_margin" ) ) {
-				style->left_margin = get_float(data);
-			} else if ( !strcmp( node->name, "bottom_margin" ) ) {
-				style->bottom_margin = get_float(data);
-			} else if ( !strcmp( node->name, "right_margin" ) ) {
-				style->right_margin = get_float(data);
-			} else if ( !strcmp( node->name, "page_width" ) ) {
-				style->page_width = get_float(data);
-			} else if ( !strcmp( node->name, "page_height" ) ) {
-				style->page_height = get_float(data);
-			} else if ( !strcmp( node->name, "orientation" ) ) {
-				if ( data ) {
-					lowify(data);
-					style->orientation_portrait = strcmp(data, "landscape");
-				} else {
-					style->orientation_portrait = TRUE;
-				}
-			} else if ( !strcmp( node->name, "header_font" ) ) {
-				get_font( data, &(style->header_font) );
-			} else if ( !strcmp( node->name, "left_header" ) ) {
-				get_string(data, &(style->left_header));
-			} else if ( !strcmp( node->name, "center_header" ) ) {
-				get_string(data, &(style->center_header));
-			} else if ( !strcmp( node->name, "right_header" ) ) {
-				get_string(data, &(style->right_header));
-			} else if ( !strcmp( node->name, "footer_font" ) ) {
-				get_font( data, &(style->footer_font) );
-			} else if ( !strcmp( node->name, "left_footer" ) ) {
-				get_string(data, &(style->left_footer));
-			} else if ( !strcmp( node->name, "center_footer" ) ) {
-				get_string(data, &(style->center_footer));
-			} else if ( !strcmp( node->name, "right_footer" ) ) {
-				get_string(data, &(style->right_footer));
-			} else if ( !strcmp( node->name, "reverse_on_even_pages" ) ) {
-				style->reverse_on_even_pages = get_bool(data);
-			}
-			if ( data )
-				xmlFree (data);
-		}
-		xmlFreeDoc(styledoc);
-	}
-}
-
-static gint
-e_contact_print_close(GnomeDialog *dialog, gpointer data)
-{
-	return FALSE;
-}
-
-static void
-e_contact_print_button(GnomeDialog *dialog, gint button, gpointer data)
-{
-	EContactPrintContext *ctxt = g_new(EContactPrintContext, 1);
-	EContactPrintStyle *style = g_new(EContactPrintStyle, 1);
-	GnomePrintMaster *master;
-	GnomePrintContext *pc;
-	gboolean uses_book = (gint) gtk_object_get_data(GTK_OBJECT(dialog), "uses_book");
-	EBook *book = NULL;
-	char *query = NULL;
-	ECard *card = NULL;
-	gdouble font_size;
-	if (uses_book) {
-		book = gtk_object_get_data(GTK_OBJECT(dialog), "book");
-		query = gtk_object_get_data(GTK_OBJECT(dialog), "query");
-	} else {
-		card = gtk_object_get_data(GTK_OBJECT(dialog), "card");
-	}
-	switch( button ) {
-	case GNOME_PRINT_PRINT:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-		e_contact_build_style(style);
-		
-		ctxt->x = 0;
-		ctxt->y = 0;
-		ctxt->column = 0;
-		ctxt->style = style;
-		ctxt->master = master;
-		ctxt->first_section = TRUE;
-		ctxt->first_char_on_page = 'A' - 1;
-		ctxt->type = GNOME_PRINT_PRINT;
-
-		font_size = 72 * ctxt->style->page_height / 27.0 / 2.0;
-		ctxt->letter_heading_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), gnome_font_get_size (ctxt->style->headings_font) * 1.5);
-		ctxt->letter_tab_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), font_size);
-	
-		ctxt->pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, 
-										   72 * style->paper_width, 
-										   72 * style->paper_height,
-										   72 * style->page_width,
-										   72 * style->page_height));
-		
-		ctxt->book = book;
-		ctxt->query = query;
-		if (uses_book) {
-			ctxt->cards = NULL;
-			e_contact_do_print(book, ctxt->query, ctxt);
-		} else {
-			ctxt->cards = g_list_append(NULL, card);
-			complete_sequence(NULL, ctxt);
-		}
-		gnome_dialog_close(dialog);
-		break;
-	case GNOME_PRINT_PREVIEW:
-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );
-		pc = gnome_print_master_get_context( master );
-		e_contact_build_style(style);
-		
-		ctxt->x = 0;
-		ctxt->y = 0;
-		ctxt->column = 0;
-		ctxt->style = style;
-		ctxt->master = master;
-		ctxt->first_section = TRUE;
-		ctxt->first_char_on_page = 'A' - 1;
-		ctxt->type = GNOME_PRINT_PREVIEW;
-
-		font_size = 72 * ctxt->style->page_height / 27.0 / 2.0;
-		ctxt->letter_heading_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), gnome_font_get_size (ctxt->style->headings_font) * 1.5);
-		ctxt->letter_tab_font = gnome_font_new(gnome_font_get_name(ctxt->style->headings_font), font_size);
-		
-		ctxt->pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, 
-										   72 * style->paper_width, 
-										   72 * style->paper_height,
-										   72 * style->page_width,
-										   72 * style->page_height));
-		
-		ctxt->book = book;
-		ctxt->query = g_strdup(query);
-		if (uses_book) {
-			ctxt->cards = NULL;
-			gtk_object_ref(GTK_OBJECT(book));
-			e_contact_do_print(book, ctxt->query, ctxt);
-		} else {
-			ctxt->cards = g_list_append(NULL, card);
-			gtk_object_ref(GTK_OBJECT(card));
-			complete_sequence(NULL, ctxt);
-		}
-		break;
-	case GNOME_PRINT_CANCEL:
-		if (uses_book)
-			gtk_object_unref(GTK_OBJECT(book));
-		else
-			gtk_object_unref(GTK_OBJECT(card));
-		g_free(query);
-		gnome_dialog_close(dialog);
-		g_free(style);
-		g_free(ctxt);
-		break;
-	}
-}
-
-GtkWidget *
-e_contact_print_dialog_new(EBook *book, char *query)
-{
-	GtkWidget *dialog;
-	
-	
-	dialog = gnome_print_dialog_new("Print cards", GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);
-	gnome_print_dialog_construct_range_any(GNOME_PRINT_DIALOG(dialog), GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_SELECTION,
-					       NULL, NULL, NULL);
-
-	gtk_object_ref(GTK_OBJECT(book));
-	gtk_object_set_data(GTK_OBJECT(dialog), "uses_book", (void *) 1);
-	gtk_object_set_data(GTK_OBJECT(dialog), "book", book);
-	gtk_object_set_data(GTK_OBJECT(dialog), "query", g_strdup(query));
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "close", GTK_SIGNAL_FUNC(e_contact_print_close), NULL);
-	return dialog;
-}
-
-GtkWidget *
-e_contact_print_card_dialog_new(ECard *card)
-{
-	GtkWidget *dialog;
-	
-	dialog = gnome_print_dialog_new("Print card", GNOME_PRINT_DIALOG_COPIES);
-
-	card = e_card_duplicate(card);
-	gtk_object_set_data(GTK_OBJECT(dialog), "card", card);
-	gtk_object_set_data(GTK_OBJECT(dialog), "uses_book", (void *) 0);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);
-	gtk_signal_connect(GTK_OBJECT(dialog),
-			   "close", GTK_SIGNAL_FUNC(e_contact_print_close), NULL);
-	return dialog;
-}
diff --git a/addressbook/printing/e-contact-print.glade b/addressbook/printing/e-contact-print.glade
deleted file mode 100644
index be24c9fc60..0000000000
--- a/addressbook/printing/e-contact-print.glade
+++ /dev/null
@@ -1,2009 +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>
-  <use_widget_names>False</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>True</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>e-contact-print.glade.h</translatable_strings_file>
-</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>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>Font...</label>
-		    </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>
-		    </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>Font...</label>
-	      </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>
-	      </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>
-      <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>
-</widget>
-
-</GTK-Interface>
diff --git a/addressbook/printing/e-contact-print.glade.h b/addressbook/printing/e-contact-print.glade.h
deleted file mode 100644
index b3b03d6d68..0000000000
--- a/addressbook/printing/e-contact-print.glade.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Page Setup:");
-gchar *s = N_("Style name:");
-gchar *s = N_("Preview:");
-gchar *s = N_("Options");
-gchar *s = N_("Include:");
-gchar *s = N_("Sections:");
-gchar *s = N_("Immediately follow each other");
-gchar *s = N_("Letter tabs on side");
-gchar *s = N_("Headings for each letter");
-gchar *s = N_("Start on a new page");
-gchar *s = N_("Number of columns:");
-gchar *s = N_("Blank forms at end:");
-gchar *s = N_("Fonts");
-gchar *s = N_("Font...");
-gchar *s = N_("Font...");
-gchar *s = N_("Headings");
-gchar *s = N_("10 pt. Tahoma");
-gchar *s = N_("Body");
-gchar *s = N_("8 pt. Tahoma");
-gchar *s = N_("Shading");
-gchar *s = N_("Print using gray shading");
-gchar *s = N_("Format");
-gchar *s = N_("Paper");
-gchar *s = N_("Type:");
-gchar *s = N_("label26");
-gchar *s = N_("Dimensions:");
-gchar *s = N_("Width:");
-gchar *s = N_("Height:");
-gchar *s = N_("Paper source:");
-gchar *s = N_("Margins");
-gchar *s = N_("Top:");
-gchar *s = N_("Bottom:");
-gchar *s = N_("Left:");
-gchar *s = N_("Right:");
-gchar *s = N_("Page");
-gchar *s = N_("Size:");
-gchar *s = N_("label26");
-gchar *s = N_("Dimensions:");
-gchar *s = N_("Width:");
-gchar *s = N_("Height:");
-gchar *s = N_("Orientation");
-gchar *s = N_("Portrait");
-gchar *s = N_("Landscape");
-gchar *s = N_("Paper");
-gchar *s = N_("Font...");
-gchar *s = N_("Header");
-gchar *s = N_("Footer:");
-gchar *s = N_("Font...");
-gchar *s = N_("Reverse on even pages");
-gchar *s = N_("Header/Footer");
diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h
deleted file mode 100644
index fb17271f6b..0000000000
--- a/addressbook/printing/e-contact-print.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * e-contact-print.h
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef E_CONTACT_PRINT_H
-#define E_CONTACT_PRINT_H
-
-#include <gnome.h>
-#include <addressbook/backend/ebook/e-book.h>
-#include "e-contact-print-types.h"
-
-GtkWidget *e_contact_print_dialog_new(EBook *book, char *query);
-GtkWidget *e_contact_print_card_dialog_new(ECard *card);
-
-#endif /* E_CONTACT_PRINT_H */
diff --git a/addressbook/printing/medbook.ecps b/addressbook/printing/medbook.ecps
deleted file mode 100644
index 72cca146dd..0000000000
--- a/addressbook/printing/medbook.ecps
+++ /dev/null
@@ -1,30 +0,0 @@
-<style>
-<title/>
-<type>cards</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>2</num_columns>
-<blank_forms>2</blank_forms>
-<letter_tabs>TRUE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica-Bold 12</headings_font>
-<body_font>Helvetica 8</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>8.5</page_width>
-<page_height>11</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 8</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 8</footer_font>
-<left_footer/>
-<center_footer>[Page #]</center_footer>
-<right_footer/>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/phonelist.ecps b/addressbook/printing/phonelist.ecps
deleted file mode 100644
index 53ca294d36..0000000000
--- a/addressbook/printing/phonelist.ecps
+++ /dev/null
@@ -1,29 +0,0 @@
-<style>
-<title/>
-<type>phone_list</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>2</num_columns>
-<letter_tabs>FALSE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica-Bold 10</headings_font>
-<body_font>Helvetica 8</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>8.5</page_width>
-<page_height>11</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 8</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 8</footer_font>
-<left_footer>[User Name]</left_footer>
-<center_footer>[Page #]</center_footer>
-<right_footer>[Date Printed]</right_footer>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/smallbook.ecps b/addressbook/printing/smallbook.ecps
deleted file mode 100644
index 5844851bfb..0000000000
--- a/addressbook/printing/smallbook.ecps
+++ /dev/null
@@ -1,30 +0,0 @@
-<style>
-<title/>
-<type>cards</type>
-<sections_start_new_page>FALSE</sections_start_new_page>
-<num_columns>1</num_columns>
-<blank_forms>2</blank_forms>
-<letter_tabs>TRUE</letter_tabs>
-<letter_headings>TRUE</letter_headings>
-<headings_font>Helvetica-Bold 8</headings_font>
-<body_font>Helvetica 6</body_font>
-<print_using_grey>TRUE</print_using_grey>
-<paper_width>8.5</paper_width>
-<paper_height>11</paper_height>
-<top_margin>0.5</top_margin>
-<left_margin>0.5</left_margin>
-<bottom_margin>0.5</bottom_margin>
-<right_margin>0.5</right_margin>
-<page_width>2.75</page_width>
-<page_height>4.25</page_height>
-<orientation>portrait</orientation>
-<header_font>Helvetica 6</header_font>
-<left_header/>
-<center_header/>
-<right_header/>
-<footer_font>Helvetica 6</footer_font>
-<left_footer/>
-<center_footer>[Page #]</center_footer>
-<right_footer/>
-<reverse_on_even_pages>FALSE</reverse_on_even_pages>
-</style>
diff --git a/addressbook/printing/test-contact-print-style-editor.c b/addressbook/printing/test-contact-print-style-editor.c
deleted file mode 100644
index d4dccc0b87..0000000000
--- a/addressbook/printing/test-contact-print-style-editor.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * test-contact-print-style-editor.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <gnome.h>
-#include "e-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, Helix Code, 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 1b73fda3da..0000000000
--- a/addressbook/printing/test-print.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * test-print.c
- * Copyright (C) 2000  Helix Code, Inc.
- * Author: Chris Lahey <clahey@helixcode.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include <gnome.h>
-#include <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, Helix Code, 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/Makefile.am b/art/Makefile.am
deleted file mode 100644
index 5168740740..0000000000
--- a/art/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-imagesdir = $(datadir)/images/evolution
-
-images_DATA = \
-	briefcase.png       		\
-	cellphone.png       		\
-	envelope.png        		\
-	evolution-calendar-mini.png 	\
-	evolution-calendar.png 		\
-	evolution-contacts-mini.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.png 		\
-	globe.png           		\
-	house.png           		\
-	malehead.png			\
-	splash.png
-
-buttonsdir = $(datadir)/images/evolution/buttons
-buttons_DATA = 				\
-	compose-message.png		\
-	copy-message.png		\
-	fetch-mail.png			\
-	forward.png			\
-	move-message.png		\
-	reply-to-all.png		\
-	reply.png
-
-EXTRA_DIST = \
-	attachment.xpm \
-	compose-message.png \
-	copy-message.png \
-	empty.xpm \
-	fetch-mail.png \
-	forward.png \
-	mail-new.xpm \
-	mail-read.xpm \
-	mail-replied.xpm \
-	mark.xpm \
-	meeting.xpm \
-	move-message.png \
-	priority-high.xpm \
-	priority-low.xpm \
-	reply.png \
-	reply-to-all.png \
-	tree-expanded.xpm \
-	tree-unexpanded.xpm \
-	score-lowest.xpm \
-	score-lower.xpm \
-	score-low.xpm \
-	score-normal.xpm \
-	score-high.xpm \
-	score-higher.xpm \
-	score-highest.xpm \
-	$(images_DATA)
diff --git a/art/add-attachment.png b/art/add-attachment.png
deleted file mode 100644
index 024b203fe0..0000000000
--- a/art/add-attachment.png
+++ /dev/null
diff --git a/art/add-service.png b/art/add-service.png
deleted file mode 100644
index 62ddebe678..0000000000
--- a/art/add-service.png
+++ /dev/null
diff --git a/art/attachment.xpm b/art/attachment.xpm
deleted file mode 100644
index 1bcc0386d2..0000000000
--- a/art/attachment.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * attachment_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #000000",
-"                ",
-"                ",
-"     ...        ",
-"    .   . .     ",
-"    . . . .     ",
-"    . . . .     ",
-"    . . . .     ",
-"    . . . .     ",
-"    . . . .     ",
-"    . . . .     ",
-"    . . . .     ",
-"    .  .  .     ",
-"    .     .     ",
-"     .   .      ",
-"      ...       ",
-"                "};
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/cellphone.png b/art/cellphone.png
deleted file mode 100644
index c8d70ae663..0000000000
--- a/art/cellphone.png
+++ /dev/null
diff --git a/art/compose-message.png b/art/compose-message.png
deleted file mode 100644
index 2b0b97c791..0000000000
--- a/art/compose-message.png
+++ /dev/null
diff --git a/art/copy-message.png b/art/copy-message.png
deleted file mode 100644
index bd7c71d0a1..0000000000
--- a/art/copy-message.png
+++ /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/envelope.png b/art/envelope.png
deleted file mode 100644
index 77acd63100..0000000000
--- a/art/envelope.png
+++ /dev/null
diff --git a/art/evolution-calendar-mini.png b/art/evolution-calendar-mini.png
deleted file mode 100644
index 5386190d96..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 685812c137..0000000000
--- a/art/evolution-contacts-mini.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 3b0f90b292..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 0878645f9f..0000000000
--- a/art/evolution-tasks.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/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/forward.png b/art/forward.png
deleted file mode 100644
index 45ac85807b..0000000000
--- a/art/forward.png
+++ /dev/null
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/house.png b/art/house.png
deleted file mode 100644
index df43ec6181..0000000000
--- a/art/house.png
+++ /dev/null
diff --git a/art/mail-new.xpm b/art/mail-new.xpm
deleted file mode 100644
index dee13fb6b3..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 81bcdf8fd3..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 9b398da7e0..0000000000
--- a/art/mail-replied.xpm
+++ /dev/null
@@ -1,52 +0,0 @@
-/* XPM */
-static char * mail_replied_xpm[] = {
-"16 16 33 1",
-" 	c None",
-".	c #010101",
-"+	c #2F2F2F",
-"@	c #A7A4A0",
-"#	c #FCFCFC",
-"$	c #64625F",
-"%	c #95938E",
-"&	c #FBFBFB",
-"*	c #F9F8F6",
-"=	c #FBFAFA",
-"-	c #F6F5F1",
-";	c #7D7B78",
-">	c #EAE8E3",
-",	c #969491",
-"'	c #000000",
-")	c #928F8B",
-"!	c #FFFFFF",
-"~	c #F7F6F4",
-"{	c #B5B2AC",
-"]	c #003366",
-"^	c #EFEFEF",
-"/	c #CCCCCC",
-"(	c #AEABA6",
-"_	c #B0ADA7",
-":	c #F5F3F0",
-"<	c #83817E",
-"[	c #E1DFDA",
-"}	c #E2DFD9",
-"|	c #002C59",
-"1	c #002850",
-"2	c #00254A",
-"3	c #181818",
-"4	c #090909",
-"                ",
-"                ",
-"                ",
-"                ",
-"  .+.........   ",
-" .@#########$.  ",
-" .#%&*#*=*-;>.  ",
-" .#*,=''''''''' ",
-" .#**)'!!!!!!!' ",
-" .#*~{'!]]]]^/' ",
-" .#~(*'!]]]^^/' ",
-" .#_*:'!]]]]^/' ",
-" .<[}}'!]^]]|/' ",
-"  ....'!^^^12/' ",
-"      '!//////3 ",
-"      ''4'''''' "};
diff --git a/art/malehead.png b/art/malehead.png
deleted file mode 100644
index ada9545c85..0000000000
--- a/art/malehead.png
+++ /dev/null
diff --git a/art/mark.xpm b/art/mark.xpm
deleted file mode 100644
index 710cd0e872..0000000000
--- a/art/mark.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * mark_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #36592A",
-"                ",
-"                ",
-"                ",
-"                ",
-"           .    ",
-"          ..    ",
-"         ..     ",
-"    .   ..      ",
-"    .. ...      ",
-"     ....       ",
-"     ...        ",
-"      ..        ",
-"      .         ",
-"                ",
-"                ",
-"                "};
diff --git a/art/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/move-message.png b/art/move-message.png
deleted file mode 100644
index f9a3443109..0000000000
--- a/art/move-message.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/priority-high.xpm b/art/priority-high.xpm
deleted file mode 100644
index 8858f5bf94..0000000000
--- a/art/priority-high.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * priority_high_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #A7453E",
-"                ",
-"                ",
-"                ",
-"        .       ",
-"       ...      ",
-"       ...      ",
-"       ...      ",
-"       ..       ",
-"       ..       ",
-"       .        ",
-"                ",
-"      ..        ",
-"      ..        ",
-"                ",
-"                ",
-"                "};
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/reply-to-all.png b/art/reply-to-all.png
deleted file mode 100644
index 6f42de1de0..0000000000
--- a/art/reply-to-all.png
+++ /dev/null
diff --git a/art/reply.png b/art/reply.png
deleted file mode 100644
index cc8be8511f..0000000000
--- a/art/reply.png
+++ /dev/null
diff --git a/art/score-high.xpm b/art/score-high.xpm
deleted file mode 100644
index bb7bd47562..0000000000
--- a/art/score-high.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_high_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #00FF00",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .+   ",
-"    @@@    .++  ",
-"   @#@#@   .++  ",
-"   @$%$@   .++  ",
-"   @$$$@   . +  ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-higher.xpm b/art/score-higher.xpm
deleted file mode 100644
index 696e74bed5..0000000000
--- a/art/score-higher.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_higher_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #00FF00",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++  ",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .  ++",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-highest.xpm b/art/score-highest.xpm
deleted file mode 100644
index d8dab65079..0000000000
--- a/art/score-highest.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_highest_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #00FF00",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++++",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .    ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-low.xpm b/art/score-low.xpm
deleted file mode 100644
index e071741adc..0000000000
--- a/art/score-low.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_low_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #FF0000",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .+   ",
-"    @@@    .++  ",
-"   @#@#@   .++  ",
-"   @$%$@   .++  ",
-"   @$$$@   . +  ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-lower.xpm b/art/score-lower.xpm
deleted file mode 100644
index 74da90d670..0000000000
--- a/art/score-lower.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_lower_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #FF0000",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++  ",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .  ++",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-lowest.xpm b/art/score-lowest.xpm
deleted file mode 100644
index 9beee1849f..0000000000
--- a/art/score-lowest.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * score_lowest_xpm[] = {
-"16 16 7 1",
-" 	c None",
-".	c #BCBCBC",
-"+	c #FF0000",
-"@	c #000000",
-"#	c #17D1EA",
-"$	c #FFFFFF",
-"%	c #EF9815",
-"                ",
-"           .++++",
-"    @@@    .++++",
-"   @#@#@   .++++",
-"   @$%$@   .++++",
-"   @$$$@   .    ",
-"   @@$@@   .    ",
-"  @@$$$@@  .    ",
-" @@$$$$$@@@@    ",
-" @@$$$$$@@ .    ",
-" @@$$$$$@  .    ",
-" @@$$$$$@  .    ",
-"  @$$$$$@  .    ",
-"   %%$%%   .    ",
-"   %% %%   .    ",
-"                "};
diff --git a/art/score-normal.xpm b/art/score-normal.xpm
deleted file mode 100644
index 82b618cb8d..0000000000
--- a/art/score-normal.xpm
+++ /dev/null
@@ -1,24 +0,0 @@
-/* XPM */
-static char * score_normal_xpm[] = {
-"16 16 5 1",
-" 	c None",
-".	c #000000",
-"+	c #17D1EA",
-"@	c #FFFFFF",
-"#	c #EF9815",
-"                ",
-"                ",
-"    ...         ",
-"   .+.+.        ",
-"   .@#@.        ",
-"   .@@@.        ",
-"   ..@..        ",
-"  ..@@@..       ",
-" ..@@@@@..      ",
-" ..@@@@@..      ",
-" ..@@@@@..      ",
-" ..@@@@@..      ",
-"  .@@@@@.       ",
-"   ##@##        ",
-"   ## ##        ",
-"                "};
diff --git a/art/send.png b/art/send.png
deleted file mode 100644
index fb95df6016..0000000000
--- a/art/send.png
+++ /dev/null
diff --git a/art/splash.png b/art/splash.png
deleted file mode 100644
index d6c9dcd176..0000000000
--- a/art/splash.png
+++ /dev/null
diff --git a/art/tree-expanded.xpm b/art/tree-expanded.xpm
deleted file mode 100644
index fc748953eb..0000000000
--- a/art/tree-expanded.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * tree_expanded_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"                ",
-"                ",
-"                ",
-"                ",
-"    .........   ",
-"    .+++++++.   ",
-"    .+++++++.   ",
-"    .+++++++.   ",
-"    .+.....+.   ",
-"    .+++++++.   ",
-"    .+++++++.   ",
-"    .+++++++.   ",
-"    .........   ",
-"                ",
-"                ",
-"                "};
diff --git a/art/tree-unexpanded.xpm b/art/tree-unexpanded.xpm
deleted file mode 100644
index 0dfb12a0a5..0000000000
--- a/art/tree-unexpanded.xpm
+++ /dev/null
@@ -1,22 +0,0 @@
-/* XPM */
-static char * tree_unexpanded_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"                ",
-"                ",
-"                ",
-"                ",
-"    .........   ",
-"    .+++++++.   ",
-"    .+++.+++.   ",
-"    .+++.+++.   ",
-"    .+.....+.   ",
-"    .+++.+++.   ",
-"    .+++.+++.   ",
-"    .+++++++.   ",
-"    .........   ",
-"                ",
-"                ",
-"                "};
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index eec4b5f56d..0000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="evolution"
-
-
-. $srcdir/macros/autogen.sh
diff --git a/calendar/.cvsignore b/calendar/.cvsignore
deleted file mode 100644
index 2497bd97d5..0000000000
--- a/calendar/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-Makefile.in
-Makefile
-.deps
-_libs
-.libs
-*.lo
-GnomeCal-stubs.c
-GnomeCal-skels.c
-GnomeCal-common.c
-GnomeCal.h
diff --git a/calendar/AUTHORS b/calendar/AUTHORS
deleted file mode 100644
index 7e482aef97..0000000000
--- a/calendar/AUTHORS
+++ /dev/null
@@ -1,4 +0,0 @@
-Miguel de Icaza <miguel@kernel.org>
-Federico Mena <federico@helixcode.com>
-Arturo Esponosa <arturo@nuclecu.unam.mx>
-Russell Steinthal <rms39@columbia.edu>
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
deleted file mode 100644
index 03974500da..0000000000
--- a/calendar/ChangeLog
+++ /dev/null
@@ -1,6984 +0,0 @@
-2000-10-19  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (tb_print_cb): remove; redundant.
-
-	* gui/event-editor.c (create_menu, create_toolbar): kill.
-	(event_editor_destroy): upd.
-	(event_editor_construct): update to new UI handler, cast
-	priv->general_summary to a widget not an object.
-
-2000-10-18  Michael Meeks  <michael@helixcode.com>
-
-	* gui/dialogs/task-editor.c (create_menu, create_toolbar): die.
-	(debug_xml_cb): add debugging hook.
-
-	* gui/dialogs/Makefile.am: add EVOLUTION_DATADIR
-
-	* gui/dialogs/task-editor.c (task_editor_construct): upd for new UI.
-
-2000-10-17  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit-control-applet.c: Add defines
-
-	* conduits/todo/todo-conduit-config.h: put #ifdefs around functions
-	can't make this a public interface in the usual way as then the 
-	symbols would be exported
-
-	* conduits/todo/todo-conduit.c: Kill warnings. clahey will be
-	happy! Add some defines to include only the necessary config functions.
-	(conduit_get_gpilot_conduit): Hook up archive signals
-
-	* conduits/calendar/calendar-conduit.c: Same as above
-
-	* conduits/calendar/calendar-conduit-control-applet.c: ditto
-
-	* conduits/calendar/calendar-conduit-config.h: ditto
-
-
-2000-10-16  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: You can now add incoming iTip
-	messages to your calendar store.
-
-	* gui/e-itip-control.glade: added a progress bar dialog
-	in case the calendar loading takes a long time.
-
-2000-10-16  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-client/cal-client.h: Remove pilot cruft.  All pilot stuff
-	is in the conduits now and uses the logging facility.
-
-	* pcs/cal-backend-file.c: ditto
-
-	* pcs/cal-backend.h: ditto
-
-	* pcs/cal-backend.c: ditto
-
-	* pcs/cal.c: ditto
-
-	* pcs/cal.h: ditto
-
-	* idl/evolution-calendar.idl: ditto
-
-	* cal-util/cal-component.h: ditto
-
-	* cal-util/cal-component.c: ditto
-
-	* cal-client/cal-client.c: ditto
-
-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):
-	Take a stab at storing recurrence stuff on the pilot properly
-
-	* pcs/cal-backend.c (cal_backend_update_object): Don't log the
-	event until after the update in case its a new item
-
-2000-10-16  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* gui/dayview.xpm, gui/workweekview.xpm, gui/weekview.xpm
-	gui/monthview.xpm gui/yearview.xpm: Updated icons, let me know
-	if you like these or not, I might work on these some more but 
-	I wanted to put these versions up anyway to get feedback..
-
-2000-10-15  Dan Winship  <danw@helixcode.com>
-
-	* gui/Makefile.am: Remove CPPFLAGS def since the -D there was
-	already in INCLUDES
-
-2000-10-14  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/evolution-calendar.oafinfo: Added an
-	"evolution:shell-component-icon" attribute.
-
-2000-10-12  Jesse Pavel <jpavel@helixcode.com>
-
-	* gui/e-itip-control.{c,glade}: Made the control much more
-	relavent to the function at hand.
-
-2000-10-12  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): set the 2 icon
-	columns to a min width of 18 and resizable to FALSE.
-
-2000-10-12  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): 
-	(update_pixmaps): 
-	(set_pixmap): set the pixmaps of the toolbar buttons for the views,
-	and removed a lot of old unused stuff. We'll use plain buttons for
-	the view buttons for now, until Bonobo toolbars support radio buttons.
-
-	* gui/gnome-cal.c (gnome_calendar_dayjump): check day_button is not
-	NULL before using it.
-	(gnome_calendar_update_view_buttons): check button is not NULL.
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw): got 12/24
-	hour format the wrong way round.
-
-2000-10-12  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record): 
-	Store recurrence stuff on the desktop properly
-	(get_ical_day): Utility function
-
-2000-10-12  Iain Holmes  <iain@helixcode.com>
-
-	* gui/component-factory.c: Disable the executive summary.
-
-2000-10-11  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_log_entry): Take CalObjType
-	as a param because its impossible to determine after a delete.
-	(cal_backend_remove_object): Calculate CalObjType and pass
-	it to cal_backend_log_entry
-	(cal_backend_update_object): ditto
-
-	* conduits/todo/todo-conduit.c (local_record_from_comp): Kill
-	unused variables.
-	(add_archive_record): Don't kill the sync if this happens
-	(update_record): Kill old function
-	(replace_record): New function to handle replace_record signal
-	(conduit_get_gpilot_conduit): Listen for replace record signal
-	(add_record): Always add a new record, never replace
-	(replace_record): Always replace an existing record
-
-	* conduits/calendar/calendar-conduit.c: Same as above
-
-2000-10-10  Jesse Pavel  <jpavel@helixcode.com>
-
-	* gui/e-itip-control.c: set a default size for the control.
-
-2000-10-10  Jesse Pavel  <jpavel@helixcode.com>
-
-	* gui/evolution-calendar.oafinfo: Added information about the
-	text/calendar MIME type, so that the evolution-calendar is called
-	to deal with iMIP attachments.
-
-	* gui/e-itip-control.[ch]: These files implement a Bonobo
-	control that will eventually deal with iMIP/iTIP messages from
-	the mailer. Right now, it's not working.
-
-	* gui/e-itip-control.glade: The Glade GUI for the above-mentioned
-	control.
-
-	* gui/Makefile.am: added references to the files I created.
-
-	* gui/main.c: called the initialization function of the Bonobo
-	control factory.
-
-2000-10-11  Tuomas Kuosmanen  <tigert@helixcode.com>
-
-	* gui/task-assigned-to.xpm gui/task-assigned.xpm 
-	gui/recur.xpm gui/task-recurring.xpm gui/task.xpm:
-	New versions of the icons for the tasklist/pad.
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/component-factory.c (owner_unset_cb): don't free evolution_dir
-	as we need it to save the config settings.
-
-2000-10-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/main.c (main): call calendar_config_write_on_exit() to write
-	out some special config settings (as the mail component does).
-
-	* gui/calendar-commands.c (properties_cmd): changed to use the new
-	preferences dialog.
-	(update_all_config_settings): new function to iterate over all the
-	calendars and update the config settings.
-
-	* gui/dialogs/cal-prefs-dialog.glade: preferences dialog.
-
-	* gui/dialogs/cal-prefs-dialog.[hc]: new files for the preferences
-	dialog.
-
-	* gui/calendar-config.[hc]: new files to handle loading/saving config
-	settings.
-
-	* cal-util/cal-recur.c: fixed bug in YEARLY when no filters were set,
-	plus minor changes.
-
-	* cal-util/test-recur.c: updated.
-
-	* gui/e-day-view-time-item.c: 
-	* gui/popup-menu.c: update to #include <gal/widgets/e-gui-utils.h>
-
-	* gui/component-factory.c (owner_set_cb): called calendar_config_init.
-	(owner_set_cb): 
-	(owner_unset_cb): updated the prototypes.
-
-	* gui/main.c (main): added call to calendar_config_write_on_exit().
-
-	* gui/component-factory.h: 
-	* gui/component-factory.c (owner_set_cb): added global evolution_dir
-	just like the mail component, so we know we to store config stuff.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-calendar-table.c: Fixed the column elements here.
-
-2000-10-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-calendar-table.c: Updated to use the new ETable
-	specification stuff.
-
-2000-10-11  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (map_sax_start_element): The
-	element is "pilot_id" not "pilotid".  Update both maps
-	(compute_pid): Utility function to set a local records pid
-	(local_record_from_comp): Compute the pid and status here,
-	no longer use the old cal_component pilot interfaces
-	(free_match): Its a *local not a **local
-
-	* conduits/calendar/calendar-conduit.c: same as above
-
-	* conduits/todo/todo-conduit.h: Have both a uid and pid map
-
-	* conduits/todo/calendar-conduit.h: same as above
-
-2000-10-09  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/*: Adjust to using gnome-pilot-sync-abs conduit which
-	is based on the latest pilot link changes.
-
-2000-10-09  Iain Holmes  <iain@helixcode.com>
-
-	* Makefile.am: Added the executive-summary library and cflags
-
-	* gui/evolution-calendar.oafinfo: Added oaf servers for the 
-	executive summary and executive summary factory.
-
-	* gui/calendar-summary.[ch]: New files to create the summary.
-
-	* gui/component-factory.c (summary_fn): Create the executive
-	summary component.
-	(component_factory_init): Start the summary factory as well.
-
-2000-10-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/weekday-picker.[ch]: New widget to pick weekdays.
-
-2000-10-05  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c: upd.
-	(calendar_control_activate): upd.
-	(calendar_control_deactivate): upd.
-
-2000-10-05  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c: 
-	* gui/e-week-view.c: when the user types in a new event, don't create
-	it until the user hits Return or switches focus. Removed the
-	editing_new_event flags.
-
-	* cal-util/test-recur.c: rewritten to work on ics files. Now I can
-	start testing the recurrence code.
-
-	* cal-util/cal-recur.c: a few fixes.
-
-	* gui/e-day-view.c (e_day_view_check_if_new_event_fits): fixed to
-	return TRUE for long events, not FALSE.
-
-2000-10-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/print.c (print_todo_details): As a temporary solution to the
-	to-do printing, just print the summaries.  We'll use the ETable
-	printing stuff later.
-
-	* gui/print.c (print_day_summary_cb): Use g_list_append() correctly.
-	(print_todo_details_cb): Likewise.
-	(print_day_summary): Initialize psi.events.  This code was
-	obviously never tested.
-	(print_todo_details): Likewise.
-	(print_day_details): Initialize pdi.slots.
-
-	* gui/print.c (range_selector_new): Fix strftime() %a versus %b
-	confusion.  Fixes bugzilla #644.
-	(range_selector_new): Fix the whole localization mess by making
-	better use of strftime().  Now we generate whole date strings at a
-	time and compose them later.  Fixes bugzilla #643.
-
-2000-10-02  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: added support for the ROLE and RSVP parameters
-	in both the GUI and underlying iCal.
-
-2000-09-29  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: added support for organizers in the meeting
-	scheduler.
-
-2000-09-29  Jesse Pavel   <jpavel@helixcode.com>
-
-	* gui/e-meeting-edit.c: added code that makes changes to the underlying
-	iCAL structure of an event, when the user changes meeting information.
-
-	* gui/e-meeting-dialog.glade: this is the Glade UI for the meeting dialog
-	and accoutrements.
-
-2000-09-29  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/cal-recur.c: updated to support RDATE end times or
-	durations. Note that if you have two RDATEs with the same start times,
-	but with different end dates/durations set, the results are
-	unpredictable. So the event editor dialog should check for this.
-
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day): 
-	make strftime() strings translatable, and changed the formats a bit.
-
-	* NOTE: someone needs to check print.c to make sure strftime strings
-	are OK for i18n.
-	
-	* gui/e-day-view.h: Changed EDayViewDateFormat enum. We now try to
-	include the weekday if possible. Also changed EDayView struct so we
-	store the month & weekdays with the longest names rather than the
-	actual widths. This helps i18n.
-
-	* gui/e-day-view.c (e_day_view_recalc_cell_sizes): used _() for
-	strftime strings, tried to see if weekday fits, and rearranged a
-	bit to make i18n easier.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): used _() for
-	strftime strings, and updated to use new formats.
-
-	* gui/calendar-model.c: added use_24_hour_format boolean to
-	CalendarModelPrivate so we can display dates in 12-hour format if
-	requested. This meant adding a CalendarModel argument to a few
-	functions. Also added get/set functions to set use_24_hour_format.
-	I suppose ideally we should have an ECellDate renderer and this option
-	should go there.
-
-2000-09-27  Jesse Pavel	  <jpavel@helixcode.com>
-
-	* gui/event-editor.c: changed a menu entry so that it will invoke
-	my meeting editor.
-
-	* gui/e-meeting-edit.[ch]: added these files to provide preliminary
-	support for iTIP meeting scheduling. Currently, only the GUI works;
-	there is not yet any backend support.
-
-	* gui/Makefile.am: added entries for e-meeting-edit.[ch]
-
-2000-09-24  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/dialogs/task-editor-dialog.glade: set the height of the scrolled
-	window for the description field, since the default window height
-	doesn't seem to be working.
-
-	* cal-util/cal-component.h: added functions to get the actual
-	icalproperty lists for RRULE and EXRULE properties.
-
-	* cal-util/cal-recur.[hc]: added support for COUNT, though I need to
-	test it a bit. Also fixed the call to generate_instances_for_year() so
-	it uses the chunk dates.
-
-2000-09-20  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor.c: got rid of 1 '_' in '__Formatting'.
-
-2000-09-22  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): upd.
-
-2000-09-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (verbs): Removed the "about calendar"
-	command, since we don't want to have both "About Evolution" and
-	"About Calendar".
-
-2000-09-21  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): _UIHandler
-	update.
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (pre_sync): Don't fail if there
-	is no map file.
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.h: Add since field to context
-
-	* conduits/todo/todo-conduit.c (map_set_node_timet): New utility
-	function
-	(map_sax_start_element): Look for the map timestamp as well
-	(map_write): Write the map timestamp
-	(pre_sync): Use the map time stamp when looking for changed entries
-
-	* pcs/cal-backend.c (cal_backend_log_sax_start_element): Make sure 
-	we are in a valid timestamp
-	
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_log_name): Make the log file
-	name relevant to the actual calendar file, rather than just the
-	directory.
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_get_log_entries): Oops
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_get_log_entries): Use a local
-	sax handler.
-
-	* conduits/todo/todo-conduit.c (pre_sync): Use xmlSAXParseFile
-	(map_sax_parse): Delete
-
-2000-09-20  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_log_sax_start_element): Properly
-	assign the CalObjChange type.
-	(cal_backend_log_sax_parse): Delete
-	(cal_backend_get_log_entries): Use xmlSAXUserParseFile
-
-2000-09-19  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_set_uri): New utility function
-	(cal_backend_load): use above
-	(cal_backend_create): use above
-	(cal_backend_log_name): Take a uri instead of a backend param
-
-	* pcs/cal-backend-file.c: Get rid of useless hash functions
-	(cal_backend_file_load): Check to make sure path exists and is
-	local
-	(cal_backend_file_load): Unref the current uri if there is one
-	(cal_backend_file_create): ditto
-
-	* pcs/cal-backend.c (cal_backend_last_client_gone): Sync before 
-	shooting ourselves in the foot
-
-	* pcs/cal-backend-file.c (save): Fully implement backing up the
-	calendar before writing out the new entry.
-	
-2000-09-19  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (check_for_slow_setting): Add some
-	other cases where a slow sync is in order
-	(pre_sync): Pre load the uids, the map and the add/mod/del lists
-	(match_record): Use the map hash to match records
-	(iterate): Iterate using the pre-loaded uid list
-	(iterate_specific): Iterate using the add/mod/del lists
-	(purge): Delete all entries in the del list
-	(set_status): Set status by adding to an appropriate list
-	(set_pilot_id): Set pilot_id by updating map hash
-
-	* conduits/todo/todo-conduit.h: Add lists for added, modified and
-	deleted objects
-
-	* conduits/todo/todo-conduit.c (map_name): Get the pilot_id->uid map
-	file name
-	(map_sax_start_element): SAX handler to extract a pilot_id->uid 
-	mapping
-	(map_sax_parse): Parse the given file and build a pilot_id->uid hash
-	(map_write_foreach): Write out individual mapping elements 
-	(map_write): Write out the pilot_id->uid mapping
-	(start_calendar_server_cb): Rename from gnome_calendar_load_cb
-
-	* conduits/todo/todo-conduit-config.h: Rename pilotID to pilot_id
-
-	* conduits/todo/e-todo.conduit.in: A little renaming
-
-	* conduits/todo/Makefile.am: Fix build slightly
-
-	* pcs/cal.c (build_change_seq): Build a corba sequence out of a list
-	of CalObjChanges
-	(Cal_get_objects_in_range): Implement new corba function
-
-	* pcs/cal-backend.c (cal_backend_init): Intiliaze to NULL
-	(cal_backend_load): Track the uri so we can write the log file
-	to the same place
-	(cal_backend_log_name): Figure out the log filename/path based on
-	the calendar uri
-	(cal_backend_set_node_timet): Set an xml node property value from
-	a time_t
-	(cal_backend_log_entry): Adds a log entry to list waiting to be written
-	out
-	(cal_backend_log_sync): Syncs the log entries to disk
-	(cal_backend_log_sax_start_element): SAX callback for reading in
-	log entries
-	(cal_backend_log_sax_end_element): ditto
-	(cal_backend_log_sax_parse): Main SAX parser call to parse the log
-	file looking for particular log entries and creating a CalObjChange 
-	hash with the last change for each object
-	(cal_backend_get_log_entries): Returns a hash of objects of a given 
-	type changed since the given time
-	(cal_backend_update_object): Add appropriate log entries
-	(cal_backend_remove_object): ditto
-	(cal_backend_get_changed_uids): Implement new idl interface call
-	(cal_backend_foreach_changed): Convert CalObjChange hash into a list
-
-	* pcs/cal-backend-imc.[hc]: Remove crufty files
-	
-	* pcs/cal-backend-file.c (cal_backend_file_get_type_by_uid): New
-	function that returns the CalObjType for a uid.
-
-	* cal-client/cal-client.h: Update prototypes.
-
-	* cal-client/cal-client.c (build_change_list): Build a list
-	of CalObjChange items from a corba sequence.
-	(cal_client_get_changed_uids): New accessor method for the
-	similarly named addition to the idl file.
-
-	* cal-util/cal-util.h: Update prototypes and add CalObjChangeType
-	enum.
-
-	* cal-util/cal-util.c (cal_obj_change_list_free): New utility
-	method to free a list of CalObjChange objects.
-
-	* idl/evolution-calendar.idl: Add get_changed_uids method
-	and associated types.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and
-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.
-
-	* gui/calendar-model.h, gui/e-calendar-table.c, gui/e-day-view.c,
-	gui/e-week-view-event-item.c, gui/e-week-view.c,
-	gui/event-editor.c, gui/gncal-todo.c, gui/gnome-cal.c, gui/main.c,
-	gui/print.c, gui/dialogs/task-editor.c: Fixed the #include lines
-	to deal properly with gal.
-
-	* gui/check-filled.xpm: New file since we can't include it from
-	e-table anymore.
-
-2000-09-16  Michael Meeks  <michael@helixcode.com>
-
-	* gui/Makefile.am (INCLUDES): add datadir
-
-	* gui/calendar-commands.c (calendar_control_activate): use it.
-
-2000-09-14  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/.cvsignore: Shush
-	
-2000-09-14  JP Rosevear  <jpr@helixcode.com>
-
-	* Add headers with GPL notice and credit copyright to those appropriate
-
-	* conduits/todo/todo-conduit-control-applet.c (doHelp): Update name,
-	authors, copyright for about dialog.
-	(activate_sync_type): Tidy
-
-	* conduits/todo/Makefile.am: Rename binaries and libs to e-todo*
-	to avoid conflicts.
-
-	* conduits/todo/e-todo.conduit.in: Reflect binary/lib name changes
-
-	* conduits/todo/e-todo-conduit-control-applet.desktop: ditto
-
-	* conduits/todo/todo.conduit.in: Removed
-
-	* conduits/todo/todo-conduit-control-applet.desktop: Removed
-
-	* conduits/todo/todo-conduit-config.h (todoconduit_load_configuration):
-	The config file will now be called e-todo-conduit
-	(todoconduit_save_configuration): ditto
-
-	* conduits/todo/todo-conduit.c: Some renaming to keep consistent.
-	(pre_sync): Remove commented out function that does not exist.
-
-	* conduits/todo/todo-conduit-control-applet.c: ditto 
-
-	* conduits/todo/todo-conduit-config.h: ditto 
-
-	* conduits/todo/todo-conduit.h: ditto
-
-
-2000-09-07  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c: Re-write most UI handler code.
-
-2000-09-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (obj_updated_cb): Removed an unused
-	variable.
-
-	* gui/calendar-model.c (obj_updated_cb): See if the new object
-	matches the type of objects we were told to deal with.
-	(load_objects): Likewise.
-
-2000-09-13  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (remove_component): Only remove the pilot
-	item from the hash if it exists in the first place.
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (add_component): plug leakage
-	
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c: Hack to compile for distcheck.
-
-	* conduits/calendar/calendar-conduit.h: Remove calobj.h dependency
-
-2000-09-12  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_load): Use g_int_*
-	for now
-	(cal_backend_file_create): ditto
-
-	* conduits/todo/todo-conduit.c (local_record_from_compobject): Make
-	this actually fill in the todo record.
-	(find_record_in_repository): Add debug stuff
-	(iterate_specific): Use the already exisiting utility function
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_pilot_id): correct
-	the status and id types. g_strdup the uid since this is not a 
-	constified return
-	(cal_backend_file_get_uid_by_pilot_id): correct the id type
-
-2000-09-12  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am: Remove `ui.xml' stuff.
-
-	* pcs/cal-backend.c: Dont' #include calobj.h anymore as it's gone.
-
-2000-09-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_construct): Connect to the
-	"cal_loaded" signal of the client here.
-	(connect_load): Removed function.
-	(disconnect_load): Removed function.
-	(cal_loaded_cb): Store the URI we are loading in the GnomeCal
-	structure instead of in a weird closure.  This gets rid of the
-	connect/disconnect mess as well.
-	(gnome_calendar_open): Store the URI in the GnomeCal.
-
-2000-09-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-day-view.c: Fixed a warning (removed unused variable
-	gfloat width from e_day_view_get_event_position.)
-
-2000-09-11  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c: Handle renaming, header cleanup
-
-	* conduits/todo/todo-conduit.h: Rename GCalLocalRecord to 
-	EToDoLocalRecord, header cleanup
-	
-2000-09-11  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Use
-	description list instead of comment list for pilot todo note
-	(transmit): Check for null cal component properties, set priority
-	correctly, use description list instead of comment list.  Make
-	pilot record private when appropriate.
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Only
-	set the due date only if it exists
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/calendar-model.c (get_is_complete): Relying on the status
-	field is somewhat faulty since it is related to group scheduling
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (update_calendar_entry_in_repository): 
-	Make log output a little more sensible
-	(comp_from_remote_record): Minor correction when making a CalComponent
-	from scratch.
-	(update_record): Use comp_from_remote_record for new items, rather
-	than repeating the code here.
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c: Remove catch_ret_val function
-	since its no longer useful.  Fix naming of various fields from
-	the header changes.  Use GnomePilotRecord* stuff instead of 
-	ICAL_PILOT_SYNC_*
-	(e_todo_context_new): Rename from gcalconduit_new_context. Now takes
-	a pilot id and loads the configuration here
-	(e_todo_context_destroy): Rename from gcalconduit_destroy_context.
-	Unref the client and destroy the configuration if they exist here
-	(start_calendar_server): Change the default calendar name
-	(local_record_from_comp_uid): Rename from local_record_from_ical_uid
-	(local_record_from_compobject): Rename from 
-	local_record_from_icalobject.  Properly do the pilot id and status.
-	(comp_from_remote_record): Rename from ical_from_remote_record.
-	Handle due, complete, classification and pilot stuff properly
-	(pre_sync): Remove some old stuff.  We need to figure out how to
-	set some of the field values.
-	(set_status): Reflect pilot status changes from above
-	(conduit_destroy_gpilot_conduit): Remove cleanup stuff that is
-	now done by e_todo_context_destroy
-	(conduit_get_gpilot_conduit): Only set the context as object
-	data of the conduit.
-
-	* conduits/todo/todo-conduit.h: Rename GCalConduitContext to
-	EToDoConduitContext.  Remove some unused struct fields.
-	For GCalLocalRecord, rename ical to comp.
-
-2000-09-11  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/dialogs/task-editor.c: changed to use EDateEdit.
-
-	* gui/dialogs/task-editor-dialog.glade: added "None" option to
-	Classification option menu, and used custom widgets for the date
-	entries so we can use EDateEdit widgets.
-
-	* gui/event-editor.c: changed to use EDateEdit. Note that this needs
-	to be fixed at some point to handle invalid dates, i.e. when
-	e_date_edit_get_time returns -1.
-
-	* gui/calendar-model.c (ensure_task_complete): 
-	(ensure_task_not_complete): new functions to set the related properties
-	to make sure a task is marked as complete on not, i.e. "Date Completed"
-	"Status" and "Percent" properties.
-
-2000-09-08  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (get_is_complete): use the status field rather
-	than the completed date, as it is more reliable.
-	(get_is_overdue): use get_is_complete().
-	(calendar_model_mark_task_complete): check if it is already complete,
-	and if so don't update it.
-
-	* cal-util/cal-component.c (cal_component_get_status): 
-	(cal_component_set_status): added functions to support the STATUS
-	property. Also added the property to CalComponentPrivate and set it
-	to NULL in free_icalcomponent(). Someone should check my code as I've
-	mainly done a Cut & Paste job.
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-	* conduits/todo/todo-conduit.c: Convert "//" style comments
-	(local_record_from_ical_uid): Remove iCalObject cruft
-	(ical_from_remote_record): ditto
-	(free_match): Properly unref the CalComponent
-
-2000-09-10  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c (local_record_from_icalobject): Use
-	cal component pilot stuff properly
-	(find_record_in_repository): Remove cruft
-	(ical_from_remote_record): Remove cruft
-	(update_record): Set the vtype immediately after creation. Remove cruft
-
-	* conduits/todo/todo-conduit.h: Remove iCalObject stuff
-
-	* conduits/todo/todo-conduit-config.h: Move all the config stuff
-	here, I need to kill the warnings at some point
-
-	* conduits/todo/todo-conduit-control-applet.c (doRevertSettings): 
-	Set all the state variables correctly on a revert
-	(doSaveSettings): Update original state
-	(doHelp): Rename from about_cb
-	(main): Destroy configurations when done
-
-	* conduits/todo/Makefile.am: Tidy
-
-	* pcs/cal-backend-file.c (cbf_pilot_hash): Function for hashing
-	pilot ids
-	(cbf_pilot_equal): For hash table of pilot ids
-	(cal_backend_file_destroy): Destroy pilot id hash
-	(add_component): Insert the uid into the pilot hash
-	(remove_component): Remove the uid from the pilot hash
-	(cal_backend_file_load): Create the pilot hash
-	(cal_backend_file_create): ditto
-	(cal_backend_file_get_uid_by_pilot_id): Implement using the pilot hash
-	(cal_backend_file_update_pilot_id): ditto
-
-	* cal-util/cal-component.h: Update prototypes
-
-	* cal-util/cal-component.c (cal_component_get_pilot_id): Implement
-	using ical X properties
-	(cal_component_set_pilot_id): ditto
-	(cal_component_get_pilot_status): ditto
-	(cal_component_set_pilot_status): ditto
-	(cal_component_free_pilot_id): Free a pilot id
-	(cal_component_free_pilot_status): Free a pilot status
-	
-2000-09-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/dialogs/Makefile.am (INCLUDES): Add
-	`-I$(top_builddir)/libical/src/libical' so that we get
-	`icalversion.h' from the build directory instead of taking it from
-	the installation directory, which is of course Wrong (tm).
-	* gui/Makefile.am (INCLUDES): Likewise.
-
-2000-09-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (cal_loaded_cb): New function with the
-	loading/creation state machine.  It is carefully modelled after
-	the state machine that started the Universe, so bow before it.
-	(gnome_calendar_construct): Do not connect to cal_loaded here.
-	(connect_load): The closure for the cal_loaded callback is a bit
-	tricky, so provide a function to create it and connect to the
-	signal.
-	(disconnect_load): Disconnect from the signal and free the
-	closure.
-	(gnome_calendar_load_cb): Removed obsolete buggy function.
-	(gnome_calendar_open): Use the new mechanism.
-
-	* gui/control-factory.c (set_prop): The default filename is now
-	calendar.ics.
-
-2000-09-08  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c (transmit): Use
-	icaltime_as_timet
-
-2000-09-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-util/cal-recur.c, gui/e-day-view.c, gui/e-week-view.c,
-	gui/event-editor.c, gui/getdate.y, gui/gncal-todo.c,
-	gui/gnome-cal.c, gui/dialogs/task-editor.c: Fixed some warnings.
-
-2000-09-08  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/calendar/Makefile.am: Tidy
-
-	* conduits/todo/Makefile.am: Tidy
-
-2000-09-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	Fall equinox cleanup!
-
-	OK, I know the equinox is not here yet, but weather has changed
-	enough to warrant it.
-
-	Sigh.  This place is definitely not the tropics.
-
-	* gui/gnome-cal.c (obj_updated_cb): Renamed from
-	gnome_calendar_object_updated_cb(); fixed prototype.
-	(obj_removed_cb): Renamed from gnome_calendar_object_removed_cb();
-	fixed prototype.
-	(GnomeCalendarPrivate): Moved all the GnomeCalendar fields to a
-	private structure so I don't have to rebuild the whole calendar
-	GUI directory every time something changes in the object.
-	(GnomeCalendarPrivate): Removed the property bag and the control
-	fields; they are local to the control-factory now.
-	(gnome_calendar_update_view_buttons): Remove the
-	ignore_view_button_clicks mess and just block the signal.
-	(gnome_calendar_set_view): Added a "focus" argument to indicate
-	whether we want the main widget in the specified view to grab the
-	focus.
-	(gnome_calendar_set_view_internal): Handle the focus argument here.
-	(gnome_calendar_set_view_buttons): Temporary hack to notify the
-	calendar about its buttons.
-	(gnome_calendar_get_selected_time_range): New function.
-	(gnome_calendar_get_cal_client): New function.
-
-	* gui/control-factory.c (calendar_properties_init): Keep the
-	property bag local to here; it does not need to be in the calendar
-	object yet.
-	(control_factory_fn): Renamed from control_factory().  Just use
-	control_factory_new_control().
-	(control_factory_new_control): Moved the stuff over from
-	create_control(), and keep the control local to here.  Check the
-	return value of bonobo_control_new().
-
-	* gui/calendar-commands.c (show_day_view_clicked): Remove the
-	ignore_view_button_clicks mess.
-	(new_calendar): Removed the useless "page" argument.
-	(calendar_control_activate): Use gnome_calendar_set_view_buttons()
-	for now.
-
-2000-09-07  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* cal-client/Makefile.am: Added -lunicode
-
-	* gui/dialogs/task-editor.c: More UTF-8 wrappers
-	(priority_index_to_value): Kill warning, add assertion
-
-2000-09-06  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event): 
-	Use new cal_component_has_recurrences convenience function
-	
-	* gui/e-week-view.c (e_week_view_show_popup_menu): ditto
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons): 
-	ditto
-
-	* gui/calendar-model.c (calendar_model_value_at): ditto
-	(calendar_model_value_at): ditto
-
-	* gui/e-day-view.c (e_day_view_on_event_click): ditto
-	(e_day_view_on_event_right_click): ditto
-	(e_day_view_on_top_canvas_motion): ditto
-	(e_day_view_on_top_canvas_motion): ditto
-	(e_day_view_on_main_canvas_motion): ditto
-	(e_day_view_on_main_canvas_motion): ditto
-	(e_day_view_reshape_day_event): ditto
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event): 
-	ditto
-
-	* gui/e-day-view.c (e_day_view_on_long_event_click): ditto
-
-2000-09-06  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (cal_recur_generate_instances): Use
-	new convenience functions and only get the recurrence
-	stuff if needed.  Free the recurrence stuff if used.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-component.h: Add new prototypes
-
-	* cal-util/cal-component.c (cal_component_has_exrules): Utility 
-	function to determine whether a cal component has any exrules
-	(cal_component_has_exdates): Ditto for exdates
-	(cal_component_has_exceptions): Utility function to determine
-	whether a cal component has any exception rules
-	(cal_component_has_recurrences):Utility function to determine
-	whether a cal component has any recurrence rules 
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): Kill all exdates if
-	there are no dates in the box
-
-	* cal-util/cal-recur.c (generate_instances_for_year): Add a special
-	case for when there are exceptions but no rrules or rdates.
-	(cal_obj_remove_exceptions): Use date only compare func
-	(cal_obj_date_only_compare_func): New compare function that
-	compares the date only, not the time.
-
-	* gui/event-editor.c (dialog_to_comp_object): Need a break for the
-	yearly recurrence type
-	(dialog_to_comp_object): We need to allocate icaltimetypes for the
-	exdate list
-	(fill_widgets): Handle a weekly recurrence with no particular day set
-	(dialog_to_comp_object): Kill all rrules if "None" is selected as 
-	the recurrence type by the user
-
-2000-09-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_open_task): uses the new
-	TaskEditor dialog.
-
-	* gui/dialogs/task-editor.[hc]: 
-	* gui/dialogs/task-editor-dialog.glade: updated. Still need to fix the
-	'Status' property (CalComponent doesn't support it yet), and use a
-	replacement for GnomeDateEdit, since we need to support setting 'None'
-	as the date.
-
-2000-09-04  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor.c (obj_updated_cb): 
-	(obj_removed_cb): compare the updated object's uid with the one we
-	are editing, and just return if it doesn't match.
-
-2000-09-01  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_tag_calendar): added check to see
-	if the client has loaded successfully. Gets rid of a few warnings.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (generate_instances_for_year): The exdate
-	and rdate lists are a list of icaltimetypes, not CalComponentPeriods
-
-	*gui/e-day-view.c (e_day_view_on_delete_occurrence): The exdate list 
-	is a list of icaltimetypes, not CalComponentDateTimes
-	
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): Append
-	the exdate to the list AFTER we create the date value.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_free_recur_list): Free
-	the data, not the list element.
-	
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (cal_recur_generate_instances): Compute
-	the event duration using the event start/end times, not the
-	interval times.
-
-2000-09-05  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (cal_recur_from_icalrecurrencetype): Check
-	to see if r->enddate is (time_t)-1 and set to 0 if so
-
-2000-09-02  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* conduits/calendar/Makefile.am (INCLUDES): Add libical include
-	directories and `$(BONOBO_GNOME_CFLAGS)'.
-	* conduits/todo/Makefile.am (INCLUDES): Likewise.
-
-2000-09-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* gui/event-editor.c: e_utf8 wrappers
-
-	* gui/gncal-todo.c: e_utf8_wrappers
-	
-2000-09-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* conduits/calendar/calendar-conduit.c,
-	conduits/todo/todo-conduit.c, gui/e-week-view.c, gui/gnome-cal.c:
-	Fixed some warnings.
-
-2000-09-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_new): Use
-	gnome_calendar_construct() so that we can check for proper
-	creation of the client.
-	(gnome_calendar_destroy): Check that the client exists before we
-	unref it.
-	(gnome_calendar_construct): Do the CalClient creation here.  Bind
-	the views to it here as well instead of in setup_widgets().
-	(gnome_calendar_init): Call setup_widgets() here.
-
-	* gui/e-calendar-table.c (e_calendar_table_destroy): Unref the
-	model.
-
-2000-09-01  JP Rosevear  <jpr@helixcode.com>
-
-	* conduits/todo/todo-conduit.c: Update for new libical.
-	Conduits should atleast compile now.
-
-	* conduits/calendar/calendar-conduit.c: ditto 
-
-	* Makefile.am: Build the conduits only when they've been
-	enabled.
-
-2000-09-01  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c: Make toolbar save and close button.
-	We should put a similar menu option in sometime.
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/cal-recur.c (array_to_list): Use
-	ICAL_RECURRENCE_ARRAY_MAX instead of MAX_SHORT
-	
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): Implement delete option
-	(dialog_to_comp_object): Set the weekday start value and use
-	local not UTC time
-
-2000-08-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): No need to spit a warning
-	if removal fails.
-	(event_editor_destroy): Free the exception clist data.  Unref the
-	calendar client here.
-	(close_dialog): Just call gtk_object_destroy() on the event
-	editor; the destroy handler will free everything else.
-
-	* cal-client/cal-client.c (cal_client_object_exists): Removed
-	function; this is not useful because we operate asynchronously.
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): No need to
-	spit a warning if removal fails.
-
-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise.
-
-	* gui/calendar-model.c (calendar_model_delete_task): Likewise.
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (file_delete_cb): Implement delete option
-	(recurrence_toggled): Make an ugly hack to get the recurrence
-	pages showing properly since we don't yet implement all of the
-	recurrence rule stuff.
-
-	* cal-client/cal-client.c (cal_client_object_exists): New function
-	to see if an object exists and is obtainable from the backend
-
-	* cal-client/cal-client.h: Add prototype
-
-2000-08-31  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gnome-cal.c (editor_closed_cb): Event editor destroyed
-	callback to do hash cleanup
-	(gnome_calendar_edit_object): Set event editor calendar client.
-
-	* gui/event-editor.h: Add new prototype
-
-	* gui/event-editor.c: Trash signal stuff.  We will manipulate
-	the client directly.  Make the toolbar save and menu save items
-	work identically.  Add icons to the toolbar.
-	(save_event_object): Call cal_client_update_object
-	(close_dialog): Unref the client and disconnect signals
-	Actually destroy the event editor object.
-	(obj_updated_cb): New function.  Doesn't really do anything
-	yet but it will inform the user the event has changed elsewhere
-	in the future.
-	(obj_removed_cb): ditto
-	(event_editor_set_cal_client): New function to set the calendar
-	client
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment): Commit
-	the sequence to the cal component and use non UTC times.
-
-2000-08-30  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* gui/print.c: Countless small changes for gnome-print 0.21+
-
-2000-08-30  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.[hc]: 
-	* gui/e-day-view-main-item.c: 
-	* gui/e-week-view.[hc]: 
-	* gui/e-week-view-main-item.c: 
-	* gui/calendar-commands.c:
-	* gui/gnome-cal.[hc]: switched to using new ECalendar widget,
-	and a few other fixes.
-
-2000-08-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.h (GnomeCal): Removed unused field event_editor.
-
-	* gui/e-day-view.c (e_day_view_key_press): Oops, set the
-	dtstart/dtend on the component before adding it.
-	(e_day_view_on_editing_stopped): No need to check for an UID.
-	Update the summary properly.
-
-2000-08-30  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c: Make sure the is_utc flag is always 
-	FALSE for icaltime_from_timet
-	(e_week_view_on_unrecur_appointment): Use icaltimetype struct
-	from the stack and make sure tzid is always NULL
-	(e_week_view_key_press): ditto
-
-2000-08-30  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.c: Make sure the is_utc flag is always 
-	FALSE for icaltime_from_timet
-	(e_day_view_on_unrecur_appointment): Use icaltimetype struct
-	from the stack and make sure tzid is always NULL
-	(e_day_view_finish_long_event_resize): ditto
-	(e_day_view_finish_resize): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-2000-08-30  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-client/cal-client.c (add_instance): Actually add the
-	comp_instance struct to the instances list.  We now appear
-	to able to keep events and todos between sessions. Yay!
-
-2000-08-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	Now the views monitor the client by themselves; it does not make
-	sense to proxy all notifications through the GnomeCal.  The
-	GnomeCal should just be a meta-widget that holds all the views.
-
-	At some later point we'll want to decouple the views from the
-	GnomeCal so that they can be embedded anywhere; they should emit
-	signals to request appropriate actions from the toplevel GUI
-	instead of calling the GnomeCal directly.
-
-	* gui/e-day-view.c (e_day_view_set_cal_client): New function; now
-	the day view monitors the client by itself.
-	(cal_loaded_cb): New callback; moved over from
-	e_day_view_update_all_events().
-	(obj_updated_cb): New callback; moved over from
-	e_day_view_update_event().
-	(obj_removed_cb): New callback; moved over from
-	e_day_view_remove_event().
-	(e_day_view_update_all_events): Removed function.
-	(e_day_view_update_event): Removed function.
-	(e_day_view_remove_event): Removed function.
-	(*): Use the day_view->client directly instead of fetching it from
-	the GnomeCal.
-	(e_day_view_destroy): Unref the client.
-	(e_day_view_reload_events): Check if the client is loaded.
-	(e_day_view_key_press): Set the vtype of the new component.
-
-	* gui/e-week-view.c (e_week_view_set_cal_client): New function.
-	(cal_loaded_cb): New callback.
-	(obj_updated_cb): New callback.
-	(obj_removed_cb): New callback.
-	(e_week_view_update_all_events): Removed function.
-	(e_week_view_update_event): Removed function.
-	(e_week_view_remove_event): Removed function.
-	(*): Use the week_view->client directly.
-	(e_week_view_destroy): Unref the client.
-	(e_week_view_reload_events): Check if the client is loaded.
-
-	* gui/gnome-cal.c (setup_widgets): Set the cal_client on all the
-	views.
-	(gnome_calendar_update_all): Do not update the views, since now
-	they do it themselves.
-	(gnome_calendar_object_updated_cb): Likewise.
-	(gnome_calendar_object_removed_cb): Likewise.
-	(setup_widgets): Remove all to-do list cruft.
-	(gnome_calendar_colors_changed): Likewise.
-	(gnome_calendar_todo_properties_changed): Likewise.
-
-	* gui/calendar-commands.h (todo_style_changed): Removed variable.
-
-	* gui/gncal-todo.c: Removed old clist cruft; just left in the
-	temporary dialog box for now.
-
-2000-08-29  Dan Winship  <danw@helixcode.com>
-
-	* cal-client/client-test.c: 
-	* cal-client/cal-client.c:
-	* conduits/todo/todo-conduit.h: 
-	* conduits/calendar/calendar-conduit.h: remove USING_OAF checks.
-
-2000-08-29  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): Use
-	event_editor_set_event_object
-
-	* gui/event-editor.c (event_editor_set_event_object): Rename
-	from event_editor_set_ical_object
-
-	* gui/event-editor.h: Update prototype
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment): 
-	Call cal_component_commit_sequence after event changes. Default
-	to these being all day events.
-	
-2000-08-29  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): These are not UTC
-	times
-
-2000-08-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_is_loaded): New function.
-	We need this from code that dynamically updates from a client and
-	could not have connected to the "cal_loaded" signal right after
-	the client was created.
-
-	* gui/calendar-model.c (load_objects): Do not try to load the
-	objects if the client has not been loaded yet.
-	(cal_loaded_cb): Check the status value.
-
-	* gui/calendar-model.h (CalendarModel): Declare the private
-	structure here so that gdb will give me love.
-
-	* pcs/cal-factory.h (CalFactory): Likewise.
-
-	* pcs/cal.h (Cal): Likewise.
-
-	* cal-client/cal-listener.h (CalListener): Likewise.
-
-	* cal-client/cal-client.h (CalClient): Likewise.
-
-	* pcs/cal-backend.h (CalBackend): This no longer has a private
-	structure, so remove it.
-
-	* cal-util/Makefile.am (libcal_util_la_SOURCES): Removed the
-	vCalendar and old iCalendar cruft.
-	(libcal_utilinclude_HEADERS): Likewise.
-	Removed the obsolete iCalendar test program.
-
-2000-08-28  JP Rosevear  <jpr@helixcode.com>
-
-	* cal-util/timeutil.h: We no longer need time_from_icaltimetype
-	as libical has the API for this
-
-	* cal-util/timeutil.c: ditto 
-
-	* cal-util/cal-recur.c: Replace time_from_icaltimetype with
-	icaltime_as_timet
-
-	* gui/calendar-model.c: ditto
-
-	* gui/event-editor.c: ditto
-
-	* gui/gnome-cal.c: ditto
-
-2000-08-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.c (remove_component): Remove the
-	icalcomponent from the toplevel calendar here.
-	(cal_backend_file_update_object): Do not remove it here.
-	(cal_backend_file_remove_object): Do not remove it here.
-	(add_component): Add the icalcomponent to the toplevel calendar if
-	asked to.
-	(cal_backend_file_update_object): Do not add it here.
-
-2000-08-28  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.c (dialog_to_comp_object): Initiliaze tzid to
-	null, only set recurrence rules and exception dates if there
-	are any
-
-2000-08-27  JP Rosevear  <jpr@helixcode.com>
-
-	* pcs/cal-backend-file.c (save): Write out the calendar object
-	(cal_backend_file_update_object): Remove/add the icalcomponent
-	from our master icalcomponent (the calendar)
-	(cal_backend_file_remove_object): Remove the icalcomponent
-	from our master icalcomponent
-
-2000-08-26  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/Makefile.am: Remove gnorba stuff 
-
-	* gui/main.c: ditto
-
-	* gui/component-factory.c: ditto
-
-	* gui/control-factory.c: ditto
-
-	* gui/*.gnorba: ditto
-
-2000-08-25  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Uncomment
-	debug code.
-
-	* gui/calendar-model.c (set_complete): Set the completed
-	date to the current date
-	(calendar_model_set_value_at): Handle complete field
-
-2000-08-25  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/calendar-model.c (get_is_complete): Don't attempt to
-	free this if its null
-	(calendar_model_duplicate_value): Implement for summary field
-	value
-	(calendar_model_initialize_value): Remove debug code
-
-	* gui/e-calendar-table.c: Correct etable init xml
-	(create_column): Pass the id to e_table_header_add_column 
-	rather than a hard coded one
-	(e_calendar_table_init): Make sure summary column isn't
-	added twice.  Add an alarms column, else etable won't
-	work with columns who have an ID higher than that
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gncal-todo.c (ok_button): Properly append to list
-
-	* gui/event-editor.c (dialog_to_comp_object): ditto
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): The base
-	times are not UTC
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment): ditto
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* Update for libical 0.19 
-
-2000-08-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-commands.c, gui/e-day-view.c, gui/e-week-view.c,
-	gui/event-editor.c, gui/gncal-todo.c, gui/gnome-cal.c, gui/prop.c:
-	Fixed some warnings.
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment): Do not alloc
-	the struct icaltimetype but point to one on the stack.  More
-	importantly, set the date.tzid to NULL.
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gnome-cal.c (save_event_object_cb): Make signal
-	names saner
-	(released_event_object_cb): ditto
-	(gnome_calendar_edit_object): ditto
-
-	* gui/event-editor.h: Make signal names saner
-
-	* gui/event-editor.c (event_editor_class_init): Make signal
-	names saner now that we don't use ical object
-	(save_event_object): ditto with callback names
-	(file_save_cb): ditto
-	(tb_save_and_close_cb): ditto
-	(event_editor_set_ical_object): ditto
-
-	* gui/e-day-view.c (e_day_view_update_event): Umm, 
-	!= CAL_COMPONENT_EVENT (I hope that wasn't me!)
-
-2000-08-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Do not alloc
-	the struct icaltimetype but point to one on the stack.  More
-	importantly, set the date.tzid to NULL.
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Remove owner field
-
-	* gui/event-editor.c (clear_widgets): Forget about owner field
-	(get_widgets): ditto
-	(fill_widgets): ditto
-
-2000-08-24  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_initialize_value): Handle
-	summary field
-	(calendar_model_value_is_empty): ditto
-	(calendar_model_free_value): ditto
-
-2000-08-23  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Remove status bar
-
-	* cal-util/cal-component.c (cal_component_set_rrule_list): Allow
-	a null list
-	(cal_component_set_rdate_list): Allow a null list
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Commit
-	the CalComponent sequence
-	
-2000-08-23  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c: #include <e-util/e-cursors.h>
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw):
-	Initialize time_min_x1 and hour_r to keep gcc happy.
-
-	* gui/e-day-view.c (e_day_view_update_event_label): Warning fix.
-	(e_day_view_update_main_canvas_drag): Initialize start_row.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw):
-	Initialize time_y_small_min, icon_x.
-
-	* Makefile.am (SUBDIRS): Re-enable the gui directory.
-
-	* gui/prop.c (prop_store_alarm_default_values): Temporarily #if 0
-	out.
-
-2000-08-23  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_key_press): Set vtype of new
-	CalComponent
-	(e_week_view_on_new_appointment): ditto
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): ditto
-
-2000-08-23  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-time-item.c: Include gnome.h for gettext purposes
-
-	* gui/gnome-cal.c: ditto
-
-	* gui/prop.c: #if out some alarm stuff
-
-2000-08-23  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-calendar-table.c (e_calendar_table_init): Updated
-	function.
-	(e_calendar_table_open_task): Updated function.
-
-2000-08-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_duplicate_value): Updated
-	function.
-	(calendar_model_free_value): Updated function.
-	(calendar_model_initialize_value): Updated function.
-	(calendar_model_value_is_empty): Updated function.
-	(remove_object): Updated function.
-	(obj_updated_cb): Updated function.
-	(calendar_model_get_cal_client): Added inline docs.
-	(calendar_model_delete_task): Updated.
-	(calendar_model_mark_task_complete): Updated.
-	(calendar_model_get_cal_object): Updated.
-
-2000-08-21  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (set_categories): New function.
-	(parse_time): Moved over from the old set_time_t().  This just
-	parses the time and leaves the warning dialog for the caller.
-	(set_datetime): New function.
-	(set_geo): Updated old function.
-	(set_percent): Updated old function.
-	(set_priority): Updated old function.
-	(set_summary): New function.
-	(set_url): New function.
-	(calendar_model_set_value_at): Updated function.
-	(calendar_model_is_cell_editable): Updated function.
-	(calendar_model_append_row): Updated.  Added an ugly hack to
-	accomodate ETable's lack of a real API for adding new items.
-	Also, don't try to set columns that are not editable.
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_reload_events): 
-	Use CalObjType
-
-	* gui/e-day-view.c (e_day_view_reload_events): ditto
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event): 
-	Use CalComponent instead of iCalObject.  #if some alarm stuff
-	
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view-top-item.c (e_day_view_top_draw_long_event):
-	Use CalComponent instead of iCalObject.  #if some alarm stuff
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.h: Update prototypes
-
-	* gui/e-day-view.c (e_day_view_on_unrecur_appointment): 
-	Remove commented out portions.
-
-	* gui/e-week-view.c (e_week_view_on_unrecur_appointment): 
-	Tidy.
-	
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-day-view.c 
-	(e_day_view_update_event): Use CalComponent
-	instead of iCalObject.  Work around not having a compare
-	dates routine for two CalComponents.
-	(e_day_view_reshape_long_event): Use CalComponent instead
-	of iCalObject, #if some alarm stuff
-	(e_day_view_reshape_day_event): ditto
-	(e_day_view_reload_events): Use revamped CalClient
-	(e_day_view_update_event_cb): Use CalComponent
-	instead of iCalObject
-	(e_day_view_foreach_event_with_uid): ditto
-	(e_day_view_remove_event_cb): ditto
-	(e_day_view_update_event_label): ditto
-	(e_day_view_find_event_from_uid): ditto
-	(e_day_view_on_event_click): ditto
-	(e_day_view_on_event_right_click): ditto
-	(e_day_view_on_new_appointment): ditto
-	(e_day_view_on_edit_appointment): ditto
-	(e_day_view_on_delete_occurrence): ditto
-	(e_day_view_on_delete_appointment): ditto
-	(e_day_view_on_unrecur_appointment): ditto
-	(e_day_view_on_top_canvas_motion): ditto
-	(e_day_view_on_main_canvas_motion): ditto
-	(e_day_view_finish_long_event_resize): ditto
-	(e_day_view_finish_resize): ditto
-	(e_day_view_free_event_array): ditto
-	(e_day_view_add_event): ditto
-	(e_day_view_key_press): ditto
-	(e_day_view_on_editing_stopped): ditto
-	(e_day_view_update_top_canvas_drag): ditto
-	(e_day_view_update_main_canvas_drag): ditto
-	(e_day_view_on_drag_data_get): ditto
-	(e_day_view_on_top_canvas_drag_data_received): ditto
-	(e_day_view_on_main_canvas_drag_data_received): ditto
-
-2000-08-20  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):
-	Use CalComponent instead of iCalObject.  #if some alarm stuff
-
-2000-08-20  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_update_event): Use CalComponent
-	instead of iCalObject.  Work around not having a compare
-	dates routine for two CalComponents.
-	(e_week_view_reload_events): Use revamped CalClient
-	(e_week_view_reshape_event_span): Use CalComponent instead
-	of iCalObject, #if some alarm stuff
-	(e_week_view_update_event_cb): Use CalComponent instead of
-	iCalObject
-	(e_week_view_foreach_event_with_uid): ditto
-	(e_week_view_remove_event_cb): ditto
-	(e_week_view_free_events): ditto
-	(e_week_view_add_event): ditto
-	(e_week_view_on_editing_stopped): ditto
-	(e_week_view_find_event_from_uid): ditto
-	(e_week_view_key_press): ditto
-	(e_week_view_show_popup_menu): ditto
-	(e_week_view_on_new_appointment): ditto
-	(e_week_view_on_edit_appointment): ditto
-	(e_week_view_on_delete_occurrence): ditto
-	(e_week_view_on_delete_appointment): ditto
-	(e_week_view_on_unrecur_appointment): ditto
-
-	* gui/e-week-view.h: Update prototypes. 
-
-2000-08-18  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/event-editor.h: Update prototypes.
-
-	* gui/event-editor.c: Need to come back here later to fix the 
-	alarm stuff.  The gui also needs to be completely redone to 
-	support the fancier CalComponent settings (exrules, rdates, etc)
-	There are some warnings that I put in to mark some of these
-	spots
-	(event_editor_destroy): Use Calcomponent instead
-	of iCalObject
-	(make_title_from_comp): ditto
-	(clear_widgets): ditto
-	(fill_widgets): ditto
-	(classification_get): ditto
-	(dialog_to_comp_object): ditto
-	(save_ical_object): ditto
-	(close_dialog): ditto
-	(event_editor_set_ical_object): ditto
-
-2000-08-17  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/gncal-todo.c (ok_button): Use CalComponent instead of
-	iCalObject
-	(cancel_button): ditto
-	(gncal_todo_edit): ditto
-	(add_todo): ditto
-	(edit_todo): ditto
-	(delete_todo): ditto
-	(insert_in_clist): ditto
-	(gncal_todo_update): ditto
-
-	* gui/gncal-todo.h: Update prototypes
-
-2000-08-16  JP Rosevear  <jpr@helixcode.com>
-
-	Rework gnome-cal.c - alarms are a tad broken ATM so this
-	will need more cleaning later.
-	
-	* gui/gnome-cal.c (snooze): Use CalComponent instead of
-	iCalObject
-	(edit): ditto
-	(audio_notification): ditto
-	(display_notification_cb): Use CalComponent member of 
-	alarm_notify_closure rather than iCalObject
-	(display_notification): ditto
-	(trigger_alarm_cb): ditto.  Use CalComponent alarm types
-	(gnome_calendar_tag_calendar_cb): New 
-	cal_client_generate_instances callback to 
-	mark_gtk_calendar_day's
-	(gnome_calendar_tag_calendar): Use above callback
-	(save_ical_object_cb): Use CalComponent instead of
-	iCalObject
-	(gnome_calendar_edit_object): ditto
-	(gnome_calendar_new_appointment): ditto
-
-2000-08-15  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/mark.c (mark_month_item_cb): Callback used to mark every
-	event in a month.
-	(mark_month_item): Use cal_client_generate_instances with
-	above callback
-	
-2000-08-15  JP Rosevear  <jpr@helixcode.com>
-
-	* gui/print.c (print_month_small): Use 
-	cal_client_get_objects_in_range
-	(print_day_details_cb): Callback used to create columns and fill 
-	events into a day view.  Code should be shared with e-day-view 
-	in reality.  Maybe need to go back to layout.[hc] a bit later
-	(print_day_details): Use cal_client_generate_instances with 
-	above callback. Iterate over results to expand events to fit.
-	(print_day_summary_cb): Callback to build list of event info 
-	for a day
-	(print_day_summary): Use cal_client_generate_instances with 
-	above callback to generate the required event info for printing
-	(print_todo_details_cb): Callback used create list of todo info
-	(print_todo_details): Use cal_client_generate_instances with 
-	above callback to generate required todo info for printing.
-
-	* gui/layout.[hc]: No longer used.
-
-2000-08-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (get_is_overdue): Finished implementing.
-	(calendar_model_value_at): Handle the color field.
-
-2000-08-11  Seth Alves  <alves@hungry.com>
-
-	* cal-util/cal-component.c (cal_component_get_pilot_id):
-	(cal_component_set_pilot_id):  stubs for pilot id accessors
-	(cal_component_get_pilot_status): 
-	(cal_component_set_pilot_status): stubs for pilot status accessors
-
-	* conduits/calendar/calendar-conduit.c (transmit): start to
-	convert to cal-component interface
-	
-	* conduits/todo/todo-conduit.c (transmit): same
-
-2000-08-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (get_geo): Generate a prettier string for
-	the geographical position.
-	(get_classification): New function.
-	(get_categories): New function.
-	(get_completed): New function.
-	(get_dtend): New function.
-	(get_dtstart): New function.
-	(get_due): New function.
-	(get_percent): New function.
-	(get_priority): New function.
-	(get_summary): New function.
-	(get_transparency): New function.
-	(get_url): New function.
-	(get_has_alarms): New function.
-	(get_has_recurrences): New function.
-	(get_is_complete): New function.
-	(get_is_overdue): New function.
-
-	* cal-util/cal-component.c (scan_property): Handle the GEO
-	property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_geo): Likewise.
-	(cal_component_set_geo): Likewise.
-	(cal_component_free_geo): Likewise.
-	(cal_component_set_exdate_list): Removed incorrect assertion.
-	(cal_component_set_exrule_list): Removed incorrect assertion.
-	(cal_component_get_next_alarm): Oops, this had not been
-	implemented at all.
-	(cal_component_has_rdates): New function.
-	(cal_component_has_rrules): New function.
-
-	* cal-util/cal-component.h (CalComponentField): Added the GEO
-	property.
-
-2000-08-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the
-	PERCENT-COMPLETE property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_percent): Likewise.
-	(cal_component_set_percent): Likewise.
-	(cal_component_free_percent): Likewise.
-	(scan_property): Handle the PRIORITY property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_priority): Likewise.
-	(cal_component_set_priority): Likewise.
-	(cal_component_free_priority): Likewise.
-
-	* cal-util/cal-component.h (CalComponentField): New enumeration
-	with the list of fields we support for ETable.
-
-2000-08-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/component-factory.c (owner_set_cb): Update prototype.
-
-2000-08-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_new_appointment): New function.
-	Mostly moved over from calendar-commands.c:display_objedit().
-
-	* gui/calendar-commands.c (calendar_iterate): Removed.  Wheee!
-	(display_objedit): Removed.
-	(new_appointment_cb): New function.  Just call
-	gnome_calendar_new_appointment().
-	(display_objedit_today): Removed.
-	(calendar_control_activate): Removed the "New appointment for
-	today" option, since it is pretty useless.
-
-2000-08-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_generate_instances): There.
-	A pretty function to generate recurrence instances atomically so
-	that clients don't have to jump through hoops.  Now we can get rid
-	of the ugly calendar_iterate() function.
-
-2000-08-09  Cody Russell  <bratsche@gnome.org>
-
-	* gui/calendar-commands.c: Make the toolbar honor the user's
-	gnomecc settings for detachable toolbars.
-
-2000-08-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/alarm.c (pop_alarm): Oops, subtract the new alarm's trigger
-	time from the current time.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-client/cal-client.c: Fixed a warning.
-
-2000-08-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-client/cal-client.c, gui/e-calendar-table.c, pcs/cal.c:
-	Fixed some warnings.
-
-2000-08-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* idl/evolution-calendar.idl (Cal): Added a get_objects_in_range()
-	method.  Takes in a time range and the type of component we are
-	interested in; returns a list of UIDs.  The idea is that
-	ocurrences get computed in the client; we can have multiple
-	recurrences in iCalendar and we cannot identify them trivially
-	across the wire.
-	(Cal): Removed the get_events_in_range() method.
-
-	* pcs/cal-backend.c (cal_backend_free_uid_list): New function.
-	(cal_backend_get_objects_in_range): New function.
-	(cal_backend_get_events_in_range): Removed.
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_objects_in_range):
-	Implemented new method.
-	(cal_backend_file_get_events_in_range): Removed.
-
-	* pcs/cal.c (Cal_get_events_in_range): Removed.
-	(uncorba_obj_type): New function.
-	(Cal_get_uids): Use uncorba_obj_type().
-	(Cal_get_n_objects): Likewise.
-	(Cal_get_objects_in_range): Implemented new method.
-
-	* cal-client/cal-client.c (cal_client_get_events_in_range): Removed.
-	(cal_client_get_objects_in_range): Implemented.
-	(corba_obj_type): New function.
-	(cal_client_get_n_objects): Use corba_obj_type().
-	(cal_client_get_uids): Likewise.
-
-2000-08-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_clone): New function.
-	(cal_component_get_icalcomponent): Ensure that the SEQUENCE
-	property does not need incrementing.
-
-	* gui/dialogs/alarm-notify-dialog.c (alarm_notify_dialog): Use
-	CalComponent.  Deal with an empty summary property.
-
-2000-08-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_as_string): Doh,
-	libical owns the string's memory, so do not free it.
-
-	* cal-client/client-test.c (create_client): Connect to the destroy
-	signal of the client here.
-
-	* cal-client/test.ics: New test file, modified from Eric Busboom's
-	test file from RFC 2445.
-
-2000-08-05  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/client-test.c (dump_component): This was gone for
-	some reason.
-	(main): Load a new test file.
-
-2000-08-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_commit_sequence): New
-	function to commit changes to the SEQUENCE property.
-	(cal_component_get_as_string): Ensure that the sequence has been
-	committed.
-
-	* cal-client/cal-client.c (cal_client_get_object): Use
-	CalComponent instead of the old iCalObject.
-	(cal_client_update_object): Use iCalObject.  Commit the SEQUENCE
-	property before stringifying the object and piping it over to the
-	Wombat.
-
-2000-08-04  Seth Alves  <alves@hungry.com>
-
-	* conduits/todo/todo-conduit.c (conduit_get_gpilot_conduit): if
-	oaf isn't initialized by the time the conduit starts, start it
-	up.  we do this because we need to start wombat with oaf, and
-	gpilotd doesn't currently start oaf.
-
-2000-08-04  Michael Meeks  <michael@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): unref.
-
-2000-08-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_get_uid_by_pilot_id):
-	Added stub for now.
-	(cal_backend_file_update_pilot_id): Likewise.
-
-	* pcs/Makefile.am (libpcs_a_SOURCES): Removed cal-backend-imc.[ch]
-	from the list of sources.  The idea is to move vCalendar importing
-	to the GUI as a convenience function.
-
-2000-08-02  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_update_pilot_id): call
-	save (cbimc) after setting the pilot id and status.
-
-2000-08-02  Joe Shaw  <joe@helixcode.com>
-
-	* pcs/cal-backend-file.c (cal_backend_file_update_pilot_id):
-	Fixed a g_return_if_fail that had two parameters and thus
-	wouldn't build.
-
-2000-08-03  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_append_row): updated to match
-	the new ETableModel append_row. This meant we could also get rid of
-	the row_being_added and idle_id hack.
-
-2000-08-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-model.c: Emit "model_pre_change" signals as
-	appropriate.
-
-2000-08-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend-file.[ch]: New files for the iCalendar file
-	backend.
-
-	* pcs/Makefile.am (libpcs_a_SOURCES): Added cal-backend-file.[ch].
-
-	* cal-util/cal-component.c (cal_component_set_icalcomponent):
-	Return an operation success code for if we are passed a component
-	of a type we don't support.
-
-2000-07-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-recur.c (*): Use CalComponent and the new property
-	types instead of the old iCalObject stuff.
-	(cal_recur_generate_instances): Renamed from
-	cal_object_generate_events().  Ensure that the component has the
-	DTSTART property.
-	(generate_instances_for_year): Renamed from
-	cal_object_generate_events_for_year().
-	(cal_obj_expand_recurrence): Made static.
-	(cal_recur_from_icalrecurrencetype): New function.  We should
-	really convert this whole file to use struct icalrecurrencetype
-	instead.
-	(cal_recur_free): New function.
-
-	* cal-util/cal-recur.h (CalRecurType): Renamed from CalObjRecurType.
-	(CalRecurrence): Renamed from CalObjRecurrence.
-
-	* cal-util/timeutil.c (time_from_icaltimetype): New function.
-
-	* cal-util/Makefile.am: Commented out the test-recur program.
-
-2000-08-01  Damon Chaplin  <damon@helixcode.com>
-
-	* Removed doc directory, since it is the old gnome-pim docs which
-	aren't used any more.
-	
-	* Makefile.am (SUBDIRS): removed doc.
-
-2000-07-26  Peter Williams  <peterw@helixcode.com>
-
-	* gui/calendar-model.c: compile fix for Solaris
-	(works under Linux, too; don't know about others)
-
-	* this is a test of whether CVS merge does what I
-	think it will do.
-	
-2000-07-26  Federico Mena Quintero  <federico@helixcode.com>
-
-	OK, it seems that we have all the interesting properties for
-	single-user calendars now.  RFC 2445 can bite me.
-
-	* cal-util/cal-component.c (scan_property): Handle the RRULE
-	property.  Yay!.
-	(scan_recur): Likewise, yow!
-	(get_recur_list): Likewise, yeehaw!
-	(get_recur_list): Likewise, honk honk!
-	(set_recur_list): Likewise, booooga booooga!
-	(cal_component_get_rrule_list): Likewise, squeek squeek!
-	(cal_component_set_rrule_list): That's it, I ran out of sounds.
-	(cal_component_free_recur_list): Likewise.
-	(scan_property): Handle the EXRULE property.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_exrule_list): Likewise.
-	(cal_component_set_exrule_list): Likewise.
-	(set_period_list): Oops, free the old properties as well as
-	removing them.
-	(set_text_list): Ditto.
-	(cal_component_set_exdate_list): Ditto.
-
-	* cal-util/cal-component.c: Put all the functions used to free
-	returned values all together.
-	(cal_component_set_rdate_list): Oops, mark SEQUENCE property to be
-	incremented since the RFC requires it.
-	(scan_property): Handle the EXDATE property.
-	(scan_exdate): Likewise.
-	(free_icalcomponent): Likewise.
-	(cal_component_get_exdate_list): Likewise.
-	(cal_component_set_exdate_list): Likewise.
-	(cal_component_free_exdate_list): Likewise.
-
-2000-07-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/Makefile.am: Fixed a typo
-
-2000-07-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* gui/Makefile.am: Added a few xpm files to the EXTRA DIST section
-
-2000-07-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_free_period_list): New function.
-	(scan_property): Handle the RDATE property.
-	(scan_period): Likewise.
-	(free_icalcomponent): Likewise.
-	(get_period_list): Likewise.
-	(set_period_list): Likewise.
-	(cal_component_get_rdate_list): Likewise.
-	(cal_component_set_rdate_list): Likewise.
-	(scan_text): Simplify a bit since we only handle the ALTREP
-	parameter; there is no need to iterate over all parameters.
-	(scan_datetime): Simplify; just handle the TZID parameter.
-	(scan_summary): Simplify; just handle the ALTREP parameter.
-	(cal_component_get_as_string): New function.
-
-	* idl/evolution-calendar.idl (CalObjType): Removed the TYPE_OTHER;
-	now we only expose the types of objects we know about.
-
-	* cal-util/cal-util.h (CalObjType): Likewise.
-
-	* cal-client/cal-client.c (cal_client_get_n_objects): Likewise.
-	(cal_client_get_uids): Likewise.
-
-	* conduits/calendar/calendar-conduit.c (get_calendar_objects): Likewise.
-	(check_for_slow_setting): Likewise.
-
-	* pcs/cal-backend-imc.c (count_objects): Likewise.
-	(build_uids_list): Likewise.
-
-	* pcs/cal.c (Cal_get_uids): Likewise.
-	(Cal_get_n_objects): Likewise.
-
-2000-07-25  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-calendar-table.[hc]: new ECalendarTable to show an ETable view
-	for Todo/Event items.
-
-	* gui/task-assigned-to.xpm: 
-	* gui/task-recurring.xpm: 
-	* gui/task-assigned.xpm: 
-	* gui/task.xpm: new pixmaps (all the same at present) to go in the
-	icon column of the ETable.
-
-	* gui/event-editor.c: hid the silly 'Calendar' labels on the
-	GnomeDateEdits and hid the times when you select 'All day event'.
-	Also adjusted the time_t's so that when an all day event finishes on
-	say midnight 13th May, we show 12th May in the dialog, since it
-	implicitly includes all of that day up to midnight.
-
-	* gui/dialogs/task-editor-dialog.glade: 
-	* gui/dialogs/task-editor.[hc]: unfinished dialog to edit tasks.
-
-	* gui/gncal-todo.c: temporary hack so that we can use the simple dialog
-	with our new ETable.
-
-2000-07-23  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/calobj.h: added a few more fields.
-
-	* cal-util/calobj.c (ical_object_create_from_vobject): check for a
-	NULL return from vObjectUStringZValue for URL property to avoid SEGV.
-	For some reason an empty 'URL:' property appears and causes trouble.
-	
-2000-07-20  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (factory_fn): Update for the new
-	`evolution_shell_component_new()' arg.
-
-2000-07-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_set_trigger):
-	Finish filling the trigger.  What a pain, again.
-	(cal_component_alarm_free_trigger): Implemented.
-
-2000-07-19  Fatih Demir	<kabalak@gmx.net>
-	
-	* conduits/calendar/calendar-conduit-control-applet.desktop:
-	
-	* conduits/todo/todo-conduit-control-applet.desktop:
-		Added the Turkish desktop entries.
-
-2000-07-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_alarm_free): Free the
-	icalcomponent if this is an unattached alarm.
-	(scan_alarm_property): Handle the TRIGGER property.
-	(cal_component_alarm_get_trigger): Ditto.  Royal pain.
-	(cal_component_alarm_set_trigger): Ditto.  Less pain.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_get_object): Fixed inline
-	docs.
-	(cal_client_new): Ditto.
-	(cal_client_get_n_objects): Added inline docs.
-
-2000-07-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (CalComponentAlarm): New internal
-	represntation for alarm components.  We really don't map them to a
-	CalComponent because it is more convenient to handle them as
-	"child" structures.
-	(make_alarm): New function to create a CalComponentAlarm from an
-	icalcomponent representing a VALARM.
-	(scan_alarm_property): New function to scan a property from an
-	alarm component.  We support ACTION.
-	(cal_component_get_first_alarm): New function to start an iterator
-	over the alarms in a calendar component.
-	(cal_component_alarm_get_action): New function.
-	(cal_component_alarm_set_action): New function.
-
-2000-07-13  Seth Alves  <alves@hungry.com>
-
-	* conduits/todo/todo-conduit.c: conduit based on the calendar conduit.
-	this conduit syncs a pilot's ToDoDB database to wombat's list of "todo"
-	events.
-
-	* gui/gncal-todo.c (simple_todo_editor): set todo's priority control
-	based on value from ical object during edit.
-
-2000-07-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/print.c: Revert Michael's GnomeFont patch until the
-	gnome-print API stabilizes.
-
-2000-07-12  Michael Meeks  <michael@helixcode.com>
-
-	* gui/print.c (titled_box, print_text, print_month_small),
-	(bound_text): GnomeFont update.
-
-2000-07-12  Seth Alves  <alves@hungry.com>
-
-	* conduits/calendar/calendar-conduit.c: fixed various problems
-
-	* cal-client/Makefile.am: build a static version of the library
-	to link with the conduits
-
-	* cal-util/Makefile.am: same
-
-2000-07-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the COMPLETED
-	property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_completed): Ditto.
-	(cal_component_set_completed): Ditto.
-	(scan_property): Handle the TRANSPARENCY property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_transparency): Ditto.
-	(cal_component_set_transparency): Ditto.
-	(scan_property): Handle the URL property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_url): Ditto.
-	(cal_component_set_url): Ditto.
-
-	* pcs/cal-factory.c (queue_load_create_job): Removed unneeded
-	check for the URI.
-	(load_fn): Be more paranoid about the URI and notify the listener
-	if we got passed a bad URI.  Simplify the termination code a bit.
-	(create_fn): Likewise.
-	(queue_load_create_job): Be more paranoid about the URI.
-
-2000-07-10  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am: Remove pilot stuff for now.
-
-	* Makefile.am (SUBDIRS): Remove `conduits'.
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* gui/Makefile.am (EXTRA_DIST): remove gnomecal.conduit
-
-	* conduits/calendar/Makefile.am (EXTRA_DIST): We want
-	calendar.conduit.in, not calendar.conduit.
-
-2000-07-10  Seth Alves  <alves@hungry.com>
-
-	* gui/Makefile.am (SUBDIRS): 
-	* conduits/calendar/Makefile.am: moved calendar-conduit stuff from
-	the gui directory to here.
-
-	* Makefile.am (SUBDIRS): added conduits to SIBDIRS
-
-2000-07-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Remove
-	"close calendar" command.
-
-2000-07-08  Anders Carlsson  <andersca@gnu.org>
-
-	* gui/e-week-view.c (e_week_view_on_button_press): Handle mouse wheel scrolling.
-
-	* gui/e-day-view.c (e_day_view_on_time_canvas_button_press): New function to handle
-	mouse wheel scrolling.
-	(e_day_view_on_main_canvas_button_press): Handle mouse wheel scrolling.
-
-2000-07-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the SEQUENCE
-	property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_sequence): Ditto.
-	(cal_component_set_sequence): Ditto.
-	(cal_component_free_sequence): Ditto.
-	(cal_component_set_last_modified): Removed incorrect assertion.
-	(CalComponentPrivate): New need_sequence_inc flag.  The sequence
-	number must be incremented when certain properties change, so we
-	store a flag that says if we need to bump it when piping the
-	object over the wire.
-	(free_icalcomponent): Reset need_sequence_inc.
-	(cal_component_set_dtstart): Set need_sequence_inc.
-	(cal_component_set_dtend): Ditto.
-	(cal_component_set_due): Ditto.
-
-2000-07-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_property): Handle the
-	LAST-MODIFIED property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_last_modified): Ditto.
-	(cal_component_set_last_modified): Ditto.
-	(get_icaltimetype): New function to get struct icaltimetype
-	values.
-	(cal_component_get_created): Use get_icaltimetype().
-	(set_icaltimetype): New function to set struct icaltimetype
-	values.
-	(cal_component_set_created): Use set_icaltimetype().
-
-	* cal-util/cal-component.c (scan_property): Handle the CREATED
-	property.
-	(free_icalcomponent): Ditto.
-	(cal_component_free_icaltimetype): Ditto.
-	(cal_component_get_created): Ditto.
-	(cal_component_set_created): Ditto.
-	(cal_component_init): Do not create an UID here.
-	(ensure_mandatory_properties): New function to ensure that the
-	mandatory RFC properties are indeed in the component.  If they are
-	not, we create them on the fly.
-	(cal_component_set_new_vtype): Use ensure_mandatory_properties().
-	(cal_component_set_icalcomponent): Ditto.
-	(cal_component_get_uid): Return the UID in a parameter, not as a
-	function return value, for consistency's sake.
-	(scan_property): Handle the DTSTAMP property.
-	(free_icalcomponent): Ditto.
-	(cal_component_get_dtstamp): Ditto.
-	(cal_component_set_dtstamp): Ditto.
-
-2000-07-04  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gncal-todo.c (gncal_todo_update): Use &obj instead of &ico in
-	the call to cal_client_get_object(). The ToDo list should work now.
-
-	* gui/event-editor-dialog.glade: set the toplevel GnomeApp to invisible
-	so it doesn't appear and then resize.
-
-2000-07-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_summary): Use
-	CalComponentText instead of CalComponentPropSummary.  Removed the
-	latter typedef.
-	(cal_component_set_summary): Likewise.
-	(scan_property): Handle the CLASSIFICATION property.
-	(cal_component_get_classification): Ditto.
-	(cal_component_set_classification): Ditto.
-
-	* cal-util/cal-component.c (cal_component_free_text_list): Renamed
-	from cal_component_free_description_list().  We can share this
-	function since both comments and descriptions have the same form.
-	(scan_text): Ditto.
-	(get_text_list): New function.
-	(set_text_list): New function.
-	(cal_component_get_description_list): Use get_text_list().
-	(cal_component_set_description_list): Use set_text_list().
-	(cal_component_set_uid): Add sanity check.
-	(cal_component_get_summary): Ditto.
-	(cal_component_get_description_list): Ditto.
-	(cal_component_get_dtstart): Ditto.
-	(cal_component_get_dtend): Ditto.
-	(cal_component_get_due): Ditto.
-	(scan_property): Handle the COMMENT property.
-	(cal_component_get_comment_list): Ditto.
-	(cal_component_set_comment_list): Ditto.
-
-2000-07-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_categories): Handle CATEGORIES.
-	This can appear multiple times, so we maintain a list.  We
-	compress them later to a single property with multiple values.
-	(cal_component_get_categories_list): Ditto.
-	(cal_component_set_categories_list): Ditto.
-	(cal_component_free_categories_list): Ditto.
-	(free_icalcomponent): Properly free the mappings.
-
-2000-07-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (scan_datetime): Handle date/time and
-	timezone pairs.
-	(scan_property): Handle DTSTART and DTEND.
-	(cal_component_free_datetime): Ditto.
-	(get_datetime): Ditto.
-	(cal_component_get_dtstart): Ditto.
-	(set_datetime): Ditto.
-	(cal_component_set_dtstart): Ditto.
-	(cal_component_get_dtend): Ditto.
-	(cal_component_set_dtend): Ditto.
-	(scan_property): Handle DUE date.
-	(cal_component_get_due): Ditto.
-	(cal_component_set_due): Ditto.
-
-2000-07-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_description_list):
-	Handle the DESCRIPTION property.  There can be multiple
-	descriptions with parameters each, so we deal with a list instead
-	of a single structure.
-	(cal_component_set_description_list): Ditto.
-	(cal_component_free_description_list): Ditto.
-	(scan_property): Ditto.
-	(scan_description): Ditto.
-
-2000-06-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c (cal_component_get_summary): To avoid
-	passing a million parameters to setters/getters for properties
-	that support parameters, we now pass client-side structures
-	instead.  Here we use CalComponentPropSummary.
-	(cal_component_set_summary): Ditto.
-
-2000-06-29  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/component-factory.c: Make calendar die when evolution quits.
-
-2000-06-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.c: Change of plans.  We use an
-	icalcomponent from libical as our core representation so that we
-	can preserve extension fields and fields that we don't (yet)
-	support.  CalComponent is just a wrapper with a nice API that
-	provides non-iterative, random access to the ical's fields.
-	(cal_component_destroy): Free the thing correctly.
-	(cal_component_get_vtype): Re-implement in terms of icalcomponent.
-	(cal_component_set_icalcomponent): New function to set the
-	CalComponent's data from an existing icalcomponent.
-	(cal_component_get_icalcomponent): New function.
-	(cal_component_set_new_vtype): New convenience function to create
-	an empty component.
-	(scan_icalcomponent): Core scanning function.
-	(scan_property): Another core scanning function.
-	(cal_component_get_uid): Use the property directly.
-	(cal_component_get_summary): Ditto.  Handle the altrep parameter
-	as well.
-	(cal_component_set_summary): Ditto.  Feel the pain, motherfucker.
-	It is ridiculous how much code this involves.
-	(scan_summary): Ditto.
-
-2000-06-29  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (owner_set_cb): Get an
-	EvolutionShellClient instead of an Evolution_Shell to match the
-	changes in libeshell.
-
-2000-06-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/Makefile.am: Do not link and include the pilot stuff for the
-	calendar component, just for the Pilot conduit.  Commented out the
-	Pilot part so that Evolution can build.  Sigh, we'll have to
-	modify gnome-pilot to use OAF.
-
-2000-06-29  Peter Williams  <peterw@helixcode.com>
-
-	* gui/Makefile.am (LINK_FLAGS): Make the calendar-pilot-sync
-	program conditional on HAVE_GNOME_PILOT, and add 
-	GNOME_PILOT_CFLAGS, GNOME_PILOT_LIBS, and PISOCK_LIBS in the
-	appropriate places.
-
-2000-06-29  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal.c (Cal_get_uid_by_pilot_id): 
-	(Cal_update_pilot_id): 
-	* pcs/cal-backend-imc.c (cal_backend_imc_update_pilot_id): 
-	(cal_backend_imc_get_uid_by_pilot_id): 
-	* pcs/cal-backend.c (cal_backend_get_uid_by_pilot_id): 
-	(cal_backend_update_pilot_id):  server code to service these:
-
-	* gui/calendar-pilot-sync.c: updated to make use of cal-client.
-	also uses dirty bits on both sides to aid in syncing.
-
-	* cal-client/cal-client.c (cal_client_get_uid_by_pilot_id): new
-	function -- ask the cal server to return uid given an object's
-	pilot id.
-	(cal_client_update_pilot_id): new function -- inform the
-	cal server of an objects pilot id and pilot dirty-flag.
-
-2000-06-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/cal-component.[ch]: New files for the new iCalendar
-	component object.  Today's properties: basic component type, UID,
-	SUMMARY.
-
-	* cal-util/Makefile.am: Added cal-component.[ch] to the list of
-	sources.
-
-2000-06-27  Michael Meeks  <michael@helixcode.com>
-
-	* pcs/Makefile.am (INCLUDES): use BONOBO_VFS_GNOME_CFLAGS.
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/calendar-model.c: Added an #ifdefed value_to_string handler
-	assignment.
-
-2000-06-26  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_duplicate_value):
-	Implement.
-	(calendar_model_initialize_value): Implement.
-	(calendar_model_value_is_empty): Implement.
-
-2000-06-21  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_reshape_long_event): set event before
-	using it!
-	(e_day_view_init): used new colors from tigert.
-
-2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/e-day-view.c, gui/e-week-view.c: Remove the usage of the "x"
-	and "y" arguments.
-
-2000-06-21  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_direction): changed so it keeps the
-	selection range. It just moves it on one day/week etc. This makes
-	it very handy for the keyboard shortcut code.
-
-	* gui/calendar-commands.c (calendar_control_activate): fixed bug
-	setting the radio button active.
-
-	* gui/e-day-view.[hc]: added support for keyboard navigation and
-	selection of the time range.
-
-2000-06-20  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_set_value_at): Implemented.
-	(calendar_model_is_cell_editable): Implemented.
-
-	* cal-client/cal-client.c (cal_client_update_object): Take in an
-	iCalObject instead of a stringified version.
-
-	* gui/gnome-cal.c (gnome_calendar_update_object): Removed.
-	(gnome_calendar_remove_object): Removed.
-	(save_ical_object_cb): Use the CalClient function.
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): Likewise.
-	(e_day_view_on_unrecur_appointment): Likewise.
-	(e_day_view_finish_long_event_resize): Likewise.
-	(e_day_view_finish_resize): Likewise.
-	(e_day_view_key_press): Likewise.
-	(e_day_view_on_editing_stopped): Likewise.
-	(e_day_view_on_top_canvas_drag_data_received): Likewise.
-	(e_day_view_on_main_canvas_drag_data_received): Likewise.
-	(e_day_view_on_delete_appointment): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_editing_stopped): Likewise.
-	(e_week_view_key_press): Likewise.
-	(e_week_view_on_delete_occurrence): Likewise.
-	(e_week_view_on_unrecur_appointment): Likewise.
-	(e_week_view_on_delete_appointment): Likewise.
-
-	* gui/gncal-todo.c (ok_button): Likewise.
-	(delete_todo): Likewise.
-
-2000-06-19  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/event-editor-dialog.glade: tidied up dialog a bit, adding
-	space etc.
-
-	* gui/e-week-view.c (e_week_view_reshape_events): removed debug msg.
-
-2000-06-18  Ettore Perazzoli <ettore@helixcode.com>
-
-	* cal-util/Makefile.am (INCLUDES): Include from
-	`$(top_builddir)/libical/src/libical' too.  [For the generated
-	libical `icalversion.h' header.]
-	* cal-client/Makefile.am (INCLUDES): Likewise.
-
-2000-06-18  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_top_canvas_drag_data_received): 
-	fixed a DnD bug.
-
-2000-06-17  Dan Winship  <danw@helixcode.com>
-
-	* cal-client/Makefile.am (INCLUDES): Fix to not depend on
-	installed ical.h
-
-2000-06-17  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view.c: added little buttons which are shown when there
-	are more events than will fit in a day. Clicking on the button takes
-	the user to the 1-Day view and shows the full day.
-
-	* gui/e-day-view.c: 
-	* gui/e-week-view.c: set the "use_ellipsis" arg to TRUE for the EText
-	items so we get tooltips automatically. Though we may want to use our
-	own code to show tooltips so we can show the tips when the mouse is
-	around the edges of the event box, and we may want to show the start
-	and end times of the event in full.
-
-	* gui/calendar-commands.c (calendar_control_activate): 
-	* gui/gnome-cal.h: added view_toolbar_buttons[] so we can access the
-	radio buttons in the code easily. We need this if we want to jump to
-	another view programmatically.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/jump.xpm: new icon for the EWeekView to jump to the day.
-
-	* gui/Makefile.am (EXTRA_DIST): added jump.xpm
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-model.c (calendar_model_class_init): #ifdef'ed out
-	references to functions which don't exist yet, so evolution still
-	compiles.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/test-recur.c: updated.
-
-	* cal-util/cal-recur.[hc]: mostly finished, though it depends on the
-	iCalObject struct being updated to support more of iCalendar.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* pcs/.cvsignore: added icalendar-test.
-
-2000-06-15  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/Makefile.am (test_recur_LDADD): use libical.a
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* cal-util/Makefile.am (noinst_PROGRAMS): merge the two separate
-	noinst_PROGRAMS declarations into one so automake accepts it.
-	(INCLUDES): include libical src dir so we don't depend on having
-	ical.h already installed
-
-2000-06-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c: GPtrArray cannot insert stuff in the
-	middle of the array (!), so use plain GArray everywhere.  Sigh.
-
-2000-06-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/cal-client.c (cal_client_get_object): Use vCalendar
-	again.
-
-	* cal-util/calobj.c (ical_object_find_in_string): From Seth, make
-	it use vCalendar again.
-
-2000-06-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (obj_updated_cb): Juggle some eggs in
-	asynchronous fashion.  Finished implementing.
-	(obj_removed_cb): Implemented.  This one needs no juggling.
-	(calendar_model_set_cal_client): Only load the objects if we have
-	a client.
-	(calendar_model_destroy): Disconnect from the client's signals.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added
-	calendar-model.[ch] to the list of sources.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_n_objects): Doh,
-	return the computed value.
-
-2000-06-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-model.c (CalendarModelPrivate): Added the array of
-	objects and the hash table of UID->array index.
-	(calendar_model_row_count): Return the length directly from the
-	array instead of asking the Wombat.
-	(calendar_model_value_at): Implemented.
-	(calendar_model_new): Create an empty model.  We provide a new
-	setter function now.
-	(calendar_model_construct): Removed function.
-	(calendar_model_set_cal_client): New function to set the calendar
-	client and object type at any time.  This lets us reuse a calendar
-	model object.
-
-	* cal-util/calobj.h (iCalObjectField): Just report whether the
-	object has alarms; not every single alarm.
-
-2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/Makefile.am (SHELL_OBJS): Removed.
-	(evolution_calendar_LDADD): Link with
-	`$(top_builddir)/shell/libeshell.a'.
-
-2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/component-factory.c (factory_fn): Pass NULL for the new args
-	@create_folder_fn and @remove_folder_fn.
-	(create_view): Updated to match the new
-	`EvolutionShellComponentCreateViewFn'.  Return
-	`EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE' if type is not
-	"calendar".
-
-2000-06-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* idl/evolution-calendar.idl (Cal): Added a get_n_objects()
-	method.
-
-	* pcs/cal-backend.c (cal_backend_get_n_objects): New function.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_n_objects):
-	Implemented.
-
-	* pcs/cal.c (Cal_get_n_objects): Implemented.
-
-	* cal-client/cal-client.c (cal_client_get_uids): Free the ev.
-	(cal_client_get_n_objects): Implemented.
-
-	* cal-util/calobj.h (iCalObjectField): New enumeration to identify
-	the fields in an iCalObject.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (event_editor_destroy): Free the private
-	structure.
-
-2000-06-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/calobj.c (ical_object_to_vobject): Allow for NULL
-	summaries.
-
-2000-06-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (toolbar): Added missing tooltips.  We still
-	need icons, though.
-
-2000-06-07  Seth Alves  <alves@hungry.com>
-
-	* cal-util/calobj.c (ical_object_find_in_string): put this back in,
-	it's still used in cal-backend-imc.c:cal_backend_imc_update_object
-
-	* cal-client/cal-client.c (cal_client_get_object): instead of
-	returning a text representation, decode the text and return an
-	iCalObject.  Also added CalClientGetStatus which indicates
-	success or type of failure.
-
-	* cal-util/calobj.c (ical_object_find_in_string): #ifed out
-	ical_object_find_in_string since it is unused now.
-
-	* cal-client/client-test.c (list_uids): track get_object change
-	* gui/calendar-commands.c (calendar_iterate): same
-	* gui/e-day-view.c (e_day_view_update_event): same
-	* gui/e-week-view.c (e_week_view_update_event): same
-	* gui/print.c (print_day_details): same
-	(print_day_summary): same
-	(print_todo_details): same
-	* gui/gnome-cal.c (trigger_alarm_cb): same
-	* gui/gncal-todo.c (gncal_todo_update): same
-
-2000-06-06  Seth Alves  <alves@hungry.com>
-
-	* cal-util/icalendar.c, icalendar-save.c: fixed a bunch of problems
-	* cal-util/calobj.c (ical_object_find_in_string): use libical
-	instead of libversit
-	(ical_object_to_string): same
-	(dump_icalobject): prints the contents of an icalobject for debugging
-
-	* gui/Makefile.am (LINK_FLAGS): link libical.a instead of libical.la
-	so we don't have to modify the build system of the released libical
-	* cal-client/Makefile.am (client_test_LDADD): same
-	* cal-util/Makefile.am (icalendar_test_LDADD): same
-
-2000-06-06  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/calobj.c (ical_object_destroy): Removed from the public
-	header; made static.  Now everyone should use refcounting.
-
-	* pcs/cal-backend-imc.c (free_ical_object): Use
-	ical_object_unref().
-	(remove_object): Likewise.
-
-2000-06-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (print): New function to call the print
-	engine.
-	(calendar_toolbar): Added the Print button.
-	(calendar_control_activate): Added the File/Print item.
-
-	* gui/e-day-view.c (e_day_view_get_selected_time_range): Allow
-	start_time and end_time to be NULL.
-
-	* gui/e-week-view.c (e_week_view_get_selected_time_range):
-	Likewise.
-
-	* gui/print.c (range_selector_new): Show the range selector
-	widgets.  Use the correct radio group for all of them!
-	(print_calendar): Do the dialog box here.  We may want to split
-	this function later into smaller chunks.
-
-2000-06-05  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_button_press): 
-	allow the right button to popup the menu, even when the event is
-	being edited.
-
-	* gui/e-week-view.c: 
-	* gui/e-day-view.c: Set the keyboard focus to the EDayView/EWeekView
-	when the right button is clicked, so that any event being edited is
-	saved before any action (e.g. opening the Event Editor dialog) is
-	started. Note that this won't work if we switch to asynchronous
-	notification.
-
-2000-06-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (tb_save_and_close_cb): Implemented.
-	(toolbar): Added an icon for the Save and Close command.
-	(save_ical_object): Recompute the title of the window here.  Maybe
-	it would be better to do it when we actually get the
-	"object_changed" signal from the CalClient.
-	(file_close_cb): Implemented.
-
-2000-06-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (save_ical_object_cb): Implemented.
-	(gnome_calendar_add_object): Removed function, since it was
-	identical to gnome_calendar_update_object().  Modified the rest
-	of the code to use only the latter.
-	(gnome_calendar_remove_object): Be more paranoid about the UID.
-	(gnome_calendar_update_object): Ditto.  Also, renamed this
-	function from gnome_calendar_object_changed(), for consistency
-	with the lower-level CalClient interface.
-
-	* gui/event-editor.c (event_editor_class_init): New
-	"save_ical_object" signal to ask that our parent store the
-	calendar object to the backend.
-	(save_ical_object): New function to save the calendar object,
-	actually if just emits the signal.
-	(file_save_cb): Implemented.
-	(dialog_to_ical_object): We want priv->
-	alarm_program_run_program_entry (i.e. the entry inside the
-	GnomeFileEntry), not the file entry itself.
-	(dialog_to_ical_object): Only insert the recurrence ending date if
-	the event is recurrent!
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Fixed EXTRA_DIST.
-
-2000-06-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (editor_closed_cb): Handler for the
-	"editor_closed" signal of the event editor; we just destroy it
-	then.
-
-	* gui/event-editor.c (app_delete_event_cb): Callback used when the
-	dialog is closed.  Release the iCalObject here instead of the
-	event editor's destroy handler, and emit the new "editor_closed"
-	signal.
-
-2000-06-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Change of plans.  The toplevel
-	GnomeApp is now generated with Glade instead of being created in
-	the program code.  Otherwise we can't migrate the accelerators to
-	the new toplevel and they won't work.
-
-	* gui/event-editor.[ch]: EventEditor now derives from GtkObject.
-	This lets us use the GnomeApp created by libglade and still have
-	signals and stuff.
-
-	* gui/event-editor.c (create_menu): Tell the UI handler that the
-	menubar is the GnomeApp's existing one, not to create a new one.
-	(create_toolbar): Tell the UI handler to use the GnomeApp's
-	existing toolbar.
-	(event_editor_focus): New function to raise/focus an event editor.
-
-	* gui/gnome-cal.c (gnome_calendar_edit_object): Use
-	event_editor_focus().
-
-2000-06-01  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Put the
-	toolbar into a frame to make it look like standard GNOME toolbars.
-	Also, set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not
-	do evil things when its moved to the left or the right of the
-	window.
-
-2000-05-31  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.h (GnomeCalendar): Added a hash table to map
-	calendar objects to their respective event editors.
-
-	* gui/gnome-cal.c (gnome_calendar_init): Create the
-	object_editor_hash.
-	(gnome_calendar_destroy): Free the object_editor_hash.
-	(gnome_calendar_edit_object): New function to centralize the
-	launching of event editors; if one already exists for a particular
-	calendar object, we just raise its window.
-	(edit): Use gnome_calendar_edit_object().
-
-	* gui/calendar-commands.c (display_objedit): Use
-	gnome_calendar_edit_object().
-	(display_objedit_today): Likewise.
-
-	* gui/e-day-view.c (e_day_view_on_new_appointment): Likewise.
-	(e_day_view_on_edit_appointment): Likewise.
-
-	* gui/e-week-view.c (e_week_view_on_new_appointment): Likewise.
-	(e_week_view_on_edit_appointment): Likewise.
-
-	* gui/event-editor.c (event_editor_new): Do not take in an
-	iCalObject; rather provide an event_editor_set_ical_object()
-	function.  We need this because a single editor may be switched
-	between different calendar objects.  Also, do not show the event
-	editor; leave it up to the client code.
-	(event_editor_construct): Likewise.
-	(clear_widgets): New function to clear the widgets to default
-	values.
-	(fill_widgets): New function to fill in the widgets from the
-	iCalObject.  We don't do this in init_widgets() anymore.
-	(free_exception_clist_data): New function to free the exceptions
-	clist data.  We were leaking the row data.
-	(init_widgets): Hook to the destroy signal of the exceptions
-	clist.
-	(event_editor_set_ical_object): New function.  Now it also makes a
-	copy of the calendar object for the event editor; clients do not
-	need to copy it anymore.
-	(event_editor_destroy): Unref the UI handler as well.
-	(event_editor_class_init): New "ical_object_released" signal to
-	notify the parent that we are no longer editing the calendar
-	object.
-	(make_title_from_ico): Handle NULL objects.
-
-	* gui/event-editor.h (EventEditor): Removed fields that are no
-	longer used.
-
-2000-05-31  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/Makefile.am: added test-recur test program.
-
-	* cal-util/test-recur.c: new file to test the recurrence code.
-
-	* cal-util/.cvsignore: added test-recur.
-
-	* cal-util/cal-recur.c: updated.
-
-2000-05-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor.c (event_editor_construct): Create the UI
-	handler after we have constructed the parent GnomeApp.
-	(main_menu): Menu template is now in place.
-	(toolbar): Tollbar template is now in place.
-	(create_toolbar): Turn off labels in the toolbar since it sucks;
-	it should support non-homogeneous buttons with horizontal icons
-	and text.
-
-2000-05-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_object_changed): Removed the
-	flags argument, since now we just proxy the calendar object to the
-	calendar client.
-
-	* gui/event-editor.c (alarm_unit_get): Moved over from
-	event-editor-utils.c.
-
-	* gui/event-editor-utils.[ch]: Removed files, since the two
-	functions that were left there (i.e. the ones not present in
-	e-dialog-widgets) can simply be moved to event-editor.c.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed
-	event-editor-utils.[ch] from the list of sources.
-
-2000-05-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-utils.c: Moved many functions to
-	e-util/e-dialog-widgets.c.
-
-2000-05-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/event-editor-dialog.glade: Put the main notebook directly
-	under a simple GtkWindow.  We are going to pull out the notebook
-	and slap it into our custom-built GnomeApp, anwyays.
-
-	* gui/event-editor.c: Made the EventEditor derive from GnomeApp.
-	Added a BonoboUIHandler for its menu and toolbar.
-	(make_title_from_ico): Create a nice title for the window.
-	(get_widgets): Fetch the Glade widgets here instead of all over
-	the place.
-	(event_editor_new): Temporary hack to show the dialog here, just
-	so that I can test it.
-
-	* gui/Makefile.am (EXTRA_DIST): Added the Glade messages file.
-
-2000-05-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c (init_bonobo): Do not initialize libglade twice.
-
-	* gui/component-factory.c (create_view): Set the folder_uri
-	property, otherwise the calendar will not get loaded into the
-	view.
-
-2000-05-25  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/main.c: Make it so that warnings don't crash calendar.
-
-2000-05-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/evolution-calendar-control.c: Removed.
-
-	* gui/main.c: New.
-
-	* gui/control-factory.c: New.
-	* gui/control-factory.h: New.
-
-	* gui/calendar-component-factory.c: New.
-	* gui/calendar-component-factory.c: New.
-
-	* gui/evolution-calendar-control.c (calendar_control_factory):
-	Renamed from `calendar_factory'.
-	(calendar_control_factory_init): Renamed from
-	`calendar_factory_init'.
-
-	* gui/Makefile.am: Link with the files from `$(builddir)/shell'.
-
-	* gui/evolution-calendar.gnorba: New.
-	* gui/evolution-calendar.oafinfo: New.
-
-2000-05-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/print.c (range_selector_new): New function to create the
-	custom range selector.
-	(print_dialog): New function to show the print dialog.
-	(print_calendar): Use the print dialog.
-
-2000-05-24  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added libepaned.a.
-
-	* gui/gnome-cal.c: Switched from GtkPaned to EPaned.
-
-2000-05-22  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_get_events_in_range): Removed
-	function.
-
-	* gui/mark.c (mark_month_item): Use
-	cal_client_get_events_in_range().
-
-	* gui/calendar-commands.c (show_year_view_clicked): Comment out,
-	since we don't have a year view.
-
-	* gui/gnome-cal.c (setup_widgets): Removed the year view stuff.
-	(gnome_calendar_get_current_view_name): Likewise.
-	(gnome_calendar_update_view_times): Likewise.
-	(gnome_calendar_direction): Likewise.
-	(gnome_calendar_set_view): Likewise.
-	(gnome_calendar_update_all): Likewise.
-	(gnome_calendar_object_updated_cb): Likewise.
-	(gnome_calendar_object_removed_cb): Likewise.
-	(gnome_calendar_time_format_changed): Likewise.
-	(gnome_calendar_get_current_time_range): Likewise.
-
-	* gui/gnome-cal.h (GnomeCalendar): Removed the year view stuff.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Added layout.[ch],
-	print.[ch].  Removed quick-view.[ch], year-view.[ch] since they
-	are no longer used.  Removed all the old Pilot crap.
-
-2000-05-20  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/cal-recur.[hc]: new files to implement iCalendar recurrence
-	rules. These are only part finished, but people may like to check that
-	the architecture seems OK.
-
-2000-05-17  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): 
-	* gui/e-week-view.c (e_week_view_on_delete_occurrence): use a copy of
-	the iCalObject so we detect the change in the "update_event" callback.
-	Maybe we should just update the view ourselves and then we wouldn't
-	need to detect any change in the callback.
-
-	* cal-util/calobj.c (ical_object_reset_recurrence): new function to
-	get rid of any recurrence rules. Used when we 'unrecur' an event.
-
-	* gui/e-day-view.c (e_day_view_key_press): don't add a new event if it
-	won't fit, or we end up adding a new event for each key press.
-	(e_day_view_update_event_label): don't update it if it doesn't have
-	an EText item (i.e. it isn't visible).
-
-	* gui/e-day-view-time-item.c: allow selection of times using this
-	column.
-
-2000-05-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/timeutil.c (time_add_minutes): Fixed warning message.
-	(time_add_day): Likewise.
-	(time_add_month): Likewise.
-	(time_add_year): Likewise.
-	(time_from_day): Of all functions, *this* one had to have a bug.
-	Set the tm.tm_isdst to -1 to specify that we don't know whether
-	the time is in DST or not.  This fixes *many* bugs upstream.
-	(time_week_begin): Likewise.  We never noticed this since the week
-	functions are never used.
-	(time_week_end): Likewise.
-
-2000-05-17  Seth Alves  <alves@hungry.com>
-
-	* gui/event-editor.c: hooked up more widget signals to callbacks
-	to the gladified dialog acts more like the original one.
-
-2000-05-16  Seth Alves  <alves@hungry.com>
-
-	* gui/event-editor.c (recurrence_toggled): hook the radio buttons
-	to the pages of the notebook.
-	(append_exception): 
-	(recurrence_exception_added): 
-	(recurrence_exception_deleted): 
-	(recurrence_exception_changed): code to deal with the recurrence
-	exception list.
-
-2000-05-15  Seth Alves  <alves@hungry.com>
-
-	* gui/event-editor.[ch]: gladeified replacement for eventedit.c
-
-	* gui/event-editor-utils.[ch]: utilities used by event-editor.c
-
-	* gui/event-editor-dialog.glade: glade file used by event-editor.c
-
-2000-05-14  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (display_notification): Use the alarm
-	notification dialog.
-	(display_notification_cb): New callback for the result of the
-	alarm notification dialog.
-
-	* gui/dialogs/alarm-notify.glade: New file with the alarm
-	notification dialog.
-
-	* gui/dialogs/alarm-notify-dialog.[ch]: New file.
-
-	* gui/dialogs/Makefile.am: New file.
-
-	* gui/Makefile.am (SUBDIRS): Added the dialogs directory.
-
-2000-05-13  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (trigger_alarm_cb): Better error checking, and
-	plug leaks of str_ico and ico.
-
-	* gui/evolution-calendar-control.c (main): Initialize libglade.
-
-2000-05-13  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* pcs/Makefile.am (INCLUDES): Add
-	`-I$(top_builddir)/libical/src/libical'.
-
-2000-05-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/calobj.c (generate): Use a (dtend - dtstart) offset to
-	compute the ending time of the occurrence.  This takes care of
-	recurring events that span multiple days.  Also, removed the DST
-	condition since it did not look right at all:  if you have a daily
-	appointment at 18:00, it still should happen at 18:00 even during
-	daylight savings.
-
-	* gui/gnome-cal.c (gnome_calendar_tag_calendar): Use the timeutil
-	functions instead of calculating the month's times by hand.  Use
-	cal_obj_instance_list_free() instead of freeing the list by hand.
-	Clip the range we pass to mark_gtk_calendar_day().
-	(mark_gtk_calendar_day): Fixed off-by-one error at the end of the
-	month by adding real day offsets.
-
-2000-05-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (add_alarms_for_object): New function to add
-	today's alarms for a single object.
-	(gnome_calendar_object_updated_cb): Update the object's alarms.
-
-	* idl/evolution-calendar.idl (Cal): Added a
-	get_alarms_for_object() method.
-
-	* pcs/cal.c (Cal_get_alarms_for_object): Implemented method.
-
-	* pcs/cal-backend.c (cal_backend_get_alarms_for_object): New
-	function.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_alarms_for_object):
-	Implemented.
-
-	* cal-client/cal-client.c (cal_client_get_alarms_for_object): New
-	function.
-
-2000-05-11  Dan Winship  <danw@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Now that we
-	depend on current gnome-libs we can make the toolbar detachable
-	again.
-
-	* pcs/icalendar-save.c (timet_to_icaltime): remove unused timezone
-	variable to make this compile on BSD systems (where timezone is
-	the name of a function)
-
-2000-05-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/gnome-cal.c (gnome_calendar_update_all): Removed unused
-	arguments.  Load the initial alarms here.
-	(load_alarms): New function to load a day's worth of alarms.
-	(gnome_calendar_class_init): Eeeek!  This was taking in an
-	incorrect argument type.
-	(gnome_calendar_init): Now the calendar keeps a hash table of
-	UIDs->queued alarms.  Create the hash table here.
-	(gnome_calendar_destroy): Destroy the alarms hash table.
-	(gnome_calendar_object_updated_cb): Remove the alarms for the
-	object and regenerate them.
-	(gnome_calendar_object_removed_cb): Remove the alarms for the
-	object.
-
-	* gui/alarm.c (alarm_add): Do not take in a CalendarAlarm, just
-	the trigger time, the callback and the closure data.  Return an
-	opaque identifier for the alarm so that it can be removed by the
-	client code if needed.  Use the queue_alarm() helper function.
-	(queue_alarm): Helper function to actually queue the alarm and set
-	up the itimer.  Deal with a nonzero return value from
-	setitimer().
-	(alarm_remove): New function to remove an alarm based on its ID.
-	(pop_alarm): New helper function; pops the first alarm of the
-	queue and resets the timer as appropriate.
-	(alarm_ready): Simplified a lot by using pop_alarm().
-
-	* idl/evolution-calendar.idl (Cal): Added get_alarms_in_range().
-
-	* pcs/cal.c (build_instance_seq): New function to build a CORBA
-	sequence from the internal list of instances.
-	(Cal_get_events_in_range): Use build_instance_seq().
-	(Cal_get_alarms_in_range): Implemented new method.
-
-	* pcs/cal-backend.c (cal_backend_get_alarms_in_range): New
-	function with the get_alarms_in_range() engine.
-
-	* pcs/cal-backend-imc.c (cal_backend_imc_get_alarms_in_range):
-	Implemented the get_alarms_in_range() method.
-
-	* cal-client/cal-client.c (cal_client_get_alarms_in_range): New
-	client-side function for getting the alarms.
-	(build_instance_list): New helper function to build the
-	CalObjInstance list from the CORBA sequence.
-	(cal_client_get_events_in_range): Use build_instance_list().
-
-	* gui/calendar-commands.h: #include <cal-util/calobj.h>.  #include
-	"gnome-cal.h".
-
-	* gui/e-week-view.c: #include "calendar-commands.h" instead of
-	main.h; the latter is an obsolete file and will be killed.
-
-	* gui/evolution-calendar-control.c (main): Call init_bonobo()
-	before anything else.  We need the GTK+ object system initialized.
-
-	* gui/Makefile.am (evolution_calendar_SOURCES): Do not use main.h.
-
-	* cal-util/cal-util.c (cal_alarm_instance_list_free): New function.
-
-2000-05-10  Matt Loper  <matt@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): Move
-	"about" menuitem to the help menu.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Added main.h.  Combined the two EXTRA_DIST
-	sections.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* pcs/cal-backend-imc.c: Set the format when creating a new
-	calendar.
-
-2000-05-09  Christopher James Lahey  <clahey@helixcode.com>
-
-	* pcs/cal-factory.c: Removed double free of method_string in
-	uri->method_string.
-
-2000-05-08  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* pcs/cal.h: Include "calendar/pcs/evolution-calendar.h" instead
-	of "evolution-calendar.h".
-
-	* pcs/cal-backend.h: Include "calendar/pcs/evolution-calendar.h"
-	instead of "evolution-calendar.h".
-
-2000-05-08  Seth Alves  <alves@hungry.com>
-
-	* gui/e-day-view.c (e_day_view_on_delete_appointment): call
-	e_day_view_stop_editing_event here to avoid a divide by zero
-	a bit further on.  i'm not sure if this is the best fix for this.
-
-2000-05-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend.h (CalBackendClass): CalBackendClass now is just
-	an interface for calendar backends; this is an abstract class.
-	Put in the vtable for the backend methods.
-
-	* pcs/cal-backend.c (cal_backend_new): Removed function, since
-	CalBackend is not just an abstract class.
-	Removed implementation-specific functions and made public
-	functions call the virtual methods instead.
-
-	* pcs/cal-backend-imc.[ch]: New files with the CalBackendIMC
-	implementation; this implements a backend for iCalendar and
-	vCalendar files.  Moved the implementation-specific stuff from
-	cal-backend.[ch] to here.
-
-	* pcs/cal-backend-imc.c (CalendarFormat): Moved enumeration to
-	here.  Added a CAL_UNKNOWN value for when the backend is not
-	loaded yet.
-	(cal_backend_imc_init): Initialize priv->format as CAL_UNKNOWN.
-	(save_to_vcal): Use the same VCProdIdProp value as in
-	cal-util/calobj.c.  Use "1.0" as the VCVersionProp as per the
-	vCalendar spec.
-	(ensure_uid): Return nothing, since the result value need not be
-	used anymore.
-	(add_object): Since we mark the calendar as dirty anyways, we do
-	not need to check the result value of ensure_uid() anymore.
-	(remove_object): Asssert that we know how to handle the object's
-	type.  We do this in add_object() anyways.
-
-	* pcs/Makefile.am (libpcs_a_SOURCES): Added cal-backend-imc.[ch].
-
-	* gui/gnome-cal.c: Replaced debugging printf()s with g_message()
-	so that we can see the line number where they occur.
-
-	* gui/gnome-cal.c (gnome_calendar_load_cb): Sort of handle the
-	LOAD_METHOD_NOT_SUPPORTED result code, and added a default for the
-	switch.
-
-	* cal-client/cal-listener.h (CalListenerLoadStatus): Removed
-	enumeration; it is stupid to translate all values for the
-	CalClient when it is going to translate them again.
-	(CalListenerClass::cal_loaded): This signal now passes the
-	LoadStatus directly from the CORBA side.
-
-	* cal-client/cal-listener.c (Listener_cal_loaded): Do not
-	translate the status value.
-
-	* cal-client/cal-client.h (CalClientLoadStatus): Added the
-	CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED error code.
-
-	* cal-client/cal-client.c (cal_loaded_cb): Translate the CORBA
-	version of the LoadStatus result code.
-
-	* pcs/cal-factory.c (CalFactoryPrivate): New methods field for the
-	hash table from method strings to the GtkTypes for backend class
-	types.
-	(cal_factory_init): Create the priv->methods hash table.
-	(cal_factory_destroy): Free the priv->methods hash table.
-	(cal_factory_register_method): New function to register a backend
-	class for a particular URI method.
-	(launch_backend_for_uri): New function to launch a backend for a
-	particular URI's method.
-	(load_backend): Use launch_backend_for_uri().  Move the error
-	notification code from load_fn() to here.
-	(create_backend): Use launch_backend_for_uri().  Move the error
-	notification code form create_fn() to here; it is #ifdefed out
-	since currently cal_backend_create() does not have any error
-	reporting capabilities.
-
-	* idl/evolution-calendar.idl (Listener::LoadStatus): Added a
-	PROTOCOL_NOT_SUPPORTED error code.
-
-	* pcs/cal-factory.c (cal_factory_load cal_factory_create): Removed
-	functions, since they were supposed to be internal only.
-	(CalFactory_load): Call queue_load_create_job() directly.
-	(CalFactory_create): Likewise.
-
-2000-05-08  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-week-view.c (e_week_view_remove_event_cb):
-	* gui/e-day-view.c (e_day_view_remove_event_cb): don't set the ico->uid
-	to NULL or we won't find any other occurrences of the event. Set the
-	editing_event_day/num to -1 instead.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): fixed the
-	positioning of the icons for long events.
-
-	* cal-util/calobj.c (ical_object_normalize_summary): forgot to
-	terminate the string.
-
-2000-05-07  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received):
-	(e_day_view_on_top_canvas_drag_data_received): show the EText item,
-	just in case it hasn't moved, otherwise it won't appear.
-
-	* gui/e-day-view.h (E_DAY_VIEW_BAR_WIDTH): increased from 6 to 8 to
-	make it easier to drag an event. Also increased E_DAY_VIEW_GAP_WIDTH
-	since it must be >= the BAR_WIDTH.
-
-2000-05-07  Matt Loper  <matt@helixcode.com>
-
-	* gui/evolution-calendar-control.c (PROPERTY_CALENDAR_URI):
-	Changed to "folder_uri" from "calendar_uri".
-	(set_prop): The uri given to us is a directory, so we append a
-	filename onto the end before we use it.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/timeutil.c (time_day_begin):
-	(time_day_end): changed these so they just do a simple localtime(),
-	update the struct tm, then do a mktime(). I don't know why it used to
-	look at the tm_isdst flags etc. From a little test program I wrote
-	which steps through testing every hour for a year it wasn't working
-	correctly, and the new code does.
-	(time_add_day): also got rid of the stuff that looked at tm_isdst here.
-	My test program now works better.
-
-2000-05-06  Chris Toshok  <toshok@helixcode.com>
-	* gui/.cvsignore: ignore evolution-calendar.pure
-
-	* gui/Makefile.am: add support for building evolution-calendar.pure
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c:
-	* gui/e-week-view.c: finish editing event when user hits Return key.
-	(e_week_view_on_text_item_event): stop event signals after doing any
-	other calls, since otherwise it will also stop any other resulting
-	event signals.
-
-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): don't
-	draw the start/end times while editing.
-
-	* gui/eventedit.c: changed the Summary field to a GtkEntry, since we
-	now only want a single line of text.
-
-	* cal-util/calobj.c (ical_object_normalize_summary): new function to
-	convert the summary field to a single line of text, by converting any
-	sequence of CR & LF characters to a single space.
-	(ical_object_create_from_vobject): call the above function. I think
-	all functions that load iCalObjects go through this.
-	(ical_new): called it here as well just in case.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/week-view.[hc]: removed.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gncal-day-panel.[hc]:
-	* gui/gncal-day-view.[hc]:
-	* gui/gncal-full-day.[hc]:
-	* gui/gncal-week-view.[hc]:
-	* gui/layout.[hc]:
-	* gui/view-utils.[hc]: removed old calendar view files.
-
-2000-05-06  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/calobj.[hc]: added guint ref_count to iCalObject struct,
-	and ical_object_ref/unref() functions. I've updated all the gui/
-	stuff to use ref_counts but I haven't touched the pcs/ stuff. Maybe
-	just using ical_object_destroy() is OK there.
-
-	* gui/gncal-todo.c:
-	* gui/calendar-commands.c:
-	* gui/eventedit.c:
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: use refcounting for iCalObjects.
-
-	* gui/e-day-view-main-item.c:
-	* gui/e-day-view-top-item.c:
-	* gui/e-day-view.c: try not to ever draw outside the event, even when
-	the event is very small.
-
-2000-05-05  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c: don't allow recurring events to be resized or
-	dragged, and don't show the resize/drag cursors. Actually it may be
-	better to let the user do the resize/drag and then ask them what they
-	want to do - change the single occurrence or the entire series.
-
-	* gui/e-day-view-time-item.c (e_day_view_time_item_show_popup_menu):
-	use e_auto_kill_popup_menu_on_hide() to destroy the popup menu.
-
-	* gui/popup-menu.c: include e-gui-utils.h
-
-2000-05-04  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view.c (e_day_view_foreach_event_with_uid): for the long
-	events pass E_DAY_VIEW_LONG_EVENT as the day. Fixes SEGV.
-
-	* gui/calendar-commands.c: when we switch views, grab the focus.
-
-	* gui/gnome-cal.c (gnome_calendar_tag_calendar):
-	(gnome_calendar_mark_gtk_calendar_day): changed this so it uses
-	cal_client_get_events_in_range(), and doesn't load any objects.
-	Also just return if it isn't visible.
-
-	* gui/calendar-commands.c (calendar_get_events_in_range): call
-	g_list_sort() to sort the list rather than g_list_insert_sorted() for
-	each element. It is much more efficient.
-	Also changed it so that the co->ev_start/end fields are copied from
-	the CalObjInstance rather than the parameters to the function
-	(that is right, isn't it?)
-	Also freed the list elements, and finally the list.
-	(calendar_iterate): changed this to use cal_client_get_events_in_range
-	since that is more efficient than getting all the uids and then loading
-	and parsing all the events.
-
-	* pcs/cal-backend.c (save): output the '... saved' message before
-	freeing the string!
-
-	* gui/gncal-todo.c (gncal_todo_update):
-	* gui/e-week-view.c (e_week_view_update_event):
-	* gui/e-day-view.c (e_day_view_update_event):
-	* gui/calendar-commands.c (calendar_get_events_in_range):
-	(calendar_iterate): free obj_string after it is parsed.
-
-2000-05-02  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): set the active
-	radio button here. Oops - it wasn't a Bonobo problem after all.
-
-	* gui/popup-menu.c (popup_menu): added call to
-	e_auto_kill_popup_menu_on_hide() to destroy the menu.
-
-	* gui/e-week-view.c (e_week_view_show_popup_menu):
-	* gui/e-day-view.c (e_day_view_on_event_right_click): ico->user_data
-	isn't useful any more, since the event editor keeps its own iCalObject.
-	So for now we make the menu commands available even when the event is
-	being edited in the event editor.
-	Also corrected misspellings of 'occurance' -> 'occurrence'.
-
-	* gui/eventedit.c (event_editor_destroy): destroy the iCalObject.
-	The event editor now uses its own independent iCalObject.
-
-	* gui/e-week-view.c (e_week_view_on_unrecur_appointment):
-	* gui/e-day-view.c (e_day_view_on_unrecur_appointment): create a new
-	uid for the new single instance. I'm not sure what we should do about
-	the creation/last modification times of the objects.
-
-	* gui/e-week-view.c (e_week_view_on_edit_appointment):
-	* gui/e-day-view.c (e_day_view_on_edit_appointment): duplicate the
-	iCalObject before passing it to the event editor, since it will change
-	the fields. If we don't duplicate it we won't know what has changed
-	when we get the "update_event" callback.
-
-	* gui/e-week-view.c (e_week_view_key_press):
-	* gui/e-day-view.c (e_day_view_key_press): set the created and last_mod
-	times of the new iCalObject. We may want to set the default alarm as
-	well.
-
-	* cal-util/calobj.c (ical_gen_uid): made this function public so we
-	can generate new uids if necessary.
-
-2000-05-01  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/gnome-cal.[hc] (gnome_calendar_get_current_time_range): new
-	function to get the currently seleted time range form the current view.
-
-	* gui/calendar-commands.c (display_objedit): use the above function
-	to get the time for the new appointment.
-
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: use a shallow copy of the ico when we update the
-	times (when resizing/dragging). Otherwise we won't detect that the
-	time has changed in the "update_event" callback.
-
-	Also added functions to get the currently selected time range.
-
-2000-04-30  Seth Alves  <alves@hungry.com>
-
-	* pcs/icalendar-save.c (icalcomponent_create_from_ical_object): set
-	attendee and contact address correctly.
-
-	* pcs/cal-backend.c (icalendar_calendar_load): init priv->object_hash
-	when loading.
-	(cal_get_type_from_filename): if file extension is .ical, consider
-	the file an ical file.
-
-2000-05-01  Damon Chaplin  <damon@helixcode.com>
-
-	* cal-util/calobj.c (ical_object_compare_dates): new function to see
-	if the event dates have changed (including any recurrence rules).
-	It is used for optimization when we get the "object_changed" signal.
-	We have to do far less work if the dates are unchanged.
-
-	* gui/e-week-view.c:
-	* gui/e-day-view.c: only draw the selection when we have the keyboard
-	focus, since the user expects to be able to type in a new event when
-	the selection is shown. Also keep the selection when we lose focus,
-	but just don't show it.
-
-	Also quite a few changes to cope with the new client/server
-	architecture.
-
-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw):
-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw):
-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):
-	only draw the selection if the widget has the keyboard focus.
-
-	* gui/gnome-cal.c (mark_gtk_calendar_day): fixed so it works with
-	events longer than one day. And changed the code for updating events
-	in the new views.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* gui/evolution-calendar-control.c
-	(init_bonobo): OAFized.
-
-	* gui/main.c (main): Initialize with OAF if `USING_OAF'.
-
-	* gui/evolution-calendar-control.c: New #define
-	`CONTROL_FACTORY_ID', varying according to whether we are
-	`USING_OAF'.
-	(calendar_factory_init): Use `CONTROL_FACTORY_ID'.
-
-	* gui/Makefile.am: Updated for OAF.
-
-	* pcs/cal-factory.h: Explicitly #include
-	"calendar/pcs/evolution-calendar.h" instead of just
-	"evolution-calendar.h".
-
-	* cal-client/cal-client.c (cal_client_construct) [USING_OAF]: Use
-	OAF.
-
-	* cal-client/client-test.c (init_corba): New function, implemented
-	differently depending on `USING_OAF'.
-
-2000-04-27    <alves@hungry.com>
-
-	* pcs/cal-backend.c (cal_backend_load): fix memory leak
-	(save_to_vcal): same
-	(save): same
-	(cal_backend_load): same
-
-2000-04-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* cal-util/.cvsignore: Replaced libcal-util.la with *.la
-
-	* pcs/.cvsignore: Added *.la and *.lo.
-
-2000-04-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-factory.c (backend_last_client_gone_cb): Renamed from
-	backend_destroy_cb.  Now we use it for the "last_client_gone"
-	signal from the backend.  Also, unref the backend to destroy it.
-	(add_backend): Connect to the "last_client_gone" signal of the
-	backend.
-	(cal_factory_get_n_backends): New function to query the number of
-	running backends.
-
-	* pcs/cal-backend.c (cal_backend_class_init): Register the new
-	"last_client_gone" signal.  It is emitted when the last Cal client
-	goes away.  It is used to notify the factory when a backend may be
-	safely destroyed.
-	(cal_destroy_cb): Emit the "last_client_gone" signal when the last
-	client disconnects from the backend.
-
-2000-04-25  Seth Alves  <alves@hungry.com>
-
-	* gui/e-day-view.c (e_day_view_find_event_from_ico): compare
-	iCalObjects by their UIDs instead of by their pointers.
-
-	* pcs/cal-backend.c (cal_backend_destroy): don't save on destroy.
-
-2000-04-25  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* cal-client/Makefile.am: Add `$(datadir)/idl'.
-
-	* pcs/Makefile.am (idl_flags): Add `$(datadir)/idl'.
-	(INCLUDES): Use `$(BONOBO_GNOME_CFLAGS)'.
-
-2000-04-25  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_destroy): hook for widget
-	destroy -- used to unref the CalClient so wombat knows we are gone.
-	(gnome_calendar_class_init): added a class init for this widget.
-
-	* gui/e-day-view.c (e_day_view_update_event): allow for null ico
-
-	* gui/e-week-view.c (e_week_view_update_event): allow for null ico
-
-2000-04-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/client-test.c (main): The path to the test calendar
-	changed when we moved stuff around.  Users will have to tweak this
-	for their CVS setup, anyways.
-	(create_client): Create or load the calendar as appropriate.
-	(client_destroy_cb): Exit the main loop if both clients are gone.
-	(main): Connect to the "destroy" signal of the clients so that we
-	can terminate the test program.
-
-2000-04-24  Seth Alves  <alves@hungry.com>
-
-	* pcs/icalendar.c (parse_person): allow for null CN
-	(parse_person): allow for null sent_by
-
-	* pcs/Makefile.am: build icalendar-test
-
-	* pcs/icalendar-test.c: a test which loads an ical file and
-	converts it to our internal format, and then saves it back out.
-
-2000-04-24  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/Makefile.am: added new source files and pixmaps, and removed
-	old source files, which can be deleted.
-
-	* gui/e-week-view-titles-item.[hc]:
-	* gui/e-week-view-main-item.[hc]:
-	* gui/e-week-view-event-item.[hc]:
-	* gui/e-week-view.[hc]: new files implementing the week/month views.
-
-	* gui/yearview.xpm:
-	* gui/monthview.xpm:
-	* gui/weekview.xpm:
-	* gui/workweekview.xpm:
-	* gui/dayview.xpm: new pixmaps for the toolbar buttons. These aren't
-	intended to be the final pixmaps.
-
-	* gui/calendar-commands.c: added radio buttons to the toolbar to
-	switch between the calendar views, and moved the am_pm_flag here so we
-	can get rid of view-utils.c.
-
-	* gui/gnome-cal.[hc]: made it a subclass of GtkVBox, rearranged the
-	widgets into 2 notebooks, and added the	selection_start_time and
-	selection_end_time fields.
-
-	* gui/goto.c: updated to use new selection time range.
-
-	* gui/quick-view.c: added '#include <gtk/gtkwindow.h>' so it compiles.
-
-	* gui/e-day-view.[hc]: changed the interface to support the new
-	selection time range, got rid of a few debugging messages and changed
-	a few bits.
-
-2000-04-21  Seth Alves  <alves@hungry.com>
-
-	* pcs/icalendar-save.c: start on code to do the opposite of
-	icalendar.c (convert from iCalObjects to libical's icalcomponents).
-
-	* gui/calendar-commands.c (calendar_control_activate): moved
-	"About Calendar" into the View menu so it shows up.
-
-2000-04-20  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_changed_cb): new function: callback
-	for listener's object updated signal.
-	(gnome_calendar_object_removed_cb): new function: callback for
-	listener's object removed signal.
-	(gnome_calendar_new): hook up listener's "obj_updated" and
-	"obj_removed" signals so if evolution is running twice,
-	they will both see changes right away.
-	(gnome_calendar_object_changed): don't call update_all, since
-	it will be called by the listener.
-	(gnome_calendar_remove_object): don't call update_all
-	(gnome_calendar_add_object): don't call update_all
-
-	* gui/gncal-full-day.c (child_realize): create fullday's gcs
-	even if pixmap_bell has already been created.  this was
-	causing crashes if the calendar was run twice.
-
-2000-04-19  Seth Alves  <alves@hungry.com>
-
-	* gui/eventedit.c (ee_rp_init_rule): changed the order around
-	a bit to avoid a Gtk-CRITICAL crash
-
-	* gui/gncal-todo.c (gncal_todo_update): fixed code to populate
-	the todo clist
-
-	* cal-client/cal-client.c (cal_client_get_uids): don't check
-	type against CALOBJ_TYPE_ANY since it will always match.
-	(cal_client_get_uids): same (re: CALOBJ_TYPE_ANY)
-
-	* pcs/cal-backend.c (build_uids_list): same (re: CALOBJ_TYPE_ANY)
-
-	* pcs/cal.c (Cal_get_uids): same (re: CALOBJ_TYPE_ANY)
-
-	* pcs/cal-backend.c (remove_object): don't call save from here
-	because in all cases the caller of remove_object calls save
-
-	* gui/calendar-commands.c (calendar_set_uri): calls gnome_calendar_open
-	instead of checking on disk and calling load or create.
-
-	* gui/gnome-cal.c (gnome_calendar_object_changed): fixed to use
-	cal_client_update_object -- editing and dragging events works again
-	(gnome_calendar_open): collapsed gnome_calendar_load and
-	gnome_calendar_create into this function.  added new type
-	GnomeCalendarOpenMode which has the value CALENDAR_OPEN or
-	CALENDAR_OPEN_OR_CREATE.
-
-	* gui/evolution-calendar-control.c (calendar_properties_init): create
-	a property bag for this control
-	(set_prop): callback for property sets
-	(get_prop): callback for proprety gets
-
-	* gui/calendar-commands.c (calendar_set_uri): new function,
-	called when the "calendar_uri" property is set on the calendar-
-	control's property bag.
-
-2000-04-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/Makefile.am (INCLUDES): Fix include path.
-
-2000-04-16  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-factory.h (CalFactoryClass): We have a new
-	"last_calendar_gone" signal that Wombat can use to terminate
-	itself properly.
-
-	* pcs/cal-factory.c (cal_factory_class_init): Register the
-	"last_calendar_gone" signal.
-	(backend_destroy_cb): Emit the "last_calendar_gone" signal instead
-	of killing the factory.
-
-	* pcs/Makefile.am: Added $(CORBA_GENERATED) to BUILT_SOURCES.
-	(INCLUDES): Make the log domain be "wombat-pcs".
-
-2000-04-17  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal-backend.c (add_object): removed implicit save, since
-	we don't want to save as we load from disk.
-	(cal_backend_update_object): added a call to save, since it
-	isn't done by add_object now.
-
-2000-04-16  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-util/Makefile.am: Renamed library from libcalutil to
-	libcal-util, to be consistent with libcal-client.  Install header
-	files in $(includedir)/evolution/cal-util.
-	(INCLUDES): Add "cal-util" log domain for glib.
-	(libcal_clientincludedir): The header files are now installed in
-	$(includedir)/evolution/cal-client.
-
-	* cal-util/cal-util.h: Fix includes.
-
-	* cal-client/client-test.c: Fix includes.
-
-	* pcs/Makefile.am: Create libpcs.a, not a shared library, because
-	it is for internal use by Wombat only.  The header files should
-	not be installed, either.  Removed all the old Tlacuache stuff.
-
-	* gui/Makefile.am (EXTRA_DIST): We no longer distribute
-	gncal.desktop.
-	(evolution_calendar_INCLUDES): Add "calendar-gui" for the glib log
-	domain.
-
-	* gui/*.[ch]: Fix cal-util and cal-client includes.
-
-	* pcs/Makefile.am (INCLUDES): Added "pcs" log domain for glib.
-
-	* pcs/*.[ch]: Fix cal-util includes.
-
-2000-04-11  Chris Toshok  <toshok@helixcode.com>
-
-	* pcs/icalendar.c (icaltime_to_timet): use HAVE_TIMEZONE to switch
-	between linux's timezone variable and *bsd's method of getting the
-	gmt offset.
-
-2000-04-10  Seth Alves  <alves@hungry.com>
-
-	* pcs/cal-backend.c (save_to_vcal): create and save an actual
-	vcalendar instead of a list of vcal objects.
-
-2000-04-10  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/Makefile.am (INCLUDES): moved srcdir directories to the top so
-	we search headers in the evolution tree before installed headers.
-	(Otherwise when you do 'make install' lots of files in gui/ get
-	rebuilt, since they depend on the installed cal-client.h which has just
-	been updated.)
-
-2000-04-09  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_load): catch cal_loaded signal
-	on the cal client.
-	(gnome_calendar_load_cb): callback for cal_loaded signal.  moved
-	gnome_calendar_update_all from gnome_calendar_load to here.
-
-	* gui/calendar-commands.c: minor cleanups
-
-	* pcs/cal-backend.c (save_to_vcal): copied code from gnome-pim
-	to write vcal to a file
-	(save): filled it with more gnome-pim code
-	(add_object): call save () after changing
-	(remove_object): same
-	(cal_backend_create): same
-	(cal_backend_remove_object): same
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* gui/Makefile.am: Removed linking with libetable and libeminicard
-	since they weren't being used.
-
-2000-04-08  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.c (gnome_calendar_create): new function:
-	friendly wrapper for cal_client_create_calendar
-
-	* gui/calendar-commands.c (new_calendar): call gnome_calendar_create
-	if no filename is provided
-
-	* gui/prop.c (properties): calendar is a frame
-
-	* gui/calendar-commands.c (calendar_control_activate): sort out the
-	menus a bit, more of them show up now.
-
-	* gui/Makefile.am: don't build library or test, just the bonobo control
-
-	* gui/gncal-todo.c (simple_todo_editor): calendar is a frame instead
-	of a window, now.
-
-	* gui/gnome-cal.c (gnome_calendar_new): same
-
-	* gui/goto.c (goto_dialog): same
-
-2000-04-06  Seth Alves  <alves@hungry.com>
-
-	* gui/calendar-commands.c (calendar_control_activate): removed
-	uih from the argument list, added cal.  use cal as user_data
-	in callbacks rather than the control.
-	(calendar_control_deactivate): removed uih from argument list
-
-2000-04-05  Seth Alves  <alves@hungry.com>
-
-	* gui/calendar-commands.c (setup_menu): removed
-	(setup_appbar): removed
-	(calendar_control_activate): new function -- does the work
-	that setup_appbar and setup_menu used to do.
-	(calendar_control_deactivate): undoes what calendar_control_activate
-	does by removing the toolbar items and menu items.
-
-	* gui/Makefile.am: build test-calendar-widget and evolution-calendar,
-	common stuff is in a library
-
-	* gui/gnome-cal.c (gnome_calendar_get_type): made the calendar widget
-	based on a gtk_frame rather than a gnome_app
-
-	* gui/calendar-commands.c: split out some of main.c
-
-	* gui/evolution-calendar-control.c: bonobo bung so evolution
-	can use the calendar widget
-
-2000-04-01  Matt Loper  <matt@helixcode.com>
-
-	* pcs/.cvsignore: Added *.lo.
-
-2000-03-30  Seth Alves  <alves@hungry.com>
-
-        * gui/main.c (calendar_get_events_in_range):
-        cal_client_get_events_in_range returns a list of CalObjInstance *, not
-        a list of (char *) uid.
-
-	* Makefile.am (SUBDIRS): readded the gui directory
-
-	* gui/main.c: temporarily added alarm_defaults back in,
-	since the calendar doesn't link without it
-
-2000-03-29  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: remove the gui directory, which doesn't compile.
-
-2000-03-28  Matt Loper  <matt@helixcode.com>
-
-	* pcs/Makefile.am: create a libpcs.la library, for use in the
-	wombat.
-
-2000-03-28  Seth Alves  <alves@hungry.com>
-
-	* gui/Makefile.am (LINK_FLAGS): added libeutil.la and libetext.a
-
-	* gui/main.c (calendar_iterate): switch from string_to_ical_object to
-	ical_object_find_in_string
-	(calendar_get_events_in_range): same
-	(session_save_state): commented out references
-	to gcal->client->filename
-
-2000-03-27  Federico Mena Quintero  <federico@helixcode.com>
-
-	* pcs/cal-backend.c (cal_backend_get_object): Use
-	ical_object_to_string().
-
-	* cal-util/calobj.c (ical_object_to_string): Moved over from
-	pcs/cal-backend.c (was string_from_ical_object).
-	(get_calendar_base_vobject): Likewise, moved over from
-	pcs/cal-backend.c.
-
-	* cal-util/cal-util.c: Removed string_to_ical_object(); the
-	correct function is in calobj.[ch], called
-	ical_object_find_in_string().  Removed ical_object_to_string,
-	since we now implement it in calobj.c.
-
-	* cal-util/calobj.c: Removed ical_object_new_from_string(); see
-	above.
-
-	* idl/evolution-calendar.idl (CalObjInstance): Calendar object
-	instances now contain only the UID for the object, not the whole
-	string representation of the object.  This allows clients to
-	implement caching of objects if they wish.
-
-	* pcs/cal.c (Cal_get_events_in_range): Likewise.
-
-	* pcs/cal-backend.c (build_event_list): Likewise.
-
-	* cal-client/cal-client.c (cal_client_get_events_in_range):
-	Likewise.
-
-	* cal-util/cal-util.h (CalObjInstance): Likewise.
-
-	* cal-util/cal-util.c (cal_obj_instance_list_free): Likewise.
-	(cal_obj_uid_list_free): Assert that the UIDs in the list are not
-	NULL.
-
-	* pcs/tlacuache.gnorba (repo_id): The calendar factory also
-	supports the Unknown interface.
-
-2000-03-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/e-day-view.c: Fix includes.
-	(e_day_view_on_delete_occurance): Do not call save_default_calendar().
-	(e_day_view_on_delete_appointment): Likewise.
-	(e_day_view_on_unrecur_appointment): Likewise.
-	(e_day_view_finish_long_event_resize): Likewise.
-	(e_day_view_finish_resize): Likewise.
-	(e_day_view_key_press): Likewise.
-	(e_day_view_on_editing_stopped): Likewise.
-	(e_day_view_on_top_canvas_drag_data_received): Likewise.
-	(e_day_view_on_main_canvas_drag_data_received): Likewise.
-
-2000-03-13  Damon Chaplin  <damon@helixcode.com>
-
-	* gui/e-day-view*.[hc]: new files for the Day/Work-Week views.
-
-2000-03-12  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c (gnome_calendar_locate): Removed function now that it
-	is no CORBA server in the GUI.
-	(save_default_calendar): Removed function.  Now the personal
-	calendar server will take care of saving modified calendars when
-	appropriate.
-	(close_cmd): Do not call unregister_calendar_services().
-
-	* gui/eventedit.c (ee_ok): Do not save the calendar.
-
-	* gui/gncal-day-panel.c (day_view_range_activated): Likewise.
-
-	* gui/gncal-todo.c (ok_button): Likewise.
-	(delete_todo): Likewise.
-
-	* gui/gncal-full-day.c (delete_occurance): Likewise.
-	(delete_appointment): Likewise.
-	(unrecur_appointment): Likewise.
-	(child_focus_out): Likewise.
-	(update_from_drag_info): Likewise.
-
-	* gui/gnome-cal.c (gnome_calendar_new): Removed obsolete call to
-	create the CORBA server.
-
-	* gui/gnome-cal.h (GnomeCalendar): Renamed `calc' field to
-	`client'.
-
-	* cal-client/cal-client.h (CalClient): Removed filename and
-	corba_server fields.
-
-2000-03-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/main.c (main): Do not pass the INIT_SERVER flag to
-	gnome_CORBA_init_with_popt_table().  Check for exceptions
-	properly.
-	(main): Initialize Bonobo.
-	(main): Call process_dates() to parse the dates from the command
-	line before we dump the events or the TODOs.
-	(main): Use bonobo_main() instead of gtk_main().
-
-	* cal-util/calobj.c (ical_new): Initialize the alarm types here.
-	Do not call default_alarm() anymore, since that is a GUI issue.
-	(default_alarm): Removed function.
-	(alarm_defaults): Removed defaults data.
-
-	* pcs/tlacuache.c (calendar_notify): Removed stubs for
-	alarm_defaults, calendar_notify(), debug_alarms.
-
-2000-03-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* gui/Makefile.am: Removed the corba-cal stuff.  Commented out the
-	Pilot conduit stuff for now.
-
-	* gui/calendar.c: Random #ifdefs to make it build, although this
-	file is going away.
-
-	* gui/Makefile.am: Removed referenes to calobj.[ch] and timeutil.[ch].
-
-	* gui/calendar-conduit.c: Fixup includes.
-
-	* gui/calendar-conduit.h: Fixup includes.
-
-2000-03-09  Seth Alves  <alves@hungry.com>
-
-	* gui/gnome-cal.h: replaced "Calendar *cal" with "CalClient *calc"
-	in the GnomeCalendar struct.
-
-	* gui/*.c: tracked change from Calendar * to CalClient
-
-	* gui/main.c: moved alarm_defaults from here to cal-util/calobj.c
-	(calendar_get_events_in_range): pulled this out of calendar.c and
-	fixed it up to use cal-client stuff.  i'm not sure where to put it yet.
-
-	* gui/main.c (calendar_iterate): pulled this one out of calendar.c also
-
-2000-03-07  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client/Makefile.am: Removed cal-client-alarm.[ch] from the
-	list of sources.  This was a miscommunication on our part.
-
-2000-03-05  Seth Alves  <alves@hungry.com>
-
-	* cal-client/cal-client-alarm.c: stubs for client side
-	access to alarm structures.  this will probably change,
-	since i don't know what i'm doing.
-
-	* cal-util/alarm-enums.h: enums for alarms needed by
-	both the client and the server
-
-	* remaining source files in calendar/... have been moved
-	to calendar/gui.
-
-	* gui/alarm.c: start to decouple the view from the model
-	in the alarm editing code
-
-2000-03-03  Seth Alves  <alves@hungry.com>
-
-	* cal-util/Makefile.am: new file -- things shared between
-	the client and server go in this directory
-
-	*  calobj.c calobj.h icalendar.c icalendar.h
-	timeutil.c timeutil.h cal-util.c cal-util.h where moved
-	backend stuff went into pcs.  shared stuff went into
-	cal-util.
-
-2000-03-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	At this point the calendar client and personal calendar server
-	files were moved to the idl/, cal-client/, and pcs/ directories.
-
-	* idl/Makefile.am: New file.
-
-	* cal-client/Makefile.am: New file.  Moved the libcal-client stuff
-	from calendar/Makefile.am to here.
-
-	* pcs/Makefile.am: New file.  Moved the tlacuache stuff from
-	calendar/Makefile.am to here.
-
-	* Makefile.am (SUBDIRS): Added the idl and cal-client directories.
-
-	* calendar.h: Removed the references to cal-backend.h and its
-	stuff.  This file is going away soon!
-
-	* icalendar.c: #include <config.h>.  Also, we don't need to
-	include cal-backend.h or gnome.h.
-
-	* icalendar.h: Protect from multiple inclusions.
-
-2000-03-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am: Use the gnome-config flags for orbit-idl.
-	Create a libcal-client library with the calendar client object.
-
-2000-02-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am: Removed stale rule for the conduit.
-
-2000-02-21  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: Added *.lo.
-
-2000-02-19  Matt Loper  <matt@helixcode.com>
-
-	* .cvsignore: Added tlacuache and tl-test.
-
-2000-02-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* Makefile.am (INCLUDES): Use BONOBO_VFS_GNOME_CFLAGS instead of
-	GNOMEUI_INCLUDES, as we use Bonobo and VFS.
-
-2000-02-17  Seth Alves  <alves@hungry.com>
-
-	* cal-backend.h: moved CalendarFormat type def here
-
-	* cal-backend.c (cal_backend_load): if extension suggests
-	an ical file, attempt to load an iCal file.
-	(cal_get_type_from_filename): returns CAL_ICAL if file
-	extension is 'ics' or 'ifb', else returns CAL_VCAL
-	(icalendar_calendar_load): moved this here from
-	icalendar.c because it needs to call the static function
-	add_object.
-
-2000-02-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c (cal_client_remove_object): Implemented.
-
-	* cal.c (cal_notify_remove): Implemented.
-	(Cal_remove_object): Implemented.
-	(cal_get_epv): Fill in the remove_object field in the epv.
-
-	* cal-backend.c (cal_backend_remove_object): Implemented.
-	(notify_remove): New function to notify clients that an object was
-	removed.
-
-2000-02-16  Russell Steinthal  <rms39@columbia.edu>
-
-	* calobj.[ch], eventedit.c, main.c: Change iCalObject.organizer
-	from char* to iCalPerson*
-
-	* calobj.[ch]: Change iCalObject.related from list of char* to
-	list of iCalRelation*; assorted related fixes
-
-	* icalendar.c: interface between libical and the gnomecal
-	internal representation
-
-2000-02-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c (cal_client_update_object): Implemented.
-
-	* cal.c (cal_notify_update): New function to notify the listener
-	about an updated object.
-	(Cal_update_object): Implemented.
-	(Cal_get_uids): set_release() the sequence to TRUE.
-	(Cal_get_events_in_range): Likewise.
-
-	* cal-backend.c (remove_object): New function to remove objects
-	from a calendar backend.
-	(cal_backend_update_object): New public function to update an
-	object and notify clients about it.
-
-	* evolution-calendar.idl (Cal): Added update_object() and
-	delete_object() methods.
-	(Listener): Removed the obj_changed method and renamed obj_added
-	to obj_updated.  We now only have updated and removed notifiers.
-
-	* cal-listener.[ch]: Removed the "changed" notification code.
-	Changed the "added" notification code to the "updated"
-	notification.
-
-	* cal-client.c: Likewise.
-
-	* tlacuache.c (create_cal_factory): Connect to "destroy" on the
-	factory and exit the main loop when the factory is destroyed.
-
-	* cal-factory.c (backend_destroy_cb): New callback used when a
-	backend is destroyed.  Removes the backend from the factory's hash
-	table and unrefs the factory if all backends go away.
-	(add_calendar_client): Free the environment.
-
-	* cal.c (cal_new): Use bonobo_object_unref() if we fail to
-	initialize.
-
-	* cal-listener.c (cal_listener_new): Likewise.
-
-	* layout.c (layout_events): Plug li.partition memory leak.
-
-2000-02-10  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (cal_backend_add_cal): Connect to the Cal's
-	destroy signal.
-	(cal_backend_remove_cal): Killed function now that removal of Cal
-	objects is done in their destroy callback.
-	(cal_destroy_cb): New callback to remove a Cal from the backend's
-	list of clients.  Also, the backend destroys itself when there are
-	no more clients connected to it.
-	(save): New placeholder function to save a backend.
-	(destroy): New function to destroy a backend's data.
-	(cal_backend_destroy): Save the calendar and destroy it.
-
-	* cal.c (cal_destroy): Reset the priv->backend to NULL.
-
-	* cal-factory.c (add_calendar_client): There is no need to call
-	cal_backend_remove_cal(); we can now just destroy the Cal object.
-	(create_fn): Make sure we always unref the URI.
-	(load_fn): Move the URI unref to the end of the function for
-	safety.
-
-	* cal-factory.c (add_calendar_client): Unref the Cal only if
-	notification of the listener was unsuccessful.  Otherwise, the
-	calendar user agent (Listener side) keeps the reference.
-
-	* tl-test.c (list_uids): Free the calobj.
-
-	* cal-client.c (cal_loaded_cb): Use bonobo_object_unref() to get
-	rid of the listener.
-	(load_or_create): Likewise.
-	(destroy_factory): New function to get rid of the factory.
-	(destroy_listener): New function to get rid of the listener.
-	(destroy_cal): New function to get rid of the calendar client
-	interface object.
-	(cal_client_destroy): Free all resources.
-	(cal_client_get_object): CORBA_free() the calobj string.  Boy, I
-	love memprof.
-
-	* cal-listener.c (cal_listener_destroy): Reset the priv->cal to
-	CORBA_OBJECT_NIL.
-
-	* cal-backend.c (cal_backend_remove_cal): Do not unref the Cal,
-	since the calendar user agent owns it.
-	(cal_backend_add_cal): Do not ref the Cal, since the calendar user
-	agent owns it.
-
-	* cal-factory.c (add_calendar_client): Use bonobo_object_unref()
-	to get rid of the calendar client interface object.
-
-	* calobj.c (ical_object_create_from_vobject): Duplicate the
-	default "PUBLIC" string.
-
-2000-02-09  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (cal_factory_load): Added documentation comment.
-	(load_fn): Do not print a message if the backend could not be
-	loaded due to a non-fatal error.
-	(queue_load_create_job): Moved the stuff from cal_factory_load()
-	to here.  Now this function serves to queue load or create
-	requests.
-	(cal_factory_load): Use queue_load_create_job().
-	(cal_factory_create): Implemented; use queue_load_create_job().
-	(create_fn): New job handler for creating new calendars.
-	(create_backend): New function to create a new backend with a new
-	calendar.
-	(add_backend): New helper function to add backends to the
-	factory's hash table.
-	(load_backend): Use add_backend() instead of adding the backend by
-	ourselves.
-
-	* cal-client.c (load_or_create): Moved the functionality from
-	cal_client_load_calendar() to here, and added an option to create
-	a new calendar instead of loading an existing one.
-	(cal_client_load_calendar): Use load_or_create().
-	(cal_client_create_calendar): Implemented.
-
-	* cal-backend.c (cal_backend_create): Implemented.
-
-	* evolution-calendar.idl (LoadStatus): Added an IN_USE error for
-	create requests.
-
-	* cal-listener.h (CalListenerLoadStatus): Added CAL_LISTENER_LOAD_IN_USE.
-
-	* cal-listener.c (Listener_cal_loaded): Convert the IN_USE error.
-
-	* cal-client.h (CalClientLoadStatus): Added CAL_CLIENT_LOAD_IN_USE.
-
-	* cal-client.c (cal_loaded_cb): Handle CAL_LISTENER_LOAD_IN_USE.
-
-	* tl-test.c: New test program for the calendar client side; it
-	also exercises the server side by sending commands to it.
-
-	* Makefile.am: Added the tl-test program.
-
-	* tlacuache.gnorba: Updated.
-
-	* tlacuache.c (create_cal_factory): Use the right GOAD id.
-
-	* cal-client.c (cal_client_construct): Use the right GOAD id.
-
-2000-02-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl (Cal): Added get_uids() method to get a
-	list of UIDs based on object types.
-
-	* cal-backend.c (cal_backend_get_uids): Implemented get_uids() in
-	the backend.
-
-	* cal.c (Cal_get_uids): Implemented get_uids() method.
-
-	* cal-client.c (cal_client_get_uids): Implemented client-side
-	function.
-
-	* cal-util.c (cal_obj_instance_list_free): Doh.  Free the list,
-	not the last link.
-	(cal_obj_uid_list_free): New function to free a list of UIDs.
-
-	* GnomeCal.idl (Repository): Removed unused method
-	get_object_by_id_list().  This is just for cleanup purposes and to
-	remind me exactly of what needs to be moved over to
-	evolution-calendar.idl.
-	(Repository): Removed unused get_objects() method.
-
-	* corba-cal.c (init_calendar_repo_class): Removed the unused
-	get_objects method.
-
-	* calobj.h (CalObjFindStatus): New status value enumeration for
-	the find function.
-
-	* calobj.c (ical_object_find_in_string): New function to parse a
-	complete calendar and find a calendar object in it.  This should
-	be used instead ical_object_new_from_string() in the future.
-
-	* evolution-calendar.idl (CalObjInstance): Added an uid field.
-	Now the idea is that whenever calendar object strings are passed
-	around, their UIDs are passed along with them so that the actual
-	object can be pulled from the whole VCAL object using its UID to
-	identify it.
-
-	* cal-util.h (CalObjInstance): Added uid field.
-
-	* cal-util.c (cal_obj_instance_list_free): Free the UIDs.
-
-	* cal-backend.c (build_event_list): Store the object's UID in the
-	instance structure.
-
-	* cal.c (Cal_get_events_in_range): Copy the UID field to the CORBA
-	structure.
-
-	* cal-client.c (cal_client_get_events_in_range): Copy the UID
-	field from the CORBA structure.
-
-	* main.c (gnome_cal_file_menu): Removed unfinished html-month stuff.
-
-	* Makefile.am (gnomecal_SOURCES): Removed html-month.c.
-
-	* gnome-cal.c: #include "alarm.h"
-	(mail_notify): Made static.
-
-	* alarm.h: #include "calobj.h"
-
-	* corba-cal-factory.h (init_corba_server): Fixed prototype.
-
-	* quick-view.c (create_items_for_event): Made static.
-
-	* gncal-todo.c (column_resized): Made static.
-
-	* layout.c (find_index): Made static.
-
-2000-02-08  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl (CalObjInstance): New struct to wrap
-	instances of calendar objects for recurrencies and alarms.
-	(Cal::get_events_in_range): New method to get ocurring and
-	recurring events by time range.
-
-	* cal-backend.c (cal_backend_get_events_in_range): New function to
-	get a list of event instances in a time range.
-	(string_from_ical_object): New internal function.
-	(cal_backend_get_object): Use string_from_ical_object() instead of
-	doing everything ourselves.
-	(cal_backend_get_events_in_range): New function to get a list of
-	the events that occur or recur in a specified time range.
-
-	* cal-client.c (cal_client_get_events_in_range): Implemented
-	client-side function.
-
-	* cal-util.h:
-	* cal-util.c: New files with utilities and types common to the
-	client and server parts.
-	(CalObjInstance): New structure to hold an instance of an actual
-	occurrence, recurrence, or alarm trigger of a calendar object.
-	(cal_obj_instance_list_free): New function to free a list of
-	calendar object instances.
-
-	* cal.c (Cal_get_events_in_range): Implemented new method.
-
-	* corba-cal.c (cal_repo_get_updated_objects): Free `str' with
-	free(), not g_free(), since calendar_get_as_vcal_string() uses
-	writeMemVObject(), which uses realloc().  Fixed in gnome-pim as
-	well.
-
-2000-02-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (get_calendar_base_vobject): New function to
-	create the base VObject for a calendar.
-	(cal_backend_get_object): Create the base calendar and add the
-	sought object to it, then stringify it.
-
-	* evolution-calendar.idl (Listener::obj_added
-	Listener::obj_changed): Now these pass in just the UIDs, not the
-	complete objects.
-
-	* cal-listener.c (Listener_obj_added): Changed to pass in the uid,
-	not the object.
-	(Listener_obj_changed): Likewise.
-
-	* cal-client.h (CalClientClass): Made the obj_added and
-	obj_changed signals take in the UIDs, not the full objects.
-
-	* cal-client.c (obj_added_cb): Likewise.
-	(obj_changed_cb): Likewise.
-
-2000-02-04  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (CalBackendPrivate): Renamed the event_hash field
-	to object_hash.  Now we hash all the calendar's objects here based
-	on their UIDs.
-	(ensure_uid): New function to create UIDs for calendar objects
-	that don't have them.
-	(add_object): Ensure the object has an UID before inserting it in
-	the calendar.
-	(cal_backend_get_object): New function.
-
-2000-02-03  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl (Cal): Added the get_object() method.
-
-	* cal-client.c (cal_client_get_object): New function to get a
-	calendar object by its UID.
-
-	* cal.c (Cal_get_object): Implemented.
-
-	* cal-backend.c (cal_backend_get_object): New unfinished backend
-	function.  We need some reorganizing of how the calendar objects
-	are stored.
-
-2000-02-02  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (gnomecal_SOURCES): Added the CORBA generated
-	sources.
-
-2000-02-01  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c (cal_loaded): Handle the cal_loaded signal from the
-	listener.  Store the calendar client interface object, and emit
-	our own cal_loaded signal.
-	(cal_client_load_calendar): Connect to the listener's signals.
-	(cal_client_class_init): Added the "obj_added", "obj_removed",
-	�bj_changed" signals.
-	(obj_added_cb): Handle the signal from the listener.
-	(obj_removed_cb): Likewise.
-	(obj_changed_cb): Likewise.
-
-2000-01-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (gnomecal_SOURCES): Added cal-client.[ch] and
-	cal-listener.[ch].
-
-2000-01-30  Federico Mena Quintero  <federico@helixcode.com>
-
-	* evolution-calendar.idl: Changed the namespace from
-	GNOME::Calendar to Evolution::Calendar.
-	(Listener::LoadStatus): Fixed SUCESSS -> SUCCESS typo.  And I
-	never noticed it in the implementation.  Ain't M-/ grand?
-
-	* Makefile.am: Changed ocurrences of gnome-calendar.idl to
-	evolution-calendar.idl.
-
-	* *.[ch]: Changed GNOME_Calendar_foo identifiers to
-	Evolution_Calendar_foo.
-
-2000-01-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-client.c cal-client.h: New files with the calendar client
-	object.
-
-2000-01-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (CalFactory_load): Check that the listener is not
-	nil and emit and exception if it is.
-
-	* gnome-calendar.idl (CalFactory::load CalFactory::create): Now
-	these raise the NilListener exception.
-
-	* tlacuache.c (calendar_notify): Error stub for alarms.
-	(alarm_defaults): Stub array.
-	(debug_alarms): Stub variable.
-	(main): Initialize gnome-vfs.
-
-2000-01-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* tlacuache.c: New main module for the Tlacuache personal calendar
-	server.
-
-	* tlacuache.gnorba: New gnorba file for Tlacuache, the GNOME
-	personal calendar server.
-
-	* Makefile.am: Added the stuff necessary to build Tlacuache.
-
-	* cal.c (Cal_get_uri): Convert the URI to a string before
-	returning it.
-
-	* cal-factory.c (CalFactory_create): Doh, this function is void.
-
-	* job.c (job_add): Use g_idle_add(), not gtk_idle_add().
-
-2000-01-24  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c (cal_backend_remove_cal): New function to remove a
-	calendar client interface object from a backend.
-	(cal_backend_load): Convert the URI to string and use
-	Parse_MIME_FromFileName().  The conversion is not very smart,
-	though.
-
-	* cal-factory.c (load_backend): Moved most of the error handling
-	upstream to load_fn().
-	(load_fn): Handle failure in case the backend could not be loaded.
-	(cal_factory_destroy): Free the backends and the backend hash
-	table.
-	(add_calendar_client): Implemented.  We create a Cal client
-	interface object and attach it to the backend, and we notify the
-	listener.
-
-2000-01-22  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (lookup_backend): Renamed from lookup_calendar().
-	Also, return a backend instead of a Cal client object.
-
-	* cal-backend.c (cal_backend_load): Take in a GnomeVFSURI, not a
-	string.
-
-	* cal-listener.c (Listener_cal_loaded): Pass the load status to
-	the signal.
-	(cal_listener_destroy): Better error checking.
-	(cal_listener_new): Better error checking.
-
-	* cal-listener.h (CalListenerLoadStatus): New enum for the load
-	status of a calendar.
-	(CalListenerClass): Added the status argument to the cal_loaded
-	signal.
-
-	* gnome-calendar.idl (cal_loaded): Added a load status code.
-
-	* cal-backend.h (CalBackendLoadStatus): Renamed from
-	CalBackendLoadResult.
-
-2000-01-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-backend.c cal-backend.h: Moved the calendar backend here.
-	This is the actual calendar-handling object.
-	(load_from_vobject): Moved over from calendar.c.  Modified to use
-	a CalBackend instead of the old Calendar structure.
-	(add_object): Likewise.
-
-	* cal.c: Now the Cal object is just a calendar client interface
-	object; we use it as a "viewport" onto a CalBackend.  This also
-	lets us do correct resource management.
-
-	* cal-common.h: New file with common forward declarations; we
-	can't have circular dependencies between headers.
-
-2000-01-18  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal-factory.c (cal_factory_load): Queue a load job.
-	(load_fn): Load job handler.  Lookup the calendar by URI, load it
-	if it is not loaded, or just report it to the new listener if it is.
-
-	* job.c job.h: New files with a simple job queue manager.
-
-	* gnome-calendar.idl (Listener::cal_loaded): Do not return the
-	whole calendar object string.  The client will be able to query
-	the calendar for the events it needs.
-
-	* cal-listener.c (Listener_cal_loaded): Ref the calendar GNOME
-	object.  We unref it when the listener is destroyed.
-
-2000-01-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	The files from the gncal directory of the gnome-pim module on CVS
-	were moved here, to evolution/calendar, in preparation for the
-	Evolution work.  The calendar is being split into a model/view
-	architecture.  The model is a personal calendar server (PAS):  it
-	provides storage, notification, and event generation; the
-	views/controllers are the calendar user agents and things like
-	Pilot synchronizers.
-
-2000-01-11  Federico Mena Quintero  <federico@helixcode.com>
-
-	* cal.c: Removed the CORBA listener methods, adjusted for the new
-	IDL.
-
-	* cal-listener.c (cal_listener_init): Create the private
-	structure.  In it we hold a reference to the calendar the listener
-	is watching.
-	(cal_listener_destroy): Destroy the private structure and unref
-	the calendar.
-	(Listener_cal_loaded): Stuff the calendar into our private data.
-	(Listener_obj_added): Adjusted for new IDL.
-	(Listener_obj_removed): Likewise.
-
-	* gnome-calendar.idl: New IDL for the personal calendar server.
-
-	* cal.h cal.c: New files with the calendar object.
-
-	* cal-listener.h cal-listener.c: New files with the calendar
-	listener object.
-
-	* cal-factory.h cal-factory.c: New files with the calendar factory
-	object.
-
-2000-01-09  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am: Changes to remove todo capplet stuff from distro.
-
-2000-01-08  Vadim Strizhevsky  <vadim@optonline.net>
-
-	* calendar-conduit-control-applet.c: Added pilotID argument to
-	gpilotd_conduit_mgmt_new.
-
-
-2000-01-05  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* GnomeCal.idl: Added an argument to get_number_of_objects, so you
-	can choose which state the object should have
-	(any/new/modified/...). Will also add one to choose type
-	(event/journal etc).
-
-	* corba-cal.c (cal_repo_get_number_of_objects): Implemented the
-	new version of get_number_of_objects.
-
-	* calendar-conduit.c (pre_sync): Calls various
- 	gnome_pilot_conduit_standard_abs_set_num_yadayda to get progress bars.
-
-2000-01-04  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (start_calendar_server): Let's not call
-	g_error, but g_warning instead.
-	(pre_sync): Get record numbers info, total, new, deleted etc, and
-	tell gpilotd.
-
-1999-12-31  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* eventedit.c (ee_store_recur_end_to_ical): Adds 86400 secs (1
-	day) to the date chooses by the user. This ensures the recurrence
-	also occurs on that date.
-	(ee_rp_init_ending_date): And subtracts 86400 secs when about to
-	redisplay the box.
-
-	* calendar.h: Added an argument to calendar_new, to enable certain
-	features, such as initing alarms or nor.
-
-	* calendar.c (calendar_new): Implemented support for the
-	CALENDAR_INIT_ALARMS option to calendar_new.
-
-	* corba-cal.c (cal_repo_get_updated_objects): Added
- 	CALENDAR_INIT_ALARMS to calendar_new calls.
-
-	* main.c: Added CALENDAR_INIT_ALARMS to calendar_new calls. This
- 	should probably be CALENDAR_INIT_NIL, but I'm not sure, guess
- 	steintr should check it.
-
-	* gnome-cal.c: Added CALENDAR_INIT_ALARMS to calendar_new calls.
-
-	* calendar-pilot-sync.c: Added CALENDAR_INIT_NIL to calendar_new calls.
-
-1999-12-10  Russell Steinthal  <rms39@columbia.edu>
-
-	* eventedit.c (ee_create_ae): Fix sensitivity bug when used to
-	create default alarm box (widgets in that box should always be
-	sensitive, even if the enabled checkbutton is not set)
-
-1999-12-08  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit-control-applet.c (setSettings): Capplets now
-	sets first_sync on enable, this should make the conduit copy old
-	entries from the pilot to gnomecal.
-
-1999-12-07  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (pre_sync): Check if local store is
-	empty. If, force slow sync.
-
-	* GnomeCal.idl (GNOME): Added get_number_of_objects.
-
-	* corba-cal.c (cal_repo_get_number_of_objects): implemented the
- 	get_number_of_objects.
-
-	* calendar-conduit-control-applet.c (setStateCfg): Fixed bug that
-	caused the capplet to always set the sync action to Disable upon start.
-
-1999-12-05  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am (Conduits_second_DATA): Also install .desktop files
-	for conduit capplets in the gnome/apps menu dir.
-
-1999-12-04  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am (EXTRA_DIST): Added .desktop files to EXTRA_DIST.
-
-1999-10-12  Clifford R. Conover  <rusty@zootweb.com>
-
-	* gncal-todo.c Todo List improvements.
-
-	Cleaned up todo item highlighting, added support for highlighting
- 	events due today, and events not due yet.  Colors are configurable
- 	on the Colors Tab of the properties window.
-
-	Renamed Frame in Properties window to Colors rather then Month
- 	Colors since we are now asking for Todo item colors.
-
-	Added ability to display time until todo item is due in list, it
- 	automatically selects the best denomination of time (up to weeks)
- 	and down to seconds to display.  This should be made configurable
- 	in a future version.
-
-	Changed Todo dialog to ask for time that event is due.  This
- 	allows more accurate tracking of then the item is due, before the
- 	dialog was only asking for the date of the todo item.
-
-1999-12-03  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c: undef DEBUG_CALCONDUT, suppresses debug output.
-
-1999-12-02  Russell Steinthal  <rms39@columbia.edu>
-
-	* alarm.c: Enhanced debug support: can be toggled on and off by
-	SIGUSR1, reports alarms which could not be added
-
-	* gnome-cal.c, main.[ch], prop.c: Add snooze capability for audio
-	and display alarms.  Snooze interval can be configured in the
-	Properties box.
-
-1999-11-30  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (compare): Fixed compare bug. Also neated up
-	some of the if's in set_status.
-
-1999-11-22  Russell Steinthal  <rms39@columbia.edu>
-
-	* Merged todo list coloring patch from stable
-	* Added myself to AUTHORS, about box (per Miguel)
-
-1999-11-22  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c (pre_sync): Writes some warning
- 	messages when pre_sync fails.
-
-1999-11-14  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am: Stupid misplaced endif cause gncal to depend on an
-	install gnome-pilot... fixed... sorry.
-
-1999-11-12  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* Makefile.am (extra_pilot_bins): Fixed the if then else problem,
-	using solution suggested by James Henstridge, appears to be caused
-	by a (by now fixed) bug in my automake.
-
-1999-11-12  Russell Steinthal  <rms39@columbia.edu>
-
-	* prop.c: Config code for timeout, make Alarms property page use a
-	vbox instead of an hbox so that the propbox stays a reasonable width.
-
-	* gnome-cal.c, main.[ch]: Add timeout for audio alarms, code to load
-	from config file
-
-	* eventedit.c: Give some static functions external linkage so they
-	can be used elsewhere (make_spin_button); add some prototypes to
-	appease gcc.
-
-1999-11-11  Russell Steinthal  <rms39@columbia.edu>
-
-	* calendar.c (calendar_day_change): Add call to
-	calendar_init_alarms() to schedule another day change alarm.
-
-1999-11-09  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit.c: Enabled debug output. Sets a g_log_domain,
-	now version 0.8.5. Consistent use of GSList/GList. Implemented
-	compare, default uses one that compares the contents of a struct
-	Appointment, but also has #ifdeffed code that does a field level
-	comparison, not complete, but perhaps educational.
-
-	* Makefile.am (#todo_conduit_control_applet_SOURCES): Fixed an
-	unwanted conditional on libcalendar_conduit_la_LDFLAGS
-
-1999-11-05  Eskil Heyn Olsen  <deity@eskil.dk>
-
-	* calendar-conduit-control-applet.c (readStateCfg): Commented the
-	code out, thus the capplet works again.
-
-1999-11-04  Eskil Olsen   <deity@eskil.dk>
-
-	* Makefile.am: Uses the PISOCK_LIBDIR, for people with odd install
- 	dirs for their pilot-link. Also install a pretty icon for the
- 	calendar-conduit.
-
-	* calendar-conduit-control-applet.c: Modfied the
-	try/revert/ok/cancel scheme to be more intuitive, also uses a
-	GtkOptionMenu for the possible sync methods.
-
-	* calendar-conduit-control-applet.desktop: use the nice icon...
-
-	* calendar-conduit.c: Ack, had to define debug_alarms and
-	alarm_default, otherwise they are undefined. Is gncal code messy
-	or is this considered a way of configuring the cal engine ?
-	Implemented delete_all syncabs methods.
-
-	* calendar-pilot-sync.c: also had to declare debug_alarms and
- 	alarm_defaults, just as ugly.
-
-1999-11-02  Russell Steinthal  <rms39@columbia.edu>
-
-	* prop.c: Add new alarm page to properties box
-
-	* prop.c, calobj.c, main.[ch] eventedit.c: New support for default
-	alarms, configurable in the properties box.
-
-	* gnome-cal.c, prop.c, main.[ch]: add option to beep on Display
-	alarms
-
-1999-10-23  Russell Steinthal  <rms39@columbia.edu>
-
-	* calendar.c (calendar_new): Correctly initialize calendar_day_end
-	and calendar_day_begin *before* installing day-change alarm.
-
-1999-10-21  Russell Steinthal  <rms39@columbia.edu>
-
-	* alarm.c, main.c: Added alarm debugging code
-
-	* main.c (open_ok): Show an error box if the user tries to open a
-	non-existent file; fixes bug #1818
-
-1999-10-19  Russell Steinthal  <rms39@columbia.edu>
-
-	* gnome-cal.c (calendar_notify): Fix typos which were causing
-	invalid times in audio notification dialogs; fixes Bug #2561
-
-1999-10-18  Russell Steinthal  <rms39@columbia.edu>
-
-	* gncal-day-panel.c (gncal_day_panel_new): Placed the various
-	elements of the day view in paned windows so that the user can
-	adjust the relative sizes of the daily schedule, monthly calendar,
-	and to-do list.
-
-1999-10-18  Martin Norb�ck  <norpan@bigfoot.com>
-
-	* gncal.desktop: Added swedish translation
-
-1999-10-13  Eskil Olsen   <deity@eskil.dk>
-
-	* Makefile.am: Hopefully the fixes the much-hated
-	gnome-pilot dependency.
-
-1999-10-07  Eskil Olsen   <deity@eskil.dk>
-
-	* calendar.c (calendar_object_changed): moved the pilot_status =
-	MOD up, so even a CHANGE_SUMMARY will set the modified flag.
-
-	* calendar-conduit.c: more _free calls, vamped the noise on output.
-
-1999-10-06  Eskil Olsen   <deity@eskil.dk>
-
-	* *conduit*[ch]: checks return values from gpilotd_init/connect.
-
-	* calender.c (vcalendar_create_from_calendar): removed a set
- 	of cleanVObject cleanStrTbl, since the freed memory that the
-	function returned.
-
-1999-09-27  Timur Bakeyev  <mc@bat.ru>
-
-	* timeutil.c (time_from_isodate): Use tm.gmtoff or timezone to get
-	correct offset from UTC, according to HAVE_TM_GMTOFF or HAVE_TIMEZONE.
-	See also 1999-07-19  Matt Martin <matt@abacusnet.net>
-
-1999-09-27  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* month-view.c (add_event): ditto
-	(mark_current_day): ditto
-	(month_view_set): ditto
-
-	* goto.c (goto_dialog): ditto.
-
-	* gnome-month-item.c (gnome_month_item_init): ditto.
-
-	* gncal-day-panel.c (gncal_day_panel_new): ditto.
-
-	* getdate.c (RelativeDate): ditto.
-
-	* eventedit.c (set_all_day): ditto.
-	(ee_rp_init_rule): ditto.
-
-	* calendar.c (vcalendar_create_from_calendar): ditto.
-
-	* calendar-conduit.c (update_record): ditto.
-
-	* calobj.c (ical_object_generate_events): Get rid of pointers to
-	values returned from localtime, as it uses a static buffer.
-
-1999-09-26  Eskil Olsen <deity@eskil.dk>
-
-	* corba-cal.c: the g_free that was commented out since glib said
-	was a duplicate free, was supposed to be a free.
-
-	* GnomeCal.idl/corba-cal.c: added a get_object_id_list and a
-	get_objects_by_id_list. Latter is not done.
-
-	* calendar-conduit.c: rewrote the way the conduit iterates over
-	records. It no longers fetches all entries (since that didn't work
-	with more then 285 entries. It now fetches the id list, and gets
-	each record. (will be using get_objects_by_id_list to get records
-	in amounts of 10 or so later, to reduce amount of corba calls).
-
-	* calendar-conduit.c: now sets alarm parameters when transferring
-	from gnomecal to pilot.
-
-1999-09-23  Eskil Olsen <deity@eskil.dk>
-
-	* calendar-conduit.c: better merge of summary/description
- 	when doing ical_from_remote (update_record), also handles
-	import from gnomecal to pilot better, and on both ways, repeat
-	events are much better now.
-
-1999-09-22  Eskil Olsen <deity@eskil.dk>
-
-	* corba-cal.c: commented out a g_free that glib reported
-	as being a duplicate free.
-	* calendar-conduit.c: got gnomecal->pilot up and runnning.
-
-1999-02-06  Lauris Kaplinski <lauris@ariman.ee>
-
-	* gncal.desktop: Added Estonian translations.
-
-1999-09-14  Federico Mena Quintero  <federico@redhat.com>
-
-	* gncal-full-day.c (child_popup_menu): Set the data pointers for
-	all the items.
-
-1999-09-14  Kjartan Maraas  <kmaraas@online.no>
-
-	* doc/C/gnomecal.sgml: Merge from gnome-pim-1-0. Synced with newest
-	user-guide.
-
-1999-09-01  Miguel de Icaza  <miguel@gnu.org>
-
-	* eventedit.c (ee_create_buttons): Make the OK button the default
-	button per Russell's suggestion.
-
-1999-08-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calendar.c (calendar_object_changed): Modify the
-	object->last_mod field.
-	(calendar_add_object): Ditto.
-
-	Closes bug #676
-
-	* main.c (save_calendar_cmd): Fix problem in which we warned the
-	user about the calendar being modified the first time the calendar
-	was used.
-
-1999-08-22  Tomas Ogren  <stric@ing.umu.se>
-
-	* gnomecal.gnorba: "GenericFactoy" is wrong...
-
-1999-08-15  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_gen_uid): Fix the hostname part.
-
-1999-08-07  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* calendar-pilot-sync.c (sync_pilot): sync correctly for objects
-	created on the pilot, but not dirty (because they have been synced
-	with some other program in the past)
-
-1999-07-30  Miguel de Icaza  <miguel@gnu.org>
-
-	* month-view.c (month_view_init): Release points here.
-
-1999-08-02  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* Makefile.am (libcalendar_conduit_la_LDFLAGS):
-	libcalendar_conduit now installs
-
-	* calendar-pilot-sync.c (sync_pilot): do deletion of appointments
-	correctly, when they are deleted on the pilot
-	(conduit_free_Appointment): protect against double-freeing parts
-	of the Appointment structure
-	(update_record): all-day events from the pilot are handled a bit
-	more reasonably
-
-1999-08-01  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* calendar-pilot-sync.c (sync_object_to_pilot): The multi-day
-	appointment corruption bug is dead. Whoo!
-
-1999-07-31  Peter Teichman  <pat4@acpub.duke.edu>
-
-	* Makefile.am: fixed this up slightly with respect to pilot conduits
-
-1999-07-30  Jonathan Blandford  <jrb@redhat.com>
-
-	* Makefile.am (libcalendar_conduit_la_LIBADD): More autoconf-stuff
-
-1999-07-29  Jonathan Blandford  <jrb@redhat.com>
-
-	* gnome-cal.c (setup_widgets): Add scrolling to the yearview.
-
-1999-07-28  Miguel de Icaza  <miguel@gnu.org>
-
-	* calendar-pilot-sync.c: (sync_object_to_pilot): If the enddate is
-	not set, set the repeatForever to 1.  This fixes all of the
-	birthdays problems I had.
-
-	Make the code not take arguments
-	(sync_cal_to_pilot): Nice event update information
-
-	* calendar.c (calendar_new): Add Event UID hash table.
-	(calendar_add_object): Add events to the hash table here.
-	(calendar_remove_object): Remove events here.
-	(calendar_object_find_event): Use the hash table here.
-
-	* main.c (save_calendar_cmd): The object is already destroyed by
-	gnome_dialog_run.
-
-	* calendar-pilot-sync.c (sync_object_to_pilot): Do not turn
-	archived bit on.
-
-	* calobj.c (ical_gen_uid): Use the hostname, not the domain name.
-	(ical_gen_uid): Add a serial number.  Isodates can be small.
-
-	* corba-cal.c (cal_repo_update_pilot_id): New method to update the
-	pilot status.
-	(cal_repo_get_updated_objects): New method.  Returns a list of
-	modified and not-sycned objects
-
-	* calendar-pilot-sync.c (sync_cal_to_pilot): New function to sync
-	from the GnomeCalendar to the pilot.
-	(sync_object_to_pilot): Sync a single event to the pilot.
-	(try_alarm): Alarm syncing code.
-
-1999-07-27  Miguel de Icaza  <miguel@gnu.org>
-
-	* calendar-pilot-sync.c: New file.  Implements PalmPilot
-	syncronization with the Gnome Calendar.
-
-	* calobj.c (ical_object_new_from_string): New function.  Creates
-	an iCalObject from a vCalendar string that is supposed to contain
-	only one vEvent.
-
-	* calendar.c:
-	(calendar_save): Split this routine in two.
-
-	* gnome-cal.c (gnome_calendar_new): Create the corba server here.
-
-	* main.c: Include gnorba.h, and corba-cal-factory.h here
-	(close_cmd): Kill the calendar server on shutdown.
-
-	* calobj.c (load_recur_yearly_day): Added a fixme comment.  WE
-	need to handle intervals in the years.
-
-	* calendar.c (calendar_object_find_in_list, calendar_object_find,
-	calendar_object_find_todo, calendar_object_find_event): New
-	functions for looking up information.
-
-	* main.c (gnome_calendar_locate): New function.
-
-	* corba-cal.c (calendar_create_object): New file.  Implements the
-	corba server.
-
-	* calendar.c (calendar_object_changed): Flag pilot-status as changed.
-
-	* calobj.c (ical_object_to_vobject): Save pilot information for syncing.
-	(ical_object_create_from_vobject): Load syncing information for
-	pilot.  Do it in a way compatible with KOrganizer.
-
-1999-07-26  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_object_create_from_vobject): Generate unique IDs
-	on Vevents we load that lack it.  WE need this for the old
-	gnome calendar generated files (ie, before now :-).
-
-	Required to sync with the Palm
-
-1999-07-26  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_object_create_from_vobject): Generate unique IDs
-	on Vevents we load that lack it.  WE need this for the old
-	gnome calendar generated files (ie, before now :-).
-
-	Required to sync with the Palm
-
-1999-07-19  Matt Martin <matt@abacusnet.net>
-
-	* timeutil.c (time_from_isodate): Handle the 'Z' parameter to the
-	ISO date format to convert from GMT time.
-
-1999-07-17  Nat Friedman  <nat@gnome-support.com>
-
-	* calendar.c (calendar_add_object): Copy the new UID into the
- 	iCalObject structure.
-
-1999-07-16  Miguel de Icaza  <miguel@gnu.org>
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Merge fix from
-	gnome-pim-1-0: Fixed cut&paste bug for day fontsets.
-
-1999-07-14  Miguel de Icaza  <miguel@gnu.org>
-
-	* calobj.c (ical_gen_uid): Returns a UID.
-	(ical_object_new): Use a UID when creating an event.  Should get
-	syncing done easier.
-
-1999-07-14  Nicholas J Kreucher <nick@poetic.com>
-
-	* calobj.c (skip_numbers): Actually skip over the numbers.
-	(ical_object_to_vobject): Test the proper variable for storing the
-	proper information.
-
-1999-07-14  Jean-Noel Guiheneuf <jean-noel.guiheneuf@wanadoo.fr>
-
-	* timeutil.c (time_add_month): Fixed the problem with next month
-	going from a 31-day to a 30-day by adjusting the date to the
-	closest day at the end of the month.
-
-1999-06-07  Mike McEwan  <mike@lotusland.demon.co.uk>
-
-        * timeutil.c (time_add_month): Tell ktime' that we don't know
-        about daylight saving time so that it does *not* make adjustments
-        when we traverse a DST boundary.
-        (time_year_begin): ditto.
-        (time_year_end): ditto.
-        (time_month_begin): ditto.
-        (time_month_end): ditto.
-
-1999-06-16  Anders Carlsson  <anders.carlsson@tordata.se>
-
-	* main.c (new_calendar): Realize the toplevel widget when
-	--hidden is passed to gnomecal. This fixes a segfault.
-
-1999-06-04  Robert Brady  <rwb197@ecs.soton.ac.uk>
-
-	* gnome-cal.h, gnome-cal.c: Fix abort() problem with the year view.
-	(Bug #1367). Thanks to Owen Cliffe <oc197@ecs.soton.ac.uk> for
-	helping track it down.
-
-1999-06-03  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (daynumberlist): One line bug fix from Sergey I Panov.
-
-1999-06-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* view-utils.c (nicetime): Use %H instead of %k, as %k is a GNU
-	extension, not available in other systems.
-
-1999-06-01  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (daynumberlist): Work around broken software that
-	writes a broken month-of-day as "zero".  Use the dtstart date for
-	this on this event.
-
-1999-05-28  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* Makefile.am (install-data-local): help files be gone.  They are
-	now installed from the Docbook stuff.
-
-1999-05-26  Russell Steinthal  <steintr@condor.penguinpowered.com>
-
-	* gncal-todo.c main.c main.h prop.c: Added support for priorities
-	for todo items.  Doesn't do much, but you can set them and sort by
-	them.  (Use the properties box to enable them; should they be on
-	by default?)
-
-1999-05-25  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (parse_an_arg): Added missing break here.  It was causing
-	core dumps when invoked with --userfile.
-
-	* gnome-cal.c (gnome_calendar_set_view): Add some assertions here,
-	to pin point the bug reported on gnome-list.
-
-	* calobj.c (load_recurrence): Make intervals always exist.  a 0
-	interval is wrong.
-
-1999-05-25  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c: Removed unused macro CALENDAR_HEIGHT.
-
-1999-05-25  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c (idle_handler): Set the canvas scroll region here,
-	not in size_allocate().  Also, use the correct width and height
-	based on the allocation and the precomputed minimum width/height
-	values.
-
-	* gnome-cal.c (setup_widgets): Set the scrollbar policy of the
-	scrolled window.
-
-	* main.c (setup_appbar): Use the correct type for the appbar.
-
-	* gncal-day-view.c: Removed unused function switch_to_day().
-
-	* gncal-day-panel.c (calendar_day_selected): Removed unused variable.
-
-1999-05-25  Nat Friedman  <nat@nat.org>
-
-	* doc/C/gnomecal.sgml: Fixed a typo.
-
-	* gnome-cal.c (setup_widgets): Added a scrolled window widget into
- 	which the year view is placed.
-
-	* year-view.c (CALENDAR_HEIGHT): The height of the total year view
- 	inside the scrolled window.
-	(idle_handler): Set the height of the year view to
- 	CALENDAR_HEIGHT.
-	(year_view_size_allocate): Set the scroll region of the year view
- 	canvas to allocation->width, CALENDAR_HEIGHT.
-
-1999-04-25  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (dump_todo): Add --todo flag to dump the todo contents.
-
-1999-04-19  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (add_activated): Use same hack used in edit_activated
-
-1999-04-16  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (edit_activated): Kill all grabs from the CList
-	before running the new dialog box.
-
-	This fixes the problem of button-3/Edit on the todo item blocking
-	the GUI (actually, the main window responds, but not the todo
-	window).
-
-1999-04-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (gncal_todo_init): Make sure we can get events for
-	button3.  The code for the nice popup menu was there but was not
-	getting invoked.
-
-1999-04-01 Steve Murphy <murf@e-tools.com>
-
-	* calobj.c (weekdaynum): Added this routine so Monthly recurrences
-	use the weekday field as a simple integer for a single weekday.
-
-	* calobj.c (load_recur_monthly_pos): Call weekdaynum instead of
-	weekdaylist. The interface only lets the user input a single value
-	anyway.
-
-	* calobj.c (ical_object_to_vobject): instead of code to output day
-	names from a bit array, use instead the value as an int and output
-	a single dayname.
-
-	* calobj.c (ical_object_generate_events): first_week_day gets the
-	day int instead of the first entry in the bit field. I inserted a
-	fair chunk of code to avoid calling generate if the day is out of
-	range for a month. It may be unneccessary, because mktime will
-	turn the extra days into a valid date the next month. But not all
-	mktimes are equal, I fear.
-
-	* eventedit.c (ee_store_recur_rule_to_ical): For case 3,
-	(Monthly), I added code to set the interval slot of the recur
-	struct; without this value, selecting a monthly recursing, by
-	date, would lead to an infinite loop broken only by a failure to
-	alloc more memory. Also, in the "by position" case, both
-	u.month_pos and u.month_day were being assigned values. This is a
-	mistake, as they are both part of an union, and the same
-	thing. The weekday field should get the recur_rr_month_weekday
-	value.
-
-	* eventedit.c (ee_rp_init_rule): set default day from the weekday
-	field instead of the u.month_day field, which is really the
-	month_pos value.
-
-	* gnome-cal.c (gnome_calendar_tag_calendar): Month days start with
-	1, not 0; thus, setting tm.tm_mday = 0, and then calling mktime
-	will generate a time corresponding to the end of the previous
-	month, which may have a mday anywhere from 28 to 31. The end time
-	just adds 1 to the month, so your end time may not cover the last
-	few days of this month, depending on what the biggest mday of last
-	month was. I changed it so tm_mday is set to 1 instead.
-
-1999-03-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-todo.c (convert_time_t_to_char): Made static.  Make it use
-	the full year format for strftime().
-
-1999-03-27  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* calobj.c: Include <config.h> So that strings get translated.
-
-1999-03-26  Tomas Ogren  <stric@ing.umu.se>
-
-	* prop.c (build_hours_menu): Made it respect 12/24h settings..
-	Doesn't show until next time you open the dialog.. yet..
-
-1999-03-24  Tomas Ogren  <stric@ing.umu.se>
-
-	* gncal-week-view.c (gncal_week_view_set): Did some i18n work
-	* eventedit.c (get_exception_string): Did some i18n work
-
-1999-03-24  Tomas Ogren  <stric@ing.umu.se>
-
-	* gncal-todo.c (gncal_todo_init): Made clist titles i18n:able
-	* main.c (poptOption): Added which views that are possible for
-	--view in the --help text (closes #367)
-	* main.c (dump_events): Added (short) month to the strftime and made
-	the strings i18n:able
-
-1999-03-23  Tomas Ogren  <stric@ing.umu.se>
-
-	* gncal/calobj.c: Added 2 paranthesis..
-	"foobar = d / 60*60" is _NOT_ the same as "foobar = d / (60*60)"
-	which caused heavy alarm-corruption with alarms between 2 hrs and
-	2 days.
-
-1999-03-23  Nat Friedman  <nat@nat.org>
-
-	* eventedit.c (ee_store_recur_rule_to_ical): Set the
- 	recur->interval to the value of the recur_rr_month_period spin
- 	button if the event is being set "by day."  This closes bug #675
- 	as reported by bagfors@hpc2n.umu.se.  Thanks for the report!
-
-1999-03-10  Clifford R. Conover <rconover@montana.edu>
-
-	* gncal-todo.c (simple_todo_editor): Add support for Due Date when
-	adding a TODO item here.
-	(column_resized): New function
-	(init_column_sorting): New function.
-	(todo_click_column): New function.
-	(convert_time_t_to_char, make_overdue_todo_style): New functions.
-
-	* gnome-cal.c (gnome_calendar_todo_properties_changed): New
-	function used to update the TODO when the properties have been
-	chagned for it.
-
-	* prop.c (prop_apply_todo): Apply TODO properties.
-
-	* gncal-day-panel.c (todo_list_properties_changed): Update the
-	TODO display here.
-
-	* eventedit.c (date_edit_new): Made public
-
-1999-03-10  Craig A Soules (soules+@andrew.cmu.edu)
-
-	* timeutil.c, calendar.c, calobj.c, gncal-day-panel.c: Add support
-	for daylight time savings.
-
-1999-02-28  Martin Baulig  <martin@home-of-linux.org>
-
-	* gncal-full-day.c (recompute_motion): For DRAG_MOVE, DRAG_SIZE_TOP
-	and DRAG_SIZE_BOTTOM: call child_focus_out () if the child currently
-	has the focus.
-
-1999-02-27  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
-
-	* quick-view.c (QUICK_VIEW_FONTSET): Added Korean font to the
-	fontset string.
-	* mark.h (*_FONTSET): Likewise.
-
-1999-02-23  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_to_vobject): Save the owner/organizer of
-	the event.
-	(ical_object_create_from_vobject): Load the owner/organizer of the event.
-
-	* gncal-full-day.c (delete_occurance): Assign child to data (fixes
-	crash on "delete this occurrance").
-
-1999-02-22  Timur Bakeyev  <mc@bat.ru>
-
-	* calendar.c: According to configured values, use either tm.tm_zone
-	or tzname. In last case, also declare it extern.
-
-	* prop.c: langinfo.h not available everywhere. Wrapped. BTW, works
-	fine without it.
-
-1999-02-20  Tomas Ogren  <stric@ing.umu.se>
-
-	* main.c (init_username): Made use of g_get_{user,real}_name() instead
-	of our own home-brew...
-
-1999-02-17  Sergey Panov <sipan@mit.edu>
-
-	* gnome-month-item.c,gnome-month-item.h,goto.c,mark.h,
-	month-view.c,prop.c,quick-view.c,year-view.c: will define
-	fonts via fontset. Friendlier to locales that use iso8859-[^1]
-	and koi8-r encodings. Does not solve problem for Asian languiges
-	--- better solution is needed (e.g. standart GNOME fontstyles
-	defined in gtkrc).
-
-1999-02-16  Sergey Panov <sipan@mit.edu>
-
-	* main.c: Use N_() macro for color settings labels in
-	color_props structure.
-
-1999-02-15  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c (goto_dialog): Indentation fixes.
-
-1999-02-15  Tomas Ogren  <stric@ing.umu.se>
-
-	* goto.c: Made a private copy of what localtime() returns, to be able
-	to keep the data after more calls to localtime().
-
-1999-02-11  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (save_default_calendar): New function.  Saves the
-	calendar if it is the user's default calendar
-
-	* gncal-full-day.c (unrecur_appointment):
-	* gncal-day-panel.c (day_view_range_activated):
-	* eventedit.c (ee_ok):
-	* gncal-todo.c (ok_button): Added autosave for the default
-	calendar.
-
-1999-02-09  Tomas Ogren  <stric@ing.umu.se>
-
-	* main.c: Removed the gtk_widget_realize call.
-
-1999-02-06  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
-
-	* gncal.desktop: Added Korean translations.
-
-1999-02-04  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (date_edit_new): New convenience function to create
-	a properly-configured date editor widget.
-
-1999-02-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-week-view.c (gncal_week_view_new): Make the calendar start
-	weeks on Monday if appropriate.
-	(gncal_week_view_time_format_changed): New function to notify the
-	week view that the time format has changed.
-
-	* gncal-day-panel.c (gncal_day_panel_new): Make the calendar start
-	weeks on Monday if appropriate.
-	(gncal_day_panel_time_format_changed): New function to notify the
-	day panel that the time format has changed.
-
-	* gnome-cal.c (gnome_calendar_time_format_changed): Tell the day
-	and week views that the time format has changed.
-
-1999-02-01  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (event_editor_init): Set the title of the event
-	editor window.
-
-1999-01-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-view.c (gncal_day_view_expose): Do not remove the
-	clipping rectangle here.
-
-	* view-utils.c (view_utils_draw_events): Remove the clipping
-	rectangle here, since the user of this function should not know
-	about it.
-
-1999-01-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* view-utils.c (view_utils_draw_events): Improve this draw
-	routine.  Now it can split the text in lines and fit as many
-	events as possible.
-	(nicetime): Return strings without spaces at the beginning.
-
-	* gncal-day-view.c (gncal_day_view_expose): Move clip-clear
-	operation here.
-
-1999-01-29 Jason Tackaberry <tack@dok.org>
-
-	* gncal-full-day.c (child_popup_menu): if the user clicks on an
-        event that is an occurance, the menu will allow the user to delete
-        all occurances of this event, or just the selected occurance.
-        (delete_occurance): added.
-
-        * eventedit.c (append_exception): force the clist to select the
-        new exception.  (fixes segfault)
-        (delete_exception): if the last exception in the clist is deleted,
-        move the selection index up. (fixes segfault)
-
-1999-01-28  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (parse_an_arg): Add --hidden key to hide the calendar at
-	startup. Only works with GNOME window managers though :-(
-
-	* calendar.c (calendar_day_change): Reschedule alarms for the new day.
-
-	(calendar_init_alarms): Schedule an alarm for midnight to change
-	the calendar_day_begin/calendar_day_end.
-
-	* alarm.c (alarm_ready): If we reschedule, there is no need to
-	activate any pending alarms.
-
-1999-01-28  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (child_new): Insert the summary text here.
-	(child_focus_in): No need to raise the window, since we have
-	Spiffo(tm) layout code.  Boy, this is old code.
-	(gncal_full_day_focus_child): Now that GtkText works better, we
-	can avoid synthesizing a click which was causing grief, anyway.
-	(child_button_press): Grab the focus before popping up the menu.
-
-	* layout.c (find_index): Added a sanity check.
-
-	* gncal-full-day.c (child_destroy): Unmap and unrealize the child
-	before unparenting/destroying it.
-	(child_unrealize): Unrealize the widget.  What was I thinking?
-	(child_new): Save the focus_out_event signal connection id in
-	Child structure (in a new field).
-	(child_destroy): Disconnect from the focus_out_event signal, since
-	we don't want to get such an event when the widget is destroyed.
-	(gncal_full_day_destroy): Destroy the children properly; it was
-	leaking memory.
-
-1999-01-27  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c (save_calendar_cmd): Warn if the calendar file has
-	changed.
-
-	* calendar.c (calendar_load, calendar_save): Keep track of the
-	modification time for the calendar file.
-
-1999-01-20  Nat Friedman  <nat@nat.org>
-
-	* gncal-full-day.c (gncal_full_day_key_press): Only trap printable
- 	characters such that hotkeys work.
-	(UNSELECT_TIMEOUT): Changed to 0.  Much saner behavior.
-
-	* prop.c (properties): Connect gnome_help_pbox_display to the
- 	GnomePropertyBox help button.
-
-1999-01-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* quick-view.c (quick_view_do_popup): Do not grab the mouse here
-	(it was being grabbed incorrectly, anyways).
-	(quick_view_map_event): Grab the mouse when the window is mapped.
-	This avoids the ugly "while (xGrabPointer () != Success)" hack.
-	(quick_view_button_release): Handle button releases here.
-
-1999-01-19  Tomas Ogren  <stric@ing.umu.se>
-
-	* main.c: do gtk_widget_realize on the toplevel window..
-
-1999-01-13  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-panel.c (gncal_day_panel_new): Make the little
-	calendar start up with the correct date.
-
-	* gncal-week-view.c (gncal_week_view_set): Add the month to the
-	date range display label.
-
-1999-01-08  Nat Friedman  <nat@nat.org>
-
-	* main.c: Converted some more stuff to use the standards.
-
-1999-01-08  Nat Friedman  <nat@nat.org>
-
-	* main.c (setup_appbar): New function to create the status bar.
-	(setup_menu): Install menu hints.
-
-	Menu items updated to match the standards.  New Settings menu
- 	created.
-
-1998-12-30  Jeff Garzik  <jgarzik@pobox.com>
-
-	* gncal/calendar.c, gncal/gnome-cal.c, gncal/main.c,
-	  gncal/quick-view.c:
-	s/g_copy_strings/g_strconcat/
-
-1998-12-16  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	Rewrote the old and broken alarm system.  It never actually
-	worked properly.  Now it works properly, and I figured a nice way
-	to get the Audio alarm do something nicer (it is now like an alarm
-	clock :-).
-
-	* gnome-cal.c (calendar_notify): Now we take a CalendarAlarm to
-	actually distinguish which alarm was triggered.
-
-	* alarm.c (alarm_ready): The code was only activating the first
-	alarm.  Reschedule the timer upon delivery of an alarm.
-
-1998-12-14  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c (idle_handler): Use the allocation size instead of
-	the old fields in the canvas structure.
-
-	* goto.c (create_days): Use gtk_widget_set_usize() instead of
-	gnome_canvas_set_size().
-	* quick-view.c (setup_event_list): Likewise.
-
-1998-12-09  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-todo.c (simple_todo_editor): Use gnome_dialog_set_parent.
-	* goto.c (goto_dialog): ditto
-	* prop.c (properties): ditto.
-
-1998-11-23  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c (ee_rp_init_exceptions): Update GtkClist usage.
-
-1998-11-23  Andrew T. Veliath  <andrewtv@usa.net>
-
-	* gncal-day-panel.c (gncal_day_panel_new): Use
-	gtk_scrolled_window_add_with_viewport instead of
-	gtk_container_add (gtk changes).
-
-1998-11-23  Herbert V. Riedel <hvr@hvrlab.ml.org>
-
-	* eventedit.c: use GPOINTER_TO_INT
-
-	* gncal-todo.c: same.
-
-1998-11-22  Matthew Wilson  <msw@redhat.com>
-
-	* main.c: Fixed the popt event parsing callback to have the
-	correct number of arguments.  This stops it from segfaulting.
-
-1998-11-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_classification_widgets): Doh.  Fixed stupid bug
-	where the classification buttons were not being set correctly.
-	(ee_store_general_values_to_ical): Take into account the fact that
-	radio group lists are stored in reverse order of insertion.
-
-	* gncal-todo.c (gncal_todo_init): Use a scrolled window to put the
-	clist into.
-
-1998-11-11  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calendar.c (calendar_save): Backup the old file before saving
-	the caledar.
-
-1998-11-06  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c: Add ctype.h
-
-1998-10-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-cal.c (gnome_calendar_direction): Add the offset from the
-	beginning of the current time unit (day/month/etc), otherwise it
-	does not work right, for example, you are on the 31st day of a
-	month and the next month is a 30-day one and you jump to the next
-	month.
-
-1998-10-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.c: Changed a lot of stuff not to use the layout code
-	-- the month view's days are too small to display layout
-	usefully.  Now they display a little list of the events in each
-	day.  We also have a popup menu for the days in the month view.
-
-	* calendar.c (calendar_get_objects_in_range): Reverse the list so
-	that it is returned in increasing order.
-
-	* eventedit.c (event_editor_new_whole_day): New public function to
-	create an event for the complete span of day_begin to day_end.
-
-	* year-view.c (new_appointment): Use event_editor_new_whole_day().
-
-	* year-view.c (yv_popup_menu): Mark strings for i18n.
-
-1998-10-12  Ji Lee <g@ucsd.edu>
-
-	* eventedit.c (ee_store_recur_rule_to_ical): The interval was
-	never being loaded from the spin button.
-
-1998-10-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.c (month_view_update): Create a list of children and
-	lay them out nicely.  Lots of functions added for this purpose.
-	(adjust_segment): Main event segment adjustment routine.
-	(adjust_children): Adjusts all the children in the month view.
-	(child_create_segments): Creates the segments for a particular event.
-	(layout_children): Uses the generic layout engine to organize the children.
-
-1998-10-08  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-todo.c (clist_row_selected): Set the sensitivity of the
-	edit/delete buttons.
-	(gncal_todo_update): Likewise.  Thanks to Dirk Luetjens for the
-	bug report.
-
-	* layout.c: Do some cleanup; now we pass a struct with the layout
-	algorithm's state instead of passing a trillion parameters around.
-
-	* gncal-full-day.c (layout_children): Use the new generic layout
-	engine.
-	(child_compare): Sort keys are start time then end time, not just
-	start time.  This produces somewhat nicer results for the layout
-	algorithm.
-
-	The new layout code uses a partition of the time range occupied by
-	the events, rather than using a fixed time granularity.  This is
-	better since the different parts of the program that use the
-	layout module will have different semantics regarding snapping the
-	event bounds to a fixed "time grid".
-
-1998-10-07  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* layout.[ch]: New files that abstract the event layout code from
-	gncal-full-day.c into something useful for other parts of the
-	program.  Now all event layout is done here.
-
-	* Makefile.am (gnomecal_SOURCES): Added layout.[ch] to the list of
-	sources.
-
-1998-10-07  Carsten Schaar  <nhadcasc@fs-maphy.uni-hannover.de>
-
-	* main.c (main): Replaced the 'gnome_client_new_default' call with
-	'gnome_master_client'.
-
-1998-10-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* timeutil.c (time_day_begin): Changed name from
-	time_start_of_day() to be consistent with the other begin/end functions.
-	(time_day_end): Likewise.
-
-	* calobj.c (ical_object_get_first_weekday): New public function to
-	get the first toggled day in a weekday mask.  Since we do not
-	support multiple weekdays in a monthly-by-pos rule, we just fetch
-	the first toggled one.
-	(ical_object_generate_events): Added a missing break statement.
-
-	* timeutil.c (time_month_end): Made it consistent with the rest of
-	the time begin/end functions -- now it returns the first second of
-	the *next* month.
-	(time_week_end): Actually implemented this function.  It will be
-	used when the week view is rewritten.
-
-	* calobj.c (time_in_range): Fix off-by-one in the comparison of
-	the time against the end time.
-
-	* gncal-full-day.c (expand_space): Fixed bug where the columns not
-	were being expanded due to a missing "slot + j".
-
-1998-10-01  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.c (month_view_init): Use the font #defines.
-	(month_view_new): Set the colors of the month view upon creation.
-	(mark_current_day): New function to mark the current day in the
-	month view.
-	(month_view_set): Mark the current day.
-	(month_view_colors_changed): Mark the current day and colorify the
-	month item appropriately.
-
-	* month-view.h: Added year and month fields to the MonthView
-	structure.
-
-	* main.c: Renamed the Appointments color property, since it will
-	be used by the month view as well.
-
-	* goto.c (update): Set the current day's font and color.
-
-	* year-view.c (year_view_init): Set the fonts of the month items
-	when creating them.
-
-	* mark.h: Added new #defines for HEADING_FONT and TITLE_FONT.
-
-	* year-view.c (year_view_init): Use the new font #defines.
-
-	* prop.c (prop_apply_colors): Fixed to work with the
-	I-am-paranoid-and-I-need-to-size-my-ints changes to
-	GnomeColorPicker.
-	(color_spec_from_picker): Likewise.
-
-1998-09-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c (create_days): Colorify the month item and prepare it for
-	prelighting here.
-
-	* main.c (color_props):  Changed the default colors to something
-	not dull.
-
-	* year-view.c (compute_min_size): New function to compute the
-	minimum size of the year view properly.
-	(year_view_size_request): Added two new fields to the year view
-	structure that contain the minimum size.  Return this in the
-	size_request method.
-	(year_view_new): Call compute_min_size to save the minimum size
-	for later use.
-	(idle_handler): Make it resize the items correctly.
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Reshape when
-	necessary.  This is needed becaues we now actually calculate a
-	minimum size for the month item based on the font sizes and paddings.
-	(check_heading_sizes): New function to calculate a minimum size
-	based on the headings' dimensions.
-	(check_day_sizes): New function to calculate a minimum size based
-	on the day number labels' dimensions.
-	(check_sizes): New function that computes a minimum size for the
-	month item.
-	(reshape): Now calls check_sizes() to ensure a minimum size for
-	the month item.
-
-	* year-view.c (mark_current_day): New function to mark the current
-	day in the year view.
-
-	* mark.c: Removed mark_current_day from here.
-
-1998-09-29  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* prop.c (fetch_color_spec): Changed name from fetch_prelight_spec
-	and made it conform to the new prelighting mechanism.
-	(fake_mark_days): Set the proper day attributes.
-	(reconfigure_month): Use colorify_month_item().
-	(fake_mark_days): Use mark_month_item_index().
-
-	* mark.c (colorify_month_item): New public function to reset the
-	colors in a month item.
-	(get_attributes): New internal function that creates an array of
-	attributes for the days in a month item.  This is the basis of all
-	the new optimizations to month item marking.
-	(unmark_month_item): Now it uses the attributes array to unmark
-	only the days that need unmarking.
-	(mark_event_in_month): Update the day attributes array.
-	(month_item_prepare_prelight): Changed the definition of the
-	prelight color query function.  Use the new function.
-	(day_event): Do color changes based on the day attributes array.
-	(mark_month_item_index): New public function to mark a single day
-	by index.
-	(mark_event_in_month): Use mark_month_item_index().
-
-	* gnome-month-item.c (gnome_month_item_num2child): Now takes an
-	int, not a GnomeMonthItemChild.
-	(gnome_month_item_child2num): Now returns an int, not a
-	GnomeMonthItemChild.
-	(gnome_month_item_num2day): Now takes an int, not a
-	GnomeMonthItemChild.
-
-	* goto.c (goto_dialog): Create the days before the year spin
-	button, because the year_changed callback expects the month item
-	to be created.  The new semantics of the spin button cause it to
-	emit a value_changed signal on the adjustment upon creation -- is
-	this the behavior we want from it?
-	(goto_dialog): Use gtk_window_set_modal() instead of the
-	deprectaed gnome_dialog_set_modal().
-
-	* quick-view.c (quick_view_new): Make it look not as crappy by
-	putting the title inside the frame.
-	(quick_view_do_popup): Fixed the pointer grab and added a cursor.
-	(create_items_for_event): Query the text width/height from the
-	text item using the new object arguments, so that the size of the
-	popup window can be set properly.
-
-	* year-view.c (do_quick_view_popup): Calculate a nice date string
-	for the popup window.
-
-1998-09-28  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* quick-view.[ch]: New file that presents a quick view of the
-	events in a particular day when the mouse is clicked on the year
-	view.  Work in progress.
-
-	* year-view.c (do_quick_view_popup): New function that creates a
-	quick view for the events in a day.
-
-	* Makefile.am (gnomecal_SOURCES): Added quick-view.[ch] to the
-	list of sources.
-
-1998-09-27  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c: Hotkey for File/Exit should be C-q, not C-x.
-
-1998-09-24  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c (do_popup_menu): New function to execute the popup
-	menu in the year view.
-	(day_event): Invoke the popup menu with the context set to days.
-	(new_appointment): New function to create a new appointment from
-	the year view.
-	(do_jump): New function to do the appropriate view/date jumping
-	from the popup menu.
-
-	* main.c: Fixed two icons in the File menu.
-
-1998-09-21  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c: Added underlined shortcuts and accelerators to the main menu.
-
-1998-09-16  Raja R Harinath  <harinath@cs.umn.edu>
-
-	* gncal-week-view.c (<gtk/gtklabel.h>): Include.
-	* gncal-week-view.h (<gtk/gtkvbox.h>): Include.
-
-1998-09-06  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (mail_notify): Fixed the bug reported about the mail
-	notification not beint sent until the program was terminated.
-
-1998-09-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (gncal_full_day_forall): Updated foreach ->
-	forall from Gtk changes, bleah.
-
-	* year-view.c (day_event): New function to handle events from
-	days.  Jumps to the day that is clicked.
-
-	* main.c: Use a watch cursor while the previous/today/next
-	functions are doing their job.
-
-	* mark.c (month_item_prepare_prelight): New public utility
-	function to prepare a month item for prelighting.  It will store
-	the proper prelight information and attach the appropriate signals.
-	(mark_current_day): Make the current day bold as well (useful for
-	color-blind people, I guess).
-
-	* prop.c (set_current_day): Reset the date in the sample calendar
-	and mark the current day.
-	(fake_mark_days): Mark fake events in the sample calendar.
-
-	* year-view.c (year_view_set): Use the general prelighting engine.
-
-	* goto.c (day_event): Just process button presses, as prelighting
-	is done behind the scenes now.
-	(update): Use the general prelighting engine.
-
-	* prop.c (create_colors_page): We can now configure the colors of
-	the monthly calendars!  Wheeeeee!  There are still some nits to be
-	fixed, which are listed in the TODO file.
-	(build_color_spec): New function to build color specifications.
-	(parse_color_spec): New function to parse color specifications.
-
-	* mark.c: Modified all functions to use the configured colors.
-	* goto.c: Likewise.
-
-	* main.c (colors_changed): New function that notifies all
-	calendars that colors have changed.
-
-	* gnome-cal.c (gnome_calendar_colors_changed): New function that
-	notifies all the views that the colors have changed.
-
-	* month-view.c (month_view_colors_changed): New function that
-	notifies the month view that colors have changed.
-
-	* year-view.c (year_view_colors_changed): New function that
-	notifies the year view that colors have changed.
-
-	* gnome-month-item.h (struct _GnomeMonthItem): Added fields for
-	outline and day box colors.
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Added
-	outline_color, outline_color_gdk, day_box_color, and
-	day_box_color_gdk arguments to month items.  These are convenient
-	to quickly set the colors of the month item.
-	(gnome_month_item_get_arg): Likewise.
-
-	* main.[ch]: Added a global array of structures for color preferences.
-
-1998-08-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c: Small code cleanup.
-	(day_event): Upon receiving a LeaveNotify event, Reset the day's
-	background to the correct color.
-
-1998-08-29  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* mark.[ch]: New files with utility functions to mark calendars
-	with their events.
-
-	* mark.c (mark_month_item): New public function to mark a month
-	item with events.
-	(unmark_month_item): New public function to unmark all the days in
-	a month item to their default appearance.
-
-	* year-view.c (year_view_set): Use the new unmark_month_item() and
-	mark_month_item() to mark the months with events.
-
-	* goto.c (update): New function that updates the calendar in the
-	Go-to dialog by marking the days.
-
-	* timeutil.c (time_year_begin): Modified to take a time_t value.
-	(time_year_end): Likewise.
-	(time_month_begin): Actually implemented this function, which was
-	in the header file but not here.
-	(time_days_in_month): New public function that returns the number
-	of days in a month.
-
-	* Makefile.am (gnomecal_SOURCES): Added mark.[ch] to the sources.
-
-	* year-view.c (unmark_days): Use unmark_month_item().
-
-	* gncal-full-day.c (gncal_full_day_destroy): Fixed crash when
-	destroying the full day view.  The full day's destroy method is
-	unusual in that it destroys the list of child widgets itself, as
-	it does not have a remove method, so it needs to reset the list to
-	NULL.
-
-1998-08-27  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-month-item.c (build_month): Now does the correct thing
-	when the user wants weeks to start on Monday.  Now all the Monday
-	special casing, as far as day numbering is concerned, is only in
-	this function.
-
-	* year-view.c (mark_days): This function marks the days that have
-	events in them.  It also fixes a memory leak in the old
-	implementation (it was leaking the whole list).
-	(unmark_days): New function used to unmark all the days in the
-	year view.
-	(mark_event): New function that marks all the days that are
-	spanned by a time range.  It also fixes the bug in the old
-	implementation where it could possibly mark days past the ends of
-	the year (if the event crosses year boundaries, for example).
-
-	* timeutil.c (time_year_begin): Take the year parameter since year
-	1, not 1900.
-	(time_year_end): Likewise.
-
-	* year-view.c (year_view_size_allocate): Now changing the size of
-	the calendars is done in the idle loop.
-	(idle_handler): This function actually does the resizing of the items.
-
-	* year-view.h (struct _YearView): Added idle_id and need_resize
-	fields.
-
-1998-08-26  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* year-view.c: Beginning of the new year view.  Sizing and event
-	marking needs to be finished.
-
-	* gnome-cal.c: Updated for year-view.
-	(gnome_calendar_time_format_changed): Use year_view_time_format_changed().
-
-	* year-view.[ch]: Renamed the gncal-year-view.[ch] files to
-	year-view.[ch].
-
-	* Makefile.am (gnomecal_SOURCES): Updated year-view.[ch] in the
-	list of source files.
-
-1998-08-25  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* goto.c (create_days): Set the heading color of the month item.
-
-	* main.c: Use GNOME_STOCK_PIXMAP_JUMP_TO, now that it exists,
-	instead of goto.xpm.  Also, removed goto.xpm from cvs.
-
-	* gnome-month-item.h (struct _GnomeMonthItem): Added fields for
-	the heading and day number fonts.  Added fields for heading and
-	day number label colors.
-
-	* gnome-month-item.c (gnome_month_item_class_init): ARG_DAY_NAMES
-	should be write-only.  Also, added arguments for heading and day
-	number fonts.  Added arguments for heading and day number colors.
-
-1998-08-24  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* prop.c (build_two_radio_group): Doh.  Set the state of the radio
-	buttons properly.
-
-	* month-view.c (month_view_time_format_changed): New public
-	function that notifies the month view of a time format change.
-
-	* gnome-cal.c (gnome_calendar_time_format_changed): New public
-	function that notifies the calendar of a time format change.
-
-	* main.c (time_format_changed): Use gnome_calendar_time_format_changed().
-
-	* month-view.c (month_view_update): New public function to update
-	the month view when an event changes.  This is still unfinished.
-	(month_view_set): New public function to set the month in the
-	month view.
-
-	* gnome-cal.c (gnome_calendar_direction): Add case for month view.
-	(gnome_calendar_set_view): Likewise.
-	(gnome_calendar_update_all): Likewise.
-
-	* timeutil.c (time_add_week): Implemented the time_add_week()
-	function, which was on the header file.
-	(time_add_month): Added public month-adding routine.
-
-	* gnome-cal.c (gnome_calendar_get_current_view_name): Add case for
-	month view.
-	(gnome_calendar_goto): Likewise, and set the time on the month view.
-
-	* month-view.c (month_view_new): Now it takes the calendar plus
-	the time_t representing the month.
-
-	* gnome-month-item.h: Added documentation on the object arguments
-	for the month item.
-
-	* month-view.c (month_view_init): Added a month/year heading to
-	the month view.
-
-	* TODO: Updated the TODO list a bit.
-
-	* main.c (gnome_cal_file_menu): The preferences menu option should
-	go in the File menu.
-	(gnome_cal_edit_menu): Added stock pixmaps to the menu items.
-	(gnome_cal_menu): Renamed the Calendar menu to Edit.
-	(gnome_cal_help_menu): Use "About Gnomecal", not just "About".
-
-	* prop.c (hour_activated): Notify the property box that it has changed.
-
-	* main.c: Changed the Properties menu item to Preferences.  These
-	are global application preferences, not a single calendar's
-	properties.
-
-	* prop.c (prop_apply): Save the week_starts_on_monday flag to the
-	configuration file.
-	(properties): Added a check button for weeks starting on Monday.
-	(properties): Beautified the Preferences dialog.
-
-	* month-view.c (month_view_init):
-	* goto.c (create_days): Set the month item to start weeks on
-	Monday if appropriate.
-
-	* main.c (init_calendar): A boolean is not an hour, so don't
-	range_check_hour() on it.
-	(init_calendar): Added a global week_starts_on_monday flag.
-
-	* main.h: Added global week_starts_on_monday flag.
-
-1998-08-21  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_create_from_vobject): If mail alarm or
-	program alarm are missing the action, then set an empty default.
-
-1998-08-18  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-month-item.c (gnome_month_item_day2index): New public
-	function to get the displayed day index of the specified date.
-
-	* gnome-cal.c (gnome_calendar_goto_today): New public function to
-	jump to the current day.
-
-	* goto.c (day_event): Jump to the selected day when the user
-	clicks the mouse, and prelight days as appropriate.
-
-	* timeutil.c (time_from_day): New public function to build a
-	time_t from a year/month/day triplet.
-
-	* gnome-month-item.c (gnome_month_item_num2child):
-	(gnome_month_item_child2num): New public functions to convert an
-	index into a child and vice-versa, respectively.
-	(gnome_month_item_num2day): New public function to convert a child
-	number into a displayed day number.
-
-	* goto.c (goto_dialog): Doh, use gnome-dialog properly :-)
-
-	* gnome-month-item.c (create_items): Use g_strdup()ed day names
-	from the start.
-
-1998-08-17  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c (gnome_toolbar): Made it use goto.xpm.
-
-	* Makefile.am (EXTRA_DIST): Added goto.xpm to the list of files.
-
-1998-08-13  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-month-item.c (gnome_month_item_set_arg): Doh.  Actually
-	recalculate the days using the month and year.
-
-	* main.c: Added "Go to" button to quickly jump to a specific date.
-
-	* goto.c: New file that defines the quick go-to date dialog.
-
-	* Makefile.am (gnomecal_SOURCES): Added goto.c to the sources.
-
-1998-08-11  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* main.c (new_calendar): Made title i18n friendly. This was bug
-	#215.
-
-	* eventedit.c (ee_store_recur_end_to_ical): Set recur->enddate to
-	recur->_enddate, not to itself, when adding recurring event and
-	supplying an end date. This fixes (at least part of) bug #99.
-
-1998-08-10  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* month-view.[ch]: Start of the month view widget.  This will use
-	the generic month item and extend it to have the semantics desired
-	for the gnomecal month view.
-
-	* gnome-month-item.[ch]: New generic canvas item for the month
-	view and the "small calendars".  This is intended to be a
-	high-level display engine for monthly calendars.  This is a work
-	in progress.
-
-	* gnome-cal.h (GnomeCalendar): Added a month_view field.
-
-	* gnome-cal.c (setup_widgets): Create the month view and insert it
-	into the notebook.
-
-	* Makefile.am: Added month-view.[ch] and gnome-month-item.[ch] to
-	the sources.
-
-1998-08-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* main.c (about_calendar_cmd): Use an array of const strings to
-	keep gcc happy.
-
-	* alarm.c (alarm_compare_by_time): Use gconstpointer to keep gcc happy.
-	* calendar.c (calendar_object_compare_by_start): Likewise.
-	* gncal-full-day.c (child_compare_by_start): Likewise.
-
-1998-07-07  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c: Add support for --view flag.
-	(session_save_state): Save the view mode;
-	(new_calendar): Now takes a view mode flag.
-
-	* gnome-cal.c (gnome_calendar_get_current_view_name): New
-	function for enhancing the session management support for
-	gnomecal.
-	(gnome_calendar_set_view): New function that makes a given page
-	active.
-
-1998-07-01  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* gncal.desktop: Added Portuguese translation.
-
-Mon Jun 22 13:01:16 1998  Havoc Pennington  <hp@pobox.com>
-
-	* main.c (session_save_state): Use gnome_geometry_string to get
-	the geometry string.
-
-1998-06-04  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_rp_init_rule): Do not subtract 1 from
-	tm->tm_mday for the default_day.
-
-	* gnome-cal.c (gnome_calendar_new):
-	(gnome_calendar_goto): Use the start of the day -- things expect
-	it to be that way.
-
-1998-05-27  Nuno Ferreira  <nmrf@rnl.ist.utl.pt>
-
-	* eventedit.c (ee_store_recur_rule_to_ical): Fill in
-	ical->recur->interval from value in spin_button. This ixed an
-	infinnite loop.
-
-1998-05-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (child_draw): Paint the decorations correctly.
-	(child_draw_decor): Paint the recurrence/bell icons correctly.
-
-1998-05-25  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c (ee_rp_init_rule): Use the contents of
-	ee->ical->dtstart for computing the predefined values of the recurrence.
-
-	* gncal-full-day.c (gncal_full_day_unrealize): Fix the gc
-	destruction in the unrealization code and fix the pixmap unrefing.
-
-	* main.c (close_cmd): Remove a bad hack that disabled calendar
-	widget destruction.
-
-	* calobj.c (ical_object_generate_events): Fix for the weekly event
-	generation.  Was reported on the bug tracking system.
-
-1998-05-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-full-day.c (layout_children): Implemented ultra-cool
-	layout for the events that share the same time range.  Gals and
-	guys you can now drop Outlook on the recycle bin.
-
-	Which reminds me.  We do not have a recycle bin.  How could that
-	happen in a project as cool as this one?  Someone explain this to
-	me.
-
-1998-05-18  Federico Mena  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (paint_back): Eliminated unnecessary border repainting.
-
-Sun May 17 17:55:03 1998  Havoc Pennington  <hp@pobox.com>
-
-	* gncal-todo.c (simple_todo_editor): Close dialog when return is pressed.
-
-1998-05-15  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (mark_gtk_calendar_day): Bug free version of the
-	range computation in place.
-
-	* gncal-year-view.c (year_view_mark_day): Use the same new version
-	of the range computation here.
-
-	* calobj.c (ical_object_generate_events): Fix the begin/end
-	condition.
-
-1998-05-14  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* timeutil.c (isodate_from_time_t): Do not add the spurious
-	padding.
-
-	* calobj.c (store_date_list): Bug fix:  I was using the wrong
-	pointer when saving the exception date list.
-	(set_date_list): Bug fix:  load correctly the complete exception
-	date list.
-	(set_date_list): Use ',' for the exception date separator as the
-	versit people can not get their standard right.
-
-	* gncal-full-day.c (unrecur_appointment): Support for making an
-	existing recurrent event `movable' for a day.
-
-	* calobj.c (ical_object_add_exdate): New routine, used to add
-	exception dates.
-	(ical_object_duplicate): New routine:  used to do the magic
-	recur->no-recur event.
-
-1998-05-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-full-day.c (new_appointment): Use gtk_calendar freeze/thaw
-
-	* gncal-year-view.c (gncal_year_view_set_year): Use gtkcalendar freeze/thaw.
-
-	* eventedit.c (event_editor_init): Use gnome_dialog_set_close to
-	avoid the ugly warning.
-
-	* main.c (display_objedit): Default to the day the user is looking
-	at.
-
-1998-05-05  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-day-panel.c (full_day_size_allocated): Do not emit a value
-	changed signal if the value is the same.
-
-1998-05-04  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* prop.c (prop_apply): Only run the apply code once.
-
-1998-05-03  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-day-panel.c (update): Draw the day at startup.
-	(gncal_day_panel_set): Fix selected-day display.
-	(gncal_day_panel_new): Switch day on double clicks, not on single
-	clicks.
-
-	* calobj.c (ical_object_compute_end): Removed debug messages.
-
-1998-04-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* prop.c (prop_apply): Do not call prop_cancel, ths is now using
-	GnomePropertyDialog.
-
-1998-04-29  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-week-view.c (sync_week): Use gnome_calendar_tag_calendar.
-
-	* gnome-cal.c (gnome_calendar_tag_calendar): New routine used to
-	fill a gtk_calendar with the events on a GnomeCalendar object.
-
-	* gncal-week-view.c (gncal_week_view_new): Set the week to the day
-	we double clicked.
-
-1998-04-28  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (calendar_notify): Apply black magic to get mail
-	notifications to work.
-
-	* gncal-full-day.c (child_focus_out): Temporary optimization, the
-	child_focus_out is constantly calling the
-	gnome_calendar_object_changed when the property editor has been
-	invoked.  This happens every time the mouse moves crosses the main
-	window.
-
-	* calendar.c (calendar_object_changed): Reschedule alarms when a
-	calendar object has changed its times.
-
-Sat Apr 25 22:20:45 1998  Havoc Pennington  <hp@pobox.com>
-
-	* eventedit.c, eventedit.h: Descend from GnomeDialog. Took vbox
-	out of class structure; use GnomeDialog vbox
-	instead. gnome_dialog_set_destroy instead of destroying in button
-	callbacks. Don't create buttons, separator, or vbox manually.
-	#include <libgnomeui/gnome-dialog.h>.
-
-1998-04-24  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_create_from_vobject): Fixed alarm loading;
-	Load snooze time and snooze count
-
-1998-04-23  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* calendar.c (calendar_save): Actually save the to-do entries.
-
-	* gncal-todo.c (simple_todo_editor): Now you can add and edit
-	to-do entries.
-
-1998-04-22  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c: Made it use popup_menu().
-
-	* popup-menu.c: New file with utility functions for creating popup
-	menus.  Maybe such a thing would be useful in libgnomeui, a la
-	gnome-app-helper?
-
-	* Makefile.am (gnomecal_SOURCES): Added popup-menu.[ch] to the sources.
-
-1998-04-22  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* prop.c (properties): Added Calendar properties editor.
-	(properties): Make the code use a propery box.
-
-	* main.c: Save/load properties (fix to old commit).
-
-1998-04-21  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-todo.c: New widget for editing TODO lists.  This will be
-	worked on a lot.
-
-	* Makefile.am (gnomecal_SOURCES): Added gncal-todo.[ch] to the sources.
-
-	* gncal-day-panel.c: Make it use the new TODO widget.
-
-1998-04-21  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* timeutil.c (isodate_from_time_t): Do not save with the global
-	time flag (Z at the end of the isodate).  When we figure out a way
-	to load times in GMT time, we will add this back
-
-	* view-utils.c (popup_menu): Moved this routine here as there are
-	more users of this code.
-
-	* gncal-day-view.c (gncal_day_view_class_init): Add button press
-	handler.
-	(new_appointment): New routine for creating appointments on a day.
-
-
-
-	* main.c (save_ok): Added call to gtk_window_set_wmclass.
-
-	* gncal-day-panel.c (calendar_day_selected): Fix, years for mktime
-	should substract 1900 and gtk_calendar stores years relative to
-	year 0.
-
-	* gncal-week-view.c (gncal_week_view_new): Make the week view
-	descend from VBox so that we can add a label to it.
-	(gncal_week_view_set): Display the ending day of the week
-	correctly.
-
-	Added a label that displays the week range.
-
-1998-04-21  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-cal.c: Made it use GncalDayPanel.
-
-	* gncal-day-panel.c: New widget for the day view in the main
-	calendar toplevel.  It basically takes care of everything
-	gnome-cal did by hand with respect to the day view.
-
-	* Makefile.am (gnomecal_SOURCES): Added gncal-day-panel.[ch] to
-	the rules.
-
-	* main.c: Added a separator between the About menu item and the
-	help topics.
-
-1998-04-20  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c (ee_ok): Mark the event as non-new after accepting changes.
-
-1998-04-20  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (gncal_full_day_get_day_start_yoffset): New
-	public function that returns the y offset for the row
-	corresponding to the "day begin" time.
-
-	* gncal-full-day.c (gncal_full_day_key_press): Now any printable
-	keystroke (not just Return) will activate the selected range.
-
-	* gncal-full-day.c (paint_back): Made it use the new paint_row
-	function instead of painting everything directly.  We calculate
-	areas in a smarter way so there is even less flicker than before,
-	especially when selecting regions.
-
-	* eventedit.c: Sensitize recurrence widgets properly.
-
-	* calobj.c (duration_callback): Pass the correct pointer type to
-	is_date_in_list().
-
-1998-04-20  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (duration_callback): Take exception dates into
-	account.
-
-	* gncal-full-day.c (new_appointment): Setup the event editor dates
-	to those of the currently displayed day.
-	(gncal_full_day_selection_range): Use sensible values in the case
-	no range is selected.
-	(new_appointment): Events now use the current day for event creation.
-
-	* view-utils.c: Pretty up the time display.
-
-	* calobj.c (ical_object_compute_end): Initialize
-	ico->recur->enddate, otherwise we loop forever during final date computation.
-
-	* eventedit.c: Now recurrence is toggled by a radio button in the
-	recurrence page, as the checkbox is confusing.
-
-	* calobj.c (is_date_in_list): Add support for the exclussion
-	dates.
-
-1998-04-18  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-year-view.c (double_click): Fix this routine as well.
-
-	* gncal-week-view.c (jump_to_day): Bind the gtkcalendar signals to
-	the week.
-
-	* gncal-year-view.c (gncal_year_view_set_year): Put things in the
-	proper range.  Now the year view actually matches this year.
-
-	* gnome-cal.html: Added small documentation.
-
-	* main.c: Add more icons to the menus;  Rename some menubar
-	entries;  Add `new' icon to the toolbar.
-	(dump_events): Added argument handling and dumping of events from
-	the command line.  Extremely cool.
-
-	* getdate.y: Taken from the CVS source code.  Used for date
-	parsing in the command line.
-
-	Internationalized getdate.y.  Wee!  It even works with spanish.
-
-	* calobj.c (ical_object_to_vobject): Add Quoted printable property
-	to items containing new lines.
-	(duration): Use unsigned integers, to work around buggy calendar
-	files generated by korganizer.
-
-	* main.c (save_calendar_cmd): Do not ask for file name if we are
-	saving.
-	(save_as_calendar_cmd): New command.
-
-
-1998-04-17  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* alarm.c (alarm_kill, alarm_init, alarm_add): Implement the alarm
-	management framework.
-
-1998-04-17  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* calobj.c (ical_new): Added mandatory status property.
-	(ical_object_to_vobject): Only store "related" list if it exists.
-	(store_list): Add terminating null char and free the correct data.
-
-	* main.c (save_calendar_cmd): Implemented calendar saving.
-	(open_calendar_cmd): Implemented calendar loading.
-	(new_calendar_cmd): Implemented calendar creation.
-	(new_calendar): Don't load our test calendar by default.
-
-	* gncal-full-day.c (delete_appointment): Delete appointment implemented.
-
-	* eventedit.c (ee_store_recur_values_to_ical): Free/create
-	ical's recurrence appropriately.
-	(ee_rp_init_rule): Initialize all missing parameters from ical.
-	(ee_rp_init_ending_date): Initialize missing fields from ical.
-
-1998-04-17  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (gnome_calendar_remove_object): Add support for
-	removing objects.
-
-1998-04-17  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_init_recurrence_page): New function that creates
-	the recurrence page in the toplevel notebook.
-	(ee_store_recur_values_to_ical): Now we can also store the recurrences.
-
-1998-04-17  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_object_generate_events): Implement
-	RECUR_MONTHLY_BY_POS implemented.
-	(ical_object_create_from_vobject): Fix the alarm
-	initialization code.
-	(save_alarm): Save alarms.
-	(ical_object_generate_events): Fixed the recurrent code to take
-	into account the recur->endate field (if at all specified).
-
-	(ical_object_to_vobject): Implement recurrence rule saving.
-
-1998-04-16  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_store_alarm): Use menu_shell->children, not
-	menu->children.  Why does GtkMenu have a children field in the
-	object structure?
-	(check_dates): New function that insures that start_date < end_date.
-	(check_times): In addition to checking whether the event spans the
-	whole day, now it insures that start_time < end_time.
-
-	* gncal-full-day.c (child_set_size): Now children get bigger
-	temporarily while they are focused.  This allows the handles not
-	to "overlap" the rows used by the child and thus allow editing of
-	very thin events.
-	(recompute_motion): Fix for new child coordinates.
-	(gncal_full_day_expose): Make it use find_child_by_window()
-	instead of looking for it by hand.
-
-	* bell.xpm recur.xpm: XPM files for events with alarm and
-	recurrence, respectively.
-
-1998-04-15  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (button_1): Preserve the up/down cursor while dragging.
-
-	* gncal-full-day.c (child_draw): Now children have a vertical
-	handle as well.  This can be used to move the child anytime, not
-	only when it is focused.
-	(recompute_motion): Modified for new drag behavior.
-
-	* eventedit.c (ee_init_general_page): The general_owner may be
-	null.  Do the proper thing when creating the label.
-	(ee_ok): Update the gnome calendar appropriately.
-
-	* timeutil.h:
-	* gncal-year-view.h: Add some missing prototypes.
-
-	* gncal-full-day.c (child_popup_menu): Set the sensitivity of menu
-	items according to whether the ical object is being edited or not.
-
-	* eventedit.c (event_editor_new): Set the "being edited" flag on
-	the ical object (stored as the ical object's user data).
-	(event_editor_destroy): Release the flag.
-
-	* calobj.h: The iCalObject structure now has a generic user_data pointer.
-	* calobj.c (ical_object_set_user_data ical_object_get_user_data):
-	Functions to set this data.
-
-	* gncal-full-day.c (child_button_press): Do child popup menu correctly.
-
-	* main.c (about_calendar_cmd): Fixed my address and added Arturo
-	to the authors in the about box.
-
-	* gncal-full-day.c (find_child_by_window): Compare child's widget
-	windows by user_data (which will be the parent widget, that is,
-	the text widget).  We cannot assume that child->widget->window
-	will be *the* window we are interested on because there may be
-	child widgets with multiple windows.
-
-1998-04-15  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* calobj.c (ical_foreach): Define iterator routine.
-
-1998-04-15  Arturo Espinosa Aldama  <arturo@nuclecu.unam.mx>
-
-	* gncal-year-view.[hc]: Now using time_t for new and set.
-	  Random fixes, as well.
-
-1998-04-15  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (button_3): New popup menus activated with
-	mouse button 3.
-	(create_appointment): Create a new appointment from the popup
-	menus.  See the FIXME.
-
-1998-04-15  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-full-day.c (layout_kill_rows): Routine to destory rows
-	array properly.
-
-	* gncal-year-view.c (gncal_year_view_new): Add missing year in
-	call to strftime.
-
-	* calobj.c (ical_object_create_from_vobject): Fixed memory leaks
-	from the return values of versit's fakeCString.
-
-1998-04-14  Arturo Espinosa Aldama  <arturo@nuclecu.unam.mx>
-
-	* gncal-year-view.[hc]: New widget for the year view.
-	* Makefile.am: added required compilation of the new files.
-
-1998-04-14  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (event_editor_setup_time_frame): Fixed some table
-	expansions to make the dialog look nicer when resized.
-
-	* calobj.c (ignore_space): Fixed compiler warning about unused
-	computed value.
-	(ocurrencelist): Replace str by p confusion.  Removed unused
-	variables value and q.
-	(daynumber): Fixed a couple of warnings about unused values.
-	(load_recurrence): Removed unused variable c.  Added a default
-	clause to the switch(type).
-
-	* eventedit.c (ee_rp_init_frequency): Removed unused variable content.
-	Fixed a compiler warning by adding a missing cast.
-
-	* calobj.c (ical_object_create_from_vobject): Make the
-	load_recurrence() part work correctly.  Eliminated use of
-	syntax_error variable.
-
-1998-04-13  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (child_key_press): Unfocus the child and focus
-	the parent fullday widget when the user presses Esc.
-
-	* gncal-week-view.c (gncal_week_view_update): Now takes object and
-	flags parameters.
-	* gncal-day-view.c (gncal_day_view_update): Likewise.
-	* gncal-full-day.c (gncal_full_day_update): Likewise.
-	(child_focus_in): New function.  In conjunction with
-	child_focus_out(), these only display the handles in the child
-	when it is focused.  The result is that the user can see more of
-	the child's text when nothing is focused, and we can also display
-	fatter and nicer drag handles.
-
-	* gnome-cal.c (gnome_calendar_object_changed): Now takes an
-	additional flags parameter
-	(gnome_calendar_update_all): Made function static.  Now takes
-	changed object and flags parameters as well.
-	(gnome_calendar_object_changed): Now takes additional flags
-	parameter to indicate what changed in the specified object.
-
-	* calobj.h (CalObjectChange): New enum with flags to describe what
-	has been changed in an object.
-
-	* gncal-full-day.h:
-	* gncal-full-day.c (gncal_full_day_focus_child): New function to
-	let the outside world decide which child to focus.
-	(gncal_full_day_focus_child): Bleah.  We have to synthesize a
-	click because GtkText will not set the cursor when you focus it.
-
-	* gnome-cal.c (day_view_range_activated): Focus the new child in
-	the full day widget.
-
-	* eventedit.c (event_editor_setup_time_frame): Re-aligned some
-	widgets to make it look prettier.
-	(ee_alarm_widgets): Likewise.
-	(ee_init_general_page): Likewise.
-	(ee_classification_widgets): Likewise.
-	(event_editor_init_widgets): Likewise.
-
-	* gnome-cal.c (day_view_range_activated): Create new object and
-	add it to the calendar.  You can now select a range in the
-	full-day view, hit Return, and a new event will be added at the
-	selected range.  I still have to figure out how to focus this new child.
-
-	* gncal-full-day.c (paint_back): Rewrote function to avoid
-	painting an area more than once -- eliminate flicker.
-	(paint_back_rows): New function that calls paint_back() only for
-	the area of the specified rows.
-	(gncal_full_day_button_press):
-	(gncal_full_day_button_release):
-	(gncal_full_day_motion): Made these functions use
-	paint_back_rows() instead of paint_back(), to eliminate flicker.  Wheee!
-
-1998-04-12  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gnome-cal.c (setup_day_view): We now connect to the
-	range_activated signal of the fullday widget instead of catching
-	key presses ourselves.
-	(day_view_range_activated): New function that creates a new
-	iCalObject and inserts it into the calendar, not finished yet.
-
-1998-04-11  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (get_time_from_rows): New function, calculates
-	a pair of time_t values from the specified start and number of rows.
-
-	* gncal-full-day.h (GncalFullDayClass): New signal
-	"range_activated".  It is emitted when a range is selected and the
-	user hits Return.
-	(gncal_full_day_selection_range): New function, returns the
-	selected range.
-
-	* gncal-full-day.c (struct drag_info): Moved selection information
-	to their own fields instead of sharing the child's drag fields.
-	This allows us to keep the selection when a child is moved.
-	(recompute_motion): Made the case when (row < di->sel_click_row)
-	work correctly.
-
-1998-04-11  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gnome-cal.c (gnome_calendar_goto): Add support for navigating
-	on the day view.
-
-	* timeutil.c (time_start_of_day, time_end_of_day, time_day_hour):
-	New time manipulation functions.
-
-	* eventedit.c (ee_rp_init_frequency): Add the different frequency
-	editors to a notebook.  Make the notebook startup on the entry
-	selected recurrence type;
-
-1998-04-11  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c (recompute_motion): Now we support selecting a
-	range in the main window (by clicking+dragging).  It flickers
-	horribly and is not perfect, but it is a start.
-
-1998-04-09  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c: #include <string.h>
-
-	* gncal-full-day.c (child_map): Show instead of just map the child
-	widget (otherwise the text widget gets confused and will not focus).
-
-	* calobj.c (ical_object_to_vobject): Quote chars as 'x', not "x".
-
-	* calobj.h: Added prototype for ical_object_to_vobject().
-
-	* gnome-cal.c (gnome_calendar_object_changed): New function.  This
-	should be called when a calendar object is changed.
-
-	* gncal-full-day.c (update_from_drag_info): Call
-	gnome_calendar_object_changed() instead of updating manually.
-
-	* calendar.c (calendar_add_object):
-	(calendar_remove_object): Set the modified flag to true.
-
-	* gncal-full-day.c (gncal_full_day_draw): Finished implementing
-	this function.
-
-1998-04-08  Raja R Harinath  <harinath@cs.umn.edu>
-
-	* gncal.c (update_calendar): Say `#if 0', not `#ifdef 0'.
-
-1998-04-07  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c: Removed unused global variable parent_class.
-
-	* eventedit.h: Renamed gtk_window field to window.
-	Made the parent_class field in the EventEditorClass structure be a
-	GtkWindowClass, not a gnome property box class.
-	Added prototype for event_editor_get_type().
-
-1998-04-06  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-week-view.c (gncal_week_view_new): Use the new
-	gtk_table_set_homogeneous() instead of setting the variable directly.
-
-1998-04-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* eventedit.c (ee_create_ae): Make it return void.
-	(ee_alarm_widgets): Remove some unused variables.
-	(ee_store_alarm): Make it return void.
-	#include <string.h>
-
-	* eventedit.h: #include "gnome-cal.h"
-
-	* calobj.c (list_free): Don't use g_free in the g_list_foreach.
-
-	* calendar.h: Add prototype for calendar_load().
-
-	* timeutil.h: Add prototypes for time_add_*().
-
-	* calendar.c:
-	* calobj.c:
-	* eventedit.c:
-	* gnome-cal.c: #include "timeutil.h"
-
-	* gncal-day-view.c (gncal_day_view_size_request): Make the minimum
-	width equal or larger to the title width.
-
-	* main.c: #include "eventedit.h"
-	(main): Add a return statement.
-	(new_calendar): Show stuff *after* the calendar has been loaded.
-
-	* gnome-cal.c (gnome_calendar_load): Update the day view.
-	(setup_widgets): Hackish setup of a day view widget - will fix later.
-	(gnome_calendar_init): Initialize all fields.
-
-	* gnome-cal.h: Added day_view field.  Maybe this should be changed
-	when the a complete day view panel is complete.
-
-	* gncal-day-view.c (gncal_day_view_update): Draw after update, not
-	before.
-
-1998-04-06  Carsten Schaar  <nhadcasc@fs-maphy.uni-hannover.de>
-
-	* versit/.cvsignore: New file.
-
-Fri Apr  3 22:31:54 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* calendar.c: Include <config.h>.
-
-1998-04-03  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* timeutil.c (time_add_year, time_add_year, time_add_week):
-	Routines for time manipulation.
-
-	* calobj.c (ical_object_destroy): Full destruction of the object.
-
-	* eventedit.c: Finished the main event editor form;  It still
-	lacks the details and the recurrence bits.  It now adds events
-	and cancels.
-
-1998-04-03  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* view-utils.c (view_utils_draw_events): The "better" format
-	string for strftime() wasn't better, after all :-(
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-full-day.c: New full-day widget.  It is still a work in
-	progress.  It will be similar to M$ Schedule's nifty full day view
-	widget, but with Gtk's elegance :-)
-
-	* Makefile.am (gnomecal_SOURCES): Added gncal-full-day.[ch] to the sources.
-
-1998-04-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* eventedit.c: Object editor widget.  We dropped ObjEdit.
-
-	* timeutil.c (time_from_isodate): Fix.
-
-	* view-utils.c (view_utils_draw_events): Changed the display
-	formats.
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* view-utils.c (view_utils_draw_events): Use better format
-	specifier for strftime().
-	(view_utils_draw_textured_frame): Ultra-nifty function to draw
-	textured "metal" frames, like Netscape's handles.
-
-1998-04-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* gncal-day-view.c (gncal_day_view_update): Day events are now
-	cached inside the widget.  They get initialized at this time.
-
-	* view-utils.c (view_utils_draw_events): Use the list of events.
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-view.c (gncal_day_view_set_shadow): New customization
-	function.  We can't decide on a stupid border type :-)
-	(gncal_day_view_init): Made GTK_SHADOW_ETCHED_IN be the default
-	shadow type.  Looks good.
-
-1998-04-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* main.c: New main program that uses our new datatypes and
-	objects.
-
-	* calendar.c (calendar_load_from_vobject, calendar_load):
-	Implement loading of vCalendar objects and vCalendar files.
-
-	* calobj.c (ical_object_create_from_vobject): Implement loading of
-	vCalendar event and todo objects.
-
-	* timeutil.c (isodate_from_time_t): New function.
-
-	* gnome-cal.c, gnome-cal.h: Implement a toplevel widget, derived
-	from GnomeApp.  It holds all of the day views and arbitrates the
-	display.
-
-1998-04-02  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-week-view.[ch]: New week view composite widget.  This
-	provides a full week view (7 day views plus busy time display --
-	the latter is currently unimplemented).
-
-1998-04-01  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal-day-view.c: New day view widget.  It is intended to be a
-	child widget of the week view composite widget.
-
-	* calendar.c (calendar_get_objects_in_range):
-	(calendar_get_events_in_range):
-	(calendar_get_journal_in_range):
-	(calendar_get_journal_in_range): These functions now take a
-	sort_func parameter, which is of type GCompareFunc.  If the
-	specified value is non-NULL, it will return a sorted list.
-	Otherwise, it will return an unordered list.
-	(calendar_compare_by_dtstart): Provide a generic sorting routine
-	for calendar objects.
-
-1998-04-01 Miguel de Icaza <miguel@kernel.org>
-
-	* Start from scratch
-
-Tue Mar 31 23:46:50 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* timeutil.c (format_simple_hour): `buf' now static.
-
-1998-03-31  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal.c: Removed #include "gtkcalendar.h", because it now comes
-	from libgnomeui.
-
-	* Makefile.am (gncal_SOURCES): Added new source files to the rules.
-
-	* timeutil.c (format_simple_hour): New function, formats an
-	hour/am_pm pair into a string of the form "3am", "12pm", "05h",
-	"19h", etc.  It is used by the day view widget for its labels.
-
-1998-03-31 Craig Small <csmall@small.dropbear.id.au>
-
-	* Now has (non working) session maangement
-	* Uses a clist for the dailylist like gtt
-
-Sat Mar 21 15:43:20 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* gncal.c: Use gnome_message_box_*, not gnome_messagebox_*.
-
-1998-03-12  Craig Small <csmall@small.dropbear.id.au>
-
-	* Now linked (in some horrible way) to the gtkcalendar widget.
-
-Sun Mar  8 16:38:10 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* Makefile.am (INCLUDES): Added GNOME_INCLUDEDIR.
-	(gncal_LDADD): Don't include libsupport.a.
-
-	* gncal.c (main): Use new gnome_init.
-
-1998-02-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>
-
-	* gncal.c (main): Added app_id "gncal".
-
-1998-02-19  Carsten Schaar  <nhadcasc@fs-maphy.uni-hannover.de>
-
-	* Makefile.am (gncal_LDADD): Added '$(INTLLIBS)'
-
-1998-02-18  Raja R Harinath  <harinath@cs.umn.edu>
-
-	* Makefile.am (gncal_LDADD): Include `libsupport.a'.
-
-	* calcs.c (month_atoi): Replace buggy explicit loop string compare
-	with strcasecmp.
-	(day_atoi): Likewise.
-
-Sun Jan 25 23:38:30 1998  Miguel de Icaza  <miguel@nuclecu.unam.mx>
-
-	* menus.c: Replace "Quit" with "Exit".
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
deleted file mode 100644
index e17d581184..0000000000
--- a/calendar/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-if ENABLE_PILOT_CONDUITS
-CONDUIT_DIR = conduits
-else
-CONDUIT_DIR =
-endif
-
-SUBDIRS = idl cal-util pcs cal-client gui $(CONDUIT_DIR)
diff --git a/calendar/TODO b/calendar/TODO
deleted file mode 100644
index 4a5dd6c6ff..0000000000
--- a/calendar/TODO
+++ /dev/null
@@ -1,88 +0,0 @@
-Cal-util:
-
-- calobj.h depends on libversit/vcc.h, because it uses a VObject for
-  ical_object_create_from_vobject().  This should be an internal
-  function in the PCS and nothing else (we do not install libversit,
-  so our public libraries should not depend on it).
-
-- Or maybe we *should* install libversit, since the addressbook code
-  uses it as well.
-
-- timeutil has a lot of crap and some namespace pollution.  Clean it
-  up.
-
-PCS:
-
-- When loading a calendar, substitute duplicated UIDs by new ones, and
-  possibly print out a warning message.
-
------ Old Gnomecal TODO starts here -----
-
-Pilot:
-
-* Better support for untimed events (we have none now).
-
-* Hash objects based on their UIDs.
-
-* Add placeholders for deleted events, so that we can kill those
-  when syncing to the pilot.
-
-BUGS:
-
-- Recurrence end date is wrong.  An event that repeats daily will not
-  be included in the ending date of the recurrence (off-by-one
-  error?).
-
-- X-fields (extensions) are stripped from a vCal file when it is
-  saved.  They should be preserved.
-
-Features:
-
-- Add a calendar-week so that people know which week of the year it is
-
-Year view:
-
-- See why it is so fucking slow when opening its notebook page for the
-  first time.
-
-Month view:
-
-- Popup menu like in the year view.
-
-- Double click on a day takes you to the day view.
-
-- DnD of appointments to move them around.
-
-Week view:
-
-- Nice display as in the Palm Pilot.
-
-Day view:
-
-- Rewrite in terms of the canvas and make it pretty.
-
-Preferences:
-
-- BUG: 12/24 hours stuff is not consistent - I remember that on editing
-  new appointment you get the time-selectors always on 12-hr format
-
-Event editor dialog:
-
-- Make it figure out whether the alarm is in
-  minutes/hours/days/etc. (via a cascade of conditions) and set the
-  widgets appropriately.
-
-Gnome date selection widget:
-
-- Make the displayed date be localized properly -- use strftime().
-
-General:
-
-- Write online help.  Nice help.  Lots of help.
-
-- If you leave the calendar running overnight, the "current day"
-  marker in the GnomeMonthItems does not get updated.
-
-- Add categories support.  Color-coded categories.
-
-- Untimed events
diff --git a/calendar/cal-client/.cvsignore b/calendar/cal-client/.cvsignore
deleted file mode 100644
index 6ac95f13c4..0000000000
--- a/calendar/cal-client/.cvsignore
+++ /dev/null
@@ -1,17 +0,0 @@
-Makefile.in
-.deps
-.libs
-.pure
-Makefile
-evolution-calendar-stubs.c
-evolution-calendar-skels.c
-evolution-calendar-common.c
-evolution-calendar.h
-evolution-calendar-common.lo
-evolution-calendar-skels.lo
-evolution-calendar-stubs.lo
-cal-client.lo
-cal-listener.lo
-libcal-client.la
-client-test
-libcal-client-static.la
-\ No newline at end of file
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
deleted file mode 100644
index ce968767f5..0000000000
--- a/calendar/cal-client/Makefile.am
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# libcal-client
-#
-
-CORBA_GENERATED =				\
-	evolution-calendar.h			\
-	evolution-calendar-common.c		\
-	evolution-calendar-skels.c		\
-	evolution-calendar-stubs.c
-
-idls =						\
-	$(srcdir)/../idl/evolution-calendar.idl
-
-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
-
-$(CORBA_GENERATED): $(idls)
-	$(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl
-
-INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
-	-DG_LOG_DOMAIN=\"cal-client\"			\
-	-I$(top_srcdir)/calendar			\
-	-I$(srcdir) -I$(top_srcdir) 			\
-	-I. 						\
-	-I.. 						\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/libical/src/libical		\
-	$(BONOBO_GNOME_CFLAGS)
-
-lib_LTLIBRARIES = libcal-client.la
-
-libcal_clientincludedir = $(includedir)/evolution/cal-client
-
-libcal_client_la_SOURCES =	\
-	$(CORBA_GENERATED)	\
-	cal-client.c		\
-	cal-listener.c		\
-	cal-listener.h
-
-libcal_clientinclude_HEADERS =	\
-	cal-client.h
-
-
-#
-# make a static library for use by calendar conduit's shared library
-#
-noinst_LTLIBRARIES = libcal-client-static.la
-libcal_client_static_la_SOURCES = $(libcal_client_la_SOURCES)
-libcal_client_static_la_LDFLAGS = --all-static
-
-
-#
-# client-test program
-#
-
-noinst_PROGRAMS = client-test
-
-client_test_SOURCES =	\
-	client-test.c
-
-client_test_INCLUDES =			\
-	$(INCLUDES)			\
-	-DG_LOG_DOMAIN=\"client-test\"
-
-client_test_LDADD =						\
-	$(BONOBO_VFS_GNOME_LIBS)				\
-	-lunicode						\
-	$(top_builddir)/calendar/cal-util/libcal-util.la	\
-	$(top_builddir)/libversit/libversit.la			\
-	$(top_builddir)/libical/src/libical/libical.a		\
-	libcal-client.la
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
deleted file mode 100644
index 3e7daf80c4..0000000000
--- a/calendar/cal-client/cal-client.c
+++ /dev/null
@@ -1,1408 +0,0 @@
-
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar client
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <liboaf/liboaf.h>
-
-#include "cal-client.h"
-#include "cal-listener.h"
-
-
-
-/* Loading state for the calendar client */
-typedef enum {
-	LOAD_STATE_NOT_LOADED,
-	LOAD_STATE_LOADING,
-	LOAD_STATE_LOADED
-} LoadState;
-
-/* Private part of the CalClient structure */
-struct _CalClientPrivate {
-	/* Load state to avoid multiple loads */
-	LoadState load_state;
-
-	/* The calendar factory we are contacting */
-	Evolution_Calendar_CalFactory factory;
-
-	/* Our calendar listener */
-	CalListener *listener;
-
-	/* The calendar client interface object we are contacting */
-	Evolution_Calendar_Cal cal;
-};
-
-
-
-/* Signal IDs */
-enum {
-	CAL_LOADED,
-	OBJ_UPDATED,
-	OBJ_REMOVED,
-	LAST_SIGNAL
-};
-
-static void cal_client_class_init (CalClientClass *class);
-static void cal_client_init (CalClient *client);
-static void cal_client_destroy (GtkObject *object);
-
-static guint cal_client_signals[LAST_SIGNAL];
-
-static GtkObjectClass *parent_class;
-
-
-
-/**
- * cal_client_get_type:
- * @void:
- *
- * Registers the #CalClient class if necessary, and returns the type ID assigned
- * to it.
- *
- * Return value: The type ID of the #CalClient class.
- **/
-GtkType
-cal_client_get_type (void)
-{
-	static GtkType cal_client_type = 0;
-
-	if (!cal_client_type) {
-		static const GtkTypeInfo cal_client_info = {
-			"CalClient",
-			sizeof (CalClient),
-			sizeof (CalClientClass),
-			(GtkClassInitFunc) cal_client_class_init,
-			(GtkObjectInitFunc) cal_client_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_client_type = gtk_type_unique (GTK_TYPE_OBJECT, &cal_client_info);
-	}
-
-	return cal_client_type;
-}
-
-/* Class initialization function for the calendar client */
-static void
-cal_client_class_init (CalClientClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	cal_client_signals[CAL_LOADED] =
-		gtk_signal_new ("cal_loaded",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalClientClass, cal_loaded),
-				gtk_marshal_NONE__ENUM,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_ENUM);
-	cal_client_signals[OBJ_UPDATED] =
-		gtk_signal_new ("obj_updated",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalClientClass, obj_updated),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-	cal_client_signals[OBJ_REMOVED] =
-		gtk_signal_new ("obj_removed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalClientClass, obj_removed),
-				gtk_marshal_NONE__STRING,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_STRING);
-
-	gtk_object_class_add_signals (object_class, cal_client_signals, LAST_SIGNAL);
-
-	object_class->destroy = cal_client_destroy;
-}
-
-/* Object initialization function for the calendar client */
-static void
-cal_client_init (CalClient *client)
-{
-	CalClientPrivate *priv;
-
-	priv = g_new0 (CalClientPrivate, 1);
-	client->priv = priv;
-
-	priv->factory = CORBA_OBJECT_NIL;
-	priv->load_state = LOAD_STATE_NOT_LOADED;
-}
-
-/* Gets rid of the factory that a client knows about */
-static void
-destroy_factory (CalClient *client)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	int result;
-
-	priv = client->priv;
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (priv->factory, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("destroy_factory(): could not see if the factory was nil");
-		priv->factory = CORBA_OBJECT_NIL;
-		CORBA_exception_free (&ev);
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	if (result)
-		return;
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (priv->factory, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("destroy_factory(): could not release the factory");
-
-	CORBA_exception_free (&ev);
-	priv->factory = CORBA_OBJECT_NIL;
-}
-
-/* Gets rid of the listener that a client knows about */
-static void
-destroy_listener (CalClient *client)
-{
-	CalClientPrivate *priv;
-
-	priv = client->priv;
-
-	if (!priv->listener)
-		return;
-
-	bonobo_object_unref (BONOBO_OBJECT (priv->listener));
-	priv->listener = NULL;
-}
-
-/* Gets rid of the calendar client interface object that a client knows about */
-static void
-destroy_cal (CalClient *client)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	int result;
-
-	priv = client->priv;
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (priv->cal, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("destroy_cal(): could not see if the "
-			   "calendar client interface object was nil");
-		priv->cal = CORBA_OBJECT_NIL;
-		CORBA_exception_free (&ev);
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	if (result)
-		return;
-
-	CORBA_exception_init (&ev);
-	Evolution_Calendar_Cal_unref (priv->cal, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("destroy_cal(): could not unref the calendar client interface object");
-
-	CORBA_exception_free (&ev);
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (priv->cal, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("destroy_cal(): could not release the calendar client interface object");
-
-	CORBA_exception_free (&ev);
-	priv->cal = CORBA_OBJECT_NIL;
-
-}
-
-/* Destroy handler for the calendar client */
-static void
-cal_client_destroy (GtkObject *object)
-{
-	CalClient *client;
-	CalClientPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_CLIENT (object));
-
-	client = CAL_CLIENT (object);
-	priv = client->priv;
-
-	destroy_factory (client);
-	destroy_listener (client);
-	destroy_cal (client);
-
-	priv->load_state = LOAD_STATE_NOT_LOADED;
-
-	g_free (priv);
-	client->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* Signal handlers for the listener's signals */
-
-/* Handle the cal_loaded signal from the listener */
-static void
-cal_loaded_cb (CalListener *listener,
-	       Evolution_Calendar_Listener_LoadStatus status,
-	       Evolution_Calendar_Cal cal,
-	       gpointer data)
-{
-	CalClient *client;
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	Evolution_Calendar_Cal cal_copy;
-	CalClientLoadStatus client_status;
-
-	client = CAL_CLIENT (data);
-	priv = client->priv;
-
-	g_assert (priv->load_state == LOAD_STATE_LOADING);
-
-	client_status = CAL_CLIENT_LOAD_ERROR;
-
-	switch (status) {
-	case Evolution_Calendar_Listener_SUCCESS:
-		CORBA_exception_init (&ev);
-		cal_copy = CORBA_Object_duplicate (cal, &ev);
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			g_message ("cal_loaded(): could not duplicate the calendar client interface");
-			CORBA_exception_free (&ev);
-			goto error;
-		}
-		CORBA_exception_free (&ev);
-
-		priv->cal = cal_copy;
-		priv->load_state = LOAD_STATE_LOADED;
-
-		client_status = CAL_CLIENT_LOAD_SUCCESS;
-		goto out;
-
-	case Evolution_Calendar_Listener_ERROR:
-		client_status = CAL_CLIENT_LOAD_ERROR;
-		goto error;
-
-	case Evolution_Calendar_Listener_IN_USE:
-		client_status = CAL_CLIENT_LOAD_IN_USE;
-		goto error;
-
-	case Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED:
-		client_status = CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED;
-		goto error;
-
-	default:
-		g_assert_not_reached ();
-	}
-
- error:
-
-	bonobo_object_unref (BONOBO_OBJECT (priv->listener));
-	priv->listener = NULL;
-	priv->load_state = LOAD_STATE_NOT_LOADED;
-
- out:
-
-	g_assert (priv->load_state != LOAD_STATE_LOADING);
-
-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[CAL_LOADED],
-			 client_status);
-}
-
-/* Handle the obj_updated signal from the listener */
-static void
-obj_updated_cb (CalListener *listener, const Evolution_Calendar_CalObjUID uid, gpointer data)
-{
-	CalClient *client;
-
-	client = CAL_CLIENT (data);
-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[OBJ_UPDATED], uid);
-}
-
-/* Handle the obj_removed signal from the listener */
-static void
-obj_removed_cb (CalListener *listener, const Evolution_Calendar_CalObjUID uid, gpointer data)
-{
-	CalClient *client;
-
-	client = CAL_CLIENT (data);
-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[OBJ_REMOVED], uid);
-}
-
-
-
-/**
- * cal_client_construct:
- * @client: A calendar client.
- *
- * Constructs a calendar client object by contacting the calendar factory of the
- * calendar server.
- *
- * Return value: The same object as the @client argument, or NULL if the
- * calendar factory could not be contacted.
- **/
-CalClient *
-cal_client_construct (CalClient *client)
-{
-	CalClientPrivate *priv;
-	Evolution_Calendar_CalFactory factory, factory_copy;
-	CORBA_Environment ev;
-	int result;
-
-	CORBA_exception_init (&ev);
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-	priv = client->priv;
-
-	factory = (Evolution_Calendar_CalFactory) oaf_activate_from_id (
-		"OAFIID:evolution:calendar-factory:1c915858-ece3-4a6f-9d81-ea0f108a9554",
-		OAF_FLAG_NO_LOCAL, NULL, &ev);
-
-	result = CORBA_Object_is_nil (factory, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_construct(): could not see if the factory is NIL");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	if (result) {
-		g_message ("cal_client_construct(): could not contact Wombat, "
-			   "the personal calendar server");
-		return NULL;
-	}
-
-	CORBA_exception_init (&ev);
-	factory_copy = CORBA_Object_duplicate (factory, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_construct(): could not duplicate the calendar factory");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	priv->factory = factory_copy;
-	return client;
-}
-
-/**
- * cal_client_new:
- *
- * Creates a new calendar client.  It should be initialized by calling
- * cal_client_load_calendar() or cal_client_create_calendar().
- *
- * Return value: A newly-created calendar client, or NULL if the client could
- * not be constructed because it could not contact the calendar server.
- **/
-CalClient *
-cal_client_new (void)
-{
-	CalClient *client;
-
-	client = gtk_type_new (CAL_CLIENT_TYPE);
-
-	if (!cal_client_construct (client)) {
-		g_message ("cal_client_new(): could not construct the calendar client");
-		gtk_object_unref (GTK_OBJECT (client));
-		return NULL;
-	}
-
-	return client;
-}
-
-/* Issues a load or create request */
-static gboolean
-load_or_create (CalClient *client, const char *str_uri, gboolean load)
-{
-	CalClientPrivate *priv;
-	Evolution_Calendar_Listener corba_listener;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_NOT_LOADED, FALSE);
-
-	g_return_val_if_fail (str_uri != NULL, FALSE);
-
-	priv->listener = cal_listener_new ();
-	if (!priv->listener) {
-		g_message ("load_or_create(): could not create the listener");
-		return FALSE;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (priv->listener), "cal_loaded",
-			    GTK_SIGNAL_FUNC (cal_loaded_cb),
-			    client);
-	gtk_signal_connect (GTK_OBJECT (priv->listener), "obj_updated",
-			    GTK_SIGNAL_FUNC (obj_updated_cb),
-			    client);
-	gtk_signal_connect (GTK_OBJECT (priv->listener), "obj_removed",
-			    GTK_SIGNAL_FUNC (obj_removed_cb),
-			    client);
-
-	corba_listener = (Evolution_Calendar_Listener) bonobo_object_corba_objref (
-		BONOBO_OBJECT (priv->listener));
-
-	CORBA_exception_init (&ev);
-
-	priv->load_state = LOAD_STATE_LOADING;
-
-	if (load)
-		Evolution_Calendar_CalFactory_load (priv->factory, str_uri, corba_listener, &ev);
-	else
-		Evolution_Calendar_CalFactory_create (priv->factory, str_uri, corba_listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("load_or_create(): load/create request failed");
-		bonobo_object_unref (BONOBO_OBJECT (priv->listener));
-		priv->listener = NULL;
-		priv->load_state = LOAD_STATE_NOT_LOADED;
-		CORBA_exception_free (&ev);
-		return FALSE;
-	}
-	CORBA_exception_free (&ev);
-
-	return TRUE;
-}
-
-/**
- * cal_client_load_calendar:
- * @client: A calendar client.
- * @str_uri: URI of calendar to load.
- *
- * Makes a calendar client initiate a request to load a calendar.  The calendar
- * client will emit the "cal_loaded" signal when the response from the server is
- * received.
- *
- * Return value: TRUE on success, FALSE on failure to issue the load request.
- **/
-gboolean
-cal_client_load_calendar (CalClient *client, const char *str_uri)
-{
-	return load_or_create (client, str_uri, TRUE);
-}
-
-/**
- * cal_client_create_calendar:
- * @client: A calendar client.
- * @str_uri: URI that will contain the calendar data.
- *
- * Makes a calendar client initiate a request to create a new calendar.  The
- * calendar client will emit the "cal_loaded" signal when the response from the
- * server is received.
- *
- * Return value: TRUE on success, FALSE on failure to issue the create request.
- **/
-gboolean
-cal_client_create_calendar (CalClient *client, const char *str_uri)
-{
-	return load_or_create (client, str_uri, FALSE);
-}
-
-/**
- * cal_client_is_loaded:
- * @client: A calendar client.
- * 
- * Queries whether a calendar client has been loaded successfully.
- * 
- * Return value: TRUE if the client has been loaded, FALSE if it has not or if
- * the loading process is not finished yet.
- **/
-gboolean
-cal_client_is_loaded (CalClient *client)
-{
-	CalClientPrivate *priv;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	priv = client->priv;
-	return (priv->load_state == LOAD_STATE_LOADED);
-}
-
-/* Converts our representation of a calendar component type into its CORBA representation */
-static Evolution_Calendar_CalObjType
-corba_obj_type (CalObjType type)
-{
-	return (((type & CALOBJ_TYPE_EVENT) ? Evolution_Calendar_TYPE_EVENT : 0)
-		| ((type & CALOBJ_TYPE_TODO) ? Evolution_Calendar_TYPE_TODO : 0)
-		| ((type & CALOBJ_TYPE_JOURNAL) ? Evolution_Calendar_TYPE_JOURNAL : 0));
-}
-
-/**
- * cal_client_get_n_objects:
- * @client: A calendar client.
- * @type: Type of objects that will be counted.
- * 
- * Counts the number of calendar components of the specified @type.  This can be
- * used to count how many events, to-dos, or journals there are, for example.
- * 
- * Return value: Number of components.
- **/
-int
-cal_client_get_n_objects (CalClient *client, CalObjType type)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	int n;
-	int t;
-
-	g_return_val_if_fail (client != NULL, -1);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), -1);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, -1);
-
-	t = corba_obj_type (type);
-
-	CORBA_exception_init (&ev);
-	n = Evolution_Calendar_Cal_get_n_objects (priv->cal, t, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_n_objects(): could not get the number of objects");
-		CORBA_exception_free (&ev);
-		return -1;
-	}
-
-	CORBA_exception_free (&ev);
-	return n;
-}
-
-/**
- * cal_client_get_object:
- * @client: A calendar client.
- * @uid: Unique identifier for a calendar component.
- * @comp: Return value for the calendar component object.
- *
- * Queries a calendar for a calendar component object based on its unique
- * identifier.
- *
- * Return value: Result code based on the status of the operation.
- **/
-CalClientGetStatus
-cal_client_get_object (CalClient *client, const char *uid, CalComponent **comp)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	Evolution_Calendar_CalObj calobj_str;
-	CalClientGetStatus retval;
-	icalcomponent *icalcomp;
-
-	g_return_val_if_fail (client != NULL, CAL_CLIENT_GET_NOT_FOUND);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), CAL_CLIENT_GET_NOT_FOUND);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, CAL_CLIENT_GET_NOT_FOUND);
-
-	g_return_val_if_fail (uid != NULL, CAL_CLIENT_GET_NOT_FOUND);
-	g_return_val_if_fail (comp != NULL, CAL_CLIENT_GET_NOT_FOUND);
-
-	retval = CAL_CLIENT_GET_NOT_FOUND;
-	*comp = NULL;
-
-	CORBA_exception_init (&ev);
-	calobj_str = Evolution_Calendar_Cal_get_object (priv->cal, (char *) uid, &ev);
-
-	if (ev._major == CORBA_USER_EXCEPTION
-	    && strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_NotFound) == 0)
-		goto out;
-	else if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_object(): could not get the object");
-		goto out;
-	}
-
-	icalcomp = icalparser_parse_string (calobj_str);
-	CORBA_free (calobj_str);
-
-	if (!icalcomp) {
-		retval = CAL_CLIENT_GET_SYNTAX_ERROR;
-		goto out;
-	}
-
-	*comp = cal_component_new ();
-	if (!cal_component_set_icalcomponent (*comp, icalcomp)) {
-		icalcomponent_free (icalcomp);
-		gtk_object_unref (GTK_OBJECT (*comp));
-		*comp = NULL;
-
-		retval = CAL_CLIENT_GET_SYNTAX_ERROR;
-		goto out;
-	}
-
-	retval = CAL_CLIENT_GET_SUCCESS;
-
- out:
-
-	CORBA_exception_free (&ev);
-	return retval;
-}
-
-/* Builds an UID list out of a CORBA UID sequence */
-static GList *
-build_uid_list (Evolution_Calendar_CalObjUIDSeq *seq)
-{
-	GList *uids;
-	int i;
-
-	uids = NULL;
-
-	for (i = 0; i < seq->_length; i++)
-		uids = g_list_prepend (uids, g_strdup (seq->_buffer[i]));
-
-	return uids;
-}
-
-/**
- * cal_client_get_uids:
- * @client: A calendar client.
- * @type: Bitmask with types of objects to return.
- *
- * Queries a calendar for a list of unique identifiers corresponding to calendar
- * objects whose type matches one of the types specified in the @type flags.
- *
- * Return value: A list of strings that are the sought UIDs.
- **/
-GList *
-cal_client_get_uids (CalClient *client, CalObjType type)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	Evolution_Calendar_CalObjUIDSeq *seq;
-	int t;
-	GList *uids;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, NULL);
-
-	t = corba_obj_type (type);
-
-	CORBA_exception_init (&ev);
-
-	seq = Evolution_Calendar_Cal_get_uids (priv->cal, t, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_uids(): could not get the list of UIDs");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	uids = build_uid_list (seq);
-	CORBA_free (seq);
-
-	return uids;
-}
-
-/* Builds a GList of CalObjChange structures from the CORBA sequence */
-static GList *
-build_change_list (Evolution_Calendar_CalObjChangeSeq *seq)
-{
-	GList *list;
-	int i;
-
-	/* Create the list in reverse order */
-	list = NULL;
-	for (i = 0; i < seq->_length; i++) {
-		Evolution_Calendar_CalObjChange *corba_coc;
-		CalObjChange *coc;
-
-		corba_coc = &seq->_buffer[i];
-		coc = g_new (CalObjChange, 1);
-
-		coc->uid = g_strdup (corba_coc->uid);
-		coc->type = corba_coc->type;
-
-		list = g_list_prepend (list, coc);
-	}
-
-	list = g_list_reverse (list);
-	return list;
-}
-
-/**
- * cal_client_get_changed_uids:
- * @client: A calendar client.
- * @type: Bitmask with types of objects to return.
- *
- * Queries a calendar for a list of unique identifiers corresponding to calendar
- * objects whose type matches one of the types specified in the @type flags.
- *
- * Return value: A list of strings that are the sought UIDs.
- **/
-GList *
-cal_client_get_changed_uids (CalClient *client, CalObjType type, time_t since)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	Evolution_Calendar_CalObjChangeSeq *seq;
-	int t;
-	GList *changes;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, NULL);
-
-	t = corba_obj_type (type);
-	CORBA_exception_init (&ev);
-
-	seq = Evolution_Calendar_Cal_get_changed_uids (priv->cal, t, since, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_changed_uids(): could not get the list of changes");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	changes = build_change_list (seq);
-	CORBA_free (seq);
-
-	return changes;
-}
-
-/* FIXME: Not used? */
-#if 0
-/* Builds a GList of CalObjInstance structures from the CORBA sequence */
-static GList *
-build_object_instance_list (Evolution_Calendar_CalObjInstanceSeq *seq)
-{
-	GList *list;
-	int i;
-
-	/* Create the list in reverse order */
-
-	list = NULL;
-	for (i = 0; i < seq->_length; i++) {
-		Evolution_Calendar_CalObjInstance *corba_icoi;
-		CalObjInstance *icoi;
-
-		corba_icoi = &seq->_buffer[i];
-		icoi = g_new (CalObjInstance, 1);
-
-		icoi->uid = g_strdup (corba_icoi->uid);
-		icoi->start = corba_icoi->start;
-		icoi->end = corba_icoi->end;
-
-		list = g_list_prepend (list, icoi);
-	}
-
-	list = g_list_reverse (list);
-	return list;
-}
-#endif
-
-/**
- * cal_client_get_objects_in_range:
- * @client: A calendar client.
- * @type: Bitmask with types of objects to return.
- * @start: Start time for query.
- * @end: End time for query.
- *
- * Queries a calendar for the objects that occur or recur in the specified range
- * of time.
- *
- * Return value: A list of UID strings.  This should be freed using the
- * cal_obj_uid_list_free() function.
- **/
-GList *
-cal_client_get_objects_in_range (CalClient *client, CalObjType type, time_t start, time_t end)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	Evolution_Calendar_CalObjUIDSeq *seq;
-	GList *uids;
-	int t;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, NULL);
-
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	CORBA_exception_init (&ev);
-
-	t = corba_obj_type (type);
-
-	seq = Evolution_Calendar_Cal_get_objects_in_range (priv->cal, t, start, end, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_objects_in_range(): could not get the objects");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	uids = build_uid_list (seq);
-	CORBA_free (seq);
-
-	return uids;
-}
-
-/* Callback used when an object is updated and we must update the copy we have */
-static void
-generate_instances_obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	GHashTable *uid_comp_hash;
-	CalComponent *comp;
-	CalClientGetStatus status;
-	const char *comp_uid;
-
-	uid_comp_hash = data;
-
-	comp = g_hash_table_lookup (uid_comp_hash, uid);
-	if (!comp)
-		/* OK, so we don't care about new objects that may indeed be in
-		 * the requested time range.  We only care about the ones that
-		 * were returned by the first query to
-		 * cal_client_get_objects_in_range().
-		 */
-		return;
-
-	g_hash_table_remove (uid_comp_hash, uid);
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	status = cal_client_get_object (client, uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* The hash key comes from the component's internal data */
-		cal_component_get_uid (comp, &comp_uid);
-		g_hash_table_insert (uid_comp_hash, (char *) comp_uid, comp);
-		break;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* No longer in the server, too bad */
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting "
-			   "object `%s'; ignoring...", uid);
-		break;
-		
-	}
-}
-
-/* Callback used when an object is removed and we must delete the copy we have */
-static void
-generate_instances_obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	GHashTable *uid_comp_hash;
-	CalComponent *comp;
-
-	uid_comp_hash = data;
-
-	comp = g_hash_table_lookup (uid_comp_hash, uid);
-	if (!comp)
-		return;
-
-	g_hash_table_remove (uid_comp_hash, uid);
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-/* Adds a component to the list; called from g_hash_table_foreach() */
-static void
-add_component (gpointer key, gpointer value, gpointer data)
-{
-	CalComponent *comp;
-	GList **list;
-
-	comp = CAL_COMPONENT (value);
-	list = data;
-
-	*list = g_list_prepend (*list, comp);
-}
-
-/* Gets a list of components that recur within the specified range of time.  It
- * ensures that the resulting list of CalComponent objects contains only objects
- * that are actually in the server at the time the initial
- * cal_client_get_objects_in_range() query ends.
- */
-static GList *
-get_objects_atomically (CalClient *client, CalObjType type, time_t start, time_t end)
-{
-	GList *uids;
-	GHashTable *uid_comp_hash;
-	GList *objects;
-	guint obj_updated_id;
-	guint obj_removed_id;
-	GList *l;
-
-	uids = cal_client_get_objects_in_range (client, type, start, end);
-
-	uid_comp_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	/* While we are getting the actual object data, keep track of changes */
-
-	obj_updated_id = gtk_signal_connect (GTK_OBJECT (client), "obj_updated",
-					     GTK_SIGNAL_FUNC (generate_instances_obj_updated_cb),
-					     uid_comp_hash);
-
-	obj_removed_id = gtk_signal_connect (GTK_OBJECT (client), "obj_removed",
-					     GTK_SIGNAL_FUNC (generate_instances_obj_removed_cb),
-					     uid_comp_hash);
-
-	/* Get the objects */
-
-	for (l = uids; l; l = l->next) {
-		CalComponent *comp;
-		CalClientGetStatus status;
-		char *uid;
-		const char *comp_uid;
-
-		uid = l->data;
-
-		status = cal_client_get_object (client, uid, &comp);
-
-		switch (status) {
-		case CAL_CLIENT_GET_SUCCESS:
-			/* The hash key comes from the component's internal data
-			 * instead of the duped UID from the list of UIDS.
-			 */
-			cal_component_get_uid (comp, &comp_uid);
-			g_hash_table_insert (uid_comp_hash, (char *) comp_uid, comp);
-			break;
-
-		case CAL_CLIENT_GET_NOT_FOUND:
-			/* Object disappeared from the server, so don't log it */
-			break;
-
-		case CAL_CLIENT_GET_SYNTAX_ERROR:
-			g_message ("get_objects_atomically(): Syntax error when getting "
-				   "object `%s'; ignoring...", uid);
-			break;
-
-		default:
-			g_assert_not_reached ();
-		}
-	}
-
-	cal_obj_uid_list_free (uids);
-
-	/* Now our state is consistent with the server, so disconnect from the
-	 * notification signals and generate the final list of components.
-	 */
-
-	gtk_signal_disconnect (GTK_OBJECT (client), obj_updated_id);
-	gtk_signal_disconnect (GTK_OBJECT (client), obj_removed_id);
-
-	objects = NULL;
-	g_hash_table_foreach (uid_comp_hash, add_component, &objects);
-	g_hash_table_destroy (uid_comp_hash);
-
-	return objects;
-}
-
-struct comp_instance {
-	CalComponent *comp;
-	time_t start;
-	time_t end;
-};
-
-/* Called from cal_recur_generate_instances(); adds an instance to the list */
-static gboolean
-add_instance (CalComponent *comp, time_t start, time_t end, gpointer data)
-{
-	GList **list;
-	struct comp_instance *ci;
-
-	list = data;
-
-	ci = g_new (struct comp_instance, 1);
-
-	ci->comp = comp;
-	gtk_object_ref (GTK_OBJECT (ci->comp));
-	
-	ci->start = start;
-	ci->end = end;
-
-	*list = g_list_prepend (*list, ci);
-
-	return TRUE;
-}
-
-/* Used from g_list_sort(); compares two struct comp_instance structures */
-static gint
-compare_comp_instance (gconstpointer a, gconstpointer b)
-{
-	const struct comp_instance *cia, *cib;
-	time_t diff;
-
-	cia = a;
-	cib = b;
-
-	diff = cia->start - cib->start;
-	return (diff < 0) ? -1 : (diff > 0) ? 1 : 0;
-}
-
-/**
- * cal_client_generate_instances:
- * @client: A calendar client.
- * @type: Bitmask with types of objects to return.
- * @start: Start time for query.
- * @end: End time for query.
- * @cb: Callback for each generated instance.
- * @cb_data: Closure data for the callback.
- * 
- * Does a combination of cal_client_get_objects_in_range() and
- * cal_recur_generate_instances().  It fetches the list of objects in an atomic
- * way so that the generated instances are actually in the server at the time
- * the initial cal_client_get_objects_in_range() query ends.
- *
- * The callback function should do a gtk_object_ref() of the calendar component
- * it gets passed if it intends to keep it around.
- **/
-void
-cal_client_generate_instances (CalClient *client, CalObjType type,
-			       time_t start, time_t end,
-			       CalRecurInstanceFn cb, gpointer cb_data)
-{
-	CalClientPrivate *priv;
-	GList *objects;
-	GList *instances;
-	GList *l;
-
-	g_return_if_fail (client != NULL);
-	g_return_if_fail (IS_CAL_CLIENT (client));
-
-	priv = client->priv;
-	g_return_if_fail (priv->load_state == LOAD_STATE_LOADED);
-
-	g_return_if_fail (start != -1 && end != -1);
-	g_return_if_fail (start <= end);
-	g_return_if_fail (cb != NULL);
-
-	/* Generate objects */
-
-	objects = get_objects_atomically (client, type, start, end);
-	instances = NULL;
-
-	for (l = objects; l; l = l->next) {
-		CalComponent *comp;
-
-		comp = l->data;
-		cal_recur_generate_instances (comp, start, end, add_instance, &instances);
-	}
-
-	g_list_free (objects);
-
-	/* Generate instances and spew them out */
-
-	instances = g_list_sort (instances, compare_comp_instance);
-
-	for (l = instances; l; l = l->next) {
-		struct comp_instance *ci;
-		gboolean result;
-		
-		ci = l->data;
-		
-		result = (* cb) (ci->comp, ci->start, ci->end, cb_data);
-
-		if (!result)
-			break;
-	}
-
-	/* Clean up */
-
-	for (l = instances; l; l = l->next) {
-		struct comp_instance *ci;
-
-		ci = l->data;
-		gtk_object_unref (GTK_OBJECT (ci->comp));
-		g_free (ci);
-	}
-
-	g_list_free (instances);
-}
-
-
-#if 0
-/* Translates the CORBA representation of an AlarmType */
-static enum AlarmType
-uncorba_alarm_type (Evolution_Calendar_AlarmType corba_type)
-{
-	switch (corba_type) {
-	case Evolution_Calendar_MAIL:
-		return ALARM_MAIL;
-
-	case Evolution_Calendar_PROGRAM:
-		return ALARM_PROGRAM;
-
-	case Evolution_Calendar_DISPLAY:
-		return ALARM_DISPLAY;
-
-	case Evolution_Calendar_AUDIO:
-		return ALARM_AUDIO;
-
-	default:
-		g_assert_not_reached ();
-		return ALARM_DISPLAY;
-	}
-}
-#endif
-
-/* Builds a GList of CalAlarmInstance structures from the CORBA sequence */
-static GList *
-build_alarm_instance_list (Evolution_Calendar_CalAlarmInstanceSeq *seq)
-{
-	GList *list;
-	int i;
-
-	/* Create the list in reverse order */
-
-	list = NULL;
-	for (i = 0; i < seq->_length; i++) {
-		Evolution_Calendar_CalAlarmInstance *corba_ai;
-		CalAlarmInstance *ai;
-
-		corba_ai = &seq->_buffer[i];
-		ai = g_new (CalAlarmInstance, 1);
-
-		ai->uid = g_strdup (corba_ai->uid);
-#if 0
-		ai->type = uncorba_alarm_type (corba_ai->type);
-#endif
-		ai->trigger = corba_ai->trigger;
-		ai->occur = corba_ai->occur;
-
-		list = g_list_prepend (list, ai);
-	}
-
-	list = g_list_reverse (list);
-	return list;
-}
-
-/**
- * cal_client_get_alarms_in_range:
- * @client: A calendar client.
- * @start: Start time for query.
- * @end: End time for query.
- *
- * Queries a calendar for the alarms that trigger in the specified range of
- * time.
- *
- * Return value: A list of #CalAlarmInstance structures.
- **/
-GList *
-cal_client_get_alarms_in_range (CalClient *client, time_t start, time_t end)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	Evolution_Calendar_CalAlarmInstanceSeq *seq;
-	GList *alarms;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, NULL);
-
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	CORBA_exception_init (&ev);
-
-	seq = Evolution_Calendar_Cal_get_alarms_in_range (priv->cal, start, end, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_alarms_in_range(): could not get the alarm range");
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	alarms = build_alarm_instance_list (seq);
-	CORBA_free (seq);
-
-	return alarms;
-}
-
-/**
- * cal_client_get_alarms_for_object:
- * @client: A calendar client.
- * @uid: Unique identifier for a calendar object.
- * @start: Start time for query.
- * @end: End time for query.
- * @alarms: Return value for the list of alarm instances.
- *
- * Queries a calendar for the alarms of a particular object that trigger in the
- * specified range of time.
- *
- * Return value: TRUE on success, FALSE if the object was not found.
- **/
-gboolean
-cal_client_get_alarms_for_object (CalClient *client, const char *uid,
-				  time_t start, time_t end,
-				  GList **alarms)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	Evolution_Calendar_CalAlarmInstanceSeq *seq;
-	gboolean retval;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, FALSE);
-
-	g_return_val_if_fail (uid != NULL, FALSE);
-	g_return_val_if_fail (start != -1 && end != -1, FALSE);
-	g_return_val_if_fail (start <= end, FALSE);
-	g_return_val_if_fail (alarms != NULL, FALSE);
-
-	*alarms = NULL;
-	retval = FALSE;
-
-	CORBA_exception_init (&ev);
-
-	seq = Evolution_Calendar_Cal_get_alarms_for_object (priv->cal, (char *) uid, start, end, &ev);
-	if (ev._major == CORBA_USER_EXCEPTION
-	    && strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_NotFound) == 0)
-		goto out;
-	else if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_get_alarms_for_object(): could not get the alarm range");
-		goto out;
-	}
-
-	retval = TRUE;
-	*alarms = build_alarm_instance_list (seq);
-	CORBA_free (seq);
-
- out:
-	CORBA_exception_free (&ev);
-	return retval;
-
-}
-
-/**
- * cal_client_update_object:
- * @client: A calendar client.
- * @comp: A calendar component object.
- *
- * Asks a calendar to update a component.  Any existing component with the
- * specified component's UID will be replaced.  The client program should not
- * assume that the object is actually in the server's storage until it has
- * received the "obj_updated" notification signal.
- *
- * Return value: TRUE on success, FALSE on specifying an invalid component.
- **/
-gboolean
-cal_client_update_object (CalClient *client, CalComponent *comp)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	gboolean retval;
-	char *obj_string;
-	const char *uid;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, FALSE);
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-
-	retval = FALSE;
-
-	cal_component_commit_sequence (comp);
-	obj_string = cal_component_get_as_string (comp);
-
-	cal_component_get_uid (comp, &uid);
-
-	CORBA_exception_init (&ev);
-	Evolution_Calendar_Cal_update_object (priv->cal, (char *) uid, obj_string, &ev);
-	g_free (obj_string);
-
-	if (ev._major == CORBA_USER_EXCEPTION &&
-	    strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_InvalidObject) == 0)
-		goto out;
-	else if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_update_object(): could not update the object");
-		goto out;
-	}
-
-	retval = TRUE;
-
- out:
-	CORBA_exception_free (&ev);
-	return retval;
-}
-
-gboolean
-cal_client_remove_object (CalClient *client, const char *uid)
-{
-	CalClientPrivate *priv;
-	CORBA_Environment ev;
-	gboolean retval;
-
-	g_return_val_if_fail (client != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
-
-	priv = client->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, FALSE);
-
-	g_return_val_if_fail (uid != NULL, FALSE);
-
-	retval = FALSE;
-
-	CORBA_exception_init (&ev);
-	Evolution_Calendar_Cal_remove_object (priv->cal, (char *) uid, &ev);
-
-	if (ev._major == CORBA_USER_EXCEPTION &&
-	    strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_NotFound) == 0)
-		goto out;
-	else if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_client_remove_object(): could not remove the object");
-		goto out;
-	}
-
-	retval = TRUE;
-
- out:
-	CORBA_exception_free (&ev);
-	return retval;
-}
diff --git a/calendar/cal-client/cal-client.h b/calendar/cal-client/cal-client.h
deleted file mode 100644
index fd40c424d9..0000000000
--- a/calendar/cal-client/cal-client.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* Evolution calendar client
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_CLIENT_H
-#define CAL_CLIENT_H
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkobject.h>
-#include <cal-util/cal-recur.h>
-#include <cal-util/cal-util.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_CLIENT_TYPE            (cal_client_get_type ())
-#define CAL_CLIENT(obj)            (GTK_CHECK_CAST ((obj), CAL_CLIENT_TYPE, CalClient))
-#define CAL_CLIENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_TYPE, CalClientClass))
-#define IS_CAL_CLIENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_CLIENT_TYPE))
-#define IS_CAL_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_TYPE))
-
-typedef struct _CalClient CalClient;
-typedef struct _CalClientClass CalClientClass;
-
-typedef struct _CalClientPrivate CalClientPrivate;
-
-/* Load status for the cal_loaded signal */
-typedef enum {
-	CAL_CLIENT_LOAD_SUCCESS,
-	CAL_CLIENT_LOAD_ERROR,
-	CAL_CLIENT_LOAD_IN_USE,
-	CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED
-} CalClientLoadStatus;
-
-typedef enum {
-	CAL_CLIENT_GET_SUCCESS,
-	CAL_CLIENT_GET_NOT_FOUND,
-	CAL_CLIENT_GET_SYNTAX_ERROR
-} CalClientGetStatus;
-
-
-struct _CalClient {
-	GtkObject object;
-
-	/* Private data */
-	CalClientPrivate *priv;
-};
-
-struct _CalClientClass {
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* cal_loaded) (CalClient *client, CalClientLoadStatus status);
-
-	void (* obj_updated) (CalClient *client, const char *uid);
-	void (* obj_removed) (CalClient *client, const char *uid);
-};
-
-GtkType cal_client_get_type (void);
-
-CalClient *cal_client_construct (CalClient *client);
-
-CalClient *cal_client_new (void);
-
-gboolean cal_client_load_calendar (CalClient *client, const char *str_uri);
-gboolean cal_client_create_calendar (CalClient *client, const char *str_uri);
-
-gboolean cal_client_is_loaded (CalClient *client);
-
-int cal_client_get_n_objects (CalClient *client, CalObjType type);
-
-CalClientGetStatus cal_client_get_object (CalClient *client,
-					  const char *uid,
-					  CalComponent **comp);
-
-GList *cal_client_get_uids (CalClient *client, CalObjType type);
-GList *cal_client_get_changed_uids (CalClient *client, CalObjType type, time_t since);
-
-GList *cal_client_get_objects_in_range (CalClient *client, CalObjType type,
-					time_t start, time_t end);
-
-void cal_client_generate_instances (CalClient *client, CalObjType type,
-				    time_t start, time_t end,
-				    CalRecurInstanceFn cb, gpointer cb_data);
-
-GList *cal_client_get_alarms_in_range (CalClient *client, time_t start, time_t end);
-
-gboolean cal_client_get_alarms_for_object (CalClient *client, const char *uid,
-					   time_t start, time_t end,
-					   GList **alarms);
-
-gboolean cal_client_update_object (CalClient *client, CalComponent *comp);
-
-gboolean cal_client_remove_object (CalClient *client, const char *uid);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/cal-client/cal-listener.c b/calendar/cal-client/cal-listener.c
deleted file mode 100644
index c5626fee9d..0000000000
--- a/calendar/cal-client/cal-listener.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/* Evolution calendar listener
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "cal-listener.h"
-
-
-
-/* Private part of the CalListener structure */
-struct _CalListenerPrivate {
-	/* The calendar this listener refers to */
-	Evolution_Calendar_Cal cal;
-};
-
-
-
-/* Signal IDs */
-enum {
-	CAL_LOADED,
-	OBJ_UPDATED,
-	OBJ_REMOVED,
-	LAST_SIGNAL
-};
-
-static void cal_listener_class_init (CalListenerClass *class);
-static void cal_listener_init (CalListener *listener);
-static void cal_listener_destroy (GtkObject *object);
-
-static void marshal_cal_loaded (GtkObject *object, GtkSignalFunc func, gpointer data, GtkArg *args);
-
-static POA_Evolution_Calendar_Listener__vepv cal_listener_vepv;
-
-static guint cal_listener_signals[LAST_SIGNAL];
-
-static BonoboObjectClass *parent_class;
-
-
-
-/**
- * cal_listener_get_type:
- * @void:
- *
- * Registers the #CalListener class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #CalListener class.
- **/
-GtkType
-cal_listener_get_type (void)
-{
-	static GtkType cal_listener_type = 0;
-
-	if (!cal_listener_type) {
-		static const GtkTypeInfo cal_listener_info = {
-			"CalListener",
-			sizeof (CalListener),
-			sizeof (CalListenerClass),
-			(GtkClassInitFunc) cal_listener_class_init,
-			(GtkObjectInitFunc) cal_listener_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_listener_type = gtk_type_unique (bonobo_object_get_type (), &cal_listener_info);
-	}
-
-	return cal_listener_type;
-}
-
-/* CORBA class initialization function for the calendar listener */
-static void
-init_cal_listener_corba_class (void)
-{
-	cal_listener_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	cal_listener_vepv.Evolution_Calendar_Listener_epv = cal_listener_get_epv ();
-}
-
-/* Class initialization function for the calendar listener */
-static void
-cal_listener_class_init (CalListenerClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	cal_listener_signals[CAL_LOADED] =
-		gtk_signal_new ("cal_loaded",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalListenerClass, cal_loaded),
-				marshal_cal_loaded,
-				GTK_TYPE_NONE, 2,
-				GTK_TYPE_ENUM,
-				GTK_TYPE_POINTER);
-	cal_listener_signals[OBJ_UPDATED] =
-		gtk_signal_new ("obj_updated",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalListenerClass, obj_updated),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-	cal_listener_signals[OBJ_REMOVED] =
-		gtk_signal_new ("obj_removed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalListenerClass, obj_removed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1,
-				GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class, cal_listener_signals, LAST_SIGNAL);
-
-	object_class->destroy = cal_listener_destroy;
-
-	init_cal_listener_corba_class ();
-}
-
-/* Object initialization function for the calendar listener */
-static void
-cal_listener_init (CalListener *listener)
-{
-	CalListenerPrivate *priv;
-
-	priv = g_new0 (CalListenerPrivate, 1);
-	listener->priv = priv;
-
-	priv->cal = CORBA_OBJECT_NIL;
-}
-
-/* Destroy handler for the calendar listener */
-static void
-cal_listener_destroy (GtkObject *object)
-{
-	CalListener *listener;
-	CalListenerPrivate *priv;
-	CORBA_Environment ev;
-	gboolean result;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_LISTENER (object));
-
-	listener = CAL_LISTENER (object);
-	priv = listener->priv;
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (priv->cal, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("cal_listener_destroy(): could not see if the calendar was NIL");
-	else if (!result) {
-		CORBA_exception_free (&ev);
-
-		CORBA_exception_init (&ev);
-		CORBA_Object_release (priv->cal, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("cal_listener_destroy(): could not release the calendar");
-
-		priv->cal = CORBA_OBJECT_NIL;
-	}
-	CORBA_exception_free (&ev);
-
-	g_free (priv);
-	listener->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* Marshalers */
-
-typedef void (* CalLoadedFunc) (GtkObject *object, gint status, gpointer cal, gpointer data);
-
-static void
-marshal_cal_loaded (GtkObject *object, GtkSignalFunc func, gpointer data, GtkArg *args)
-{
-	CalLoadedFunc rfunc;
-
-	rfunc = (CalLoadedFunc) func;
-	(* rfunc) (object, GTK_VALUE_ENUM (args[0]), GTK_VALUE_POINTER (args[1]), data);
-}
-
-
-
-/* CORBA servant implementation */
-
-/* Listener::cal_loaded method */
-static void
-Listener_cal_loaded (PortableServer_Servant servant,
-		     Evolution_Calendar_Listener_LoadStatus status,
-		     Evolution_Calendar_Cal cal,
-		     CORBA_Environment *ev)
-{
-	CalListener *listener;
-	CalListenerPrivate *priv;
-	CORBA_Environment aev;
-	Evolution_Calendar_Cal cal_copy;
-
-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));
-	priv = listener->priv;
-
-	if (priv->cal != CORBA_OBJECT_NIL) {
-		g_message ("Listener_cal_loaded(): calendar was already loaded!");
-		return;
-	}
-
-	CORBA_exception_init (&aev);
-	cal_copy = CORBA_Object_duplicate (cal, &aev);
-
-	if (aev._major != CORBA_NO_EXCEPTION) {
-		g_message ("Listener_cal_loaded(): could not duplicate the calendar");
-		CORBA_exception_free (&aev);
-		return;
-	}
-	CORBA_exception_free (&aev);
-
-	priv->cal = cal_copy;
-
-	gtk_signal_emit (GTK_OBJECT (listener), cal_listener_signals[CAL_LOADED],
-			 status, cal);
-}
-
-/* Listener::obj_updated method */
-static void
-Listener_obj_updated (PortableServer_Servant servant,
-		      Evolution_Calendar_CalObjUID uid,
-		      CORBA_Environment *ev)
-{
-	CalListener *listener;
-
-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));
-	gtk_signal_emit (GTK_OBJECT (listener), cal_listener_signals[OBJ_UPDATED],
-			 uid);
-}
-
-/* Listener::obj_removed method */
-static void
-Listener_obj_removed (PortableServer_Servant servant,
-		      Evolution_Calendar_CalObjUID uid,
-		      CORBA_Environment *ev)
-{
-	CalListener *listener;
-
-	listener = CAL_LISTENER (bonobo_object_from_servant (servant));
-	gtk_signal_emit (GTK_OBJECT (listener), cal_listener_signals[OBJ_REMOVED],
-			 uid);
-}
-
-/**
- * cal_listener_get_epv:
- * @void:
- *
- * Creates an EPV for the Listener CORBA class.
- *
- * Return value: A newly-allocated EPV.
- **/
-POA_Evolution_Calendar_Listener__epv *
-cal_listener_get_epv (void)
-{
-	POA_Evolution_Calendar_Listener__epv *epv;
-
-	epv = g_new0 (POA_Evolution_Calendar_Listener__epv, 1);
-	epv->cal_loaded = Listener_cal_loaded;
-	epv->obj_updated = Listener_obj_updated;
-	epv->obj_removed = Listener_obj_removed;
-	return epv;
-}
-
-
-
-/**
- * cal_listener_construct:
- * @listener: A calendar listener.
- * @corba_listener: CORBA object for the calendar listener.
- *
- * Constructs a calendar listener by binding the corresponding CORBA object to
- * it.
- *
- * Return value: the same object as the @listener argument.
- **/
-CalListener *
-cal_listener_construct (CalListener *listener, Evolution_Calendar_Listener corba_listener)
-{
-	g_return_val_if_fail (listener != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_LISTENER (listener), NULL);
-
-	bonobo_object_construct (BONOBO_OBJECT (listener), corba_listener);
-	return listener;
-}
-
-/**
- * cal_listener_corba_object_create:
- * @object: #BonoboObject that will wrap the CORBA object.
- *
- * Creates and activates the CORBA object that is wrapped by the specified
- * calendar listener @object.
- *
- * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of
- * failure.
- **/
-Evolution_Calendar_Listener
-cal_listener_corba_object_create (BonoboObject *object)
-{
-	POA_Evolution_Calendar_Listener *servant;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);
-	g_return_val_if_fail (IS_CAL_LISTENER (object), CORBA_OBJECT_NIL);
-
-	servant = (POA_Evolution_Calendar_Listener *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &cal_listener_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_Evolution_Calendar_Listener__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-	return (Evolution_Calendar_Listener) bonobo_object_activate_servant (object, servant);
-}
-
-/**
- * cal_listener_new:
- * @void:
- *
- * Creates a new #CalListener object.
- *
- * Return value: A newly-created #CalListener, or NULL if its corresponding
- * CORBA object could not be created.
- **/
-CalListener *
-cal_listener_new (void)
-{
-	CalListener *listener;
-	CORBA_Environment ev;
-	Evolution_Calendar_Listener corba_listener;
-	gboolean result;
-
-	listener = gtk_type_new (CAL_LISTENER_TYPE);
-
-	corba_listener = cal_listener_corba_object_create (BONOBO_OBJECT (listener));
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (corba_listener, &ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION || result) {
-		g_message ("cal_listener_new(): could not create the CORBA listener");
-		bonobo_object_unref (BONOBO_OBJECT (listener));
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	return cal_listener_construct (listener, corba_listener);
-}
-
-/**
- * cal_listener_get_calendar:
- * @listener: A calendar listener.
- * 
- * Queries the calendar that a listener is watching.
- * 
- * Return value: The calendar that the listener is watching.
- **/
-Evolution_Calendar_Cal
-cal_listener_get_calendar (CalListener *listener)
-{
-	CalListenerPrivate *priv;
-
-	g_return_val_if_fail (listener != NULL, CORBA_OBJECT_NIL);
-	g_return_val_if_fail (IS_CAL_LISTENER (listener), CORBA_OBJECT_NIL);
-
-	priv = listener->priv;
-	return priv->cal;
-}
diff --git a/calendar/cal-client/cal-listener.h b/calendar/cal-client/cal-listener.h
deleted file mode 100644
index b4eda6c2d6..0000000000
--- a/calendar/cal-client/cal-listener.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Evolution calendar listener
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_LISTENER_H
-#define CAL_LISTENER_H
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-#include "evolution-calendar.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_LISTENER_TYPE            (cal_listener_get_type ())
-#define CAL_LISTENER(obj)            (GTK_CHECK_CAST ((obj), CAL_LISTENER_TYPE, CalListener))
-#define CAL_LISTENER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_LISTENER_TYPE,	\
-				      CalListenerClass))
-#define IS_CAL_LISTENER(obj)         (GTK_CHECK_TYPE ((obj), CAL_LISTENER_TYPE))
-#define IS_CAL_LISTENER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_LISTENER_TYPE))
-
-typedef struct _CalListener CalListener;
-typedef struct _CalListenerClass CalListenerClass;
-
-typedef struct _CalListenerPrivate CalListenerPrivate;
-
-struct _CalListener {
-	BonoboObject object;
-
-	/* Private data */
-	CalListenerPrivate *priv;
-};
-
-struct _CalListenerClass {
-	BonoboObjectClass parent_class;
-
-	/* Notification signals */
-
-	void (* cal_loaded) (CalListener *listener,
-			     Evolution_Calendar_Listener_LoadStatus status,
-			     Evolution_Calendar_Cal cal);
-	void (* obj_updated) (CalListener *listener, const Evolution_Calendar_CalObjUID uid);
-	void (* obj_removed) (CalListener *listener, const Evolution_Calendar_CalObjUID uid);
-};
-
-GtkType cal_listener_get_type (void);
-
-CalListener *cal_listener_construct (CalListener *listener,
-				     Evolution_Calendar_Listener corba_listener);
-
-Evolution_Calendar_Listener cal_listener_corba_object_create (BonoboObject *object);
-
-CalListener *cal_listener_new (void);
-
-Evolution_Calendar_Cal cal_listener_get_calendar (CalListener *listener);
-
-POA_Evolution_Calendar_Listener__epv *cal_listener_get_epv (void);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/cal-client/client-test.c b/calendar/cal-client/client-test.c
deleted file mode 100644
index c28e3f5696..0000000000
--- a/calendar/cal-client/client-test.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* Evolution calendar client - test program
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <bonobo.h>
-#include <liboaf/liboaf.h>
-#include <gnome.h>
-#include <cal-client/cal-client.h>
-
-static CalClient *client1;
-static CalClient *client2;
-
-/* Prints a message with a client identifier */
-static void
-cl_printf (CalClient *client, const char *format, ...)
-{
-	va_list args;
-
-	va_start (args, format);
-	printf ("Client %s: ",
-		client == client1 ? "1" :
-		client == client2 ? "2" :
-		"UNKNOWN");
-	vprintf (format, args);
-	va_end (args);
-}
-
-/* Dumps some interesting data from a component */
-static void
-dump_component (CalComponent *comp)
-{
-	const char *uid;
-	CalComponentText summary;
-
-	cal_component_get_uid (comp, &uid);
-
-	printf ("UID %s\n", uid);
-
-	cal_component_get_summary (comp, &summary);
-	if (summary.value)
-		printf ("\tSummary: `%s', altrep `%s'\n",
-			summary.value,
-			summary.altrep ? summary.altrep : "NONE");
-	else
-		printf ("\tNo summary\n");
-}
-
-/* Lists the UIDs of objects in a calendar, called as an idle handler */
-static gboolean
-list_uids (gpointer data)
-{
-	CalClient *client;
-	GList *uids;
-	GList *l;
-
-	client = CAL_CLIENT (data);
-
-	uids = cal_client_get_uids (client, CALOBJ_TYPE_ANY);
-
-	cl_printf (client, "UIDs: ");
-
-	if (!uids)
-		printf ("none\n");
-	else {
-		for (l = uids; l; l = l->next) {
-			char *uid;
-
-			uid = l->data;
-			printf ("`%s' ", uid);
-		}
-
-		printf ("\n");
-
-		for (l = uids; l; l = l->next) {
-			char *uid;
-			CalComponent *comp;
-			CalClientGetStatus status;
-
-			uid = l->data;
-			status = cal_client_get_object (client, uid, &comp);
-
-			if (status == CAL_CLIENT_GET_SUCCESS) {
-				printf ("------------------------------\n");
-				dump_component (comp);
-				printf ("------------------------------\n");
-				gtk_object_unref (GTK_OBJECT (comp));
-			} else {
-				printf ("FAILED: %d\n", status);
-			}
-		}
-	}
-
-	cal_obj_uid_list_free (uids);
-
-	gtk_object_unref (GTK_OBJECT (client));
-
-	return FALSE;
-}
-
-/* Callback used when a calendar is loaded */
-static void
-cal_loaded (CalClient *client, CalClientLoadStatus status, gpointer data)
-{
-	cl_printf (client, "Load/create %s\n",
-		   ((status == CAL_CLIENT_LOAD_SUCCESS) ? "success" :
-		    (status == CAL_CLIENT_LOAD_ERROR) ? "error" :
-		    (status == CAL_CLIENT_LOAD_IN_USE) ? "in use" :
-		    "unknown status value"));
-
-	if (status == CAL_CLIENT_LOAD_SUCCESS)
-		g_idle_add (list_uids, client);
-	else
-		gtk_object_unref (GTK_OBJECT (client));
-}
-
-/* Callback used when an object is updated */
-static void
-obj_updated (CalClient *client, const char *uid, gpointer data)
-{
-	cl_printf (client, "Object updated: %s\n", uid);
-}
-
-/* Callback used when a client is destroyed */
-static void
-client_destroy_cb (GtkObject *object, gpointer data)
-{
-	if (CAL_CLIENT (object) == client1)
-		client1 = NULL;
-	else if (CAL_CLIENT (object) == client2)
-		client2 = NULL;
-	else
-		g_assert_not_reached ();
-
-	if (!client1 && !client2)
-		gtk_main_quit ();
-}
-
-/* Creates a calendar client and tries to load the specified URI into it */
-static void
-create_client (CalClient **client, const char *uri, gboolean load)
-{
-	gboolean result;
-
-	*client = cal_client_new ();
-	if (!*client) {
-		g_message ("create_client(): could not create the client");
-		exit (1);
-	}
-
-	gtk_signal_connect (GTK_OBJECT (*client), "destroy",
-			    client_destroy_cb,
-			    NULL);
-
-	gtk_signal_connect (GTK_OBJECT (*client), "cal_loaded",
-			    GTK_SIGNAL_FUNC (cal_loaded),
-			    NULL);
-	gtk_signal_connect (GTK_OBJECT (*client), "obj_updated",
-			    GTK_SIGNAL_FUNC (obj_updated),
-			    NULL);
-
-	printf ("Calendar loading `%s'...\n", uri);
-
-	if (load)
-		result = cal_client_load_calendar (*client, uri);
-	else
-		result = cal_client_create_calendar (*client, uri);
-
-	if (!result) {
-		g_message ("create_client(): failure when issuing calendar %s request `%s'",
-			   load ? "load" : "create",
-			   uri);
-		exit (1);
-	}
-}
-
-int
-main (int argc, char **argv)
-{
-	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
-	textdomain (PACKAGE);
-
-	gnome_init ("tl-test", VERSION, argc, argv);
-	oaf_init (argc, argv);
-
-	if (!bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) {
-		g_message ("main(): could not initialize Bonobo");
-		exit (1);
-	}
-
-	create_client (&client1, "/cvs/evolution/calendar/cal-client/test.ics", TRUE);
-	create_client (&client2, "/cvs/evolution/calendar/cal-client/test.ics", FALSE);
-
-	bonobo_main ();
-	return 0;
-}
diff --git a/calendar/cal-client/test.ics b/calendar/cal-client/test.ics
deleted file mode 100644
index 128251ee11..0000000000
--- a/calendar/cal-client/test.ics
+++ /dev/null
@@ -1,318 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//hacksw/handcal//NONSGML v1.0//EN
-
-BEGIN:VEVENT
-DTSTART:19970714T170000Z
-DTEND:19970715T035959Z
-SUMMARY:Bastille Day Party
-END:VEVENT
-
-BEGIN:VEVENT
-UID:19970901T130000Z-123401@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970903T163000Z
-DTEND:19970903T190000Z
-SUMMARY:Annual Employee Review
-CLASS:PRIVATE
-CATEGORIES:BUSINESS,HUMAN RESOURCES
-END:VEVENT
-
-BEGIN:VEVENT
-UID:19970901T130000Z-123402@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970401T163000Z
-DTEND:19970402T010000Z
-SUMMARY:Laurel is in sensitivity awareness class.
-CLASS:PUBLIC
-CATEGORIES:BUSINESS,HUMAN RESOURCES
-TRANSP:TRANSPARENT
-END:VEVENT
-
-BEGIN:VEVENT
-UID:19970901T130000Z-123403@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19971102
-SUMMARY:Our Blissful Anniversary
-CLASS:CONFIDENTIAL
-CATEGORIES:ANNIVERSARY,PERSONAL,SPECIAL OCCASION
-RRULE:FREQ=YEARLY
-END:VEVENT
-
-BEGIN:VTODO
-UID:19970901T130000Z-123404@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970415T133000Z
-DUE:19970416T045959Z
-SUMMARY:1996 Income Tax Preparation
-CLASS:CONFIDENTIAL
-CATEGORIES:FAMILY,FINANCE
-PRIORITY:1
-STATUS:NEEDS-ACTION
-END:VTODO
-
-BEGIN:VJOURNAL
-UID:19970901T130000Z-123405@host.com
-DTSTAMP:19970901T1300Z
-DTSTART;VALUE=DATE:19970317
-SUMMARY:Staff meeting minutes
-DESCRIPTION:1. Staff meeting: Participants include Joe\, Lisa
-  and Bob. Aurora project plans were reviewed. There is currently
-  no budget reserves for this project. Lisa will escalate to
-  management. Next meeting on Tuesday.\n
-  2. Telephone Conference: ABC Corp. sales representative called
-  to discuss new printer. Promised to get us a demo by Friday.\n
-  3. Henry Miller (Handsoff Insurance): Car was totaled by tree.
-  Is looking into a loaner car. 654-2323 (tel).
-END:VJOURNAL
-
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jane_doe@host1.com
-ATTENDEE:MAILTO:john_public@host2.com
-DTSTART:19971015T050000Z
-DTEND:19971016T050000Z
-DTSTAMP:19970901T083000Z
-END:VFREEBUSY
-
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jane_doe@host1.com
-ATTENDEE:MAILTO:john_public@host2.com
-DTSTAMP:19970901T100000Z
-FREEBUSY;VALUE=PERIOD:19971015T050000Z/PT8H30M,
- 19971015T160000Z/PT5H30M,19971015T223000Z/PT6H30M
-URL:http://host2.com/pub/busy/jpublic-01.ifb
-COMMENT:This iCalendar file contains busy time information for
-  the next three months.
-END:VFREEBUSY
-
-BEGIN:VFREEBUSY
-ORGANIZER:jsmith@host.com
-DTSTART:19980313T141711Z
-DTEND:19980410T141711Z
-FREEBUSY:19980314T233000Z/19980315T003000Z
-FREEBUSY:19980316T153000Z/19980316T163000Z
-FREEBUSY:19980318T030000Z/19980318T040000Z
-URL:http://www.host.com/calendar/busytime/jsmith.ifb
-END:VFREEBUSY
-
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTART:19971026T020000
-RDATE:19971026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19971026T020000
-RDATE:19970406T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-LAST-MODIFIED:19870101T000000Z
-TZURL:http://zones.stds_r_us.net/tz/US-Eastern
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-
-BEGIN:VTIMEZONE
-TZID:US--Fictitious-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-
-BEGIN:VTIMEZONE
-TZID:US--Fictitious-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19990424T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=4
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME:19970317T133000Z
-REPEAT:4
-DURATION:PT15M
-ACTION:AUDIO
-ATTACH;FMTTYPE=audio/basic:ftp://host.com/pub/sounds/bell-01.aud
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT30M
-REPEAT:2
-DURATION:PT15M
-ACTION:DISPLAY
-DESCRIPTION:Breakfast meeting with executive\n
- team at 8:30 AM EST.
-END:VALARM
-
-BEGIN:VALARM
-TRIGGER:-P2D
-ACTION:EMAIL
-ATTENDEE:MAILTO:john_doe@host.com
-SUMMARY:*** REMINDER: SEND AGENDA FOR WEEKLY STAFF MEETING ***
-DESCRIPTION:A draft agenda needs to be sent out to the attendees
-  to the weekly managers meeting (MGR-LIST). Attached is a
-  pointer the document template for the agenda file.
-ATTACH;FMTTYPE=application/binary:http://host.com/templates/agen
- da.doc
-END:VALARM
-
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME:19980101T050000Z
-REPEAT:23
-DURATION:PT1H
-ACTION:PROCEDURE
-ATTACH;FMTTYPE=application/binary:ftp://host.com/novo-
- procs/felizano.exe
-END:VALARM
-
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-BEGIN:STANDARD
-DTSTART:19981025T020000
-RDATE:19981025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19990404T020000
-RDATE:19990404T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-
-BEGIN:VEVENT
-DTSTAMP:19980309T231000Z
-UID:guid-1.host1.com
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:
- MAILTO:employee-A@host.com
-DESCRIPTION:Project XYZ Review Meeting
-CATEGORIES:MEETING
-CLASS:PUBLIC
-CREATED:19980309T130000Z
-SUMMARY:XYZ Project Review
-DTSTART;TZID=US-Eastern:19980312T083000
-DTEND;TZID=US-Eastern:19980312T093000
-LOCATION:1CP Conference Room 4350
-END:VEVENT
-
-BEGIN:VEVENT
-DTSTAMP:19970324T1200Z
-SEQUENCE:0
-UID:uid3@host1.com
-ORGANIZER:MAILTO:jdoe@host1.com
-DTSTART:19970324T123000Z
-DTEND:19970324T210000Z
-CATEGORIES:MEETING,PROJECT
-CLASS:PUBLIC
-SUMMARY:Calendaring Interoperability Planning Meeting
-DESCRIPTION:Discuss how we can test c&s interoperability\n
- using iCalendar and other IETF standards.
-LOCATION:LDB Lobby
-ATTACH;FMTTYPE=application/postscript:ftp://xyzCorp.com/pub/
- conf/bkgrnd.ps
-END:VEVENT
-
-BEGIN:VTODO
-DTSTAMP:19980130T134500Z
-SEQUENCE:2
-UID:uid4@host1.com
-ORGANIZER:MAILTO:unclesam@us.gov
-ATTENDEE;PARTSTAT=ACCEPTED:MAILTO:jqpublic@host.com
-DUE:19980415T235959
-STATUS:NEEDS-ACTION
-SUMMARY:Submit Income Taxes
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER:19980403T120000
-ATTACH;FMTTYPE=audio/basic:http://host.com/pub/audio-
- files/ssbanner.aud
-REPEAT:4
-DURATION:PT1H
-END:VALARM
-END:VTODO
-
-BEGIN:VJOURNAL
-DTSTAMP:19970324T120000Z
-UID:uid5@host1.com
-ORGANIZER:MAILTO:jsmith@host.com
-STATUS:DRAFT
-CLASS:PUBLIC
-CATEGORIES:Project Report, XYZ, Weekly Meeting
-DESCRIPTION:Project xyz Review Meeting Minutes\n
- Agenda\n1. Review of project version 1.0 requirements.\n2.
- Definition
- of project processes.\n3. Review of project schedule.\n
- Participants: John Smith\, Jane Doe\, Jim Dandy\n-It was
-  decided that the requirements need to be signed off by
-  product marketing.\n-Project processes were accepted.\n
- -Project schedule needs to account for scheduled holidays
-  and employee vacation time. Check with HR for specific
-  dates.\n-New schedule will be distributed by Friday.\n-
- Next weeks meeting is cancelled. No meeting until 3/23.
-END:VJOURNAL
-
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jsmith@host.com
-DTSTART:19980313T141711Z
-DTEND:19980410T141711Z
-FREEBUSY:19980314T233000Z/19980315T003000Z
-FREEBUSY:19980316T153000Z/19980316T163000Z
-FREEBUSY:19980318T030000Z/19980318T040000Z
-URL:http://www.host.com/calendar/busytime/jsmith.ifb
-END:VFREEBUSY
-END:VCALENDAR
diff --git a/calendar/cal-util/.cvsignore b/calendar/cal-util/.cvsignore
deleted file mode 100644
index edf21e8e74..0000000000
--- a/calendar/cal-util/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.libs
-Makefile.in
-Makefile
-.deps
-*.lo
-*.la
-test-recur
-icalendar-test
diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am
deleted file mode 100644
index cedbd84d25..0000000000
--- a/calendar/cal-util/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-noinst_PROGRAMS = test-recur
-
-INCLUDES =						\
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-DG_LOG_DOMAIN=\"cal-util\"			\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/calendar			\
-	-I. 						\
-	-I.. 						\
-	-I$(top_builddir)				\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
-        $(GNOME_INCLUDEDIR)
-
-#
-# cal util library
-#
-
-lib_LTLIBRARIES = libcal-util.la
-
-libcal_util_la_SOURCES = 	\
-	cal-component.c		\
-	cal-recur.c		\
-	cal-util.c		\
-	timeutil.c
-
-libcal_utilincludedir = $(includedir)/evolution/cal-util
-
-libcal_utilinclude_HEADERS =	\
-	cal-component.h		\
-	cal-recur.h		\
-	cal-util.h		\
-	timeutil.h
-
-#
-# static library for use in conduits' shared libraries
-#
-noinst_LTLIBRARIES = libcal-util-static.la
-libcal_util_static_la_SOURCES = $(libcal_util_la_SOURCES)
-libcal_util_static_la_LDFLAGS = --all-static
-
-test_recur_SOURCES = 	\
-	 test-recur.c
-
-test_recur_LDADD = 	\
-	 libcal-util.la	\
-	 $(top_builddir)/libversit/libversit.la		\
-	 $(top_builddir)/libical/src/libical/libical.a	\
-	 $(EXTRA_GNOME_LIBS)
diff --git a/calendar/cal-util/cal-component.c b/calendar/cal-util/cal-component.c
deleted file mode 100644
index 4efb29a610..0000000000
--- a/calendar/cal-util/cal-component.c
+++ /dev/null
@@ -1,3642 +0,0 @@
-/* Evolution calendar - iCalendar component object
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "cal-component.h"
-#include "timeutil.h"
-
-
-
-/* Private part of the CalComponent structure */
-struct _CalComponentPrivate {
-	/* The icalcomponent we wrap */
-	icalcomponent *icalcomp;
-
-	/* Properties */
-
-	icalproperty *uid;
-
-	icalproperty *status;
-
-	struct categories {
-		icalproperty *prop;
-	};
-	GSList *categories_list; /* list of struct categories */
-
-	icalproperty *classification;
-
-	struct text {
-		icalproperty *prop;
-		icalparameter *altrep_param;
-	};
-
-	GSList *comment_list; /* list of struct text */
-
-	icalproperty *completed;
-	icalproperty *created;
-
-	GSList *description_list; /* list of struct text */
-
-	struct datetime {
-		icalproperty *prop;
-		icalparameter *tzid_param;
-	};
-
-	struct datetime dtstart;
-	struct datetime dtend;
-
-	icalproperty *dtstamp;
-
-	struct datetime due;
-
-	GSList *exdate_list; /* list of icalproperty objects */
-	GSList *exrule_list; /* list of icalproperty objects */
-
-	icalproperty *geo;
-	icalproperty *last_modified;
-	icalproperty *percent;
-	icalproperty *priority;
-
-	struct period {
-		icalproperty *prop;
-		icalparameter *value_param;
-	};
-
-	GSList *rdate_list; /* list of struct period */
-
-	GSList *rrule_list; /* list of icalproperty objects */
-
-	icalproperty *sequence;
-
-	struct {
-		icalproperty *prop;
-		icalparameter *altrep_param;
-	} summary;
-
-	icalproperty *transparency;
-	icalproperty *url;
-
-	/* Whether we should increment the sequence number when piping the
-	 * object over the wire.
-	 */
-	guint need_sequence_inc : 1;
-};
-
-/* Private structure for alarms */
-struct _CalComponentAlarm {
-	/* Our parent component */
-	CalComponent *parent;
-
-	/* Alarm icalcomponent we wrap */
-	icalcomponent *icalcomp;
-
-	/* Properties */
-
-	icalproperty *action;
-	icalproperty *trigger;
-};
-
-
-
-static void cal_component_class_init (CalComponentClass *class);
-static void cal_component_init (CalComponent *comp);
-static void cal_component_destroy (GtkObject *object);
-
-static GtkObjectClass *parent_class;
-
-
-
-/**
- * cal_component_get_type:
- *
- * Registers the #CalComponent class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #CalComponent class.
- **/
-GtkType
-cal_component_get_type (void)
-{
-	static GtkType cal_component_type = 0;
-
-	if (!cal_component_type) {
-		static const GtkTypeInfo cal_component_info = {
-			"CalComponent",
-			sizeof (CalComponent),
-			sizeof (CalComponentClass),
-			(GtkClassInitFunc) cal_component_class_init,
-			(GtkObjectInitFunc) cal_component_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_component_type = gtk_type_unique (GTK_TYPE_OBJECT, &cal_component_info);
-	}
-
-	return cal_component_type;
-}
-
-/* Class initialization function for the calendar component object */
-static void
-cal_component_class_init (CalComponentClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	object_class->destroy = cal_component_destroy;
-}
-
-/* Object initialization function for the calendar component object */
-static void
-cal_component_init (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	priv = g_new0 (CalComponentPrivate, 1);
-	comp->priv = priv;
-}
-
-/* Does a simple g_free() of the elements of a GSList and then frees the list
- * itself.  Returns NULL.
- */
-static GSList *
-free_slist (GSList *slist)
-{
-	GSList *l;
-
-	for (l = slist; l; l = l->next)
-		g_free (l->data);
-
-	g_slist_free (slist);
-	return NULL;
-}
-
-/* Frees the internal icalcomponent only if it does not have a parent.  If it
- * does, it means we don't own it and we shouldn't free it.
- */
-static void
-free_icalcomponent (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-
-	if (!priv->icalcomp)
-		return;
-
-	/* Free the icalcomponent */
-
-	if (icalcomponent_get_parent (priv->icalcomp) != NULL)
-		icalcomponent_free (priv->icalcomp);
-
-	priv->icalcomp = NULL;
-
-	/* Free the mappings */
-
-	priv->uid = NULL;
-
-	priv->status = NULL;
-
-	priv->categories_list = free_slist (priv->categories_list);
-
-	priv->classification = NULL;
-	priv->comment_list = NULL;
-	priv->completed = NULL;
-	priv->created = NULL;
-
-	priv->description_list = free_slist (priv->description_list);
-
-	priv->dtend.prop = NULL;
-	priv->dtend.tzid_param = NULL;
-
-	priv->dtstamp = NULL;
-
-	priv->dtstart.prop = NULL;
-	priv->dtstart.tzid_param = NULL;
-
-	priv->due.prop = NULL;
-	priv->due.tzid_param = NULL;
-
-	g_slist_free (priv->exdate_list);
-	priv->exdate_list = NULL;
-
-	g_slist_free (priv->exrule_list);
-	priv->exrule_list = NULL;
-
-	priv->geo = NULL;
-	priv->last_modified = NULL;
-	priv->percent = NULL;
-	priv->priority = NULL;
-
-	priv->rdate_list = free_slist (priv->rdate_list);
-
-	g_slist_free (priv->rrule_list);
-	priv->rrule_list = NULL;
-
-	priv->sequence = NULL;
-
-	priv->summary.prop = NULL;
-	priv->summary.altrep_param = NULL;
-
-	priv->transparency = NULL;
-	priv->url = NULL;
-
-	/* Clean up */
-
-	priv->need_sequence_inc = FALSE;
-}
-
-/* Destroy handler for the calendar component object */
-static void
-cal_component_destroy (GtkObject *object)
-{
-	CalComponent *comp;
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (object));
-
-	comp = CAL_COMPONENT (object);
-	priv = comp->priv;
-
-	free_icalcomponent (comp);
-
-	g_free (priv);
-	comp->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/**
- * cal_component_gen_uid:
- *
- * Generates a unique identifier suitable for calendar components.
- *
- * Return value: A unique identifier string.  Every time this function is called
- * a different string is returned.
- **/
-char *
-cal_component_gen_uid (void)
-{
-	static char *hostname;
-	time_t t = time (NULL);
-	static int serial;
-
-	if (!hostname) {
-		static char buffer [512];
-
-		if ((gethostname (buffer, sizeof (buffer) - 1) == 0) &&
-		    (buffer [0] != 0))
-			hostname = buffer;
-		else
-			hostname = "localhost";
-	}
-
-	return g_strdup_printf (
-		"%s-%d-%d-%d-%d@%s",
-		isodate_from_time_t (t),
-		getpid (),
-		getgid (),
-		getppid (),
-		serial++,
-		hostname);
-}
-
-/**
- * cal_component_new:
- *
- * Creates a new empty calendar component object.  You should set it from an
- * #icalcomponent structure by using cal_component_set_icalcomponent() or with a
- * new empty component type by using cal_component_set_new_vtype().
- *
- * Return value: A newly-created calendar component object.
- **/
-CalComponent *
-cal_component_new (void)
-{
-	return CAL_COMPONENT (gtk_type_new (CAL_COMPONENT_TYPE));
-}
-
-/**
- * cal_component_clone:
- * @comp: A calendar component object.
- * 
- * Creates a new calendar component object by copying the information from
- * another one.
- * 
- * Return value: A newly-created calendar component with the same values as the
- * original one.
- **/
-CalComponent *
-cal_component_clone (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	CalComponent *new_comp;
-	icalcomponent *new_icalcomp;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->need_sequence_inc == FALSE, NULL);
-
-	new_comp = cal_component_new ();
-
-	if (priv->icalcomp) {
-		new_icalcomp = icalcomponent_new_clone (priv->icalcomp);
-		cal_component_set_icalcomponent (new_comp, new_icalcomp);
-	}
-
-	return new_comp;
-}
-
-/* Scans the categories property */
-static void
-scan_categories (CalComponent *comp, icalproperty *prop)
-{
-	CalComponentPrivate *priv;
-	struct categories *categ;
-
-	priv = comp->priv;
-
-	categ = g_new (struct categories, 1);
-	categ->prop = prop;
-
-	priv->categories_list = g_slist_append (priv->categories_list, categ);
-}
-
-/* Scans a date/time and timezone pair property */
-static void
-scan_datetime (CalComponent *comp, struct datetime *datetime, icalproperty *prop)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-
-	datetime->prop = prop;
-	datetime->tzid_param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER);
-}
-
-/* Scans an exception date property */
-static void
-scan_exdate (CalComponent *comp, icalproperty *prop)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-	priv->exdate_list = g_slist_append (priv->exdate_list, prop);
-}
-
-/* Scans an icalperiodtype property */
-static void
-scan_period (CalComponent *comp, GSList **list, icalproperty *prop)
-{
-	struct period *period;
-
-	period = g_new (struct period, 1);
-	period->prop = prop;
-	period->value_param = icalproperty_get_first_parameter (prop, ICAL_VALUE_PARAMETER);
-
-	*list = g_slist_append (*list, period);
-}
-
-/* Scans an icalrecurtype property */
-static void
-scan_recur (CalComponent *comp, GSList **list, icalproperty *prop)
-{
-	*list = g_slist_append (*list, prop);
-}
-
-/* Scans the summary property */
-static void
-scan_summary (CalComponent *comp, icalproperty *prop)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-
-	priv->summary.prop = prop;
-	priv->summary.altrep_param = icalproperty_get_first_parameter (prop, ICAL_ALTREP_PARAMETER);
-}
-
-/* Scans a text (i.e. text + altrep) property */
-static void
-scan_text (CalComponent *comp, GSList **text_list, icalproperty *prop)
-{
-	struct text *text;
-
-	text = g_new (struct text, 1);
-	text->prop = prop;
-	text->altrep_param = icalproperty_get_first_parameter (prop, ICAL_ALTREP_PARAMETER);
-
-	*text_list = g_slist_append (*text_list, text);
-}
-
-/* Scans an icalproperty and adds its mapping to the component */
-static void
-scan_property (CalComponent *comp, icalproperty *prop)
-{
-	CalComponentPrivate *priv;
-	icalproperty_kind kind;
-
-	priv = comp->priv;
-
-	kind = icalproperty_isa (prop);
-
-	switch (kind) {
-	case ICAL_STATUS_PROPERTY:
-		priv->status = prop;
-		break;
-
-	case ICAL_CATEGORIES_PROPERTY:
-		scan_categories (comp, prop);
-		break;
-
-	case ICAL_CLASS_PROPERTY:
-		priv->classification = prop;
-		break;
-
-	case ICAL_COMMENT_PROPERTY:
-		scan_text (comp, &priv->comment_list, prop);
-		break;
-
-	case ICAL_COMPLETED_PROPERTY:
-		priv->completed = prop;
-		break;
-
-	case ICAL_CREATED_PROPERTY:
-		priv->created = prop;
-		break;
-
-	case ICAL_DESCRIPTION_PROPERTY:
-		scan_text (comp, &priv->description_list, prop);
-		break;
-
-	case ICAL_DTEND_PROPERTY:
-		scan_datetime (comp, &priv->dtend, prop);
-		break;
-
-	case ICAL_DTSTAMP_PROPERTY:
-		priv->dtstamp = prop;
-		break;
-
-	case ICAL_DTSTART_PROPERTY:
-		scan_datetime (comp, &priv->dtstart, prop);
-		break;
-
-	case ICAL_DUE_PROPERTY:
-		scan_datetime (comp, &priv->due, prop);
-		break;
-
-	case ICAL_EXDATE_PROPERTY:
-		scan_exdate (comp, prop);
-		break;
-
-	case ICAL_EXRULE_PROPERTY:
-		scan_recur (comp, &priv->exrule_list, prop);
-		break;
-
-	case ICAL_GEO_PROPERTY:
-		priv->geo = prop;
-		break;
-
-	case ICAL_LASTMODIFIED_PROPERTY:
-		priv->last_modified = prop;
-		break;
-
-	case ICAL_PERCENTCOMPLETE_PROPERTY:
-		priv->percent = prop;
-		break;
-
-	case ICAL_PRIORITY_PROPERTY:
-		priv->priority = prop;
-		break;
-
-	case ICAL_RDATE_PROPERTY:
-		scan_period (comp, &priv->rdate_list, prop);
-		break;
-
-	case ICAL_RRULE_PROPERTY:
-		scan_recur (comp, &priv->rrule_list, prop);
-		break;
-
-	case ICAL_SEQUENCE_PROPERTY:
-		priv->sequence = prop;
-		break;
-
-	case ICAL_SUMMARY_PROPERTY:
-		scan_summary (comp, prop);
-		break;
-
-	case ICAL_TRANSP_PROPERTY:
-		priv->transparency = prop;
-		break;
-
-	case ICAL_UID_PROPERTY:
-		priv->uid = prop;
-		break;
-
-	case ICAL_URL_PROPERTY:
-		priv->url = prop;
-		break;
-
-	default:
-		break;
-	}
-}
-
-/* Scans an icalcomponent for its properties so that we can provide
- * random-access to them.
- */
-static void
-scan_icalcomponent (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	icalproperty *prop;
-
-	priv = comp->priv;
-
-	g_assert (priv->icalcomp != NULL);
-
-	for (prop = icalcomponent_get_first_property (priv->icalcomp, ICAL_ANY_PROPERTY);
-	     prop;
-	     prop = icalcomponent_get_next_property (priv->icalcomp, ICAL_ANY_PROPERTY))
-		scan_property (comp, prop);
-
-	/* We don't scan for alarm subcomponents since they can be iterated
-	 * through using cal_component_get_{first,next}_alarm().
-	 */
-}
-
-/* Ensures that the mandatory calendar component properties (uid, dtstamp) do
- * exist.  If they don't exist, it creates them automatically.
- */
-static void
-ensure_mandatory_properties (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-	g_assert (priv->icalcomp != NULL);
-
-	if (!priv->uid) {
-		char *uid;
-
-		uid = cal_component_gen_uid ();
-		priv->uid = icalproperty_new_uid (uid);
-		g_free (uid);
-
-		icalcomponent_add_property (priv->icalcomp, priv->uid);
-	}
-
-	if (!priv->dtstamp) {
-		time_t tim;
-		struct icaltimetype t;
-
-		tim = time (NULL);
-		t = icaltime_from_timet (tim, FALSE, FALSE);
-
-		priv->dtstamp = icalproperty_new_dtstamp (t);
-		icalcomponent_add_property (priv->icalcomp, priv->dtstamp);
-	}
-}
-
-/**
- * cal_component_set_new_vtype:
- * @comp: A calendar component object.
- * @type: Type of calendar component to create.
- *
- * Clears any existing component data from a calendar component object and
- * creates a new #icalcomponent of the specified type for it.  The only property
- * that will be set in the new component will be its unique identifier.
- **/
-void
-cal_component_set_new_vtype (CalComponent *comp, CalComponentVType type)
-{
-	CalComponentPrivate *priv;
-	icalcomponent *icalcomp;
-	icalcomponent_kind kind;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-
-	free_icalcomponent (comp);
-
-	if (type == CAL_COMPONENT_NO_TYPE)
-		return;
-
-	/* Figure out the kind and create the icalcomponent */
-
-	switch (type) {
-	case CAL_COMPONENT_EVENT:
-		kind = ICAL_VEVENT_COMPONENT;
-		break;
-
-	case CAL_COMPONENT_TODO:
-		kind = ICAL_VTODO_COMPONENT;
-		break;
-
-	case CAL_COMPONENT_JOURNAL:
-		kind = ICAL_VJOURNAL_COMPONENT;
-		break;
-
-	case CAL_COMPONENT_FREEBUSY:
-		kind = ICAL_VFREEBUSY_COMPONENT;
-		break;
-
-	case CAL_COMPONENT_TIMEZONE:
-		kind = ICAL_VTIMEZONE_COMPONENT;
-		break;
-
-	default:
-		g_assert_not_reached ();
-		kind = ICAL_NO_COMPONENT;
-	}
-
-	icalcomp = icalcomponent_new (kind);
-	if (!icalcomp) {
-		g_message ("cal_component_set_new_vtype(): Could not create the icalcomponent!");
-		return;
-	}
-
-	/* Scan the component to build our mapping table */
-
-	priv->icalcomp = icalcomp;
-	scan_icalcomponent (comp);
-
-	/* Add missing stuff */
-
-	ensure_mandatory_properties (comp);
-}
-
-/**
- * cal_component_set_icalcomponent:
- * @comp: A calendar component object.
- * @icalcomp: An #icalcomponent.
- *
- * Sets the contents of a calendar component object from an #icalcomponent
- * structure.  If the @comp already had an #icalcomponent set into it, it will
- * will be freed automatically if the #icalcomponent does not have a parent
- * component itself.
- *
- * Supported component types are VEVENT, VTODO, VJOURNAL, VFREEBUSY, and VTIMEZONE.
- *
- * Return value: TRUE on success, FALSE if @icalcomp is an unsupported component
- * type.
- **/
-gboolean
-cal_component_set_icalcomponent (CalComponent *comp, icalcomponent *icalcomp)
-{
-	CalComponentPrivate *priv;
-	icalcomponent_kind kind;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-
-	priv = comp->priv;
-
-	if (priv->icalcomp == icalcomp)
-		return TRUE;
-
-	free_icalcomponent (comp);
-
-	if (!icalcomp) {
-		priv->icalcomp = NULL;
-		return TRUE;
-	}
-
-	kind = icalcomponent_isa (icalcomp);
-
-	if (!(kind == ICAL_VEVENT_COMPONENT
-	      || kind == ICAL_VTODO_COMPONENT
-	      || kind == ICAL_VJOURNAL_COMPONENT
-	      || kind == ICAL_VFREEBUSY_COMPONENT
-	      || kind == ICAL_VTIMEZONE_COMPONENT))
-		return FALSE;
-
-	priv->icalcomp = icalcomp;
-
-	scan_icalcomponent (comp);
-	ensure_mandatory_properties (comp);
-
-	return TRUE;
-}
-
-/**
- * cal_component_get_icalcomponent:
- * @comp: A calendar component object.
- *
- * Queries the #icalcomponent structure that a calendar component object is
- * wrapping.
- *
- * Return value: An #icalcomponent structure, or NULL if the @comp has no
- * #icalcomponent set to it.
- **/
-icalcomponent *
-cal_component_get_icalcomponent (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->need_sequence_inc == FALSE, NULL);
-
-	return priv->icalcomp;
-}
-
-/**
- * cal_component_get_vtype:
- * @comp: A calendar component object.
- *
- * Queries the type of a calendar component object.
- *
- * Return value: The type of the component, as defined by RFC 2445.
- **/
-CalComponentVType
-cal_component_get_vtype (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	icalcomponent_kind kind;
-
-	g_return_val_if_fail (comp != NULL, CAL_COMPONENT_NO_TYPE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), CAL_COMPONENT_NO_TYPE);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, CAL_COMPONENT_NO_TYPE);
-
-	kind = icalcomponent_isa (priv->icalcomp);
-	switch (kind) {
-	case ICAL_VEVENT_COMPONENT:
-		return CAL_COMPONENT_EVENT;
-
-	case ICAL_VTODO_COMPONENT:
-		return CAL_COMPONENT_TODO;
-
-	case ICAL_VJOURNAL_COMPONENT:
-		return CAL_COMPONENT_JOURNAL;
-
-	case ICAL_VFREEBUSY_COMPONENT:
-		return CAL_COMPONENT_FREEBUSY;
-
-	case ICAL_VTIMEZONE_COMPONENT:
-		return CAL_COMPONENT_TIMEZONE;
-
-	default:
-		/* We should have been loaded with a supported type! */
-		g_assert_not_reached ();
-		return CAL_COMPONENT_NO_TYPE;
-	}
-}
-
-/**
- * cal_component_get_as_string:
- * @comp: A calendar component.
- *
- * Gets the iCalendar string representation of a calendar component.  You should
- * call cal_component_commit_sequence() before this function to ensure that the
- * component's sequence number is consistent with the state of the object.
- *
- * Return value: String representation of the calendar component according to
- * RFC 2445.
- **/
-char *
-cal_component_get_as_string (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	char *str, *buf;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	/* Ensure that the user has committed the new SEQUENCE */
-	g_return_val_if_fail (priv->need_sequence_inc == FALSE, NULL);
-
-	/* We dup the string; libical owns that memory */
-
-	str = icalcomponent_as_ical_string (priv->icalcomp);
-
-	if (str)
-		buf = g_strdup (str);
-	else
-		buf = NULL;
-
-	return buf;
-}
-
-/**
- * cal_component_commit_sequence:
- * @comp: 
- * 
- * Increments the sequence number property in a calendar component object if it
- * needs it.  This needs to be done when any of a number of properties listed in
- * RFC 2445 change values, such as the start and end dates of a component.
- *
- * This function must be called before calling cal_component_get_as_string() to
- * ensure that the component is fully consistent.
- **/
-void
-cal_component_commit_sequence (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->need_sequence_inc)
-		return;
-
-	if (priv->sequence) {
-		int seq;
-
-		seq = icalproperty_get_sequence (priv->sequence);
-		icalproperty_set_sequence (priv->sequence, seq + 1);
-	} else {
-		/* The component had no SEQUENCE property, so assume that the
-		 * default would have been zero.  Since it needed incrementing
-		 * anyways, we use a value of 1 here.
-		 */
-		priv->sequence = icalproperty_new_sequence (1);
-		icalcomponent_add_property (priv->icalcomp, priv->sequence);
-	}
-
-	priv->need_sequence_inc = FALSE;
-}
-
-/**
- * cal_component_get_uid:
- * @comp: A calendar component object.
- * @uid: Return value for the UID string.
- *
- * Queries the unique identifier of a calendar component object.
- **/
-void
-cal_component_get_uid (CalComponent *comp, const char **uid)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (uid != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* This MUST exist, since we ensured that it did */
-	g_assert (priv->uid != NULL);
-
-	*uid = icalproperty_get_uid (priv->uid);
-}
-
-/**
- * cal_component_set_uid:
- * @comp: A calendar component object.
- * @uid: Unique identifier.
- *
- * Sets the unique identifier string of a calendar component object.
- **/
-void
-cal_component_set_uid (CalComponent *comp, const char *uid)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (uid != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* This MUST exist, since we ensured that it did */
-	g_assert (priv->uid != NULL);
-
-	icalproperty_set_uid (priv->uid, (char *) uid);
-}
-
-/**
- * cal_component_get_status:
- * @comp: A calendar component object.
- * @status: Return value for the status string.
- *
- * Queries the status property of a calendar component object.
- **/
-void
-cal_component_get_status (CalComponent *comp, const char **status)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (status != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->status) {
-		*status = NULL;
-		return;
-	}
-
-	*status = icalproperty_get_status (priv->status);
-}
-
-/**
- * cal_component_set_status:
- * @comp: A calendar component object.
- * @status: a status string, e.g. "IN-PROCESS", "NEEDS-ACTION". See the RFC.
- *
- * Sets the status string property of a calendar component object.
- **/
-void
-cal_component_set_status (CalComponent *comp, const char *status)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (status != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	priv->need_sequence_inc = TRUE;
-
-	if (status == NULL) {
-		if (priv->status) {
-			icalcomponent_remove_property (priv->icalcomp, priv->status);
-			icalproperty_free (priv->status);
-			priv->status = NULL;
-		}
-
-		return;
-	}
-
-	if (priv->status) {
-		icalproperty_set_status (priv->status, (char *) status);
-	} else {
-		priv->status = icalproperty_new_status ((char *) status);
-		icalcomponent_add_property (priv->icalcomp,
-					    priv->status);
-	}
-}
-
-/**
- * cal_component_get_categories_list:
- * @comp: A calendar component object.
- * @categ_list: Return value for the list of strings, where each string is a
- * category.  This should be freed using cal_component_free_categories_list().
- *
- * Queries the list of categories of a calendar component object.  Each element
- * in the returned categ_list is a string with the corresponding category.
- **/
-void
-cal_component_get_categories_list (CalComponent *comp, GSList **categ_list)
-{
-	CalComponentPrivate *priv;
-	const char *categories;
-	const char *p;
-	const char *cat_start;
-	char *str;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (categ_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->categories_list) {
-		*categ_list = NULL;
-		return;
-	}
-
-	categories = icalproperty_get_categories (priv->categories_list);
-	g_assert (categories != NULL);
-
-	cat_start = categories;
-
-	*categ_list = NULL;
-
-	for (p = categories; *p; p++)
-		if (*p == ',') {
-			str = g_strndup (cat_start, p - cat_start);
-			*categ_list = g_slist_prepend (*categ_list, str);
-
-			cat_start = p + 1;
-		}
-
-	str = g_strndup (cat_start, p - cat_start);
-	*categ_list = g_slist_prepend (*categ_list, str);
-
-	*categ_list = g_slist_reverse (*categ_list);
-}
-
-/* Creates a comma-delimited string of categories */
-static char *
-stringify_categories (GSList *categ_list)
-{
-	GString *s;
-	GSList *l;
-	char *str;
-
-	s = g_string_new (NULL);
-
-	for (l = categ_list; l; l = l->next) {
-		g_string_append (s, l->data);
-
-		if (l->next != NULL)
-			g_string_append (s, ",");
-	}
-
-	str = s->str;
-	g_string_free (s, FALSE);
-
-	return str;
-}
-
-/**
- * cal_component_set_categories_list:
- * @comp: A calendar component object.
- * @categ_list: List of strings, one for each category.
- *
- * Sets the list of categories of a calendar component object.
- **/
-void
-cal_component_set_categories_list (CalComponent *comp, GSList *categ_list)
-{
-	CalComponentPrivate *priv;
-	struct categories *cat;
-	char *categories_str;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* Free the old list */
-
-	if (!categ_list) {
-		if (priv->categories_list) {
-			GSList *l;
-
-			for (l = priv->categories_list; l; l = l->next) {
-				struct categories *c;
-
-				c = l->data;
-				icalcomponent_remove_property (priv->icalcomp, c->prop);
-				icalproperty_free (c->prop);
-
-				g_free (c);
-			}
-
-			g_slist_free (priv->categories_list);
-			priv->categories_list = NULL;
-		}
-
-		return;
-	}
-
-	/* Create a single string of categories */
-
-	categories_str = stringify_categories (categ_list);
-
-	/* Set the categories */
-
-	cat = g_new (struct categories, 1);
-	cat->prop = icalproperty_new_categories (categories_str);
-	g_free (categories_str);
-
-	icalcomponent_add_property (priv->icalcomp, cat->prop);
-}
-
-/**
- * cal_component_get_classification:
- * @comp: A calendar component object.
- * @classif: Return value for the classification.
- *
- * Queries the classification of a calendar component object.  If the
- * classification property is not set on this component, this function returns
- * #CAL_COMPONENT_CLASS_NONE.
- **/
-void
-cal_component_get_classification (CalComponent *comp, CalComponentClassification *classif)
-{
-	CalComponentPrivate *priv;
-	const char *class;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (classif != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->classification) {
-		*classif = CAL_COMPONENT_CLASS_NONE;
-		return;
-	}
-
-	class = icalproperty_get_class (priv->classification);
-
-	if (strcasecmp (class, "PUBLIC") == 0)
-		*classif = CAL_COMPONENT_CLASS_PUBLIC;
-	else if (strcasecmp (class, "PRIVATE") == 0)
-		*classif = CAL_COMPONENT_CLASS_PRIVATE;
-	else if (strcasecmp (class, "CONFIDENTIAL") == 0)
-		*classif = CAL_COMPONENT_CLASS_CONFIDENTIAL;
-	else
-		*classif = CAL_COMPONENT_CLASS_UNKNOWN;
-}
-
-/**
- * cal_component_set_classification:
- * @comp: A calendar component object.
- * @classif: Classification to use.
- *
- * Sets the classification property of a calendar component object.  To unset
- * the property, specify CAL_COMPONENT_CLASS_NONE for @classif.
- **/
-void
-cal_component_set_classification (CalComponent *comp, CalComponentClassification classif)
-{
-	CalComponentPrivate *priv;
-	char *str;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (classif != CAL_COMPONENT_CLASS_UNKNOWN);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (classif == CAL_COMPONENT_CLASS_NONE) {
-		if (priv->classification) {
-			icalcomponent_remove_property (priv->icalcomp, priv->classification);
-			icalproperty_free (priv->classification);
-			priv->classification = NULL;
-		}
-
-		return;
-	}
-
-	switch (classif) {
-	case CAL_COMPONENT_CLASS_PUBLIC:
-		str = "PUBLIC";
-		break;
-
-	case CAL_COMPONENT_CLASS_PRIVATE:
-		str = "PRIVATE";
-		break;
-
-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:
-		str = "CONFIDENTIAL";
-		break;
-
-	default:
-		g_assert_not_reached ();
-		str = NULL;
-	}
-
-	if (priv->classification)
-		icalproperty_set_class (priv->classification, str);
-	else {
-		priv->classification = icalproperty_new_class (str);
-		icalcomponent_add_property (priv->icalcomp, priv->classification);
-	}
-}
-
-/* Gets a text list value */
-static void
-get_text_list (GSList *text_list,
-	       char *(* get_prop_func) (icalproperty *prop),
-	       GSList **tl)
-{
-	GSList *l;
-
-	*tl = NULL;
-
-	if (!text_list)
-		return;
-
-	for (l = text_list; l; l = l->next) {
-		struct text *text;
-		CalComponentText *t;
-
-		text = l->data;
-		g_assert (text->prop != NULL);
-
-		t = g_new (CalComponentText, 1);
-		t->value = (* get_prop_func) (text->prop);
-
-		if (text->altrep_param)
-			t->altrep = icalparameter_get_altrep (text->altrep_param);
-		else
-			t->altrep = NULL;
-
-		*tl = g_slist_prepend (*tl, t);
-	}
-
-	*tl = g_slist_reverse (*tl);
-}
-
-/* Sets a text list value */
-static void
-set_text_list (CalComponent *comp,
-	       icalproperty *(* new_prop_func) (char *value),
-	       GSList **text_list,
-	       GSList *tl)
-{
-	CalComponentPrivate *priv;
-	GSList *l;
-
-	priv = comp->priv;
-
-	/* Remove old texts */
-
-	for (l = *text_list; l; l = l->next) {
-		struct text *text;
-
-		text = l->data;
-		g_assert (text->prop != NULL);
-
-		icalcomponent_remove_property (priv->icalcomp, text->prop);
-		icalproperty_free (text->prop);
-		g_free (text);
-	}
-
-	g_slist_free (*text_list);
-	*text_list = NULL;
-
-	/* Add in new texts */
-
-	for (l = tl; l; l = l->next) {
-		CalComponentText *t;
-		struct text *text;
-
-		t = l->data;
-		g_return_if_fail (t->value != NULL);
-
-		text = g_new (struct text, 1);
-
-		text->prop = (* new_prop_func) ((char *) t->value);
-		icalcomponent_add_property (priv->icalcomp, text->prop);
-
-		if (t->altrep) {
-			text->altrep_param = icalparameter_new_altrep ((char *) t->altrep);
-			icalproperty_add_parameter (text->prop, text->altrep_param);
-		} else
-			text->altrep_param = NULL;
-
-		*text_list = g_slist_prepend (*text_list, text);
-	}
-
-	*text_list = g_slist_reverse (*text_list);
-}
-
-/**
- * cal_component_get_comment_list:
- * @comp: A calendar component object.
- * @text_list: Return value for the comment properties and their parameters, as
- * a list of #CalComponentText structures.  This should be freed using the
- * cal_component_free_text_list() function.
- *
- * Queries the comment of a calendar component object.  The comment property can
- * appear several times inside a calendar component, and so a list of
- * #CalComponentText is returned.
- **/
-void
-cal_component_get_comment_list (CalComponent *comp, GSList **text_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (text_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_text_list (priv->comment_list, icalproperty_get_comment, text_list);
-}
-
-/**
- * cal_component_set_comment_list:
- * @comp: A calendar component object.
- * @text_list: List of #CalComponentText structures.
- *
- * Sets the comment of a calendar component object.  The comment property can
- * appear several times inside a calendar component, and so a list of
- * #CalComponentText structures is used.
- **/
-void
-cal_component_set_comment_list (CalComponent *comp, GSList *text_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_text_list (comp, icalproperty_new_comment, &priv->comment_list, text_list);
-}
-
-/* Gets a struct icaltimetype value */
-static void
-get_icaltimetype (icalproperty *prop,
-		  struct icaltimetype (* get_prop_func) (icalproperty *prop),
-		  struct icaltimetype **t)
-{
-	if (!prop) {
-		*t = NULL;
-		return;
-	}
-
-	*t = g_new (struct icaltimetype, 1);
-	**t = (* get_prop_func) (prop);
-}
-
-/* Sets a struct icaltimetype value */
-static void
-set_icaltimetype (CalComponent *comp, icalproperty **prop,
-		  icalproperty *(* prop_new_func) (struct icaltimetype v),
-		  void (* prop_set_func) (icalproperty *prop, struct icaltimetype v),
-		  struct icaltimetype *t)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-
-	if (!t) {
-		if (*prop) {
-			icalcomponent_remove_property (priv->icalcomp, *prop);
-			icalproperty_free (*prop);
-			*prop = NULL;
-		}
-
-		return;
-	}
-
-	if (*prop)
-		(* prop_set_func) (*prop, *t);
-	else {
-		*prop = (* prop_new_func) (*t);
-		icalcomponent_add_property (priv->icalcomp, *prop);
-	}
-}
-
-/**
- * cal_component_get_completed:
- * @comp: A calendar component object.
- * @t: Return value for the completion date.  This should be freed using the
- * cal_component_free_icaltimetype() function.
- *
- * Queries the date at which a calendar compoment object was completed.
- **/
-void
-cal_component_get_completed (CalComponent *comp, struct icaltimetype **t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (t != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_icaltimetype (priv->completed, icalproperty_get_completed, t);
-}
-
-/**
- * cal_component_set_completed:
- * @comp: A calendar component object.
- * @t: Value for the completion date.
- *
- * Sets the date at which a calendar component object was completed.
- **/
-void
-cal_component_set_completed (CalComponent *comp, struct icaltimetype *t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_icaltimetype (comp, &priv->completed,
-			  icalproperty_new_completed,
-			  icalproperty_set_completed,
-			  t);
-}
-
-
-/**
- * cal_component_get_created:
- * @comp: A calendar component object.
- * @t: Return value for the creation date.  This should be freed using the
- * cal_component_free_icaltimetype() function.
- *
- * Queries the date in which a calendar component object was created in the
- * calendar store.
- **/
-void
-cal_component_get_created (CalComponent *comp, struct icaltimetype **t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (t != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_icaltimetype (priv->created, icalproperty_get_created, t);
-}
-
-/**
- * cal_component_set_created:
- * @comp: A calendar component object.
- * @t: Value for the creation date.
- *
- * Sets the date in which a calendar component object is created in the calendar
- * store.  This should only be used inside a calendar store application, i.e.
- * not by calendar user agents.
- **/
-void
-cal_component_set_created (CalComponent *comp, struct icaltimetype *t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_icaltimetype (comp, &priv->created,
-			  icalproperty_new_created,
-			  icalproperty_set_created,
-			  t);
-}
-
-/**
- * cal_component_get_description_list:
- * @comp: A calendar component object.
- * @text_list: Return value for the description properties and their parameters,
- * as a list of #CalComponentText structures.  This should be freed using the
- * cal_component_free_text_list() function.
- *
- * Queries the description of a calendar component object.  Journal components
- * may have more than one description, and as such this function returns a list
- * of #CalComponentText structures.  All other types of components can have at
- * most one description.
- **/
-void
-cal_component_get_description_list (CalComponent *comp, GSList **text_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (text_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_text_list (priv->description_list, icalproperty_get_description, text_list);
-}
-
-/**
- * cal_component_set_description_list:
- * @comp: A calendar component object.
- * @text_list: List of #CalComponentSummary structures.
- *
- * Sets the description of a calendar component object.  Journal components may
- * have more than one description, and as such this function takes in a list of
- * #CalComponentDescription structures.  All other types of components can have
- * at most one description.
- **/
-void
-cal_component_set_description_list (CalComponent *comp, GSList *text_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_text_list (comp, icalproperty_new_description, &priv->description_list, text_list);
-}
-
-/* Gets a date/time and timezone pair */
-static void
-get_datetime (struct datetime *datetime,
-	      struct icaltimetype (* get_prop_func) (icalproperty *prop),
-	      CalComponentDateTime *dt)
-{
-	if (datetime->prop) {
-		dt->value = g_new (struct icaltimetype, 1);
-		*dt->value = (* get_prop_func) (datetime->prop);
-	} else
-		dt->value = NULL;
-
-	if (datetime->tzid_param)
-		dt->tzid = icalparameter_get_tzid (datetime->tzid_param);
-	else
-		dt->tzid = NULL;
-}
-
-/* Sets a date/time and timezone pair */
-static void
-set_datetime (CalComponent *comp, struct datetime *datetime,
-	      icalproperty *(* prop_new_func) (struct icaltimetype v),
-	      void (* prop_set_func) (icalproperty * prop, struct icaltimetype v),
-	      CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	priv = comp->priv;
-
-	if (!dt) {
-		if (datetime->prop) {
-			icalcomponent_remove_property (priv->icalcomp, datetime->prop);
-			icalproperty_free (datetime->prop);
-
-			datetime->prop = NULL;
-			datetime->tzid_param = NULL;
-		}
-
-		return;
-	}
-
-	g_return_if_fail (dt->value != NULL);
-
-	if (datetime->prop)
-		(* prop_set_func) (datetime->prop, *dt->value);
-	else {
-		datetime->prop = (* prop_new_func) (*dt->value);
-		icalcomponent_add_property (priv->icalcomp, datetime->prop);
-	}
-
-	if (dt->tzid) {
-		g_assert (datetime->prop != NULL);
-
-		if (datetime->tzid_param)
-			icalparameter_set_tzid (datetime->tzid_param, (char *) dt->tzid);
-		else {
-			datetime->tzid_param = icalparameter_new_tzid ((char *) dt->tzid);
-			icalproperty_add_parameter (datetime->prop, datetime->tzid_param);
-		}
-	} else if (datetime->tzid_param) {
-#if 0
-		/* FIXME: this fucking routine will assert(0) since it is not implemented */
-		icalproperty_remove_parameter (datetime->prop, ICAL_TZID_PARAMETER);
-		icalparameter_free (datetime->tzid_param);
-#endif
-		datetime->tzid_param = NULL;
-	}
-}
-
-/**
- * cal_component_get_dtend:
- * @comp: A calendar component object.
- * @dt: Return value for the date/time end.  This should be freed with the
- * cal_component_free_datetime() function.
- *
- * Queries the date/time end of a calendar component object.
- **/
-void
-cal_component_get_dtend (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (dt != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_datetime (&priv->dtend, icalproperty_get_dtend, dt);
-}
-
-/**
- * cal_component_set_dtend:
- * @comp: A calendar component object.
- * @dt: End date/time.
- *
- * Sets the date/time end property of a calendar component object.
- **/
-void
-cal_component_set_dtend (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_datetime (comp, &priv->dtend,
-		      icalproperty_new_dtend,
-		      icalproperty_set_dtend,
-		      dt);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_get_dtstamp:
- * @comp: A calendar component object.
- * @t: Return value for the date/timestamp.
- *
- * Queries the date/timestamp property of a calendar component object, which is
- * the last time at which the object was modified by a calendar user agent.
- **/
-void
-cal_component_get_dtstamp (CalComponent *comp, struct icaltimetype *t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (t != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* This MUST exist, since we ensured that it did */
-	g_assert (priv->dtstamp != NULL);
-
-	*t = icalproperty_get_dtstamp (priv->dtstamp);
-}
-
-/**
- * cal_component_set_dtstamp:
- * @comp: A calendar component object.
- * @t: Date/timestamp value.
- *
- * Sets the date/timestamp of a calendar component object.  This should be
- * called whenever a calendar user agent makes a change to a component's
- * properties.
- **/
-void
-cal_component_set_dtstamp (CalComponent *comp, struct icaltimetype *t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (t != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* This MUST exist, since we ensured that it did */
-	g_assert (priv->dtstamp != NULL);
-
-	icalproperty_set_dtstamp (priv->dtstamp, *t);
-}
-
-/**
- * cal_component_get_dtstart:
- * @comp: A calendar component object.
- * @dt: Return value for the date/time start.  This should be freed with the
- * cal_component_free_datetime() function.
- *
- * Queries the date/time start of a calendar component object.
- **/
-void
-cal_component_get_dtstart (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (dt != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_datetime (&priv->dtstart, icalproperty_get_dtstart, dt);
-}
-
-/**
- * cal_component_set_dtstart:
- * @comp: A calendar component object.
- * @dt: Start date/time.
- *
- * Sets the date/time start property of a calendar component object.
- **/
-void
-cal_component_set_dtstart (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_datetime (comp, &priv->dtstart,
-		      icalproperty_new_dtstart,
-		      icalproperty_set_dtstart,
-		      dt);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_get_due:
- * @comp: A calendar component object.
- * @dt: Return value for the due date/time.  This should be freed with the
- * cal_component_free_datetime() function.
- *
- * Queries the due date/time of a calendar component object.
- **/
-void
-cal_component_get_due (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (dt != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_datetime (&priv->due, icalproperty_get_due, dt);
-}
-
-/**
- * cal_component_set_due:
- * @comp: A calendar component object.
- * @dt: End date/time.
- *
- * Sets the due date/time property of a calendar component object.
- **/
-void
-cal_component_set_due (CalComponent *comp, CalComponentDateTime *dt)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_datetime (comp, &priv->due,
-		      icalproperty_new_due,
-		      icalproperty_set_due,
-		      dt);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/* Builds a list of CalComponentPeriod structures based on a list of icalproperties */
-static void
-get_period_list (GSList *period_list,
-		 struct icalperiodtype (* get_prop_func) (icalproperty *prop),
-		 GSList **list)
-{
-	GSList *l;
-
-	*list = NULL;
-
-	if (!period_list)
-		return;
-
-	for (l = period_list; l; l = l->next) {
-		struct period *period;
-		CalComponentPeriod *p;
-		struct icalperiodtype ip;
-
-		period = l->data;
-		g_assert (period->prop != NULL);
-
-		p = g_new (CalComponentPeriod, 1);
-
-		/* Get value parameter */
-
-		if (period->value_param) {
-			icalparameter_value value_type;
-
-			value_type = icalparameter_get_value (period->value_param);
-
-			if (value_type == ICAL_VALUE_DATE || value_type == ICAL_VALUE_DATETIME)
-				p->type = CAL_COMPONENT_PERIOD_DATETIME;
-			else if (value_type == ICAL_VALUE_DURATION)
-				p->type = CAL_COMPONENT_PERIOD_DURATION;
-			else {
-				g_message ("get_period_list(): Unknown value for period %d; "
-					   "using DATETIME", value_type);
-				p->type = CAL_COMPONENT_PERIOD_DATETIME;
-			}
-		} else
-			p->type = CAL_COMPONENT_PERIOD_DATETIME;
-
-		/* Get start and end/duration */
-
-		ip = (* get_prop_func) (period->prop);
-
-		p->start = ip.start;
-
-		if (p->type == CAL_COMPONENT_PERIOD_DATETIME)
-			p->u.end = ip.end;
-		else if (p->type == CAL_COMPONENT_PERIOD_DURATION)
-			p->u.duration = ip.duration;
-		else
-			g_assert_not_reached ();
-
-		/* Put in list */
-
-		*list = g_slist_prepend (*list, p);
-	}
-
-	*list = g_slist_reverse (*list);
-}
-
-/* Sets a period list value */
-static void
-set_period_list (CalComponent *comp,
-		 icalproperty *(* new_prop_func) (struct icalperiodtype period),
-		 GSList **period_list,
-		 GSList *pl)
-{
-	CalComponentPrivate *priv;
-	GSList *l;
-
-	priv = comp->priv;
-
-	/* Remove old periods */
-
-	for (l = *period_list; l; l = l->next) {
-		struct period *period;
-
-		period = l->data;
-		g_assert (period->prop != NULL);
-
-		icalcomponent_remove_property (priv->icalcomp, period->prop);
-		icalproperty_free (period->prop);
-		g_free (period);
-	}
-
-	g_slist_free (*period_list);
-	*period_list = NULL;
-
-	/* Add in new periods */
-
-	for (l = pl; l; l = l->next) {
-		CalComponentPeriod *p;
-		struct period *period;
-		struct icalperiodtype ip;
-		icalparameter_value value_type;
-
-		g_assert (l->data != NULL);
-		p = l->data;
-
-		/* Create libical value */
-
-		ip.start = p->start;
-
-		if (p->type == CAL_COMPONENT_PERIOD_DATETIME) {
-			value_type = ICAL_VALUE_DATETIME;
-			ip.end = p->u.end;
-		} else if (p->type == CAL_COMPONENT_PERIOD_DURATION) {
-			value_type = ICAL_VALUE_DURATION;
-			ip.duration = p->u.duration;
-		} else {
-			g_assert_not_reached ();
-			return;
-		}
-
-		/* Create property */
-
-		period = g_new (struct period, 1);
-
-		period->prop = (* new_prop_func) (ip);
-		period->value_param = icalparameter_new_value (value_type);
-		icalproperty_add_parameter (period->prop, period->value_param);
-
-		/* Add to list */
-
-		*period_list = g_slist_prepend (*period_list, period);
-	}
-
-	*period_list = g_slist_reverse (*period_list);
-}
-
-/**
- * cal_component_get_exdate_list:
- * @comp: A calendar component object.
- * @exdate_list: Return value for the list of exception dates, as a list of
- * struct #icaltimetype structures.  This should be freed using the
- * cal_component_free_exdate_list() function.
- * 
- * Queries the list of exception date properties in a calendar component object.
- **/
-void
-cal_component_get_exdate_list (CalComponent *comp, GSList **exdate_list)
-{
-	CalComponentPrivate *priv;
-	GSList *l;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (exdate_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	*exdate_list = NULL;
-
-	for (l = priv->exdate_list; l; l = l->next) {
-		icalproperty *prop;
-		struct icaltimetype *t;
-
-		prop = l->data;
-
-		t = g_new (struct icaltimetype, 1);
-		*t = icalproperty_get_exdate (prop);
-
-		*exdate_list = g_slist_prepend (*exdate_list, t);
-	}
-
-	*exdate_list = g_slist_reverse (*exdate_list);
-}
-
-/**
- * cal_component_set_exdate_list:
- * @comp: A calendar component object.
- * @exdate_list: List of struct #icaltimetype structures.
- * 
- * Sets the list of exception dates in a calendar component object.
- **/
-void
-cal_component_set_exdate_list (CalComponent *comp, GSList *exdate_list)
-{
-	CalComponentPrivate *priv;
-	GSList *l;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	/* Remove old exception dates */
-
-	for (l = priv->exdate_list; l; l = l->next) {
-		icalproperty *prop;
-
-		prop = l->data;
-		icalcomponent_remove_property (priv->icalcomp, prop);
-		icalproperty_free (prop);
-	}
-
-	g_slist_free (priv->exdate_list);
-	priv->exdate_list = NULL;
-
-	/* Add in new exception dates */
-
-	for (l = exdate_list; l; l = l->next) {
-		icalproperty *prop;
-		struct icaltimetype *t;
-
-		g_assert (l->data != NULL);
-		t = l->data;
-
-		prop = icalproperty_new_exdate (*t);
-		icalcomponent_add_property (priv->icalcomp, prop);
-
-		priv->exdate_list = g_slist_prepend (priv->exdate_list, prop);
-	}
-
-	priv->exdate_list = g_slist_reverse (priv->exdate_list);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_has_exdates:
- * @comp: A calendar component object.
- * 
- * Queries whether a calendar component object has any exception dates defined
- * for it.
- * 
- * Return value: TRUE if the component has exception dates, FALSE otherwise.
- **/
-gboolean
-cal_component_has_exdates (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	return (priv->exdate_list != NULL);
-}
-
-/* Gets a list of recurrence rules */
-static void
-get_recur_list (GSList *recur_list,
-		struct icalrecurrencetype (* get_prop_func) (icalproperty *prop),
-		GSList **list)
-{
-	GSList *l;
-
-	*list = NULL;
-
-	for (l = recur_list; l; l = l->next) {
-		icalproperty *prop;
-		struct icalrecurrencetype *r;
-
-		prop = l->data;
-
-		r = g_new (struct icalrecurrencetype, 1);
-		*r = (* get_prop_func) (prop);
-
-		*list = g_slist_prepend (*list, r);
-	}
-
-	*list = g_slist_reverse (*list);
-}
-
-/* Sets a list of recurrence rules */
-static void
-set_recur_list (CalComponent *comp,
-		icalproperty *(* new_prop_func) (struct icalrecurrencetype recur),
-		GSList **recur_list,
-		GSList *rl)
-{
-	CalComponentPrivate *priv;
-	GSList *l;
-
-	priv = comp->priv;
-
-	/* Remove old recurrences */
-
-	for (l = *recur_list; l; l = l->next) {
-		icalproperty *prop;
-
-		prop = l->data;
-		icalcomponent_remove_property (priv->icalcomp, prop);
-		icalproperty_free (prop);
-	}
-
-	g_slist_free (*recur_list);
-	*recur_list = NULL;
-
-	/* Add in new recurrences */
-
-	for (l = rl; l; l = l->next) {
-		icalproperty *prop;
-		struct icalrecurrencetype *recur;
-
-		g_assert (l->data != NULL);
-		recur = l->data;
-
-		prop = (* new_prop_func) (*recur);
-		icalcomponent_add_property (priv->icalcomp, prop);
-
-		*recur_list = g_slist_prepend (*recur_list, prop);
-	}
-
-	*recur_list = g_slist_reverse (*recur_list);
-}
-
-/**
- * cal_component_get_exrule_list:
- * @comp: A calendar component object.
- * @recur_list: List of exception rules as struct #icalrecurrencetype
- * structures.  This should be freed using the cal_component_free_recur_list()
- * function.
- * 
- * Queries the list of exception rule properties of a calendar component
- * object.
- **/
-void
-cal_component_get_exrule_list (CalComponent *comp, GSList **recur_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (recur_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_recur_list (priv->exrule_list, icalproperty_get_exrule, recur_list);
-}
-
-/**
- * cal_component_get_exrule_property_list:
- * @comp: A calendar component object.
- * @recur_list: Returns a list of exception rule properties.
- * 
- * Returns a list of exception rule properties of a calendar component
- * object.
- **/
-void
-cal_component_get_exrule_property_list (CalComponent *comp, GSList **recur_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (recur_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	*recur_list = priv->exrule_list;
-}
-
-/**
- * cal_component_set_exrule_list:
- * @comp: A calendar component object.
- * @recur_list: List of struct #icalrecurrencetype structures.
- * 
- * Sets the list of exception rules in a calendar component object.
- **/
-void
-cal_component_set_exrule_list (CalComponent *comp, GSList *recur_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_recur_list (comp, icalproperty_new_exrule, &priv->exrule_list, recur_list);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_has_exrules:
- * @comp: A calendar component object.
- * 
- * Queries whether a calendar component object has any exception rules defined
- * for it.
- * 
- * Return value: TRUE if the component has exception rules, FALSE otherwise.
- **/
-gboolean
-cal_component_has_exrules (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	return (priv->exrule_list != NULL);
-}
-
-/**
- * cal_component_has_exceptions:
- * @comp: A calendar component object
- * 
- * Queries whether a calendar component object has any exceptions defined
- * 
- * Return value: TRUE if the component has exceptions, FALSE otherwise
- **/
-gboolean 
-cal_component_has_exceptions (CalComponent *comp)
-{
-	return cal_component_has_exdates (comp) || cal_component_has_exrules (comp);
-}
-
-/**
- * cal_component_get_geo:
- * @comp: A calendar component object.
- * @geo: Return value for the geographic position property.  This should be
- * freed using the cal_component_free_geo() function.
- * 
- * Sets the geographic position property of a calendar component object.
- **/
-void
-cal_component_get_geo (CalComponent *comp, struct icalgeotype **geo)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (geo != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->geo) {
-		*geo = g_new (struct icalgeotype, 1);
-		**geo = icalproperty_get_geo (priv->geo);
-	} else
-		*geo = NULL;
-}
-
-/**
- * cal_component_set_geo:
- * @comp: A calendar component object.
- * @geo: Value for the geographic position property.
- * 
- * Sets the geographic position property on a calendar component object.
- **/
-void
-cal_component_set_geo (CalComponent *comp, struct icalgeotype *geo)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!geo) {
-		if (priv->geo) {
-			icalcomponent_remove_property (priv->icalcomp, priv->geo);
-			icalproperty_free (priv->geo);
-			priv->geo = NULL;
-		}
-
-		return;
-	}
-
-	if (priv->geo)
-		icalproperty_set_geo (priv->geo, *geo);
-	else {
-		priv->geo = icalproperty_new_geo (*geo);
-		icalcomponent_add_property (priv->icalcomp, priv->geo);
-	}
-}
-
-/**
- * cal_component_get_last_modified:
- * @comp: A calendar component object.
- * @t: Return value for the last modified time value.
- *
- * Queries the time at which a calendar component object was last modified in
- * the calendar store.
- **/
-void
-cal_component_get_last_modified (CalComponent *comp, struct icaltimetype **t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (t != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_icaltimetype (priv->last_modified, icalproperty_get_lastmodified, t);
-}
-
-/**
- * cal_component_set_last_modified:
- * @comp: A calendar component object.
- * @t: Value for the last time modified.
- *
- * Sets the time at which a calendar component object was last stored in the
- * calendar store.  This should not be called by plain calendar user agents.
- **/
-void
-cal_component_set_last_modified (CalComponent *comp, struct icaltimetype *t)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_icaltimetype (comp, &priv->last_modified,
-			  icalproperty_new_lastmodified,
-			  icalproperty_set_lastmodified,
-			  t);
-}
-
-/**
- * cal_component_get_percent:
- * @comp: A calendar component object.
- * @percent: Return value for the percent-complete property.  This should be
- * freed using the cal_component_free_percent() function.
- * 
- * Queries the percent-complete property of a calendar component object.
- **/
-void
-cal_component_get_percent (CalComponent *comp, int **percent)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (percent != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->percent) {
-		*percent = g_new (int, 1);
-		**percent = icalproperty_get_percentcomplete (priv->percent);
-	} else
-		*percent = NULL;
-}
-
-/**
- * cal_component_set_percent:
- * @comp: A calendar component object.
- * @percent: Value for the percent-complete property.
- * 
- * Sets the percent-complete property of a calendar component object.
- **/
-void
-cal_component_set_percent (CalComponent *comp, int *percent)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!percent) {
-		if (priv->percent) {
-			icalcomponent_remove_property (priv->icalcomp, priv->percent);
-			icalproperty_free (priv->percent);
-			priv->percent = NULL;
-		}
-
-		return;
-	}
-
-	g_return_if_fail (*percent >= 0 && *percent <= 100);
-
-	if (priv->percent)
-		icalproperty_set_percentcomplete (priv->percent, *percent);
-	else {
-		priv->percent = icalproperty_new_percentcomplete (*percent);
-		icalcomponent_add_property (priv->icalcomp, priv->percent);
-	}
-}
-
-/**
- * cal_component_get_priority:
- * @comp: A calendar component object.
- * @priority: Return value for the priority property.  This should be freed using
- * the cal_component_free_priority() function.
- * 
- * Queries the priority property of a calendar component object.
- **/
-void
-cal_component_get_priority (CalComponent *comp, int **priority)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (priority != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->priority) {
-		*priority = g_new (int, 1);
-		**priority = icalproperty_get_priority (priv->priority);
-	} else
-		*priority = NULL;
-}
-
-/**
- * cal_component_set_priority:
- * @comp: A calendar component object.
- * @priority: Value for the priority property.
- * 
- * Sets the priority property of a calendar component object.
- **/
-void
-cal_component_set_priority (CalComponent *comp, int *priority)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priority) {
-		if (priv->priority) {
-			icalcomponent_remove_property (priv->icalcomp, priv->priority);
-			icalproperty_free (priv->priority);
-			priv->priority = NULL;
-		}
-
-		return;
-	}
-
-	g_return_if_fail (*priority >= 0 && *priority <= 9);
-
-	if (priv->priority)
-		icalproperty_set_priority (priv->priority, *priority);
-	else {
-		priv->priority = icalproperty_new_priority (*priority);
-		icalcomponent_add_property (priv->icalcomp, priv->priority);
-	}
-}
-
-/**
- * cal_component_get_rdate_list:
- * @comp: A calendar component object.
- * @period_list: Return value for the list of recurrence dates, as a list of
- * #CalComponentPeriod structures.  This should be freed using the
- * cal_component_free_period_list() function.
- * 
- * Queries the list of recurrence date properties in a calendar component
- * object.
- **/
-void
-cal_component_get_rdate_list (CalComponent *comp, GSList **period_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (period_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_period_list (priv->rdate_list, icalproperty_get_rdate, period_list);
-}
-
-/**
- * cal_component_set_rdate_list:
- * @comp: A calendar component object.
- * @period_list: List of #CalComponentPeriod structures.
- * 
- * Sets the list of recurrence dates in a calendar component object.
- **/
-void
-cal_component_set_rdate_list (CalComponent *comp, GSList *period_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (period_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_period_list (comp, icalproperty_new_rdate, &priv->rdate_list, period_list);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_has_rdates:
- * @comp: A calendar component object.
- * 
- * Queries whether a calendar component object has any recurrence dates defined
- * for it.
- * 
- * Return value: TRUE if the component has recurrence dates, FALSE otherwise.
- **/
-gboolean
-cal_component_has_rdates (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	return (priv->rdate_list != NULL);
-}
-
-/**
- * cal_component_get_rrule_list:
- * @comp: A calendar component object.
- * @recur_list: List of recurrence rules as struct #icalrecurrencetype
- * structures.  This should be freed using the cal_component_free_recur_list()
- * function.
- * 
- * Queries the list of recurrence rule properties of a calendar component
- * object.
- **/
-void
-cal_component_get_rrule_list (CalComponent *comp, GSList **recur_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (recur_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	get_recur_list (priv->rrule_list, icalproperty_get_rrule, recur_list);
-}
-
-/**
- * cal_component_get_rrule_property_list:
- * @comp: A calendar component object.
- * @recur_list: Returns a list of recurrence rule properties.
- * 
- * Returns a list of recurrence rule properties of a calendar component
- * object.
- **/
-void
-cal_component_get_rrule_property_list (CalComponent *comp, GSList **recur_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (recur_list != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	*recur_list = priv->rrule_list;
-}
-
-/**
- * cal_component_set_rrule_list:
- * @comp: A calendar component object.
- * @recur_list: List of struct #icalrecurrencetype structures.
- * 
- * Sets the list of recurrence rules in a calendar component object.
- **/
-void
-cal_component_set_rrule_list (CalComponent *comp, GSList *recur_list)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	set_recur_list (comp, icalproperty_new_rrule, &priv->rrule_list, recur_list);
-
-	priv->need_sequence_inc = TRUE;
-}
-
-/**
- * cal_component_has_rrules:
- * @comp: A calendar component object.
- * 
- * Queries whether a calendar component object has any recurrence rules defined
- * for it.
- * 
- * Return value: TRUE if the component has recurrence rules, FALSE otherwise.
- **/
-gboolean
-cal_component_has_rrules (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	return (priv->rrule_list != NULL);
-}
-
-/**
- * cal_component_has_recurrence:
- * @comp: A calendar component object
- * 
- * Queries whether a calendar component object has any recurrences defined
- * 
- * Return value: TRUE if the component has recurrences, FALSE otherwise
- **/
-gboolean 
-cal_component_has_recurrences (CalComponent *comp)
-{
-	return cal_component_has_rdates (comp) || cal_component_has_rrules (comp);
-}
-
-/**
- * cal_component_get_sequence:
- * @comp: A calendar component object.
- * @sequence: Return value for the sequence number.  This should be freed using
- * cal_component_free_sequence().
- *
- * Queries the sequence number of a calendar component object.
- **/
-void
-cal_component_get_sequence (CalComponent *comp, int **sequence)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (sequence != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->sequence) {
-		*sequence = NULL;
-		return;
-	}
-
-	*sequence = g_new (int, 1);
-	**sequence = icalproperty_get_sequence (priv->sequence);
-}
-
-/**
- * cal_component_set_sequence:
- * @comp: A calendar component object.
- * @sequence: Sequence number value.
- *
- * Sets the sequence number of a calendar component object.  Normally this
- * function should not be called, since the sequence number is incremented
- * automatically at the proper times.
- **/
-void
-cal_component_set_sequence (CalComponent *comp, int *sequence)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	priv->need_sequence_inc = FALSE;
-
-	if (!sequence) {
-		if (priv->sequence) {
-			icalcomponent_remove_property (priv->icalcomp, priv->sequence);
-			icalproperty_free (priv->sequence);
-			priv->sequence = NULL;
-		}
-
-		return;
-	}
-
-	if (priv->sequence)
-		icalproperty_set_sequence (priv->sequence, *sequence);
-	else {
-		priv->sequence = icalproperty_new_sequence (*sequence);
-		icalcomponent_add_property (priv->icalcomp, priv->sequence);
-	}
-}
-
-/**
- * cal_component_get_summary:
- * @comp: A calendar component object.
- * @summary: Return value for the summary property and its parameters.
- *
- * Queries the summary of a calendar component object.
- **/
-void
-cal_component_get_summary (CalComponent *comp, CalComponentText *summary)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (summary != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->summary.prop)
-		summary->value = icalproperty_get_summary (priv->summary.prop);
-	else
-		summary->value = NULL;
-
-	if (priv->summary.altrep_param)
-		summary->altrep = icalparameter_get_altrep (priv->summary.altrep_param);
-	else
-		summary->altrep = NULL;
-}
-
-/**
- * cal_component_set_summary:
- * @comp: A calendar component object.
- * @summary: Summary property and its parameters.
- *
- * Sets the summary of a calendar component object.
- **/
-void
-cal_component_set_summary (CalComponent *comp, CalComponentText *summary)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!summary) {
-		if (priv->summary.prop) {
-			icalcomponent_remove_property (priv->icalcomp, priv->summary.prop);
-			icalproperty_free (priv->summary.prop);
-
-			priv->summary.prop = NULL;
-			priv->summary.altrep_param = NULL;
-		}
-
-		return;
-	}
-
-	g_return_if_fail (summary->value != NULL);
-
-	if (priv->summary.prop)
-		icalproperty_set_summary (priv->summary.prop, (char *) summary->value);
-	else {
-		priv->summary.prop = icalproperty_new_summary ((char *) summary->value);
-		icalcomponent_add_property (priv->icalcomp, priv->summary.prop);
-	}
-
-	if (summary->altrep) {
-		g_assert (priv->summary.prop != NULL);
-
-		if (priv->summary.altrep_param)
-			icalparameter_set_altrep (priv->summary.altrep_param,
-						  (char *) summary->altrep);
-		else {
-			priv->summary.altrep_param = icalparameter_new_altrep (
-				(char *) summary->altrep);
-			icalproperty_add_parameter (priv->summary.prop,
-						    priv->summary.altrep_param);
-		}
-	} else if (priv->summary.altrep_param) {
-#if 0
-		/* FIXME: this fucking routine will assert(0) since it is not implemented */
-		icalproperty_remove_parameter (priv->summary.prop, ICAL_ALTREP_PARAMETER);
-		icalparameter_free (priv->summary.altrep_param);
-#endif
-		priv->summary.altrep_param = NULL;
-	}
-}
-
-/**
- * cal_component_get_transparency:
- * @comp: A calendar component object.
- * @transp: Return value for the time transparency.
- *
- * Queries the time transparency of a calendar component object.
- **/
-void
-cal_component_get_transparency (CalComponent *comp, CalComponentTransparency *transp)
-{
-	CalComponentPrivate *priv;
-	const char *val;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (transp != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!priv->transparency) {
-		*transp = CAL_COMPONENT_TRANSP_NONE;
-		return;
-	}
-
-	val = icalproperty_get_transp (priv->transparency);
-
-	if (strcasecmp (val, "TRANSPARENT"))
-		*transp = CAL_COMPONENT_TRANSP_TRANSPARENT;
-	else if (strcasecmp (val, "OPAQUE"))
-		*transp = CAL_COMPONENT_TRANSP_OPAQUE;
-	else
-		*transp = CAL_COMPONENT_TRANSP_UNKNOWN;
-}
-
-/**
- * cal_component_set_transparency:
- * @comp: A calendar component object.
- * @transp: Time transparency value.
- *
- * Sets the time transparency of a calendar component object.
- **/
-void
-cal_component_set_transparency (CalComponent *comp, CalComponentTransparency transp)
-{
-	CalComponentPrivate *priv;
-	char *str;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (transp != CAL_COMPONENT_TRANSP_UNKNOWN);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-
-	if (transp == CAL_COMPONENT_TRANSP_NONE) {
-		if (priv->transparency) {
-			icalcomponent_remove_property (priv->icalcomp, priv->transparency);
-			icalproperty_free (priv->transparency);
-			priv->transparency = NULL;
-		}
-
-		return;
-	}
-
-	switch (transp) {
-	case CAL_COMPONENT_TRANSP_TRANSPARENT:
-		str = "TRANSPARENT";
-		break;
-
-	case CAL_COMPONENT_TRANSP_OPAQUE:
-		str = "OPAQUE";
-		break;
-
-	default:
-		g_assert_not_reached ();
-		str = NULL;
-	}
-
-	if (priv->transparency)
-		icalproperty_set_transp (priv->transparency, str);
-	else {
-		priv->transparency = icalproperty_new_transp (str);
-		icalcomponent_add_property (priv->icalcomp, priv->transparency);
-	}
-}
-
-/**
- * cal_component_get_url:
- * @comp: A calendar component object.
- * @url: Return value for the URL.
- *
- * Queries the uniform resource locator property of a calendar component object.
- **/
-void
-cal_component_get_url (CalComponent *comp, const char **url)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-	g_return_if_fail (url != NULL);
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (priv->url)
-		*url = icalproperty_get_url (priv->url);
-	else
-		*url = NULL;
-}
-
-/**
- * cal_component_set_url:
- * @comp: A calendar component object.
- * @url: URL value.
- *
- * Sets the uniform resource locator property of a calendar component object.
- **/
-void
-cal_component_set_url (CalComponent *comp, const char *url)
-{
-	CalComponentPrivate *priv;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (IS_CAL_COMPONENT (comp));
-
-	priv = comp->priv;
-	g_return_if_fail (priv->icalcomp != NULL);
-
-	if (!url) {
-		if (priv->url) {
-			icalcomponent_remove_property (priv->icalcomp, priv->url);
-			icalproperty_free (priv->url);
-			priv->url = NULL;
-		}
-
-		return;
-	}
-
-	if (priv->url)
-		icalproperty_set_url (priv->url, (char *) url);
-	else {
-		priv->url = icalproperty_new_url ((char *) url);
-		icalcomponent_add_property (priv->icalcomp, priv->url);
-	}
-}
-
-
-
-/**
- * cal_component_free_categories_list:
- * @categ_list: List of category strings.
- *
- * Frees a list of category strings.
- **/
-void
-cal_component_free_categories_list (GSList *categ_list)
-{
-	GSList *l;
-
-	for (l = categ_list; l; l = l->next)
-		g_free (l->data);
-
-	g_slist_free (categ_list);
-}
-
-/**
- * cal_component_free_datetime:
- * @dt: A date/time structure.
- *
- * Frees a date/time structure.
- **/
-void
-cal_component_free_datetime (CalComponentDateTime *dt)
-{
-	g_return_if_fail (dt != NULL);
-
-	if (dt->value)
-		g_free (dt->value);
-}
-
-/**
- * cal_component_free_exdate_list:
- * @exdate_list: List of struct #icaltimetype structures.
- * 
- * Frees a list of struct #icaltimetype structures.
- **/
-void
-cal_component_free_exdate_list (GSList *exdate_list)
-{
-	GSList *l;
-
-	for (l = exdate_list; l; l = l->next) {
-		struct icaltimetype *t;
-
-		g_assert (l->data != NULL);
-		t = l->data;
-
-		g_free (t);
-	}
-
-	g_slist_free (exdate_list);
-}
-
-/**
- * cal_component_free_geo:
- * @geo: An #icalgeotype structure.
- * 
- * Frees a struct #icalgeotype structure as returned by the calendar component
- * functions.
- **/
-void
-cal_component_free_geo (struct icalgeotype *geo)
-{
-	g_return_if_fail (geo != NULL);
-
-	g_free (geo);
-}
-
-/**
- * cal_component_free_icaltimetype:
- * @t: An #icaltimetype structure.
- *
- * Frees a struct #icaltimetype value as returned by the calendar component
- * functions.
- **/
-void
-cal_component_free_icaltimetype (struct icaltimetype *t)
-{
-	g_return_if_fail (t != NULL);
-
-	g_free (t);
-}
-
-/**
- * cal_component_free_percent:
- * @percent: Percent value.
- * 
- * Frees a percent value as returned by the cal_component_get_percent()
- * function.
- **/
-void
-cal_component_free_percent (int *percent)
-{
-	g_return_if_fail (percent != NULL);
-
-	g_free (percent);
-}
-
-/**
- * cal_component_free_priority:
- * @priority: Priority value.
- * 
- * Frees a priority value as returned by the cal_component_get_priority()
- * function.
- **/
-void
-cal_component_free_priority (int *priority)
-{
-	g_return_if_fail (priority != NULL);
-
-	g_free (priority);
-}
-
-/**
- * cal_component_free_period_list:
- * @period_list: List of #CalComponentPeriod structures.
- *
- * Frees a list of #CalComponentPeriod structures.
- **/
-void
-cal_component_free_period_list (GSList *period_list)
-{
-	GSList *l;
-
-	for (l = period_list; l; l = l->next) {
-		CalComponentPeriod *period;
-
-		g_assert (l->data != NULL);
-
-		period = l->data;
-		g_free (period);
-	}
-
-	g_slist_free (period_list);
-}
-
-/**
- * cal_component_free_recur_list:
- * @recur_list: List of struct #icalrecurrencetype structures.
- * 
- * Frees a list of struct #icalrecurrencetype structures.
- **/
-void
-cal_component_free_recur_list (GSList *recur_list)
-{
-	GSList *l;
-
-	for (l = recur_list; l; l = l->next) {
-		struct icalrecurrencetype *r;
-
-		g_assert (l->data != NULL);
-		r = l->data;
-
-		g_free (r);
-	}
-
-	g_slist_free (recur_list);
-}
-
-/**
- * cal_component_free_sequence:
- * @sequence: Sequence number value.
- *
- * Frees a sequence number value.
- **/
-void
-cal_component_free_sequence (int *sequence)
-{
-	g_return_if_fail (sequence != NULL);
-
-	g_free (sequence);
-}
-
-/**
- * cal_component_free_pilot_id:
- * @sequence: Sequence number value.
- *
- * Frees a sequence number value.
- **/
-void
-cal_component_free_pilot_id (unsigned long *pilot_id)
-{
-	g_return_if_fail (pilot_id != NULL);
-
-	g_free (pilot_id);
-}
-
-/**
- * cal_component_free_pilot_status:
- * @sequence: Sequence number value.
- *
- * Frees a sequence number value.
- **/
-void
-cal_component_free_pilot_status (unsigned long *pilot_status)
-{
-	g_return_if_fail (pilot_status != NULL);
-
-	g_free (pilot_status);
-}
-
-/**
- * cal_component_free_text_list:
- * @text_list: List of #CalComponentText structures.
- *
- * Frees a list of #CalComponentText structures.  This function should only be
- * used to free lists of text values as returned by the other getter functions
- * of #CalComponent.
- **/
-void
-cal_component_free_text_list (GSList *text_list)
-{
-	GSList *l;
-
-	for (l = text_list; l; l = l->next) {
-		CalComponentText *text;
-
-		g_assert (l->data != NULL);
-
-		text = l->data;
-		g_return_if_fail (text != NULL);
-		g_free (text);
-	}
-
-	g_slist_free (text_list);
-}
-
-
-
-/* Scans an icalproperty from a calendar component and adds its mapping to our
- * own alarm structure.
- */
-static void
-scan_alarm_property (CalComponentAlarm *alarm, icalproperty *prop)
-{
-	icalproperty_kind kind;
-
-	kind = icalproperty_isa (prop);
-
-	switch (kind) {
-	case ICAL_ACTION_PROPERTY:
-		alarm->action = prop;
-		break;
-
-	case ICAL_TRIGGER_PROPERTY:
-		alarm->trigger = prop;
-		break;
-
-	default:
-		break;
-	}
-}
-
-/* Creates a CalComponentAlarm from a libical alarm subcomponent */
-static CalComponentAlarm *
-make_alarm (CalComponent *comp, icalcomponent *subcomp)
-{
-	CalComponentAlarm *alarm;
-	icalproperty *prop;
-
-	alarm = g_new (CalComponentAlarm, 1);
-
-	alarm->parent = comp;
-	alarm->icalcomp = subcomp;
-
-	for (prop = icalcomponent_get_first_property (subcomp, ICAL_ANY_PROPERTY);
-	     prop;
-	     prop = icalcomponent_get_next_property (subcomp, ICAL_ANY_PROPERTY))
-		scan_alarm_property (alarm, prop);
-
-	return alarm;
-}
-
-/**
- * cal_component_get_first_alarm:
- * @comp: A calendar component object.
- *
- * Starts an iterator for the alarms in a calendar component object.  Subsequent
- * alarms can be obtained with the cal_component_get_next_alarm() function.
- *
- * Return value: The first alarm in the component, or NULL if the component has
- * no alarms.  This should be freed using the cal_component_alarm_free()
- * function.
- **/
-CalComponentAlarm *
-cal_component_get_first_alarm (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	icalcomponent *subcomp;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	subcomp = icalcomponent_get_first_component (priv->icalcomp, ICAL_VALARM_COMPONENT);
-	if (!subcomp)
-		return NULL;
-
-	return make_alarm (comp, subcomp);
-}
-
-/**
- * cal_component_get_next_alarm:
- * @comp: A calendar component object.
- * 
- * Gets the next alarm on a calendar component object.  This should be used as
- * an iterator function after calling cal_component_get_first_alarm().
- * 
- * Return value: The next alarm in the component, or NULL if the component has
- * no more alarms.  This should be freed using the cal_component_alarm_free()
- * function.
- **/
-CalComponentAlarm *
-cal_component_get_next_alarm (CalComponent *comp)
-{
-	CalComponentPrivate *priv;
-	icalcomponent *subcomp;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);
-
-	priv = comp->priv;
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	subcomp = icalcomponent_get_next_component (priv->icalcomp, ICAL_VALARM_COMPONENT);
-	if (!subcomp)
-		return NULL;
-
-	return make_alarm (comp, subcomp);
-}
-
-/**
- * cal_component_alarm_free:
- * @alarm: A calendar alarm.
- *
- * Frees an alarm structure.
- **/
-void
-cal_component_alarm_free (CalComponentAlarm *alarm)
-{
-	g_return_if_fail (alarm != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	if (icalcomponent_get_parent (alarm->icalcomp) != NULL)
-		icalcomponent_free (alarm->icalcomp);
-
-	alarm->icalcomp = NULL;
-
-	alarm->parent = NULL;
-	alarm->action = NULL;
-
-	g_free (alarm);
-}
-
-/**
- * cal_component_alarm_get_action:
- * @alarm: An alarm.
- * @action: Return value for the alarm's action type.
- *
- * Queries the action type of an alarm.
- **/
-void
-cal_component_alarm_get_action (CalComponentAlarm *alarm, CalComponentAlarmAction *action)
-{
-	const char *str;
-
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (action != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	if (!alarm->action) {
-		*action = CAL_COMPONENT_ALARM_NONE;
-		return;
-	}
-
-	str = icalproperty_get_action (alarm->action);
-
-	if (strcasecmp (str, "AUDIO") == 0)
-		*action = CAL_COMPONENT_ALARM_AUDIO;
-	else if (strcasecmp (str, "DISPLAY") == 0)
-		*action = CAL_COMPONENT_ALARM_DISPLAY;
-	else if (strcasecmp (str, "EMAIL") == 0)
-		*action = CAL_COMPONENT_ALARM_EMAIL;
-	else if (strcasecmp (str, "PROCEDURE") == 0)
-		*action = CAL_COMPONENT_ALARM_PROCEDURE;
-	else
-		*action = CAL_COMPONENT_ALARM_UNKNOWN;
-}
-
-/**
- * cal_component_alarm_set_action:
- * @alarm: An alarm.
- * @action: Action type.
- *
- * Sets the action type for an alarm.
- **/
-void
-cal_component_alarm_set_action (CalComponentAlarm *alarm, CalComponentAlarmAction action)
-{
-	char *str;
-
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (action != CAL_COMPONENT_ALARM_NONE);
-	g_return_if_fail (action != CAL_COMPONENT_ALARM_UNKNOWN);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	switch (action) {
-	case CAL_COMPONENT_ALARM_AUDIO:
-		str = "AUDIO";
-		break;
-
-	case CAL_COMPONENT_ALARM_DISPLAY:
-		str = "DISPLAY";
-		break;
-
-	case CAL_COMPONENT_ALARM_EMAIL:
-		str = "EMAIL";
-		break;
-
-	case CAL_COMPONENT_ALARM_PROCEDURE:
-		str = "PROCEDURE";
-		break;
-
-	default:
-		g_assert_not_reached ();
-		str = NULL;
-	}
-
-	if (alarm->action)
-		icalproperty_set_action (alarm->action, str);
-	else {
-		alarm->action = icalproperty_new_action (str);
-		icalcomponent_add_property (alarm->icalcomp, alarm->action);
-	}
-}
-
-/**
- * cal_component_alarm_get_trigger:
- * @alarm: An alarm.
- * @trigger: Return value for the trigger time.  This should be freed using the
- * cal_component_alarm_free_trigger() function.
- *
- * Queries the trigger time for an alarm.
- **/
-void
-cal_component_alarm_get_trigger (CalComponentAlarm *alarm, CalComponentAlarmTrigger **trigger)
-{
-	icalparameter *param;
-	union icaltriggertype t;
-
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (trigger != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	if (!alarm->trigger) {
-		*trigger = NULL;
-		return;
-	}
-
-	*trigger = g_new (CalComponentAlarmTrigger, 1);
-
-	/* Get trigger type */
-
-	param = icalproperty_get_first_parameter (alarm->trigger, ICAL_VALUE_PARAMETER);
-
-	if (param) {
-		icalparameter_value value;
-
-		value = icalparameter_get_value (param);
-
-		switch (value) {
-		case ICAL_VALUE_DURATION:
-			(*trigger)->type = CAL_COMPONENT_ALARM_TRIGGER_RELATIVE;
-			break;
-
-		case ICAL_VALUE_DATETIME:
-			(*trigger)->type = CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE;
-			break;
-
-		default:
-			g_message ("cal_component_alarm_get_trigger(): Unknown value for trigger "
-				   "value %d; using RELATIVE", value);
-
-			(*trigger)->type = CAL_COMPONENT_ALARM_TRIGGER_RELATIVE;
-			break;
-		}
-	} else
-		(*trigger)->type = CAL_COMPONENT_ALARM_TRIGGER_RELATIVE;
-
-	/* Get trigger value and the RELATED parameter */
-
-	t = icalproperty_get_trigger (alarm->trigger);
-
-	switch ((*trigger)->type) {
-	case CAL_COMPONENT_ALARM_TRIGGER_RELATIVE:
-		(*trigger)->u.relative.duration = t.duration;
-
-		param = icalproperty_get_first_parameter (alarm->trigger, ICAL_RELATED_PARAMETER);
-		if (param) {
-			icalparameter_related rel;
-
-			rel = icalparameter_get_related (param);
-
-			switch (rel) {
-			case ICAL_RELATED_START:
-				(*trigger)->u.relative.related =
-					CAL_COMPONENT_ALARM_TRIGGER_RELATED_START;
-				break;
-
-			case ICAL_RELATED_END:
-				(*trigger)->u.relative.related =
-					CAL_COMPONENT_ALARM_TRIGGER_RELATED_END;
-				break;
-
-			default:
-				g_assert_not_reached ();
-			}
-		} else
-			(*trigger)->u.relative.related = CAL_COMPONENT_ALARM_TRIGGER_RELATED_START;
-
-		break;
-
-	case CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE:
-		(*trigger)->u.absolute = t.time;
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/**
- * cal_component_alarm_set_trigger:
- * @alarm: An alarm.
- * @trigger: Trigger time structure.
- *
- * Sets the trigger time of an alarm.
- **/
-void
-cal_component_alarm_set_trigger (CalComponentAlarm *alarm, CalComponentAlarmTrigger *trigger)
-{
-	union icaltriggertype t;
-	icalparameter *param;
-	icalparameter_value value_type;
-	icalparameter_related related;
-
-	g_return_if_fail (alarm != NULL);
-	g_return_if_fail (trigger != NULL);
-
-	g_assert (alarm->icalcomp != NULL);
-
-	/* Delete old trigger */
-
-	if (alarm->trigger) {
-		icalcomponent_remove_property (alarm->icalcomp, alarm->trigger);
-		icalproperty_free (alarm->trigger);
-		alarm->trigger = NULL;
-	}
-
-	/* Set the value */
-
-	value_type = ICAL_DURATION_VALUE; /* Keep GCC happy */
-	related = ICAL_RELATED_START; /* Ditto */
-
-	switch (trigger->type) {
-	case CAL_COMPONENT_ALARM_TRIGGER_RELATIVE:
-		t.duration = trigger->u.relative.duration;
-		value_type = ICAL_DURATION_VALUE;
-
-		switch (trigger->u.relative.related) {
-		case CAL_COMPONENT_ALARM_TRIGGER_RELATED_START:
-			related = ICAL_RELATED_START;
-			break;
-
-		case CAL_COMPONENT_ALARM_TRIGGER_RELATED_END:
-			related = ICAL_RELATED_END;
-			break;
-
-		default:
-			g_assert_not_reached ();
-			return;
-		}
-
-		break;
-
-	case CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE:
-		t.time = trigger->u.absolute;
-		value_type = ICAL_DATETIME_VALUE;
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	alarm->trigger = icalproperty_new_trigger (t);
-	icalcomponent_add_property (alarm->icalcomp, alarm->trigger);
-
-	/* Value parameters */
-
-	param = icalproperty_get_first_parameter (alarm->trigger, ICAL_VALUE_PARAMETER);
-	if (param)
-		icalparameter_set_value (param, value_type);
-	else {
-		param = icalparameter_new_value (value_type);
-		icalproperty_add_parameter (alarm->trigger, param);
-	}
-
-	/* Related parameter */
-
-	if (trigger->type == CAL_COMPONENT_ALARM_TRIGGER_RELATIVE) {
-		param = icalproperty_get_first_parameter (alarm->trigger, ICAL_RELATED_PARAMETER);
-
-		if (param)
-			icalparameter_set_related (param, related);
-		else {
-			param = icalparameter_new_related (related);
-			icalproperty_add_parameter (alarm->trigger, param);
-		}
-	}
-}
-
-/**
- * cal_component_alarm_free_trigger:
- * @trigger: A #CalComponentAlarmTrigger structure.
- *
- * Frees a #CalComponentAlarmTrigger structure.
- **/
-void
-cal_component_alarm_free_trigger (CalComponentAlarmTrigger *trigger)
-{
-	g_return_if_fail (trigger != NULL);
-
-	g_free (trigger);
-}
diff --git a/calendar/cal-util/cal-component.h b/calendar/cal-util/cal-component.h
deleted file mode 100644
index 91d62ae548..0000000000
--- a/calendar/cal-util/cal-component.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/* Evolution calendar - iCalendar component object
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_COMPONENT_H
-#define CAL_COMPONENT_H
-
-#include <libgnome/gnome-defs.h>
-#include <time.h>
-#include <gtk/gtkobject.h>
-#include <ical.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_COMPONENT_TYPE            (cal_component_get_type ())
-#define CAL_COMPONENT(obj)            (GTK_CHECK_CAST ((obj), CAL_COMPONENT_TYPE, CalComponent))
-#define CAL_COMPONENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_COMPONENT_TYPE,	\
-				       CalComponentClass))
-#define IS_CAL_COMPONENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_COMPONENT_TYPE))
-#define IS_CAL_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_COMPONENT_TYPE))
-
-/* Types of calendar components to be stored by a CalComponent, as per RFC 2445.
- * We don't put the alarm component type here since we store alarms as separate
- * structures inside the other "real" components.
- */
-typedef enum {
-	CAL_COMPONENT_NO_TYPE,
-	CAL_COMPONENT_EVENT,
-	CAL_COMPONENT_TODO,
-	CAL_COMPONENT_JOURNAL,
-	CAL_COMPONENT_FREEBUSY,
-	CAL_COMPONENT_TIMEZONE
-} CalComponentVType;
-
-/* Field identifiers for a calendar component */
-typedef enum {
-	CAL_COMPONENT_FIELD_CATEGORIES,		/* concatenation of the categories list */
-	CAL_COMPONENT_FIELD_CLASSIFICATION,
-	CAL_COMPONENT_FIELD_COMPLETED,
-	CAL_COMPONENT_FIELD_DTEND,
-	CAL_COMPONENT_FIELD_DTSTART,
-	CAL_COMPONENT_FIELD_DUE,
-	CAL_COMPONENT_FIELD_GEO,
-	CAL_COMPONENT_FIELD_PERCENT,
-	CAL_COMPONENT_FIELD_PRIORITY,
-	CAL_COMPONENT_FIELD_SUMMARY,
-	CAL_COMPONENT_FIELD_TRANSPARENCY,
-	CAL_COMPONENT_FIELD_URL,
-	CAL_COMPONENT_FIELD_HAS_ALARMS,		/* not a real field */
-	CAL_COMPONENT_FIELD_ICON,		/* not a real field */
-	CAL_COMPONENT_FIELD_COMPLETE,		/* not a real field */
-	CAL_COMPONENT_FIELD_RECURRING,		/* not a real field */
-	CAL_COMPONENT_FIELD_OVERDUE,		/* not a real field */
-	CAL_COMPONENT_FIELD_COLOR,		/* not a real field */
-	CAL_COMPONENT_FIELD_NUM_FIELDS
-} CalComponentField;
-
-/* Structures to return properties and their parameters */
-
-typedef enum {
-	CAL_COMPONENT_CLASS_NONE,
-	CAL_COMPONENT_CLASS_PUBLIC,
-	CAL_COMPONENT_CLASS_PRIVATE,
-	CAL_COMPONENT_CLASS_CONFIDENTIAL,
-	CAL_COMPONENT_CLASS_UNKNOWN
-} CalComponentClassification;
-
-typedef struct {
-	/* Actual date/time value */
-	struct icaltimetype *value;
-
-	/* Timezone ID */
-	const char *tzid;
-} CalComponentDateTime;
-
-typedef enum {
-	CAL_COMPONENT_PERIOD_DATETIME,
-	CAL_COMPONENT_PERIOD_DURATION
-} CalComponentPeriodType;
-
-typedef struct {
-	CalComponentPeriodType type;
-
-	struct icaltimetype start;
-
-	union {
-		struct icaltimetype end;
-		struct icaldurationtype duration;
-	} u;
-} CalComponentPeriod;
-
-typedef struct {
-	/* Description string */
-	const char *value;
-
-	/* Alternate representation URI */
-	const char *altrep;
-} CalComponentText;
-
-typedef enum {
-	CAL_COMPONENT_TRANSP_NONE,
-	CAL_COMPONENT_TRANSP_TRANSPARENT,
-	CAL_COMPONENT_TRANSP_OPAQUE,
-	CAL_COMPONENT_TRANSP_UNKNOWN
-} CalComponentTransparency;
-
-typedef struct _CalComponentAlarm CalComponentAlarm;
-
-typedef struct _CalComponent CalComponent;
-typedef struct _CalComponentClass CalComponentClass;
-
-typedef struct _CalComponentPrivate CalComponentPrivate;
-
-struct _CalComponent {
-	GtkObject object;
-
-	/* Private data */
-	CalComponentPrivate *priv;
-};
-
-struct _CalComponentClass {
-	GtkObjectClass parent_class;
-};
-
-/* Calendar component */
-
-GtkType cal_component_get_type (void);
-
-char *cal_component_gen_uid (void);
-
-CalComponent *cal_component_new (void);
-
-CalComponent *cal_component_clone (CalComponent *comp);
-
-void cal_component_set_new_vtype (CalComponent *comp, CalComponentVType type);
-
-gboolean cal_component_set_icalcomponent (CalComponent *comp, icalcomponent *icalcomp);
-icalcomponent *cal_component_get_icalcomponent (CalComponent *comp);
-
-CalComponentVType cal_component_get_vtype (CalComponent *comp);
-
-char *cal_component_get_as_string (CalComponent *comp);
-
-void cal_component_commit_sequence (CalComponent *comp);
-
-void cal_component_get_uid (CalComponent *comp, const char **uid);
-void cal_component_set_uid (CalComponent *comp, const char *uid);
-
-void cal_component_get_status (CalComponent *comp, const char **status);
-void cal_component_set_status (CalComponent *comp, const char *status);
-
-void cal_component_get_categories_list (CalComponent *comp, GSList **categ_list);
-void cal_component_set_categories_list (CalComponent *comp, GSList *categ_list);
-
-void cal_component_get_classification (CalComponent *comp, CalComponentClassification *classif);
-void cal_component_set_classification (CalComponent *comp, CalComponentClassification classif);
-
-void cal_component_get_comment_list (CalComponent *comp, GSList **text_list);
-void cal_component_set_comment_list (CalComponent *comp, GSList *text_list);
-
-void cal_component_get_completed (CalComponent *comp, struct icaltimetype **t);
-void cal_component_set_completed (CalComponent *comp, struct icaltimetype *t);
-
-void cal_component_get_created (CalComponent *comp, struct icaltimetype **t);
-void cal_component_set_created (CalComponent *comp, struct icaltimetype *t);
-
-void cal_component_get_description_list (CalComponent *comp, GSList **text_list);
-void cal_component_set_description_list (CalComponent *comp, GSList *text_list);
-
-void cal_component_get_dtend (CalComponent *comp, CalComponentDateTime *dt);
-void cal_component_set_dtend (CalComponent *comp, CalComponentDateTime *dt);
-
-void cal_component_get_dtstamp (CalComponent *comp, struct icaltimetype *t);
-void cal_component_set_dtstamp (CalComponent *comp, struct icaltimetype *t);
-
-void cal_component_get_dtstart (CalComponent *comp, CalComponentDateTime *dt);
-void cal_component_set_dtstart (CalComponent *comp, CalComponentDateTime *dt);
-
-void cal_component_get_due (CalComponent *comp, CalComponentDateTime *dt);
-void cal_component_set_due (CalComponent *comp, CalComponentDateTime *dt);
-
-void cal_component_get_exdate_list (CalComponent *comp, GSList **exdate_list);
-void cal_component_set_exdate_list (CalComponent *comp, GSList *exdate_list);
-gboolean cal_component_has_exdates (CalComponent *comp);
-
-void cal_component_get_exrule_list (CalComponent *comp, GSList **recur_list);
-void cal_component_get_exrule_property_list (CalComponent *comp, GSList **recur_list);
-void cal_component_set_exrule_list (CalComponent *comp, GSList *recur_list);
-gboolean cal_component_has_exrules (CalComponent *comp);
-
-gboolean cal_component_has_exceptions (CalComponent *comp);
-
-void cal_component_get_geo (CalComponent *comp, struct icalgeotype **geo);
-void cal_component_set_geo (CalComponent *comp, struct icalgeotype *geo);
-
-void cal_component_get_last_modified (CalComponent *comp, struct icaltimetype **t);
-void cal_component_set_last_modified (CalComponent *comp, struct icaltimetype *t);
-
-void cal_component_get_percent (CalComponent *comp, int **percent);
-void cal_component_set_percent (CalComponent *comp, int *percent);
-
-void cal_component_get_priority (CalComponent *comp, int **priority);
-void cal_component_set_priority (CalComponent *comp, int *priority);
-
-void cal_component_get_rdate_list (CalComponent *comp, GSList **period_list);
-void cal_component_set_rdate_list (CalComponent *comp, GSList *period_list);
-gboolean cal_component_has_rdates (CalComponent *comp);
-
-void cal_component_get_rrule_list (CalComponent *comp, GSList **recur_list);
-void cal_component_get_rrule_property_list (CalComponent *comp, GSList **recur_list);
-void cal_component_set_rrule_list (CalComponent *comp, GSList *recur_list);
-gboolean cal_component_has_rrules (CalComponent *comp);
-
-gboolean cal_component_has_recurrences (CalComponent *comp);
-
-void cal_component_get_sequence (CalComponent *comp, int **sequence);
-void cal_component_set_sequence (CalComponent *comp, int *sequence);
-
-void cal_component_get_summary (CalComponent *comp, CalComponentText *summary);
-void cal_component_set_summary (CalComponent *comp, CalComponentText *summary);
-
-void cal_component_get_transparency (CalComponent *comp, CalComponentTransparency *transp);
-void cal_component_set_transparency (CalComponent *comp, CalComponentTransparency transp);
-
-void cal_component_get_url (CalComponent *comp, const char **url);
-void cal_component_set_url (CalComponent *comp, const char *url);
-
-/* Functions to free returned values */
-
-void cal_component_free_categories_list (GSList *categ_list);
-void cal_component_free_datetime (CalComponentDateTime *dt);
-void cal_component_free_exdate_list (GSList *exdate_list);
-void cal_component_free_geo (struct icalgeotype *geo);
-void cal_component_free_icaltimetype (struct icaltimetype *t);
-void cal_component_free_percent (int *percent);
-void cal_component_free_priority (int *priority);
-void cal_component_free_period_list (GSList *period_list);
-void cal_component_free_recur_list (GSList *recur_list);
-void cal_component_free_sequence (int *sequence);
-void cal_component_free_pilot_id (unsigned long *pilot_status);
-void cal_component_free_pilot_status (unsigned long *pilot_status);
-void cal_component_free_text_list (GSList *text_list);
-
-/* Alarms */
-
-typedef enum {
-	CAL_COMPONENT_ALARM_NONE,
-	CAL_COMPONENT_ALARM_AUDIO,
-	CAL_COMPONENT_ALARM_DISPLAY,
-	CAL_COMPONENT_ALARM_EMAIL,
-	CAL_COMPONENT_ALARM_PROCEDURE,
-	CAL_COMPONENT_ALARM_UNKNOWN
-} CalComponentAlarmAction;
-
-typedef enum {
-	CAL_COMPONENT_ALARM_TRIGGER_RELATIVE,
-	CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE
-} CalComponentAlarmTriggerType;
-
-typedef enum {
-	CAL_COMPONENT_ALARM_TRIGGER_RELATED_START,
-	CAL_COMPONENT_ALARM_TRIGGER_RELATED_END
-} CalComponentAlarmTriggerRelated;
-
-typedef struct {
-	CalComponentAlarmTriggerType type;
-
-	union {
-		struct {
-			struct icaldurationtype duration;
-			CalComponentAlarmTriggerRelated related;
-		} relative;
-
-		struct icaltimetype absolute;
-	} u;
-} CalComponentAlarmTrigger;
-
-CalComponentAlarm *cal_component_get_first_alarm (CalComponent *comp);
-CalComponentAlarm *cal_component_get_next_alarm (CalComponent *comp);
-
-void cal_component_alarm_free (CalComponentAlarm *alarm);
-
-void cal_component_alarm_get_action (CalComponentAlarm *alarm, CalComponentAlarmAction *action);
-void cal_component_alarm_set_action (CalComponentAlarm *alarm, CalComponentAlarmAction action);
-
-void cal_component_alarm_get_trigger (CalComponentAlarm *alarm, CalComponentAlarmTrigger **trigger);
-void cal_component_alarm_set_trigger (CalComponentAlarm *alarm, CalComponentAlarmTrigger *trigger);
-void cal_component_alarm_free_trigger (CalComponentAlarmTrigger *trigger);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/cal-util/cal-recur.c b/calendar/cal-util/cal-recur.c
deleted file mode 100644
index 74a0dbf6f7..0000000000
--- a/calendar/cal-util/cal-recur.c
+++ /dev/null
@@ -1,3630 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Evolution calendar recurrence rule functions
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Damon Chaplin <damon@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <string.h>
-#include <cal-util/cal-recur.h>
-#include <cal-util/timeutil.h>
-
-
-/*
- * Introduction to The Recurrence Generation Functions:
- *
- * Note: This is pretty complicated. See the iCalendar spec (RFC 2445) for
- *       the specification of the recurrence rules and lots of examples
- *	 (sections 4.3.10 & 4.8.5). We also want to support the older
- *	 vCalendar spec, though this should be easy since it is basically a
- *	 subset of iCalendar.
- *
- * o An iCalendar event can have any number of recurrence rules specifying
- *   occurrences of the event, as well as dates & times of specific
- *   occurrences. It can also have any number of recurrence rules and
- *   specific dates & times specifying exceptions to the occurrences.
- *   So we first merge all the occurrences generated, eliminating any
- *   duplicates, then we generate all the exceptions and remove these to
- *   form the final set of occurrences.
- *
- * o There are 7 frequencies of occurrences: YEARLY, MONTHLY, WEEKLY, DAILY,
- *   HOURLY, MINUTELY & SECONDLY. The 'interval' property specifies the
- *   multiples of the frequency which we step by. We generate a 'set' of
- *   occurrences for each period defined by the frequency & interval.
- *   So for a YEARLY frequency with an interval of 3, we generate a set of
- *   occurrences for every 3rd year. We use complete years here -  any
- *   generated occurrences that occur before the event's start (or after its
- *   end) are just discarded.
- *
- * o There are 8 frequency modifiers: BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY,
- *   BYDAY, BYHOUR, BYMINUTE & BYSECOND. These can either add extra occurrences
- *   or filter out occurrences. For example 'FREQ=YEARLY;BYMONTH=1,2' produces
- *   2 occurrences for each year rather than the default 1. And
- *   'FREQ=DAILY;BYMONTH=1' filters out all occurrences except those in Jan.
- *   If the modifier works on periods which are less than the recurrence
- *   frequency, then extra occurrences are added, otherwise occurrences are
- *   filtered. So we have 2 functions for each modifier - one to expand events
- *   and the other to filter. We use a table of functions for each frequency
- *   which points to the appropriate function to use for each modifier.
- *
- * o Any number of frequency modifiers can be used in a recurrence rule.
- *   (Though the iCalendar spec says that BYWEEKNO can only be used in a YEARLY
- *   rule, and some modifiers aren't appropriate for some frequencies - e.g.
- *   BYMONTHDAY is not really useful in a WEEKLY frequency, and BYYEARDAY is
- *   not useful in a MONTHLY or WEEKLY frequency).
- *   The frequency modifiers are applied in the order given above. The first 5
- *   modifier rules (BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY & BYDAY) all
- *   produce the days on which the occurrences take place, and so we have to
- *   compute some of these in parallel rather than sequentially, or we may end
- *   up with too many days.
- *
- * o Note that some expansion functions may produce days which are invalid,
- *   e.g. 31st September, 30th Feb. These invalid days are removed before the
- *   BYHOUR, BYMINUTE & BYSECOND modifier functions are applied.
- *
- * o After the set of occurrences for the frequency interval are generated,
- *   the BYSETPOS property is used to select which of the occurrences are
- *   finally output. If BYSETPOS is not specified then all the occurrences are
- *   output.
- */
-
-/* Define this for some debugging output. */
-#if 0
-#define CAL_OBJ_DEBUG	1
-#endif
-
-/* We will use icalrecurrencetype instead of this eventually. */
-typedef struct {
-	icalrecurrencetype_frequency freq;
-
-	int            interval;
-
-	/* Specifies the end of the recurrence. No occurrences are generated
-	   after this date. If it is 0, the event recurs forever. */
-	time_t         enddate;
-
-	/* WKST property - the week start day: 0 = Monday to 6 = Sunday. */
-	gint	       week_start_day;
-
-
-	/* NOTE: I've used GList's here, but it doesn't matter if we use
-	   other data structures like arrays. The code should be easy to
-	   change. So long as it is easy to see if the modifier is set. */
-
-	/* For BYMONTH modifier. A list of GINT_TO_POINTERs, 0-11. */
-	GList	      *bymonth;
-
-	/* For BYWEEKNO modifier. A list of GINT_TO_POINTERs, [+-]1-53. */
-	GList	      *byweekno;
-
-	/* For BYYEARDAY modifier. A list of GINT_TO_POINTERs, [+-]1-366. */
-	GList	      *byyearday;
-
-	/* For BYMONTHDAY modifier. A list of GINT_TO_POINTERs, [+-]1-31. */
-	GList	      *bymonthday;
-
-	/* For BYDAY modifier. A list of GINT_TO_POINTERs, in pairs.
-	   The first of each pair is the weekday, 0 = Monday to 6 = Sunday.
-	   The second of each pair is the week number [+-]0-53. */
-	GList	      *byday;
-
-	/* For BYHOUR modifier. A list of GINT_TO_POINTERs, 0-23. */
-	GList	      *byhour;
-
-	/* For BYMINUTE modifier. A list of GINT_TO_POINTERs, 0-59. */
-	GList	      *byminute;
-
-	/* For BYSECOND modifier. A list of GINT_TO_POINTERs, 0-60. */
-	GList	      *bysecond;
-
-	/* For BYSETPOS modifier. A list of GINT_TO_POINTERs, +ve or -ve. */
-	GList	      *bysetpos;
-} CalRecurrence;
-
-/* This is what we use to pass to all the filter functions. */
-typedef struct _RecurData RecurData;
-struct _RecurData {
-	CalRecurrence *recur;
-
-	/* This is used for the WEEKLY frequency. */
-	gint weekday;
-
-	/* This is used for fast lookup in BYMONTH filtering. */
-	guint8 months[12];
-
-	/* This is used for fast lookup in BYYEARDAY filtering. */
-	guint8 yeardays[367], neg_yeardays[367]; /* Days are 1 - 366. */
-
-	/* This is used for fast lookup in BYMONTHDAY filtering. */
-	guint8 monthdays[32], neg_monthdays[32]; /* Days are 1 to 31. */
-
-	/* This is used for fast lookup in BYDAY filtering. */
-	guint8 weekdays[7];
-
-	/* This is used for fast lookup in BYHOUR filtering. */
-	guint8 hours[24];
-
-	/* This is used for fast lookup in BYMINUTE filtering. */
-	guint8 minutes[60];
-
-	/* This is used for fast lookup in BYSECOND filtering. */
-	guint8 seconds[62];
-};
-
-/* This is what we use to represent a date & time. */
-typedef struct _CalObjTime CalObjTime;
-struct _CalObjTime {
-	guint16 year;
-	guint8 month;		/* 0 - 11 */
-	guint8 day;		/* 1 - 31 */
-	guint8 hour;		/* 0 - 23 */
-	guint8 minute;		/* 0 - 59 */
-	guint8 second;		/* 0 - 59 (maybe up to 61 for leap seconds) */
-	guint8 is_rdate;	/* TRUE if this is an RDATE, which may have an
-				   end or duration set. */
-};
-
-/* This is what we use to represent specific recurrence dates.
-   Note that we assume it starts with a CalObjTime when sorting. */
-typedef struct _CalObjRecurrenceDate CalObjRecurrenceDate;
-struct _CalObjRecurrenceDate {
-	CalObjTime start;
-	CalComponentPeriod *period;
-};
-
-/* The paramter we use to store the enddate in RRULE and EXRULE properties. */
-#define EVOLUTION_END_DATE_PARAMETER	"X-EVOLUTION-ENDDATE"
-
-typedef gboolean (*CalObjFindStartFn) (CalObjTime *event_start,
-				       CalObjTime *event_end,
-				       RecurData  *recur_data,
-				       CalObjTime *interval_start,
-				       CalObjTime *interval_end,
-				       CalObjTime *cotime);
-typedef gboolean (*CalObjFindNextFn)  (CalObjTime *cotime,
-				       CalObjTime *event_end,
-				       RecurData  *recur_data,
-				       CalObjTime *interval_end);
-typedef GArray*	 (*CalObjFilterFn)    (RecurData  *recur_data,
-				       GArray     *occs);
-
-typedef struct _CalRecurVTable CalRecurVTable;
-struct _CalRecurVTable {
-	CalObjFindStartFn find_start_position;
-	CalObjFindNextFn find_next_position;
-
-	CalObjFilterFn bymonth_filter;
-	CalObjFilterFn byweekno_filter;
-	CalObjFilterFn byyearday_filter;
-	CalObjFilterFn bymonthday_filter;
-	CalObjFilterFn byday_filter;
-	CalObjFilterFn byhour_filter;
-	CalObjFilterFn byminute_filter;
-	CalObjFilterFn bysecond_filter;
-};
-
-
-/* This is used to specify which parts of the CalObjTime to compare in
-   cal_obj_time_compare(). */
-typedef enum {
-	CALOBJ_YEAR,
-	CALOBJ_MONTH,
-	CALOBJ_DAY,
-	CALOBJ_HOUR,
-	CALOBJ_MINUTE,
-	CALOBJ_SECOND
-} CalObjTimeComparison;
-
-static void cal_recur_generate_instances_of_rule (CalComponent	*comp,
-						  icalproperty	*prop,
-						  time_t	 start,
-						  time_t	 end,
-						  CalRecurInstanceFn cb,
-						  gpointer       cb_data);
-
-static CalRecurrence * cal_recur_from_icalproperty (icalproperty *prop,
-						    gboolean exception);
-static gint cal_recur_ical_weekday_to_weekday	(enum icalrecurrencetype_weekday day);
-static void	cal_recur_free			(CalRecurrence	*r);
-
-
-static gboolean cal_object_get_rdate_end	(CalObjTime	*occ,
-						 GArray		*rdate_periods);
-static void	cal_object_compute_duration	(CalObjTime	*start,
-						 CalObjTime	*end,
-						 gint		*days,
-						 gint		*seconds);
-
-static gboolean generate_instances_for_chunk	(CalComponent		*comp,
-						 time_t			 comp_dtstart,
-						 GSList			*rrules,
-						 GSList			*rdates,
-						 GSList			*exrules,
-						 GSList			*exdates,
-						 CalObjTime		*event_start,
-						 CalObjTime		*chunk_start,
-						 CalObjTime		*chunk_end,
-						 time_t			 interval_start_time,
-						 time_t			 interval_end_time,
-						 gint			 duration_days,
-						 gint			 duration_seconds,
-						 CalRecurInstanceFn	 cb,
-						 gpointer		 cb_data);
-
-static GArray* cal_obj_expand_recurrence	(CalObjTime	  *event_start,
-						 CalRecurrence	  *recur,
-						 CalObjTime	  *interval_start,
-						 CalObjTime	  *interval_end,
-						 gboolean	  *finished);
-
-static GArray*	cal_obj_generate_set_yearly	(RecurData	*recur_data,
-						 CalRecurVTable *vtable,
-						 CalObjTime	*occ);
-static GArray*	cal_obj_generate_set_monthly	(RecurData	*recur_data,
-						 CalRecurVTable *vtable,
-						 CalObjTime	*occ);
-static GArray*	cal_obj_generate_set_default	(RecurData	*recur_data,
-						 CalRecurVTable *vtable,
-						 CalObjTime	*occ);
-
-
-static CalRecurVTable* cal_obj_get_vtable	(icalrecurrencetype_frequency recur_type);
-static void	cal_obj_initialize_recur_data	(RecurData	*recur_data,
-						 CalRecurrence	*recur,
-						 CalObjTime	*event_start);
-static void	cal_obj_sort_occurrences	(GArray		*occs);
-static gint	cal_obj_time_compare_func	(const void	*arg1,
-						 const void	*arg2);
-static void	cal_obj_remove_duplicates_and_invalid_dates (GArray	*occs);
-static void	cal_obj_remove_exceptions	(GArray		*occs,
-						 GArray		*ex_occs);
-static GArray*	cal_obj_bysetpos_filter		(CalRecurrence	*recur,
-						 GArray		*occs);
-
-
-static gboolean cal_obj_yearly_find_start_position (CalObjTime *event_start,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_start,
-						    CalObjTime *interval_end,
-						    CalObjTime *cotime);
-static gboolean cal_obj_yearly_find_next_position  (CalObjTime *cotime,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_end);
-
-static gboolean cal_obj_monthly_find_start_position (CalObjTime *event_start,
-						     CalObjTime *event_end,
-						     RecurData  *recur_data,
-						     CalObjTime *interval_start,
-						     CalObjTime *interval_end,
-						     CalObjTime *cotime);
-static gboolean cal_obj_monthly_find_next_position  (CalObjTime *cotime,
-						     CalObjTime *event_end,
-						     RecurData  *recur_data,
-						     CalObjTime *interval_end);
-
-static gboolean cal_obj_weekly_find_start_position (CalObjTime *event_start,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_start,
-						    CalObjTime *interval_end,
-						    CalObjTime *cotime);
-static gboolean cal_obj_weekly_find_next_position  (CalObjTime *cotime,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_end);
-
-static gboolean cal_obj_daily_find_start_position  (CalObjTime *event_start,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_start,
-						    CalObjTime *interval_end,
-						    CalObjTime *cotime);
-static gboolean cal_obj_daily_find_next_position   (CalObjTime *cotime,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_end);
-
-static gboolean cal_obj_hourly_find_start_position (CalObjTime *event_start,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_start,
-						    CalObjTime *interval_end,
-						    CalObjTime *cotime);
-static gboolean cal_obj_hourly_find_next_position  (CalObjTime *cotime,
-						    CalObjTime *event_end,
-						    RecurData  *recur_data,
-						    CalObjTime *interval_end);
-
-static gboolean cal_obj_minutely_find_start_position (CalObjTime *event_start,
-						      CalObjTime *event_end,
-						      RecurData  *recur_data,
-						      CalObjTime *interval_start,
-						      CalObjTime *interval_end,
-						      CalObjTime *cotime);
-static gboolean cal_obj_minutely_find_next_position  (CalObjTime *cotime,
-						      CalObjTime *event_end,
-						      RecurData  *recur_data,
-						      CalObjTime *interval_end);
-
-static gboolean cal_obj_secondly_find_start_position (CalObjTime *event_start,
-						      CalObjTime *event_end,
-						      RecurData  *recur_data,
-						      CalObjTime *interval_start,
-						      CalObjTime *interval_end,
-						      CalObjTime *cotime);
-static gboolean cal_obj_secondly_find_next_position  (CalObjTime *cotime,
-						      CalObjTime *event_end,
-						      RecurData  *recur_data,
-						      CalObjTime *interval_end);
-
-static GArray* cal_obj_bymonth_expand		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_bymonth_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byweekno_expand		(RecurData  *recur_data,
-						 GArray     *occs);
-#if 0
-/* This isn't used at present. */
-static GArray* cal_obj_byweekno_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-#endif
-static GArray* cal_obj_byyearday_expand		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byyearday_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_bymonthday_expand	(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_bymonthday_filter	(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byday_expand_yearly	(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byday_expand_monthly	(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byday_expand_weekly	(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byday_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byhour_expand		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byhour_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byminute_expand		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_byminute_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_bysecond_expand		(RecurData  *recur_data,
-						 GArray     *occs);
-static GArray* cal_obj_bysecond_filter		(RecurData  *recur_data,
-						 GArray     *occs);
-
-static void cal_obj_time_add_months		(CalObjTime *cotime,
-						 gint	     months);
-static void cal_obj_time_add_days		(CalObjTime *cotime,
-						 gint	     days);
-static void cal_obj_time_add_hours		(CalObjTime *cotime,
-						 gint	     hours);
-static void cal_obj_time_add_minutes		(CalObjTime *cotime,
-						 gint	     minutes);
-static void cal_obj_time_add_seconds		(CalObjTime *cotime,
-						 gint	     seconds);
-static gint cal_obj_time_compare		(CalObjTime *cotime1,
-						 CalObjTime *cotime2,
-						 CalObjTimeComparison type);
-static gint cal_obj_time_weekday		(CalObjTime *cotime,
-						 CalRecurrence *recur);
-static gint cal_obj_time_day_of_year		(CalObjTime *cotime);
-static void cal_obj_time_find_first_week	(CalObjTime *cotime,
-						 RecurData  *recur_data);
-static void cal_object_time_from_time		(CalObjTime *cotime,
-						 time_t      t);
-static gint cal_obj_date_only_compare_func (const void *arg1,
-					    const void *arg2);
-
-
-
-static gboolean cal_recur_ensure_end_dates	(CalComponent	*comp,
-						 gboolean	 refresh);
-static gboolean cal_recur_ensure_rule_end_date	(CalComponent	*comp,
-						 icalproperty	*prop,
-						 gboolean	 exception,
-						 gboolean	 refresh);
-static gboolean cal_recur_ensure_rule_end_date_cb	(CalComponent	*comp,
-							 time_t		 instance_start,
-							 time_t		 instance_end,
-							 gpointer	 data);
-static time_t cal_recur_get_rule_end_date	(icalproperty	*prop);
-static void cal_recur_set_rule_end_date		(icalproperty	*prop,
-						 time_t		 end_date);
-
-
-#ifdef CAL_OBJ_DEBUG
-static char* cal_obj_time_to_string	(CalObjTime *cotime);
-#endif
-
-
-CalRecurVTable cal_obj_yearly_vtable = {
-	cal_obj_yearly_find_start_position,
-	cal_obj_yearly_find_next_position,
-
-	cal_obj_bymonth_expand,
-	cal_obj_byweekno_expand,
-	cal_obj_byyearday_expand,
-	cal_obj_bymonthday_expand,
-	cal_obj_byday_expand_yearly,
-	cal_obj_byhour_expand,
-	cal_obj_byminute_expand,
-	cal_obj_bysecond_expand
-};
-
-CalRecurVTable cal_obj_monthly_vtable = {
-	cal_obj_monthly_find_start_position,
-	cal_obj_monthly_find_next_position,
-
-	cal_obj_bymonth_filter,
-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */
-	NULL, /* BYYEARDAY is not useful in a MONTHLY frequency. */
-	cal_obj_bymonthday_expand,
-	cal_obj_byday_expand_monthly,
-	cal_obj_byhour_expand,
-	cal_obj_byminute_expand,
-	cal_obj_bysecond_expand
-};
-
-CalRecurVTable cal_obj_weekly_vtable = {
-	cal_obj_weekly_find_start_position,
-	cal_obj_weekly_find_next_position,
-
-	cal_obj_bymonth_filter,
-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */
-	NULL, /* BYYEARDAY is not useful in a WEEKLY frequency. */
-	NULL, /* BYMONTHDAY is not useful in a WEEKLY frequency. */
-	cal_obj_byday_expand_weekly,
-	cal_obj_byhour_expand,
-	cal_obj_byminute_expand,
-	cal_obj_bysecond_expand
-};
-
-CalRecurVTable cal_obj_daily_vtable = {
-	cal_obj_daily_find_start_position,
-	cal_obj_daily_find_next_position,
-
-	cal_obj_bymonth_filter,
-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */
-	cal_obj_byyearday_filter,
-	cal_obj_bymonthday_filter,
-	cal_obj_byday_filter,
-	cal_obj_byhour_expand,
-	cal_obj_byminute_expand,
-	cal_obj_bysecond_expand
-};
-
-CalRecurVTable cal_obj_hourly_vtable = {
-	cal_obj_hourly_find_start_position,
-	cal_obj_hourly_find_next_position,
-
-	cal_obj_bymonth_filter,
-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */
-	cal_obj_byyearday_filter,
-	cal_obj_bymonthday_filter,
-	cal_obj_byday_filter,
-	cal_obj_byhour_filter,
-	cal_obj_byminute_expand,
-	cal_obj_bysecond_expand
-};
-
-CalRecurVTable cal_obj_minutely_vtable = {
-	cal_obj_minutely_find_start_position,
-	cal_obj_minutely_find_next_position,
-
-	cal_obj_bymonth_filter,
-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */
-	cal_obj_byyearday_filter,
-	cal_obj_bymonthday_filter,
-	cal_obj_byday_filter,
-	cal_obj_byhour_filter,
-	cal_obj_byminute_filter,
-	cal_obj_bysecond_expand
-};
-
-CalRecurVTable cal_obj_secondly_vtable = {
-	cal_obj_secondly_find_start_position,
-	cal_obj_secondly_find_next_position,
-
-	cal_obj_bymonth_filter,
-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */
-	cal_obj_byyearday_filter,
-	cal_obj_bymonthday_filter,
-	cal_obj_byday_filter,
-	cal_obj_byhour_filter,
-	cal_obj_byminute_filter,
-	cal_obj_bysecond_filter
-};
-
-/*
- * Calls the given callback function for each occurrence of the event that
- * intersects the range between the given start and end times (the end time is
- * not included). Note that the occurrences may start before the given start
- * time.
- *
- * If the callback routine returns FALSE the occurrence generation stops.
- *
- * Both start and end can be -1, in which case we start at the events first
- * instance and continue until it ends, or forever if it has no enddate.
- */
-void
-cal_recur_generate_instances (CalComponent		*comp,
-			      time_t			 start,
-			      time_t			 end,
-			      CalRecurInstanceFn	 cb,
-			      gpointer                   cb_data)
-{
-	cal_recur_generate_instances_of_rule (comp, NULL, start, end,
-					      cb, cb_data);
-}
-
-
-/*
- * Calls the given callback function for each occurrence of the given
- * recurrence rule between the given start and end times. If the rule is NULL
- * it uses all the rules from the component.
- *
- * If the callback routine returns FALSE the occurrence generation stops.
- *
- * The use of the specific rule is for determining the end of a rule when
- * COUNT is set. The callback will count instances and store the enddata
- * when COUNT is reached.
- *
- * Both start and end can be -1, in which case we start at the events first
- * instance and continue until it ends, or forever if it has no enddate.
- */
-static void
-cal_recur_generate_instances_of_rule (CalComponent	 *comp,
-				      icalproperty	 *prop,
-				      time_t		  start,
-				      time_t		  end,
-				      CalRecurInstanceFn  cb,
-				      gpointer            cb_data)
-{
-	CalComponentDateTime dtstart, dtend;
-	time_t dtstart_time, dtend_time;
-	GSList *rrules = NULL, *rdates = NULL, elem;
-	GSList *exrules = NULL, *exdates = NULL;
-	CalObjTime interval_start, interval_end, event_start, event_end;
-	CalObjTime chunk_start, chunk_end;
-	gint days, seconds, year;
-
-	g_return_if_fail (comp != NULL);
-	g_return_if_fail (cb != NULL);
-
-	/* Get dtstart, dtend, recurrences, and exceptions */
-
-	cal_component_get_dtstart (comp, &dtstart);
-	cal_component_get_dtend (comp, &dtend);
-
-	if (!dtstart.value) {
-		g_message ("cal_recur_generate_instances_of_rule(): bogus "
-			   "component, does not have DTSTART.  Skipping...");
-		goto out;
-	}
-
-	dtstart_time = icaltime_as_timet (*dtstart.value);
-	if (start == -1)
-		start = dtstart_time;
-
-	/* FIXME: DURATION could be used instead, couldn't it? - Damon */
-	if (dtend.value)
-		dtend_time = icaltime_as_timet (*dtend.value);
-	else
-		dtend_time = time_day_end (dtstart_time);
-
-	/* If there is no recurrence, just call the callback if the event
-	   intersects the given interval. */
-	if (!(cal_component_has_recurrences (comp)
-	      || cal_component_has_exceptions (comp))) {
-		if ((end == -1 || dtstart_time < end) && dtend_time > start) {
-			(* cb) (comp, dtstart_time, dtend_time, cb_data);
-		}
-
-		goto out;
-	}
-
-	/* If a specific recurrence rule is being used, set up a simple list,
-	   else get the recurrence rules from the component. */
-	if (prop) {
-		elem.data = prop;
-		elem.next = NULL;
-		rrules = &elem;
-	} else {
-		/* Make sure all the enddates for the rules are set. */
-		cal_recur_ensure_end_dates (comp, FALSE);
-
-		cal_component_get_rrule_property_list (comp, &rrules);
-		cal_component_get_rdate_list (comp, &rdates);
-		cal_component_get_exrule_property_list (comp, &exrules);
-		cal_component_get_exdate_list (comp, &exdates);
-	}
-
-	/* Convert the interval start & end to CalObjTime. Note that if end
-	   is -1 interval_end won't be set, so don't use it!
-	   Also note that we use end - 1 since we want the interval to be
-	   inclusive as it makes the code simpler. */
-	cal_object_time_from_time (&interval_start, start);
-	if (end != -1)
-		cal_object_time_from_time (&interval_end, end - 1);
-
-	cal_object_time_from_time (&event_start, dtstart_time);
-	cal_object_time_from_time (&event_end, dtend_time);
-	
-	/* Calculate the duration of the event, which we use for all
-	   occurrences. We can't just subtract start from end since that may
-	   be affected by daylight-saving time. So we want a value of days
-	   + seconds. */
-	cal_object_compute_duration (&event_start, &event_end,
-				     &days, &seconds);
-
-	/* Take off the duration from interval_start, so we get occurrences
-	   that start just before the start time but overlap it. But only do
-	   that if the interval is after the event's start time. */
-	if (start > dtstart_time) {
-		cal_obj_time_add_days (&interval_start, -days);
-		cal_obj_time_add_seconds (&interval_start, -seconds);
-	}
-
-	/* Expand the recurrence for each year between start & end, or until
-	   the callback returns 0 if end is 0. We do a year at a time to
-	   give the callback function a chance to break out of the loop, and
-	   so we don't get into problems with infinite recurrences. Since we
-	   have to work on complete sets of occurrences, if there is a yearly
-	   frequency it wouldn't make sense to break it into smaller chunks,
-	   since we would then be calculating the same sets several times.
-	   Though this does mean that we sometimes do a lot more work than
-	   is necessary, e.g. if COUNT is set to something quite low. */
-	for (year = interval_start.year;
-	     end == -1 || year <= interval_end.year;
-	     year++) {
-		chunk_start = interval_start;
-		chunk_start.year = year;
-		if (end != -1)
-			chunk_end = interval_end;
-		chunk_end.year = year;
-
-		if (year != interval_start.year) {
-			chunk_start.month  = 0;
-			chunk_start.day    = 1;
-			chunk_start.hour   = 0;
-			chunk_start.minute = 0;
-			chunk_start.second = 0;
-		}
-		if (end == -1 || year != interval_end.year) {
-			chunk_end.month  = 11;
-			chunk_end.day    = 31;
-			chunk_end.hour   = 23;
-			chunk_end.minute = 59;
-			chunk_end.second = 61;
-			chunk_end.is_rdate = FALSE;
-		}
-
-		if (!generate_instances_for_chunk (comp, dtstart_time,
-						   rrules, rdates,
-						   exrules, exdates,
-						   &event_start,
-						   &chunk_start, &chunk_end,
-						   start, end,
-						   days, seconds,
-						   cb, cb_data))
-			break;
-	}
-
-	if (!prop) {
-		cal_component_free_period_list (rdates);
-		cal_component_free_exdate_list (exdates);
-	}
-
- out:
-	cal_component_free_datetime (&dtstart);
-	cal_component_free_datetime (&dtend);
-}
-
-/* Builds a list of GINT_TO_POINTER() elements out of a short array from a
- * struct icalrecurrencetype.
- */
-static GList *
-array_to_list (short *array, int max_elements)
-{
-	GList *l;
-	int i;
-
-	l = NULL;
-
-	for (i = 0; i < max_elements && array[i] != ICAL_RECURRENCE_ARRAY_MAX; i++)
-		l = g_list_prepend (l, GINT_TO_POINTER ((int) (array[i])));
-	return g_list_reverse (l);
-}
-
-/**
- * cal_recur_from_icalproperty:
- * @ir: An RRULE or EXRULE #icalproperty.
- * 
- * Converts an #icalproperty to a #CalRecurrence.  This should be
- * freed using the cal_recur_free() function.
- * 
- * Return value: #CalRecurrence structure.
- **/
-static CalRecurrence *
-cal_recur_from_icalproperty (icalproperty *prop, gboolean exception)
-{
-	struct icalrecurrencetype ir;
-	CalRecurrence *r;
-	gint max_elements, i;
-
-	g_return_val_if_fail (prop != NULL, NULL);
-
-	r = g_new (CalRecurrence, 1);
-
-	if (exception)
-		ir = icalproperty_get_exrule (prop);
-	else
-		ir = icalproperty_get_rrule (prop);
-
-	r->freq = ir.freq;
-	r->interval = ir.interval;
-
-	if (ir.count != 0) {
-		r->enddate = cal_recur_get_rule_end_date (prop);
-	} else {
-		/* FIXME: icaltime_as_timet() seems to return -1 if UNTIL isn't
-		   set, but a simpler test would be better. */
-		r->enddate = icaltime_as_timet (ir.until);
-		if (r->enddate == -1)
-			r->enddate = 0;
-	}
-
-	r->week_start_day = cal_recur_ical_weekday_to_weekday (ir.week_start);
-
-	r->bymonth = array_to_list (ir.by_month,
-				    sizeof (ir.by_month) / sizeof (ir.by_month[0]));
-
-	r->byweekno = array_to_list (ir.by_week_no,
-				     sizeof (ir.by_week_no) / sizeof (ir.by_week_no[0]));
-
-	r->byyearday = array_to_list (ir.by_year_day,
-				      sizeof (ir.by_year_day) / sizeof (ir.by_year_day[0]));
-
-	r->bymonthday = array_to_list (ir.by_month_day,
-				       sizeof (ir.by_month_day) / sizeof (ir.by_month_day[0]));
-
-	/* FIXME: libical only supports 8 values, out of possible 107 * 7. */
-	r->byday = NULL;
-	max_elements = sizeof (ir.by_day) / sizeof (ir.by_day[0]);
-	for (i = 0; i < max_elements && ir.by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {
-		enum icalrecurrencetype_weekday day;
-		gint weeknum, weekday;
-
-		day = icalrecurrencetype_day_day_of_week (ir.by_day[i]);
-		weeknum = icalrecurrencetype_day_position (ir.by_day[i]);
-
-		weekday = cal_recur_ical_weekday_to_weekday (day);
-
-		r->byday = g_list_prepend (r->byday,
-					   GINT_TO_POINTER (weeknum));
-		r->byday = g_list_prepend (r->byday,
-					   GINT_TO_POINTER (weekday));
-	}
-
-	r->byhour = array_to_list (ir.by_hour,
-				   sizeof (ir.by_hour) / sizeof (ir.by_hour[0]));
-
-	r->byminute = array_to_list (ir.by_minute,
-				     sizeof (ir.by_minute) / sizeof (ir.by_minute[0]));
-
-	r->bysecond = array_to_list (ir.by_second,
-				     sizeof (ir.by_second) / sizeof (ir.by_second[0]));
-
-	r->bysetpos = array_to_list (ir.by_set_pos,
-				     sizeof (ir.by_set_pos) / sizeof (ir.by_set_pos[0]));
-
-	return r;
-}
-
-
-static gint
-cal_recur_ical_weekday_to_weekday	(enum icalrecurrencetype_weekday day)
-{
-	gint weekday;
-
-	switch (day) {
-	case ICAL_NO_WEEKDAY:		/* Monday is the default in RFC2445. */
-	case ICAL_MONDAY_WEEKDAY:
-		weekday = 0;
-		break;
-	case ICAL_TUESDAY_WEEKDAY:
-		weekday = 1;
-		break;
-	case ICAL_WEDNESDAY_WEEKDAY:
-		weekday = 2;
-		break;
-	case ICAL_THURSDAY_WEEKDAY:
-		weekday = 3;
-		break;
-	case ICAL_FRIDAY_WEEKDAY:
-		weekday = 4;
-		break;
-	case ICAL_SATURDAY_WEEKDAY:
-		weekday = 5;
-		break;
-	case ICAL_SUNDAY_WEEKDAY:
-		weekday = 6;
-		break;
-	default:
-		g_warning ("cal_recur_ical_weekday_to_weekday(): Unknown week day %d",
-			   day);
-		weekday = 0;
-	}
-
-	return weekday;
-}
-
-
-/**
- * cal_recur_free:
- * @r: A #CalRecurrence structure.
- * 
- * Frees a #CalRecurrence structure.
- **/
-static void
-cal_recur_free (CalRecurrence *r)
-{
-	g_return_if_fail (r != NULL);
-
-	g_list_free (r->bymonth);
-	g_list_free (r->byweekno);
-	g_list_free (r->byyearday);
-	g_list_free (r->bymonthday);
-	g_list_free (r->byday);
-	g_list_free (r->byhour);
-	g_list_free (r->byminute);
-	g_list_free (r->bysecond);
-	g_list_free (r->bysetpos);
-
-	g_free (r);
-}
-
-/* Generates one year's worth of recurrence instances.  Returns TRUE if all the
- * callback invocations returned TRUE, or FALSE when any one of them returns
- * FALSE, i.e. meaning that the instance generation should be stopped.
- */
-static gboolean
-generate_instances_for_chunk (CalComponent	*comp,
-			      time_t             comp_dtstart,
-			      GSList		*rrules,
-			      GSList		*rdates,
-			      GSList		*exrules,
-			      GSList		*exdates,
-			      CalObjTime	*event_start,
-			      CalObjTime	*chunk_start,
-			      CalObjTime	*chunk_end,
-			      time_t		 interval_start_time,
-			      time_t		 interval_end_time,
-			      gint		 duration_days,
-			      gint		 duration_seconds,
-			      CalRecurInstanceFn cb,
-			      gpointer           cb_data)
-{
-	GArray *occs, *ex_occs, *tmp_occs, *rdate_periods;
-	CalObjTime cotime, *occ;
-	GSList *elem;
-	gint i;
-	time_t start_time, end_time;
-	struct tm start_tm, end_tm;
-	gboolean cb_status = TRUE, rule_finished, finished = TRUE;
-
-#if 0
-	g_print ("In generate_instances_for_chunk rrules: %p\n"
-		 "  %i/%i/%i %02i:%02i:%02i - %i/%i/%i %02i:%02i:%02i\n",
-		 rrules,
-		 chunk_start->day, chunk_start->month + 1,
-		 chunk_start->year, chunk_start->hour,
-		 chunk_start->minute, chunk_start->second,
-		 chunk_end->day, chunk_end->month + 1,
-		 chunk_end->year, chunk_end->hour,
-		 chunk_end->minute, chunk_end->second);
-#endif
-
-	occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-	ex_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-	rdate_periods = g_array_new (FALSE, FALSE,
-				     sizeof (CalObjRecurrenceDate));
-
-	/* The original DTSTART property is included in the occurrence set.
-	   So we add it if it is in this chunk. If it is after this chunk
-	   we set finished to FALSE. */
-	if (cal_obj_time_compare_func (event_start, chunk_end) >= 0)
-		finished = FALSE;
-	else if (cal_obj_time_compare_func (event_start, chunk_start) >= 0)
-		g_array_append_vals (occs, event_start, 1);
-	
-	/* Expand each of the recurrence rules. */
-	for (elem = rrules; elem; elem = elem->next) {
-		icalproperty *prop;
-		CalRecurrence *r;
-
-		prop = elem->data;
-		r = cal_recur_from_icalproperty (prop, FALSE);
-
-		tmp_occs = cal_obj_expand_recurrence (event_start, r,
-						      chunk_start,
-						      chunk_end,
-						      &rule_finished);
-		cal_recur_free (r);
-
-		/* If any of the rules return FALSE for finished, we know we
-		   have to carry on so we set finished to FALSE. */
-		if (!rule_finished)
-			finished = FALSE;
-
-		g_array_append_vals (occs, tmp_occs->data, tmp_occs->len);
-		g_array_free (tmp_occs, TRUE);
-	}
-
-	/* Add on specific occurrence dates, flag them as RDATEs, and store
-	   a pointer to the period in the rdate_periods array. */
-	for (elem = rdates; elem; elem = elem->next) {
-		CalComponentPeriod *p;
-		CalObjRecurrenceDate rdate;
-		time_t t;
-
-		p = elem->data;
-		t = icaltime_as_timet (p->start);
-		cal_object_time_from_time (&cotime, t);
-
-		/* If the rdate is after the current chunk we set finished
-		   to FALSE, and we skip it. */
-		if (cal_obj_time_compare_func (&cotime, chunk_end) >= 0) {
-			finished = FALSE;
-			continue;
-		}
-
-		/* Check if the end date or duration is set. If it is we need
-		   to store it so we can get it later. (libical seems to set
-		   second to -1 to denote an unset time. See icalvalue.c) */
-		if (p->type != CAL_COMPONENT_PERIOD_DATETIME
-		    || p->u.end.second != -1) {
-			cotime.is_rdate = TRUE;
-
-			rdate.start = cotime;
-			rdate.period = p;
-			g_array_append_val (rdate_periods, rdate);
-		}
-
-		g_array_append_val (occs, cotime);
-	}
-
-	/* Expand each of the exception rules. */
-	for (elem = exrules; elem; elem = elem->next) {
-		icalproperty *prop;
-		CalRecurrence *r;
-
-		prop = elem->data;
-		r = cal_recur_from_icalproperty (prop, FALSE);
-
-		tmp_occs = cal_obj_expand_recurrence (event_start, r,
-						      chunk_start,
-						      chunk_end,
-						      &rule_finished);
-		cal_recur_free (r);
-
-		g_array_append_vals (ex_occs, tmp_occs->data, tmp_occs->len);
-		g_array_free (tmp_occs, TRUE);
-	}
-
-	/* Add on specific exception dates. */
-	for (elem = exdates; elem; elem = elem->next) {
-		struct icaltimetype *it;
-		time_t t;
-
-		/* FIXME we should only be dealing with dates, not times too.
-
-		   No, I think it is supposed to be dates & times - Damon.
-		   I'm not sure what the semantics of just a date would be,
-		   since the event could recur several times each day. */
-		it = elem->data;
-		t = icaltime_as_timet (*it);
-		cal_object_time_from_time (&cotime, t);
-
-		g_array_append_val (ex_occs, cotime);
-	}
-
-
-	/* Sort all the arrays. */
-	cal_obj_sort_occurrences (occs);
-	cal_obj_sort_occurrences (ex_occs);
-
-	qsort (rdate_periods->data, rdate_periods->len,
-	       sizeof (CalObjRecurrenceDate), cal_obj_time_compare_func);
-
-	/* Create the final array, by removing the exceptions from the
-	   occurrences, and removing any duplicates. */
-	cal_obj_remove_exceptions (occs, ex_occs);
-
-	/* Call the callback for each occurrence. If it returns 0 we break
-	   out of the loop. */
-	for (i = 0; i < occs->len; i++) {
-		/* Convert each CalObjTime into a start & end time_t, and
-		   check it is within the bounds of the event & interval. */
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		start_tm.tm_year  = occ->year - 1900;
-		start_tm.tm_mon   = occ->month;
-		start_tm.tm_mday  = occ->day;
-		start_tm.tm_hour  = occ->hour;
-		start_tm.tm_min   = occ->minute;
-		start_tm.tm_sec   = occ->second;
-		start_tm.tm_isdst = -1;
-		start_time = mktime (&start_tm);
-
-		if (start_time == -1) {
-			g_warning ("mktime failed - time_t out of range?");
-			finished = TRUE;
-			break;
-		}
-
-		if (start_time < comp_dtstart
-		    || (interval_end_time != -1
-			&& start_time >= interval_end_time))
-			continue;
-
-		if (occ->is_rdate) {
-			if (!cal_object_get_rdate_end (occ, rdate_periods)) {
-				cal_obj_time_add_days (occ, duration_days);
-				cal_obj_time_add_seconds (occ,
-							  duration_seconds);
-			}
-		} else {
-			cal_obj_time_add_days (occ, duration_days);
-			cal_obj_time_add_seconds (occ, duration_seconds);
-		}
-
-		end_tm.tm_year  = occ->year - 1900;
-		end_tm.tm_mon   = occ->month;
-		end_tm.tm_mday  = occ->day;
-		end_tm.tm_hour  = occ->hour;
-		end_tm.tm_min   = occ->minute;
-		end_tm.tm_sec   = occ->second;
-		end_tm.tm_isdst = -1;
-		end_time = mktime (&end_tm);
-
-		if (end_time == -1) {
-			g_warning ("mktime failed - time_t out of range?");
-			finished = TRUE;
-			break;
-		}
-
-		if (end_time < interval_start_time)
-			continue;
-
-		cb_status = (*cb) (comp, start_time, end_time, cb_data);
-		if (!cb_status)
-			break;
-	}
-
-	g_array_free (occs, TRUE);
-	g_array_free (ex_occs, TRUE);
-	g_array_free (rdate_periods, TRUE);
-
-	/* We return TRUE (i.e. carry on) only if the callback has always
-	   returned TRUE and we know that we have more occurrences to generate
-	   (i.e. finished is FALSE). */
-	return cb_status && !finished;
-}
-
-
-/* This looks up the occurrence time in the sorted rdate_periods array, and
-   tries to compute the end time of the occurrence. If no end time or duration
-   is set it returns FALSE and the default duration will be used. */
-static gboolean
-cal_object_get_rdate_end	(CalObjTime	*occ,
-				 GArray		*rdate_periods)
-{
-	CalObjRecurrenceDate *rdate;
-	CalComponentPeriod *p;
-	gint lower, upper, middle, cmp = 0;
-	time_t t;
-
-	lower = 0;
-	upper = rdate_periods->len;
-
-	while (lower < upper) {
-		middle = (lower + upper) >> 1;
-	  
-		rdate = &g_array_index (rdate_periods, CalObjRecurrenceDate,
-					middle);
-
-		cmp = cal_obj_time_compare_func (occ, &rdate->start);
-	  
-		if (cmp == 0)
-			break;
-		else if (cmp < 0)
-			upper = middle;
-		else
-			lower = middle + 1;
-	}
-
-	/* This should never happen. */
-	if (cmp == 0) {
-		g_warning ("Recurrence date not found");
-		return FALSE;
-	}
-
-	p = rdate->period;
-	if (p->type == CAL_COMPONENT_PERIOD_DATETIME) {
-		t = icaltime_as_timet (p->u.end);
-		cal_object_time_from_time (occ, t);
-	} else {
-		cal_obj_time_add_days (occ, p->u.duration.weeks * 7
-				       + p->u.duration.days);
-		cal_obj_time_add_hours (occ, p->u.duration.hours);
-		cal_obj_time_add_minutes (occ, p->u.duration.minutes);
-		cal_obj_time_add_seconds (occ, p->u.duration.seconds);
-	}
-
-	return TRUE;
-}
-
-
-static void
-cal_object_compute_duration (CalObjTime *start,
-			     CalObjTime *end,
-			     gint	*days,
-			     gint	*seconds)
-{
-	GDate start_date, end_date;
-	gint start_seconds, end_seconds;
-
-	g_date_clear (&start_date, 1);
-	g_date_clear (&end_date, 1);
-	g_date_set_dmy (&start_date, start->day, start->month + 1,
-			start->year);
-	g_date_set_dmy (&end_date, end->day, end->month + 1,
-			end->year);
-
-	*days = g_date_julian (&end_date) - g_date_julian (&start_date);
-	start_seconds = start->hour * 3600 + start->minute * 60
-		+ start->second;
-	end_seconds = end->hour * 3600 + end->minute * 60 + end->second;
-
-	*seconds = end_seconds - start_seconds;
-	if (*seconds < 0) {
-		*days = *days - 1;
-		*seconds += 24 * 60 * 60;
-	}
-}
-
-
-/* Returns an unsorted GArray of CalObjTime's resulting from expanding the
-   given recurrence rule within the given interval. Note that it doesn't
-   clip the generated occurrences to the interval, i.e. if the interval
-   starts part way through the year this function still returns all the
-   occurrences for the year. Clipping is done later.
-   The finished flag is set to FALSE if there are more occurrences to generate
-   after the given interval.*/
-static GArray*
-cal_obj_expand_recurrence		(CalObjTime	  *event_start,
-					 CalRecurrence	  *recur,
-					 CalObjTime	  *interval_start,
-					 CalObjTime	  *interval_end,
-					 gboolean	  *finished)
-{
-	CalRecurVTable *vtable;
-	CalObjTime *event_end = NULL, event_end_cotime;
-	RecurData recur_data;
-	CalObjTime occ, *cotime;
-	GArray *all_occs, *occs;
-	gint len;
-
-	/* This is the resulting array of CalObjTime elements. */
-	all_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	*finished = TRUE;
-
-	vtable = cal_obj_get_vtable (recur->freq);
-	if (!vtable)
-		return all_occs;
-
-	/* Calculate some useful data such as some fast lookup tables. */
-	cal_obj_initialize_recur_data (&recur_data, recur, event_start);
-
-	/* Compute the event_end, if the recur's enddate is set. */
-	if (recur->enddate > 0) {
-		cal_object_time_from_time (&event_end_cotime,
-					   recur->enddate);
-		event_end = &event_end_cotime;
-
-		/* If the enddate is before the requested interval return. */
-		if (cal_obj_time_compare_func (event_end, interval_start) < 0)
-			return all_occs;
-	}
-
-	/* Set finished to FALSE if we know there will be more occurrences to
-	   do after this interval. */
-	if (!interval_end || !event_end
-	    || cal_obj_time_compare_func (event_end, interval_end) > 0)
-		*finished = FALSE;
-
-	/* Get the first period based on the frequency and the interval that
-	   intersects the interval between start and end. */
-	if ((*vtable->find_start_position) (event_start, event_end,
-					    &recur_data,
-					    interval_start, interval_end,
-					    &occ))
-		return all_occs;
-
-	/* Loop until the event ends or we go past the end of the required
-	   interval. */
-	for (;;) {
-		/* Generate the set of occurrences for this period. */
-		switch (recur->freq) {
-		case ICAL_YEARLY_RECURRENCE:
-			occs = cal_obj_generate_set_yearly (&recur_data,
-							    vtable, &occ);
-			break;
-		case ICAL_MONTHLY_RECURRENCE:
-			occs = cal_obj_generate_set_monthly (&recur_data,
-							     vtable, &occ);
-			break;
-		default:
-			occs = cal_obj_generate_set_default (&recur_data,
-							     vtable, &occ);
-			break;
-		}
-
-		/* Sort the occurrences and remove duplicates. */
-		cal_obj_sort_occurrences (occs);
-		cal_obj_remove_duplicates_and_invalid_dates (occs);
-
-		/* Apply the BYSETPOS property. */
-		occs = cal_obj_bysetpos_filter (recur, occs);
-
-		/* Remove any occs after event_end. */
-		len = occs->len - 1;
-		if (event_end) {
-			while (len >= 0) {
-				cotime = &g_array_index (occs, CalObjTime,
-							 len);
-				if (cal_obj_time_compare_func (cotime,
-							       event_end) <= 0)
-					break;
-				len--;
-			}
-		}
-
-		/* Add the occurrences onto the main array. */
-		if (len >= 0)
-			g_array_append_vals (all_occs, occs->data, len + 1);
-
- 		g_array_free (occs, TRUE);
-
-		/* Skip to the next period, or exit the loop if finished. */
-		if ((*vtable->find_next_position) (&occ, event_end,
-						   &recur_data, interval_end))
-			break;
-	}
-
-	return all_occs;
-}
-
-
-static GArray*
-cal_obj_generate_set_yearly	(RecurData *recur_data,
-				 CalRecurVTable *vtable,
-				 CalObjTime *occ)
-{
-	CalRecurrence *recur = recur_data->recur;
-	GArray *occs_arrays[4], *occs, *occs2;
-	gint num_occs_arrays = 0, i;
-
-	/* This is a bit complicated, since the iCalendar spec says that
-	   several BYxxx modifiers can be used simultaneously. So we have to
-	   be quite careful when determining the days of the occurrences.
-	   The BYHOUR, BYMINUTE & BYSECOND modifiers are no problem at all.
-
-	   The modifiers we have to worry about are: BYMONTH, BYWEEKNO,
-	   BYYEARDAY, BYMONTHDAY & BYDAY. We can't do these sequentially
-	   since each filter will mess up the results of the previous one.
-	   But they aren't all completely independant, e.g. BYMONTHDAY and
-	   BYDAY are related to BYMONTH, and BYDAY is related to BYWEEKNO.
-
-	   BYDAY & BYMONTHDAY can also be applied independently, which makes
-	   it worse. So we assume that if BYMONTH or BYWEEKNO is used, then
-	   the BYDAY modifier applies to those, else it is applied
-	   independantly.
-
-	   We expand the occurrences in parallel into the occs_arrays[] array,
-	   and then merge them all into one GArray before expanding BYHOUR,
-	   BYMINUTE & BYSECOND. */
-
-	if (recur->bymonth) {
-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs, occ, 1);
-
-		occs = (*vtable->bymonth_filter) (recur_data, occs);
-
-		/* If BYMONTHDAY & BYDAY are both set we need to expand them
-		   in parallel and add the results. */
-		if (recur->bymonthday && recur->byday) {
-			/* Copy the occs array. */
-			occs2 = g_array_new (FALSE, FALSE,
-					     sizeof (CalObjTime));
-			g_array_append_vals (occs2, occs->data, occs->len);
-
-			occs = (*vtable->bymonthday_filter) (recur_data, occs);
-			/* Note that we explicitly call the monthly version
-			   of the BYDAY expansion filter. */
-			occs2 = cal_obj_byday_expand_monthly (recur_data,
-							      occs2);
-
-			/* Add the 2 resulting arrays together. */
-			g_array_append_vals (occs, occs2->data, occs2->len);
-			g_array_free (occs2, TRUE);
-		} else {
-			occs = (*vtable->bymonthday_filter) (recur_data, occs);
-			/* Note that we explicitly call the monthly version
-			   of the BYDAY expansion filter. */
-			occs = cal_obj_byday_expand_monthly (recur_data, occs);
-		}
-
-		occs_arrays[num_occs_arrays++] = occs;
-	}
-
-	if (recur->byweekno) {
-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs, occ, 1);
-
-		occs = (*vtable->byweekno_filter) (recur_data, occs);
-		/* Note that we explicitly call the weekly version of the
-		   BYDAY expansion filter. */
-		occs = cal_obj_byday_expand_weekly (recur_data, occs);
-
-		occs_arrays[num_occs_arrays++] = occs;
-	}
-
-	if (recur->byyearday) {
-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs, occ, 1);
-
-		occs = (*vtable->byyearday_filter) (recur_data, occs);
-
-		occs_arrays[num_occs_arrays++] = occs;
-	}
-
-	/* If BYMONTHDAY is set, and BYMONTH is not set, we need to
-	   expand BYMONTHDAY independantly. */
-	if (recur->bymonthday && !recur->bymonth) {
-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs, occ, 1);
-
-		occs = (*vtable->bymonthday_filter) (recur_data, occs);
-
-		occs_arrays[num_occs_arrays++] = occs;
-	}
-
-	/* If BYDAY is set, and BYMONTH and BYWEEKNO are not set, we need to
-	   expand BYDAY independantly. */
-	if (recur->byday && !recur->bymonth && !recur->byweekno) {
-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs, occ, 1);
-
-		occs = (*vtable->byday_filter) (recur_data, occs);
-
-		occs_arrays[num_occs_arrays++] = occs;
-	}
-
-	/* Add all the arrays together. If no filters were used we just
-	   create an array with one element. */
-	if (num_occs_arrays > 0) {
-		occs = occs_arrays[0];
-		for (i = 1; i < num_occs_arrays; i++) {
-			occs2 = occs_arrays[i];
-			g_array_append_vals (occs, occs2->data, occs2->len);
-			g_array_free (occs2, TRUE);
-		}
-	} else {
-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs, occ, 1);
-	}
-
-	/* Now expand BYHOUR, BYMINUTE & BYSECOND. */
-	occs = (*vtable->byhour_filter) (recur_data, occs);
-	occs = (*vtable->byminute_filter) (recur_data, occs);
-	occs = (*vtable->bysecond_filter) (recur_data, occs);
-
-	return occs;
-}
-
-
-static GArray*
-cal_obj_generate_set_monthly	(RecurData *recur_data,
-				 CalRecurVTable *vtable,
-				 CalObjTime *occ)
-{
-	GArray *occs, *occs2;
-
-	/* We start with just the one time in each set. */
-	occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-	g_array_append_vals (occs, occ, 1);
-
-	occs = (*vtable->bymonth_filter) (recur_data, occs);
-
-	/* We need to combine the output of BYMONTHDAY & BYDAY, by doing them
-	   in parallel rather than sequentially. If we did them sequentially
-	   then we would lose the occurrences generated by BYMONTHDAY, and
-	   instead have repetitions of the occurrences from BYDAY. */
-	if (recur_data->recur->bymonthday && recur_data->recur->byday) {
-		occs2 = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-		g_array_append_vals (occs2, occs->data, occs->len);
-
-		occs = (*vtable->bymonthday_filter) (recur_data, occs);
-		occs2 = (*vtable->byday_filter) (recur_data, occs2);
-
-		g_array_append_vals (occs, occs2->data, occs2->len);
-		g_array_free (occs2, TRUE);
-	} else {
-		occs = (*vtable->bymonthday_filter) (recur_data, occs);
-		occs = (*vtable->byday_filter) (recur_data, occs);
-	}
-
-	occs = (*vtable->byhour_filter) (recur_data, occs);
-	occs = (*vtable->byminute_filter) (recur_data, occs);
-	occs = (*vtable->bysecond_filter) (recur_data, occs);
-
-	return occs;
-}
-
-
-static GArray*
-cal_obj_generate_set_default	(RecurData *recur_data,
-				 CalRecurVTable *vtable,
-				 CalObjTime *occ)
-{
-	GArray *occs;
-
-#if 0
-	g_print ("Generating set for %i/%i/%i %02i:%02i:%02i\n",
-		 occ->day, occ->month + 1, occ->year, occ->hour, occ->minute,
-		 occ->second);
-#endif
-
-	/* We start with just the one time in the set. */
-	occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-	g_array_append_vals (occs, occ, 1);
-
-	occs = (*vtable->bymonth_filter) (recur_data, occs);
-	if (vtable->byweekno_filter)
-		occs = (*vtable->byweekno_filter) (recur_data, occs);
-	if (vtable->byyearday_filter)
-		occs = (*vtable->byyearday_filter) (recur_data, occs);
-	if (vtable->bymonthday_filter)
-		occs = (*vtable->bymonthday_filter) (recur_data, occs);
-	occs = (*vtable->byday_filter) (recur_data, occs);
-
-	occs = (*vtable->byhour_filter) (recur_data, occs);
-	occs = (*vtable->byminute_filter) (recur_data, occs);
-	occs = (*vtable->bysecond_filter) (recur_data, occs);
-
-	return occs;
-}
-
-
-
-/* Returns the function table corresponding to the recurrence frequency. */
-static CalRecurVTable* cal_obj_get_vtable (icalrecurrencetype_frequency recur_type)
-{
-	CalRecurVTable* vtable;
-
-	switch (recur_type) {
-	case ICAL_YEARLY_RECURRENCE:
-		vtable = &cal_obj_yearly_vtable;
-		break;
-	case ICAL_MONTHLY_RECURRENCE:
-		vtable = &cal_obj_monthly_vtable;
-		break;
-	case ICAL_WEEKLY_RECURRENCE:
-		vtable = &cal_obj_weekly_vtable;
-		break;
-	case ICAL_DAILY_RECURRENCE:
-		vtable = &cal_obj_daily_vtable;
-		break;
-	case ICAL_HOURLY_RECURRENCE:
-		vtable = &cal_obj_hourly_vtable;
-		break;
-	case ICAL_MINUTELY_RECURRENCE:
-		vtable = &cal_obj_minutely_vtable;
-		break;
-	case ICAL_SECONDLY_RECURRENCE:
-		vtable = &cal_obj_secondly_vtable;
-		break;
-	default:
-		g_warning ("Unknown recurrence frequenct");
-		vtable = NULL;
-	}
-
-	return vtable;
-}
-
-
-/* This creates a number of fast lookup tables used when filtering with the
-   modifier properties BYMONTH, BYYEARDAY etc. */
-static void
-cal_obj_initialize_recur_data (RecurData  *recur_data,
-			       CalRecurrence *recur,
-			       CalObjTime *event_start)
-{
-	GList *elem;
-	gint month, yearday, monthday, weekday, week_num, hour, minute, second;
-
-	/* Clear the entire RecurData. */
-	memset (recur_data, 0, sizeof (RecurData));
-
-	recur_data->recur = recur;
-
-	/* Set the weekday, used for the WEEKLY frequency and the BYWEEKNO
-	   modifier. */
-	recur_data->weekday = cal_obj_time_weekday (event_start, recur);
-
-	/* Create an array of months from bymonths for fast lookup. */
-	elem = recur->bymonth;
-	while (elem) {
-		month = GPOINTER_TO_INT (elem->data);
-		recur_data->months[month] = 1;
-		elem = elem->next;
-	}
-
-	/* Create an array of yeardays from byyearday for fast lookup.
-	   We create a second array to handle the negative values. The first
-	   element there corresponds to the last day of the year. */
-	elem = recur->byyearday;
-	while (elem) {
-		yearday = GPOINTER_TO_INT (elem->data);
-		if (yearday >= 0)
-			recur_data->yeardays[yearday] = 1;
-		else
-			recur_data->neg_yeardays[-yearday] = 1;
-		elem = elem->next;
-	}
-
-	/* Create an array of monthdays from bymonthday for fast lookup.
-	   We create a second array to handle the negative values. The first
-	   element there corresponds to the last day of the month. */
-	elem = recur->bymonthday;
-	while (elem) {
-		monthday = GPOINTER_TO_INT (elem->data);
-		if (monthday >= 0)
-			recur_data->monthdays[monthday] = 1;
-		else
-			recur_data->neg_monthdays[-monthday] = 1;
-		elem = elem->next;
-	}
-
-	/* Create an array of weekdays from byday for fast lookup. */
-	elem = recur->byday;
-	while (elem) {
-		weekday = GPOINTER_TO_INT (elem->data);
-		elem = elem->next;
-		/* The week number is not used when filtering. */
-		week_num = GPOINTER_TO_INT (elem->data);
-		elem = elem->next;
-
-		recur_data->weekdays[weekday] = 1;
-	}
-
-	/* Create an array of hours from byhour for fast lookup. */
-	elem = recur->byhour;
-	while (elem) {
-		hour = GPOINTER_TO_INT (elem->data);
-		recur_data->hours[hour] = 1;
-		elem = elem->next;
-	}
-
-	/* Create an array of minutes from byminutes for fast lookup. */
-	elem = recur->byminute;
-	while (elem) {
-		minute = GPOINTER_TO_INT (elem->data);
-		recur_data->minutes[minute] = 1;
-		elem = elem->next;
-	}
-
-	/* Create an array of seconds from byseconds for fast lookup. */
-	elem = recur->bysecond;
-	while (elem) {
-		second = GPOINTER_TO_INT (elem->data);
-		recur_data->seconds[second] = 1;
-		elem = elem->next;
-	}
-}
-
-
-static void
-cal_obj_sort_occurrences (GArray *occs)
-{
-	qsort (occs->data, occs->len, sizeof (CalObjTime),
-	       cal_obj_time_compare_func);
-}
-
-
-static void
-cal_obj_remove_duplicates_and_invalid_dates (GArray *occs)
-{
-	static const int days_in_month[12] = {
-		31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-	};
-
-	CalObjTime *occ, *prev_occ = NULL;
-	gint len, i, j = 0, year, month, days;
-	gboolean keep_occ;
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		keep_occ = TRUE;
-
-		if (prev_occ && cal_obj_time_compare_func (occ,
-							   prev_occ) == 0)
-			keep_occ = FALSE;
-
-		year = occ->year;
-		month = occ->month;
-		days = days_in_month[occ->month];
-		/* If it is february and a leap year, add a day. */
-		if (month == 1 && (year % 4 == 0
-				   && (year % 100 != 0
-				       || year % 400 == 0)))
-			days++;
-		if (occ->day > days)
-			keep_occ = FALSE;
-
-		if (keep_occ) {
-			if (i != j)
-				g_array_index (occs, CalObjTime, j)
-					= g_array_index (occs, CalObjTime, i);
-			j++;
-		}
-
-		prev_occ = occ;
-	}
-
-	g_array_set_size (occs, j);
-}
-
-
-/* Removes the exceptions from the ex_occs array from the occurrences in the
-   occs array, and removes any duplicates. Both arrays are sorted. */
-static void
-cal_obj_remove_exceptions (GArray *occs,
-			   GArray *ex_occs)
-{
-	CalObjTime *occ, *prev_occ = NULL, *ex_occ = NULL, *last_occ_kept;
-	gint i, j = 0, cmp, ex_index, occs_len, ex_occs_len;
-	gboolean keep_occ, current_time_is_exception = FALSE;
-
-	if (occs->len == 0)
-		return;
-
-	ex_index = 0;
-	occs_len = occs->len;
-	ex_occs_len = ex_occs->len;
-
-	if (ex_occs_len > 0)
-		ex_occ = &g_array_index (ex_occs, CalObjTime, ex_index);
-
-	for (i = 0; i < occs_len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		keep_occ = TRUE;
-
-		/* If the occurrence is a duplicate of the previous one, skip
-		   it. */
-		if (prev_occ
-		    && cal_obj_time_compare_func (occ, prev_occ) == 0) {
-			keep_occ = FALSE;
-
-			/* If this occurrence is an RDATE, and the previous
-			   occurrence in the array was kept, set the RDATE flag
-			   of the last one, so we still use the end date
-			   or duration. */
-			if (occ->is_rdate && !current_time_is_exception) {
-				last_occ_kept = &g_array_index (occs,
-								CalObjTime,
-								j - 1);
-				last_occ_kept->is_rdate = TRUE;
-			}
-		} else {
-			/* We've found a new occurrence time. Reset the flag
-			   to indicate that it hasn't been found in the
-			   exceptions array (yet). */
-			current_time_is_exception = FALSE;
-
-			if (ex_occ) {
-				/* Step through the exceptions until we come
-				   to one that matches or follows this
-				   occurrence. */
-				while (ex_occ) {
-					cmp = cal_obj_time_compare_func (ex_occ, occ);
-					/* I'm pretty sure this is wrong. */
-					/*cmp = cal_obj_date_only_compare_func (ex_occ, occ);*/
-					if (cmp > 0)
-						break;
-
-					/* Move to the next exception, or set
-					   ex_occ to NULL when we reach the
-					   end of array. */
-					ex_index++;
-					if (ex_index < ex_occs_len)
-						ex_occ = &g_array_index (ex_occs, CalObjTime, ex_index);
-					else
-						ex_occ = NULL;
-
-					/* If the exception did match this
-					   occurrence we remove it, and set the
-					   flag to indicate that the current
-					   time is an exception. */
-					if (cmp == 0) {
-						current_time_is_exception = TRUE;
-						keep_occ = FALSE;
-						break;
-					}
-				}
-			}
-		}
-
-		if (keep_occ) {
-			if (i != j)
-				g_array_index (occs, CalObjTime, j)
-					= g_array_index (occs, CalObjTime, i);
-			j++;
-		}
-
-		prev_occ = occ;
-	}
-
-	g_array_set_size (occs, j);
-}
-
-
-
-static GArray*
-cal_obj_bysetpos_filter (CalRecurrence *recur,
-			 GArray	    *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, pos;
-
-	/* If BYSETPOS has not been specified, or the array is empty, just
-	   return the array. */
-	elem = recur->bysetpos;
-	if (!elem || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	/* Iterate over the indices given in bysetpos, adding the corresponding
-	   element from occs to new_occs. */
-	len = occs->len;
-	while (elem) {
-		pos = GPOINTER_TO_INT (elem->data);
-
-		/* Negative values count back from the end of the array. */
-		if (pos < 0)
-			pos += len;
-
-		if (pos >= 0 && pos < len) {
-			occ = &g_array_index (occs, CalObjTime, pos);
-			g_array_append_vals (new_occs, occ, 1);
-		}
-		elem = elem->next;
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-
-/* Finds the first year from the event_start, counting in multiples of the
-   recurrence interval, that intersects the given interval. It returns TRUE
-   if there is no intersection. */
-static gboolean
-cal_obj_yearly_find_start_position (CalObjTime *event_start,
-				    CalObjTime *event_end,
-				    RecurData  *recur_data,
-				    CalObjTime *interval_start,
-				    CalObjTime *interval_end,
-				    CalObjTime *cotime)
-{
-	*cotime = *event_start;
-
-	/* Move on to the next interval, if the event starts before the
-	   given interval. */
-	if (cotime->year < interval_start->year) {
-		gint years = interval_start->year - cotime->year
-			+ recur_data->recur->interval - 1;
-		years -= years % recur_data->recur->interval;
-		/* NOTE: The day may now be invalid, e.g. 29th Feb. */
-		cotime->year += years;
-	}
-
-	if ((event_end && cotime->year > event_end->year)
-	    || (interval_end && cotime->year > interval_end->year))
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_yearly_find_next_position (CalObjTime *cotime,
-				   CalObjTime *event_end,
-				   RecurData  *recur_data,
-				   CalObjTime *interval_end)
-{
-	/* NOTE: The day may now be invalid, e.g. 29th Feb. */
-	cotime->year += recur_data->recur->interval;
-
-	if ((event_end && cotime->year > event_end->year)
-	    || (interval_end && cotime->year > interval_end->year))
-		return TRUE;
-
-	return FALSE;
-}
-
-
-
-static gboolean
-cal_obj_monthly_find_start_position (CalObjTime *event_start,
-				     CalObjTime *event_end,
-				     RecurData  *recur_data,
-				     CalObjTime *interval_start,
-				     CalObjTime *interval_end,
-				     CalObjTime *cotime)
-{
-	*cotime = *event_start;
-
-	/* Move on to the next interval, if the event starts before the
-	   given interval. */
-	if (cal_obj_time_compare (cotime, interval_start, CALOBJ_MONTH) < 0) {
-		gint months = (interval_start->year - cotime->year) * 12
-			+ interval_start->month - cotime->month
-			+ recur_data->recur->interval - 1;
-		months -= months % recur_data->recur->interval;
-		/* NOTE: The day may now be invalid, e.g. 31st Sep. */
-		cal_obj_time_add_months (cotime, months);
-	}
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_MONTH) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_MONTH) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_monthly_find_next_position (CalObjTime *cotime,
-				    CalObjTime *event_end,
-				    RecurData  *recur_data,
-				    CalObjTime *interval_end)
-{
-	/* NOTE: The day may now be invalid, e.g. 31st Sep. */
-	cal_obj_time_add_months (cotime, recur_data->recur->interval);
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_MONTH) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_MONTH) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-
-static gboolean
-cal_obj_weekly_find_start_position (CalObjTime *event_start,
-				    CalObjTime *event_end,
-				    RecurData  *recur_data,
-				    CalObjTime *interval_start,
-				    CalObjTime *interval_end,
-				    CalObjTime *cotime)
-{
-	GDate event_start_date, interval_start_date;
-	guint32 event_start_julian, interval_start_julian;
-	gint interval_start_weekday;
-	CalObjTime week_start;
-
-	if (event_end && cal_obj_time_compare (event_end, interval_start,
-					       CALOBJ_DAY) < 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (event_start, interval_end,
-						  CALOBJ_DAY) > 0)
-		return TRUE;
-
-	*cotime = *event_start;
-
-	/* Convert the event start and interval start to GDates, so we can
-	   easily find the number of days between them. */
-	g_date_clear (&event_start_date, 1);
-	g_date_set_dmy (&event_start_date, event_start->day,
-			event_start->month + 1, event_start->year);
-	g_date_clear (&interval_start_date, 1);
-	g_date_set_dmy (&interval_start_date, interval_start->day,
-			interval_start->month + 1, interval_start->year);
-
-	/* Calculate the start of the weeks corresponding to the event start
-	   and interval start. */
-	event_start_julian = g_date_julian (&event_start_date);
-	event_start_julian -= recur_data->weekday;
-
-	interval_start_julian = g_date_julian (&interval_start_date);
-	interval_start_weekday = cal_obj_time_weekday (interval_start,
-						       recur_data->recur);
-	interval_start_julian -= interval_start_weekday;
-
-	/* We want to find the first full week using the recurrence interval
-	   that intersects the given interval dates. */
-	if (event_start_julian < interval_start_julian) {
-		gint weeks = (interval_start_julian - event_start_julian) / 7;
-		weeks += recur_data->recur->interval - 1;
-		weeks -= weeks % recur_data->recur->interval;
-		cal_obj_time_add_days (cotime, weeks * 7);
-	}
-
-	week_start = *cotime;
-	cal_obj_time_add_days (&week_start, -recur_data->weekday);
-
-	if (event_end && cal_obj_time_compare (&week_start, event_end,
-					       CALOBJ_DAY) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (&week_start, interval_end,
-						  CALOBJ_DAY) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_weekly_find_next_position (CalObjTime *cotime,
-				   CalObjTime *event_end,
-				   RecurData  *recur_data,
-				   CalObjTime *interval_end)
-{
-	CalObjTime week_start;
-
-	cal_obj_time_add_days (cotime, recur_data->recur->interval * 7);
-
-	/* Return TRUE if the start of this week is after the event finishes
-	   or is after the end of the required interval. */
-	week_start = *cotime;
-	cal_obj_time_add_days (&week_start, -recur_data->weekday);
-
-	if (event_end && cal_obj_time_compare (&week_start, event_end,
-					       CALOBJ_DAY) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (&week_start, interval_end,
-						  CALOBJ_DAY) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_daily_find_start_position  (CalObjTime *event_start,
-				    CalObjTime *event_end,
-				    RecurData  *recur_data,
-				    CalObjTime *interval_start,
-				    CalObjTime *interval_end,
-				    CalObjTime *cotime)
-{
-	GDate event_start_date, interval_start_date;
-	guint32 event_start_julian, interval_start_julian, days;
-
-	if (interval_end && cal_obj_time_compare (event_start, interval_end,
-						  CALOBJ_DAY) > 0)
-		return TRUE;
-	if (event_end && cal_obj_time_compare (event_end, interval_start,
-					       CALOBJ_DAY) < 0)
-		return TRUE;
-
-	*cotime = *event_start;
-
-	/* Convert the event start and interval start to GDates, so we can
-	   easily find the number of days between them. */
-	g_date_clear (&event_start_date, 1);
-	g_date_set_dmy (&event_start_date, event_start->day,
-			event_start->month + 1, event_start->year);
-	g_date_clear (&interval_start_date, 1);
-	g_date_set_dmy (&interval_start_date, interval_start->day,
-			interval_start->month + 1, interval_start->year);
-
-	event_start_julian = g_date_julian (&event_start_date);
-	interval_start_julian = g_date_julian (&interval_start_date);
-
-	if (event_start_julian < interval_start_julian) {
-		days = interval_start_julian - event_start_julian
-			+ recur_data->recur->interval - 1;
-		days -= days % recur_data->recur->interval;
-		cal_obj_time_add_days (cotime, days);
-	}
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_DAY) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_DAY) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_daily_find_next_position  (CalObjTime *cotime,
-				   CalObjTime *event_end,
-				   RecurData  *recur_data,
-				   CalObjTime *interval_end)
-{
-	cal_obj_time_add_days (cotime, recur_data->recur->interval);
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_DAY) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_DAY) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_hourly_find_start_position (CalObjTime *event_start,
-				    CalObjTime *event_end,
-				    RecurData  *recur_data,
-				    CalObjTime *interval_start,
-				    CalObjTime *interval_end,
-				    CalObjTime *cotime)
-{
-	GDate event_start_date, interval_start_date;
-	guint32 event_start_julian, interval_start_julian, hours;
-
-	if (interval_end && cal_obj_time_compare (event_start, interval_end,
-						  CALOBJ_HOUR) > 0)
-		return TRUE;
-	if (event_end && cal_obj_time_compare (event_end, interval_start,
-					       CALOBJ_HOUR) < 0)
-		return TRUE;
-
-	*cotime = *event_start;
-
-	if (cal_obj_time_compare (event_start, interval_start,
-				  CALOBJ_HOUR) < 0) {
-		/* Convert the event start and interval start to GDates, so we
-		   can easily find the number of days between them. */
-		g_date_clear (&event_start_date, 1);
-		g_date_set_dmy (&event_start_date, event_start->day,
-				event_start->month + 1, event_start->year);
-		g_date_clear (&interval_start_date, 1);
-		g_date_set_dmy (&interval_start_date, interval_start->day,
-				interval_start->month + 1,
-				interval_start->year);
-
-		event_start_julian = g_date_julian (&event_start_date);
-		interval_start_julian = g_date_julian (&interval_start_date);
-
-		hours = (interval_start_julian - event_start_julian) * 24;
-		hours += interval_start->hour - event_start->hour;
-		hours += recur_data->recur->interval - 1;
-		hours -= hours % recur_data->recur->interval;
-		cal_obj_time_add_hours (cotime, hours);
-	}
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_HOUR) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_HOUR) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_hourly_find_next_position (CalObjTime *cotime,
-				   CalObjTime *event_end,
-				   RecurData  *recur_data,
-				   CalObjTime *interval_end)
-{
-	cal_obj_time_add_hours (cotime, recur_data->recur->interval);
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_HOUR) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_HOUR) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_minutely_find_start_position (CalObjTime *event_start,
-				      CalObjTime *event_end,
-				      RecurData  *recur_data,
-				      CalObjTime *interval_start,
-				      CalObjTime *interval_end,
-				      CalObjTime *cotime)
-{
-	GDate event_start_date, interval_start_date;
-	guint32 event_start_julian, interval_start_julian, minutes;
-
-	if (interval_end && cal_obj_time_compare (event_start, interval_end,
-						  CALOBJ_MINUTE) > 0)
-		return TRUE;
-	if (event_end && cal_obj_time_compare (event_end, interval_start,
-					       CALOBJ_MINUTE) < 0)
-		return TRUE;
-
-	*cotime = *event_start;
-
-	if (cal_obj_time_compare (event_start, interval_start,
-				  CALOBJ_MINUTE) < 0) {
-		/* Convert the event start and interval start to GDates, so we
-		   can easily find the number of days between them. */
-		g_date_clear (&event_start_date, 1);
-		g_date_set_dmy (&event_start_date, event_start->day,
-				event_start->month + 1, event_start->year);
-		g_date_clear (&interval_start_date, 1);
-		g_date_set_dmy (&interval_start_date, interval_start->day,
-				interval_start->month + 1,
-				interval_start->year);
-
-		event_start_julian = g_date_julian (&event_start_date);
-		interval_start_julian = g_date_julian (&interval_start_date);
-
-		minutes = (interval_start_julian - event_start_julian)
-			* 24 * 60;
-		minutes += (interval_start->hour - event_start->hour) * 24;
-		minutes += interval_start->minute - event_start->minute;
-		minutes += recur_data->recur->interval - 1;
-		minutes -= minutes % recur_data->recur->interval;
-		cal_obj_time_add_minutes (cotime, minutes);
-	}
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_MINUTE) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_MINUTE) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_minutely_find_next_position (CalObjTime *cotime,
-				     CalObjTime *event_end,
-				     RecurData  *recur_data,
-				     CalObjTime *interval_end)
-{
-	cal_obj_time_add_minutes (cotime, recur_data->recur->interval);
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_MINUTE) > 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_MINUTE) > 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_secondly_find_start_position (CalObjTime *event_start,
-				      CalObjTime *event_end,
-				      RecurData  *recur_data,
-				      CalObjTime *interval_start,
-				      CalObjTime *interval_end,
-				      CalObjTime *cotime)
-{
-	GDate event_start_date, interval_start_date;
-	guint32 event_start_julian, interval_start_julian, seconds;
-
-	if (interval_end && cal_obj_time_compare (event_start, interval_end,
-						  CALOBJ_SECOND) > 0)
-		return TRUE;
-	if (event_end && cal_obj_time_compare (event_end, interval_start,
-					       CALOBJ_SECOND) < 0)
-		return TRUE;
-
-	*cotime = *event_start;
-
-	if (cal_obj_time_compare (event_start, interval_start,
-				  CALOBJ_SECOND) < 0) {
-		/* Convert the event start and interval start to GDates, so we
-		   can easily find the number of days between them. */
-		g_date_clear (&event_start_date, 1);
-		g_date_set_dmy (&event_start_date, event_start->day,
-				event_start->month + 1, event_start->year);
-		g_date_clear (&interval_start_date, 1);
-		g_date_set_dmy (&interval_start_date, interval_start->day,
-				interval_start->month + 1,
-				interval_start->year);
-
-		event_start_julian = g_date_julian (&event_start_date);
-		interval_start_julian = g_date_julian (&interval_start_date);
-
-		seconds = (interval_start_julian - event_start_julian)
-			* 24 * 60 * 60;
-		seconds += (interval_start->hour - event_start->hour)
-			* 24 * 60;
-		seconds += (interval_start->minute - event_start->minute) * 60;
-		seconds += interval_start->second - event_start->second;
-		seconds += recur_data->recur->interval - 1;
-		seconds -= seconds % recur_data->recur->interval;
-		cal_obj_time_add_seconds (cotime, seconds);
-	}
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_SECOND) >= 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_SECOND) >= 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gboolean
-cal_obj_secondly_find_next_position (CalObjTime *cotime,
-				     CalObjTime *event_end,
-				     RecurData  *recur_data,
-				     CalObjTime *interval_end)
-{
-	cal_obj_time_add_seconds (cotime, recur_data->recur->interval);
-
-	if (event_end && cal_obj_time_compare (cotime, event_end,
-					       CALOBJ_SECOND) >= 0)
-		return TRUE;
-	if (interval_end && cal_obj_time_compare (cotime, interval_end,
-						  CALOBJ_SECOND) >= 0)
-		return TRUE;
-
-	return FALSE;
-}
-
-
-
-
-
-/* If the BYMONTH rule is specified it expands each occurrence in occs, by
-   using each of the months in the bymonth list. */
-static GArray*
-cal_obj_bymonth_expand		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i;
-
-	/* If BYMONTH has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->bymonth || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->bymonth;
-		while (elem) {
-			/* NOTE: The day may now be invalid, e.g. 31st Feb. */
-			occ->month = GPOINTER_TO_INT (elem->data);
-			g_array_append_vals (new_occs, occ, 1);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* If the BYMONTH rule is specified it filters out all occurrences in occs
-   which do not match one of the months in the bymonth list. */
-static GArray*
-cal_obj_bymonth_filter		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint len, i;
-
-	/* If BYMONTH has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->bymonth || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		if (recur_data->months[occ->month])
-			g_array_append_vals (new_occs, occ, 1);
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-static GArray*
-cal_obj_byweekno_expand		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ, year_start_cotime, year_end_cotime, cotime;
-	GList *elem;
-	gint len, i, weekno;
-
-	/* If BYWEEKNO has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byweekno || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		/* Find the day that would correspond to week 1 (note that
-		   week 1 is the first week starting from the specified week
-		   start day that has 4 days in the new year). */
-		year_start_cotime = *occ;
-		cal_obj_time_find_first_week (&year_start_cotime,
-					      recur_data);
-
-		/* Find the day that would correspond to week 1 of the next
-		   year, which we use for -ve week numbers. */
-		year_end_cotime = *occ;
-		year_end_cotime.year++;
-		cal_obj_time_find_first_week (&year_end_cotime,
-					      recur_data);
-
-		/* Now iterate over the week numbers in byweekno, generating a
-		   new occurrence for each one. */
-		elem = recur_data->recur->byweekno;
-		while (elem) {
-			weekno = GPOINTER_TO_INT (elem->data);
-			if (weekno > 0) {
-				cotime = year_start_cotime;
-				cal_obj_time_add_days (&cotime,
-						       (weekno - 1) * 7);
-			} else {
-				cotime = year_end_cotime;
-				cal_obj_time_add_days (&cotime, weekno * 7);
-			}
-
-			/* Skip occurrences if they fall outside the year. */
-			if (cotime.year == occ->year)
-				g_array_append_val (new_occs, cotime);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-#if 0
-/* This isn't used at present. */
-static GArray*
-cal_obj_byweekno_filter		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-
-	return occs;
-}
-#endif
-
-
-static GArray*
-cal_obj_byyearday_expand	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ, year_start_cotime, year_end_cotime, cotime;
-	GList *elem;
-	gint len, i, dayno;
-
-	/* If BYYEARDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byyearday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		/* Find the day that would correspond to day 1. */
-		year_start_cotime = *occ;
-		year_start_cotime.month = 0;
-		year_start_cotime.day = 1;
-
-		/* Find the day that would correspond to day 1 of the next
-		   year, which we use for -ve day numbers. */
-		year_end_cotime = *occ;
-		year_end_cotime.year++;
-		year_end_cotime.month = 0;
-		year_end_cotime.day = 1;
-
-		/* Now iterate over the day numbers in byyearday, generating a
-		   new occurrence for each one. */
-		elem = recur_data->recur->byyearday;
-		while (elem) {
-			dayno = GPOINTER_TO_INT (elem->data);
-			if (dayno > 0) {
-				cotime = year_start_cotime;
-				cal_obj_time_add_days (&cotime, dayno - 1);
-			} else {
-				cotime = year_end_cotime;
-				cal_obj_time_add_days (&cotime, dayno);
-			}
-
-			/* Skip occurrences if they fall outside the year. */
-			if (cotime.year == occ->year)
-				g_array_append_val (new_occs, cotime);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* Note: occs must not contain invalid dates, e.g. 31st September. */
-static GArray*
-cal_obj_byyearday_filter	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint yearday, len, i, days_in_year;
-
-	/* If BYYEARDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byyearday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		yearday = cal_obj_time_day_of_year (occ);
-		if (recur_data->yeardays[yearday]) {
-			g_array_append_vals (new_occs, occ, 1);
-		} else {
-			days_in_year = g_date_is_leap_year (occ->year)
-				? 366 : 365;
-			if (recur_data->neg_yeardays[days_in_year + 1
-						    - yearday])
-				g_array_append_vals (new_occs, occ, 1);
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-static GArray*
-cal_obj_bymonthday_expand	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ, month_start_cotime, month_end_cotime, cotime;
-	GList *elem;
-	gint len, i, dayno;
-
-	/* If BYMONTHDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->bymonthday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		/* Find the day that would correspond to day 1. */
-		month_start_cotime = *occ;
-		month_start_cotime.day = 1;
-
-		/* Find the day that would correspond to day 1 of the next
-		   month, which we use for -ve day numbers. */
-		month_end_cotime = *occ;
-		month_end_cotime.month++;
-		month_end_cotime.day = 1;
-
-		/* Now iterate over the day numbers in bymonthday, generating a
-		   new occurrence for each one. */
-		elem = recur_data->recur->bymonthday;
-		while (elem) {
-			dayno = GPOINTER_TO_INT (elem->data);
-			if (dayno > 0) {
-				cotime = month_start_cotime;
-				cal_obj_time_add_days (&cotime, dayno - 1);
-			} else {
-				cotime = month_end_cotime;
-				cal_obj_time_add_days (&cotime, dayno);
-			}
-
-			/* Skip occurrences if they fall outside the month. */
-			if (cotime.month == occ->month)
-				g_array_append_val (new_occs, cotime);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-static GArray*
-cal_obj_bymonthday_filter	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint len, i, days_in_month;
-
-	/* If BYMONTHDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->bymonthday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		if (recur_data->monthdays[occ->day]) {
-			g_array_append_vals (new_occs, occ, 1);
-		} else {
-			days_in_month = time_days_in_month (occ->year,
-							    occ->month);
-			if (recur_data->neg_monthdays[days_in_month + 1
-						     - occ->day])
-				g_array_append_vals (new_occs, occ, 1);
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-static GArray*
-cal_obj_byday_expand_yearly	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i, weekday, week_num;
-	gint first_weekday, last_weekday, offset;
-	guint16 year;
-
-	/* If BYDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->byday;
-		while (elem) {
-			weekday = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-			week_num = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-
-			year = occ->year;
-			if (week_num == 0) {
-				occ->month = 0;
-				occ->day = 1;
-				first_weekday = cal_obj_time_weekday (occ, recur_data->recur);
-				offset = (weekday + 7 - first_weekday) % 7;
-				cal_obj_time_add_days (occ, offset);
-
-				while (occ->year == year) {
-					g_array_append_vals (new_occs, occ, 1);
-					cal_obj_time_add_days (occ, 7);
-				}
-
-			} else if (week_num > 0) {
-				occ->month = 0;
-				occ->day = 1;
-				first_weekday = cal_obj_time_weekday (occ, recur_data->recur);
-				offset = (weekday + 7 - first_weekday) % 7;
-				offset += (week_num - 1) * 7;
-				cal_obj_time_add_days (occ, offset);
-				if (occ->year == year)
-					g_array_append_vals (new_occs, occ, 1);
-
-			} else {
-				occ->month = 11;
-				occ->day = 31;
-				last_weekday = cal_obj_time_weekday (occ, recur_data->recur);
-				offset = (last_weekday + 7 - weekday) % 7;
-				offset += (week_num - 1) * 7;
-				cal_obj_time_add_days (occ, -offset);
-				if (occ->year == year)
-					g_array_append_vals (new_occs, occ, 1);
-			}
-
-			/* Reset the year, as we may have gone past the end. */
-			occ->year = year;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-static GArray*
-cal_obj_byday_expand_monthly	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i, weekday, week_num;
-	gint first_weekday, last_weekday, offset;
-	guint16 year;
-	guint8 month;
-
-	/* If BYDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->byday;
-		while (elem) {
-			weekday = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-			week_num = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-
-			year = occ->year;
-			month = occ->month;
-			if (week_num == 0) {
-				occ->day = 1;
-				first_weekday = cal_obj_time_weekday (occ, recur_data->recur);
-				offset = (weekday + 7 - first_weekday) % 7;
-				cal_obj_time_add_days (occ, offset);
-
-				while (occ->year == year
-				       && occ->month == month) {
-					g_array_append_vals (new_occs, occ, 1);
-					cal_obj_time_add_days (occ, 7);
-				}
-
-			} else if (week_num > 0) {
-				occ->day = 1;
-				first_weekday = cal_obj_time_weekday (occ, recur_data->recur);
-				offset = (weekday + 7 - first_weekday) % 7;
-				offset += (week_num - 1) * 7;
-				cal_obj_time_add_days (occ, offset);
-				if (occ->year == year && occ->month == month)
-					g_array_append_vals (new_occs, occ, 1);
-
-			} else {
-				occ->day = time_days_in_month (occ->year,
-							       occ->month);
-				last_weekday = cal_obj_time_weekday (occ, recur_data->recur);
-				offset = (last_weekday + 7 - weekday) % 7;
-				offset += (week_num - 1) * 7;
-				cal_obj_time_add_days (occ, -offset);
-				if (occ->year == year && occ->month == month)
-					g_array_append_vals (new_occs, occ, 1);
-			}
-
-			/* Reset the year & month, as we may have gone past
-			   the end. */
-			occ->year = year;
-			occ->month = month;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* Note: occs must not contain invalid dates, e.g. 31st September. */
-static GArray*
-cal_obj_byday_expand_weekly	(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i, weekday, week_num;
-	gint current_weekday;
-	gint day_of_week, new_day_of_week, days_to_add;
-
-	/* If BYDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->byday;
-		while (elem) {
-			weekday = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-			week_num = GPOINTER_TO_INT (elem->data);
-			elem = elem->next;
-
-			current_weekday = cal_obj_time_weekday (occ, recur_data->recur);
-			day_of_week = (current_weekday + 7
-				       - recur_data->recur->week_start_day) % 7;
-			new_day_of_week = (weekday + 7
-					   - recur_data->recur->week_start_day) % 7;
-			days_to_add = new_day_of_week - day_of_week;
-			cal_obj_time_add_days (occ, days_to_add);
-			g_array_append_vals (new_occs, occ, 1);
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* Note: occs must not contain invalid dates, e.g. 31st September. */
-static GArray*
-cal_obj_byday_filter		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint len, i, weekday;
-
-	/* If BYDAY has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byday || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		weekday = cal_obj_time_weekday (occ, recur_data->recur);
-
-		/* See if the weekday on its own is set. */
-		if (recur_data->weekdays[weekday])
-			g_array_append_vals (new_occs, occ, 1);
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-/* If the BYHOUR rule is specified it expands each occurrence in occs, by
-   using each of the hours in the byhour list. */
-static GArray*
-cal_obj_byhour_expand		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i;
-
-	/* If BYHOUR has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byhour || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->byhour;
-		while (elem) {
-			occ->hour = GPOINTER_TO_INT (elem->data);
-			g_array_append_vals (new_occs, occ, 1);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* If the BYHOUR rule is specified it filters out all occurrences in occs
-   which do not match one of the hours in the byhour list. */
-static GArray*
-cal_obj_byhour_filter		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint len, i;
-
-	/* If BYHOUR has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byhour || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		if (recur_data->hours[occ->hour])
-			g_array_append_vals (new_occs, occ, 1);
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-/* If the BYMINUTE rule is specified it expands each occurrence in occs, by
-   using each of the minutes in the byminute list. */
-static GArray*
-cal_obj_byminute_expand		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i;
-
-	/* If BYMINUTE has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byminute || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->byminute;
-		while (elem) {
-			occ->minute = GPOINTER_TO_INT (elem->data);
-			g_array_append_vals (new_occs, occ, 1);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* If the BYMINUTE rule is specified it filters out all occurrences in occs
-   which do not match one of the minutes in the byminute list. */
-static GArray*
-cal_obj_byminute_filter		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint len, i;
-
-	/* If BYMINUTE has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->byminute || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		if (recur_data->minutes[occ->minute])
-			g_array_append_vals (new_occs, occ, 1);
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-/* If the BYSECOND rule is specified it expands each occurrence in occs, by
-   using each of the seconds in the bysecond list. */
-static GArray*
-cal_obj_bysecond_expand		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	GList *elem;
-	gint len, i;
-
-	/* If BYSECOND has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->bysecond || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-
-		elem = recur_data->recur->bysecond;
-		while (elem) {
-			occ->second = GPOINTER_TO_INT (elem->data);
-			g_array_append_vals (new_occs, occ, 1);
-			elem = elem->next;
-		}
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-/* If the BYSECOND rule is specified it filters out all occurrences in occs
-   which do not match one of the seconds in the bysecond list. */
-static GArray*
-cal_obj_bysecond_filter		(RecurData  *recur_data,
-				 GArray     *occs)
-{
-	GArray *new_occs;
-	CalObjTime *occ;
-	gint len, i;
-
-	/* If BYSECOND has not been specified, or the array is empty, just
-	   return the array. */
-	if (!recur_data->recur->bysecond || occs->len == 0)
-		return occs;
-
-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));
-
-	len = occs->len;
-	for (i = 0; i < len; i++) {
-		occ = &g_array_index (occs, CalObjTime, i);
-		if (recur_data->seconds[occ->second])
-			g_array_append_vals (new_occs, occ, 1);
-	}
-
-	g_array_free (occs, TRUE);
-
-	return new_occs;
-}
-
-
-
-
-
-/* Adds a positive number of months to the given CalObjTime, updating the year
-   appropriately so we end up with a valid month. Note that the day may be
-   invalid. */
-static void
-cal_obj_time_add_months		(CalObjTime *cotime,
-				 gint	     months)
-{
-	guint month;
-
-	/* We use a guint to avoid overflow on the guint8. */
-	month = cotime->month + months;
-	cotime->year += month / 12;
-	cotime->month = month % 12;
-}
-
-
-/* Adds a positive number of days to the given CalObjTime, updating the month
-   and year appropriately so we end up with a valid day. */
-static void
-cal_obj_time_add_days		(CalObjTime *cotime,
-				 gint	     days)
-{
-	guint day, days_in_month;
-
-	/* We use a guint to avoid overflow on the guint8. */
-	day = (guint) cotime->day;
-	day += days;
-
-	if (days >= 0) {
-		for (;;) {
-			days_in_month = time_days_in_month (cotime->year,
-							    cotime->month);
-			if (day <= days_in_month)
-				break;
-
-			cotime->month++;
-			if (cotime->month >= 12) {
-				cotime->year++;
-				cotime->month = 0;
-			}
-
-			day -= days_in_month;
-		}
-
-		cotime->day = (guint8) day;
-	} else {
-		while (day <= 0) {
-			if (cotime->month == 0) {
-				cotime->year--;
-				cotime->month = 11;
-			} else {
-				cotime->month--;
-			}
-
-			days_in_month = time_days_in_month (cotime->year,
-							    cotime->month);
-
-			day += days_in_month;
-		}
-
-		cotime->day = (guint8) day;
-	}
-}
-
-
-/* Adds a positive number of hours to the given CalObjTime, updating the day,
-   month & year appropriately so we end up with a valid time. */
-static void
-cal_obj_time_add_hours		(CalObjTime *cotime,
-				 gint	     hours)
-{
-	guint hour;
-
-	/* We use a guint to avoid overflow on the guint8. */
-	hour = cotime->hour + hours;
-	cotime->hour = hour % 24;
-	if (hour >= 24)
-		cal_obj_time_add_days (cotime, hour / 24);
-}
-
-
-/* Adds a positive number of minutes to the given CalObjTime, updating the
-   rest of the CalObjTime appropriately. */
-static void
-cal_obj_time_add_minutes	(CalObjTime *cotime,
-				 gint	     minutes)
-{
-	guint minute;
-
-	/* We use a guint to avoid overflow on the guint8. */
-	minute = cotime->minute + minutes;
-	cotime->minute = minute % 60;
-	if (minute >= 60)
-		cal_obj_time_add_hours (cotime, minute / 60);
-}
-
-
-/* Adds a positive number of seconds to the given CalObjTime, updating the
-   rest of the CalObjTime appropriately. */
-static void
-cal_obj_time_add_seconds	(CalObjTime *cotime,
-				 gint	     seconds)
-{
-	guint second;
-
-	/* We use a guint to avoid overflow on the guint8. */
-	second = cotime->second + seconds;
-	cotime->second = second % 60;
-	if (second >= 60)
-		cal_obj_time_add_minutes (cotime, second / 60);
-}
-
-
-/* Compares 2 CalObjTimes. Returns -1 if the cotime1 is before cotime2, 0 if
-   they are the same, or 1 if cotime1 is after cotime2. The comparison type
-   specifies which parts of the times we are interested in, e.g. if CALOBJ_DAY
-   is used we only want to know if the days are different. */
-static gint
-cal_obj_time_compare		(CalObjTime *cotime1,
-				 CalObjTime *cotime2,
-				 CalObjTimeComparison type)
-{
-	if (cotime1->year < cotime2->year)
-		return -1;
-	if (cotime1->year > cotime2->year)
-		return 1;
-
-	if (type == CALOBJ_YEAR)
-		return 0;
-
-	if (cotime1->month < cotime2->month)
-		return -1;
-	if (cotime1->month > cotime2->month)
-		return 1;
-
-	if (type == CALOBJ_MONTH)
-		return 0;
-
-	if (cotime1->day < cotime2->day)
-		return -1;
-	if (cotime1->day > cotime2->day)
-		return 1;
-
-	if (type == CALOBJ_DAY)
-		return 0;
-
-	if (cotime1->hour < cotime2->hour)
-		return -1;
-	if (cotime1->hour > cotime2->hour)
-		return 1;
-
-	if (type == CALOBJ_HOUR)
-		return 0;
-
-	if (cotime1->minute < cotime2->minute)
-		return -1;
-	if (cotime1->minute > cotime2->minute)
-		return 1;
-
-	if (type == CALOBJ_MINUTE)
-		return 0;
-
-	if (cotime1->second < cotime2->second)
-		return -1;
-	if (cotime1->second > cotime2->second)
-		return 1;
-
-	return 0;
-}
-
-
-/* This is the same as the above function, but without the comparison type.
-   It is used for qsort(). */
-static gint
-cal_obj_time_compare_func (const void *arg1,
-			   const void *arg2)
-{
-	CalObjTime *cotime1, *cotime2;
-	gint retval;
-
-	cotime1 = (CalObjTime*) arg1;
-	cotime2 = (CalObjTime*) arg2;
-
-	if (cotime1->year < cotime2->year)
-		retval = -1;
-	else if (cotime1->year > cotime2->year)
-		retval = 1;
-
-	else if (cotime1->month < cotime2->month)
-		retval = -1;
-	else if (cotime1->month > cotime2->month)
-		retval = 1;
-
-	else if (cotime1->day < cotime2->day)
-		retval = -1;
-	else if (cotime1->day > cotime2->day)
-		retval = 1;
-
-	else if (cotime1->hour < cotime2->hour)
-		retval = -1;
-	else if (cotime1->hour > cotime2->hour)
-		retval = 1;
-
-	else if (cotime1->minute < cotime2->minute)
-		retval = -1;
-	else if (cotime1->minute > cotime2->minute)
-		retval = 1;
-
-	else if (cotime1->second < cotime2->second)
-		retval = -1;
-	else if (cotime1->second > cotime2->second)
-		retval = 1;
-
-	else
-		retval = 0;
-
-#if 0
-	g_print ("%s - ", cal_obj_time_to_string (cotime1));
-	g_print ("%s : %i\n", cal_obj_time_to_string (cotime2), retval);
-#endif
-
-	return retval;
-}
-
-static gint
-cal_obj_date_only_compare_func (const void *arg1,
-				const void *arg2)
-{
-	CalObjTime *cotime1, *cotime2;
-
-	cotime1 = (CalObjTime*) arg1;
-	cotime2 = (CalObjTime*) arg2;
-
-	if (cotime1->year < cotime2->year)
-		return -1;
-	if (cotime1->year > cotime2->year)
-		return 1;
-
-	if (cotime1->month < cotime2->month)
-		return -1;
-	if (cotime1->month > cotime2->month)
-		return 1;
-
-	if (cotime1->day < cotime2->day)
-		return -1;
-	if (cotime1->day > cotime2->day)
-		return 1;
-
-	return 0;
-}
-
-/* Returns the weekday of the given CalObjTime, from 0 - 6. The week start
-   day is Monday by default, but can be set in the recurrence rule. */
-static gint
-cal_obj_time_weekday		(CalObjTime *cotime,
-				 CalRecurrence *recur)
-{
-	GDate date;
-	gint weekday;
-
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, cotime->day, cotime->month + 1, cotime->year);
-
-	/* This results in a value of 0 (Monday) - 6 (Sunday). */
-	weekday = g_date_weekday (&date) - 1;
-
-	/* This calculates the offset of our day from the start of the week.
-	   We just add on a week (to avoid any possible negative values) and
-	   then subtract the specified week start day, then convert it into a
-	   value from 0-6. */
-	weekday = (weekday + 7 - recur->week_start_day) % 7;
-
-	return weekday;
-}
-
-
-/* Returns the day of the year of the given CalObjTime, from 1 - 366. */
-static gint
-cal_obj_time_day_of_year		(CalObjTime *cotime)
-{
-	GDate date;
-
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, cotime->day, cotime->month + 1, cotime->year);
-
-	return g_date_day_of_year (&date);
-}
-
-
-/* Finds the first week in the given CalObjTime's year, using the same weekday
-   as the event start day (i.e. from the RecurData).
-   The first week of the year is the first week starting from the specified
-   week start day that has 4 days in the new year. It may be in the previous
-   year. */
-static void
-cal_obj_time_find_first_week	(CalObjTime *cotime,
-				 RecurData  *recur_data)
-{
-	GDate date;
-	gint weekday, week_start_day, offset;
-
-	/* Find out the weekday of the 1st of the year. */
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, 1, 1, cotime->year);
-
-	/* This results in a value of 0 (Monday) - 6 (Sunday). */
-	weekday = g_date_weekday (&date) - 1;
-
-	/* Calculate the first day of the year that starts a new week. */
-	week_start_day = recur_data->recur->week_start_day;
-	offset = (week_start_day + 7 - weekday) % 7;
-
-	/* Now see if we have to move backwards 1 week, i.e. if the week
-	   starts on or after Jan 5th (since the previous week has 4 days in
-	   this year and so will be the first week of the year). */
-	if (offset >= 4)
-		offset -= 7;
-
-	/* Now move to the required day. */
-	offset += (recur_data->weekday + 7 - week_start_day) % 7;
-
-	/* Now move the cotime to the appropriate day. */
-	cotime->month = 0;
-	cotime->day = 1;
-	cal_obj_time_add_days (cotime, offset);
-}
-
-
-static void
-cal_object_time_from_time (CalObjTime *cotime,
-			   time_t      t)
-{
-	struct tm *tmp_tm;
-	time_t tmp_time_t;
-
-	tmp_time_t = t;
-	tmp_tm = localtime (&tmp_time_t);
-
-	cotime->year     = tmp_tm->tm_year + 1900;
-	cotime->month    = tmp_tm->tm_mon;
-	cotime->day      = tmp_tm->tm_mday;
-	cotime->hour     = tmp_tm->tm_hour;
-	cotime->minute   = tmp_tm->tm_min;
-	cotime->second   = tmp_tm->tm_sec;
-	cotime->is_rdate = FALSE;
-}
-
-
-/* Debugging function to convert a CalObjTime to a string. It uses a static
-   buffer so beware. */
-#ifdef CAL_OBJ_DEBUG
-static char*
-cal_obj_time_to_string	(CalObjTime *cotime)
-{
-	static char buffer[20];
-
-	sprintf (buffer, "%02i/%02i/%04i %02i:%02i:%02i",
-		 cotime->day, cotime->month + 1, cotime->year,
-		 cotime->hour, cotime->minute, cotime->second);
-	return buffer;
-}
-#endif
-
-
-/* This recalculates the end dates for recurrence & exception rules which use
-   the COUNT property. If refresh is TRUE it will recalculate all enddates
-   for rules which use COUNT. If refresh is FALSE, it will only calculate
-   the enddate if it hasn't already been set. It returns TRUE if the component
-   was changed, i.e. if the component should be saved at some point.
-   We store the enddate in the "X-EVOLUTION-ENDDATE" parameter of the RRULE
-   or EXRULE. */
-static gboolean
-cal_recur_ensure_end_dates (CalComponent	*comp,
-			    gboolean		 refresh)
-{
-	GSList *rrules, *exrules, *elem;
-	gboolean changed = FALSE;
-
-	/* Do the RRULEs. */
-	cal_component_get_rrule_property_list (comp, &rrules);
-	for (elem = rrules; elem; elem = elem->next) {
-		changed |= cal_recur_ensure_rule_end_date (comp, elem->data,
-							   FALSE, refresh);
-	}
-
-	/* Do the EXRULEs. */
-	cal_component_get_exrule_property_list (comp, &exrules);
-	for (elem = exrules; elem; elem = elem->next) {
-		changed |= cal_recur_ensure_rule_end_date (comp, elem->data,
-							   TRUE, refresh);
-	}
-
-	return changed;
-}
-
-
-typedef struct _CalRecurEnsureEndDateData CalRecurEnsureEndDateData;
-struct _CalRecurEnsureEndDateData {
-	gint count;
-	gint instances;
-	time_t end_date;
-};
-
-
-static gboolean
-cal_recur_ensure_rule_end_date (CalComponent			*comp,
-				icalproperty			*prop,
-				gboolean			 exception,
-				gboolean			 refresh)
-{
-	struct icalrecurrencetype rule;
-	CalRecurEnsureEndDateData cb_data;
-
-	if (exception)
-		rule = icalproperty_get_exrule (prop);
-	else
-		rule = icalproperty_get_rrule (prop);
-
-	/* If the rule doesn't use COUNT just return. */
-	if (rule.count == 0)
-		return FALSE;
-
-	/* If refresh is FALSE, we check if the enddate is already set, and
-	   if it is we just return. */
-	if (!refresh) {
-		if (cal_recur_get_rule_end_date (prop) != -1)
-			return FALSE;
-	}
-
-	/* Calculate the end date. */
-	cb_data.count = rule.count;
-	cb_data.instances = 0;
-	cal_recur_generate_instances_of_rule (comp, prop, -1, -1,
-					      cal_recur_ensure_rule_end_date_cb,
-					      &cb_data);
-
-	/* Store the end date in the "X-EVOLUTION-ENDDATE" parameter of the
-	   rule. */
-	cal_recur_set_rule_end_date (prop, cb_data.end_date);
-		
-	return TRUE;
-}
-
-
-static gboolean
-cal_recur_ensure_rule_end_date_cb	(CalComponent	*comp,
-					 time_t		 instance_start,
-					 time_t		 instance_end,
-					 gpointer	 data)
-{
-	CalRecurEnsureEndDateData *cb_data;
-
-	cb_data = (CalRecurEnsureEndDateData*) data;
-
-	cb_data->instances++;
-
-	if (cb_data->instances == cb_data->count) {
-		cb_data->end_date = instance_start;
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-
-static time_t
-cal_recur_get_rule_end_date	(icalproperty	*prop)
-{
-	icalparameter *param;
-	char *xname, *xvalue;
-	icalvalue *value;
-	struct icaltimetype icaltime;
-
-	param = icalproperty_get_first_parameter (prop, ICAL_X_PARAMETER);
-	while (param) {
-		xname = icalparameter_get_xname (param);
-		if (xname && !strcmp (xname, EVOLUTION_END_DATE_PARAMETER)) {
-			xvalue = icalparameter_get_x (param);
-			value = icalvalue_new_from_string (ICAL_DATETIME_VALUE,
-							   xvalue);
-			if (value) {
-				icaltime = icalvalue_get_datetime (value);
-				icalvalue_free (value);
-
-				return icaltime_as_timet (icaltime);
-			}
-		}
-
-		param = icalproperty_get_next_parameter (prop,
-							 ICAL_X_PARAMETER);
-	}
-
-	return -1;
-}
-
-
-static void
-cal_recur_set_rule_end_date	(icalproperty	*prop,
-				 time_t		 end_date)
-{
-	icalparameter *param;
-	icalvalue *value;
-	struct icaltimetype icaltime;
-	char *end_date_string, *xname;
-
-	icaltime = icaltime_from_timet (end_date, FALSE, FALSE);
-	value = icalvalue_new_datetime (icaltime);
-	end_date_string = icalvalue_as_ical_string (value);
-	icalvalue_free (value);
-
-	/* If we already have an X-EVOLUTION-ENDDATE parameter, set the value
-	   to the new date-time. */
-	param = icalproperty_get_first_parameter (prop, ICAL_X_PARAMETER);
-	while (param) {
-		xname = icalparameter_get_xname (param);
-		if (xname && !strcmp (xname, EVOLUTION_END_DATE_PARAMETER)) {
-			icalparameter_set_x (param, end_date_string);
-			return;
-		}
-		param = icalproperty_get_next_parameter (prop, ICAL_X_PARAMETER);
-	}
-
-	/* Create a new X-EVOLUTION-ENDDATE and add it to the property. */
-	param = icalparameter_new_x (end_date_string);
-	icalparameter_set_xname (param, EVOLUTION_END_DATE_PARAMETER);
-	icalproperty_add_parameter (prop, param);
-}
-
diff --git a/calendar/cal-util/cal-recur.h b/calendar/cal-util/cal-recur.h
deleted file mode 100644
index de5a139f78..0000000000
--- a/calendar/cal-util/cal-recur.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Evolution calendar recurrence rule functions
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Damon Chaplin <damon@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_RECUR_H
-#define CAL_RECUR_H
-
-#include <libgnome/gnome-defs.h>
-#include <glib.h>
-#include <cal-util/cal-component.h>
-
-BEGIN_GNOME_DECLS
-
-typedef gboolean (* CalRecurInstanceFn) (CalComponent *comp,
-					 time_t        instance_start,
-					 time_t        instance_end,
-					 gpointer      data);
-
-/*
- * Calls the given callback function for each occurrence of the event that
- * intersects the range between the given start and end times (the end time is
- * not included). Note that the occurrences may start before the given start
- * time.
- *
- * If the callback routine returns FALSE the occurrence generation stops.
- *
- * Both start and end can be -1, in which case we start at the events first
- * instance and continue until it ends, or forever if it has no enddate.
- */
-void	cal_recur_generate_instances	(CalComponent		*comp,
-					 time_t			 start,
-					 time_t			 end,
-					 CalRecurInstanceFn	 cb,
-					 gpointer                cb_data);
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/cal-util/cal-util.c b/calendar/cal-util/cal-util.c
deleted file mode 100644
index bfb9c88fff..0000000000
--- a/calendar/cal-util/cal-util.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* Evolution calendar utilities and types
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include "cal-util.h"
-
-
-
-/**
- * cal_obj_instance_list_free:
- * @list: List of #CalObjInstance structures.
- * 
- * Frees a list of #CalObjInstance structures.
- **/
-void
-cal_obj_instance_list_free (GList *list)
-{
-	CalObjInstance *i;
-	GList *l;
-
-	for (l = list; l; l = l->next) {
-		i = l->data;
-
-		g_assert (i != NULL);
-		g_assert (i->uid != NULL);
-
-		g_free (i->uid);
-		g_free (i);
-	}
-
-	g_list_free (list);
-}
-
-/**
- * cal_obj_change_list_free:
- * @list: List of #CalObjChange structures.
- * 
- * Frees a list of #CalObjChange structures.
- **/
-void
-cal_obj_change_list_free (GList *list)
-{
-	CalObjChange *c;
-	GList *l;
-
-	for (l = list; l; l = l->next) {
-		c = l->data;
-
-		g_assert (c != NULL);
-		g_assert (c->uid != NULL);
-
-		g_free (c->uid);
-		g_free (c);
-	}
-
-	g_list_free (list);
-}
-
-/**
- * cal_alarm_instance_list_free:
- * @list: List of #CalAlarmInstance structures.
- * 
- * Frees a list of #CalAlarmInstance structures.
- **/
-void
-cal_alarm_instance_list_free (GList *list)
-{
-	CalAlarmInstance *i;
-	GList *l;
-
-	for (l = list; l; l = l->next) {
-		i = l->data;
-
-		g_assert (i != NULL);
-		g_assert (i->uid != NULL);
-
-		g_free (i->uid);
-		g_free (i);
-	}
-
-	g_list_free (list);
-}
-
-/**
- * cal_obj_uid_list_free:
- * @list: List of strings with unique identifiers.
- *
- * Frees a list of unique identifiers for calendar objects.
- **/
-void
-cal_obj_uid_list_free (GList *list)
-{
-	GList *l;
-
-	for (l = list; l; l = l->next) {
-		char *uid;
-
-		uid = l->data;
-
-		g_assert (uid != NULL);
-		g_free (uid);
-	}
-
-	g_list_free (list);
-}
diff --git a/calendar/cal-util/cal-util.h b/calendar/cal-util/cal-util.h
deleted file mode 100644
index 243cc34105..0000000000
--- a/calendar/cal-util/cal-util.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Evolution calendar utilities and types
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_UTIL_H
-#define CAL_UTIL_H
-
-#include <libgnome/gnome-defs.h>
-#include <time.h>
-#include <glib.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-/* Instance of a calendar object.  This can be an actual occurrence, a
- * recurrence, or an alarm trigger of a `real' calendar object.
- */
-typedef struct {
-	char *uid;			/* UID of the object */
-	time_t start;			/* Start time of instance */
-	time_t end;			/* End time of instance */
-} CalObjInstance;
-
-void cal_obj_instance_list_free (GList *list);
-
-typedef enum {
-	CALOBJ_UPDATED = 1 << 0,
-	CALOBJ_REMOVED = 1 << 1
-} CalObjChangeType;
-
-typedef struct 
-{
-	char *uid;
-	CalObjChangeType type;
-} CalObjChange;
-
-void cal_obj_change_list_free (GList *list);
-
-/* Instance of an alarm trigger */
-typedef struct {
-	char *uid;			/* UID of object */
-#if 0
-	enum AlarmType type;		/* Type of alarm */
-#endif
-	time_t trigger;			/* Alarm trigger time */
-	time_t occur;			/* Occurrence time */
-} CalAlarmInstance;
-
-void cal_alarm_instance_list_free (GList *list);
-
-/* Used for multiple UID queries */
-typedef enum {
-	CALOBJ_TYPE_EVENT   = 1 << 0,
-	CALOBJ_TYPE_TODO    = 1 << 1,
-	CALOBJ_TYPE_JOURNAL = 1 << 2,
-	CALOBJ_TYPE_ANY     = 0x07
-} CalObjType;
-
-void cal_obj_uid_list_free (GList *list);
-
-END_GNOME_DECLS
-
-#endif
-
diff --git a/calendar/cal-util/calobj.c b/calendar/cal-util/calobj.c
deleted file mode 100644
index 0ede42ebc6..0000000000
--- a/calendar/cal-util/calobj.c
+++ /dev/null
@@ -1,2008 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Calendar objects implementations.
- * Copyright (C) 1998 the Free Software Foundation
- *
- * Authors:
- *   Miguel de Icaza (miguel@gnu.org)
- *   Federico Mena (quartic@gimp.org)
- */
-#include <config.h>
-#include <string.h>
-#include <glib.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <time.h>
-#include "calobj.h"
-#include "timeutil.h"
-#include "libversit/vcc.h"
-#include "icalendar-save.h"
-#include "icalendar.h"
-
-
-
-/* VCalendar product ID */
-#define PRODID "-//Helix Code//NONSGML Evolution Calendar//EN"
-
-static gint compare_exdates (gconstpointer a, gconstpointer b);
-static void ical_object_normalize_summary (iCalObject *ico);
-static void list_free (GList *list);
-
-
-
-char *
-ical_gen_uid (void)
-{
-	static char *hostname;
-	time_t t = time (NULL);
-	static int serial;
-
-	if (!hostname){
-		char buffer [128];
-
-		if ((gethostname (buffer, sizeof (buffer)-1) == 0) &&
-		    (buffer [0] != 0))
-			hostname = g_strdup (buffer);
-		else
-			hostname = g_strdup ("localhost");
-	}
-
-	return g_strdup_printf (
-		"%s-%d-%d-%d-%d@%s",
-		isodate_from_time_t (t),
-		getpid (),
-		getgid (),
-		getppid (),
-		serial++,
-		hostname);
-}
-
-iCalObject *
-ical_object_new (void)
-{
-	iCalObject *ico;
-
-	ico = g_new0 (iCalObject, 1);
-
-	ico->seq = -1;
-	ico->dtstamp = time (NULL);
-	ico->uid = ical_gen_uid ();
-
-	ico->pilot_id = 0;
-	ico->pilot_status = ICAL_PILOT_SYNC_MOD;
-
-	ico->ref_count = 1;
-
-	return ico;
-}
-
-iCalObject *
-ical_new (char *comment, char *organizer, char *summary)
-{
-	iCalObject *ico;
-
-	ico = ical_object_new ();
-
-	ico->comment   = g_strdup (comment);
-	ico->organizer = g_new0 (iCalPerson, 1);
-	ico->organizer->addr = g_strdup (organizer);
-	ico->summary   = g_strdup (summary);
-	ico->class     = g_strdup ("PUBLIC");
-	ico->status    = g_strdup ("NEEDS ACTION");
-
-	ico->dalarm.type = ALARM_DISPLAY;
-	ico->palarm.type = ALARM_PROGRAM;
-	ico->malarm.type = ALARM_MAIL;
-	ico->aalarm.type = ALARM_AUDIO;
-
-	ical_object_normalize_summary (ico);
-
-	return ico;
-}
-
-
-void
-ical_object_ref (iCalObject *ico)
-{
-	ico->ref_count++;
-}
-
-
-#define free_if_defined(x) if (x){ g_free (x); x = 0; }
-#define lfree_if_defined(x) if (x){ list_free (x); x = 0; }
-static void
-ical_object_destroy (iCalObject *ico)
-{
-	/* Regular strings */
-	free_if_defined  (ico->comment);
-	free_if_defined  (ico->organizer);
-	free_if_defined  (ico->summary);
-	free_if_defined  (ico->uid);
-	free_if_defined  (ico->status);
-	free_if_defined  (ico->class);
-	free_if_defined  (ico->url);
-	free_if_defined  (ico->recur);
-
-	/* Lists */
-	lfree_if_defined (ico->exdate);
-	lfree_if_defined (ico->categories);
-	lfree_if_defined (ico->resources);
-	lfree_if_defined (ico->related);
-	lfree_if_defined (ico->attach);
-
-	/* Alarms */
-	g_free (ico->dalarm.data);
-	g_free (ico->palarm.data);
-	g_free (ico->malarm.data);
-	g_free (ico->aalarm.data);
-
-	g_free (ico);
-}
-
-void
-ical_object_unref (iCalObject *ico)
-{
-	ico->ref_count--;
-	if (ico->ref_count == 0)
-		ical_object_destroy (ico);
-}
-
-
-static void
-my_free (gpointer data, gpointer user_dat_ignored)
-{
-	g_free (data);
-}
-
-static void
-list_free (GList *list)
-{
-	g_list_foreach (list, my_free, 0);
-	g_list_free (list);
-}
-
-/* This resets any recurrence rules of the iCalObject. */
-void
-ical_object_reset_recurrence (iCalObject *ico)
-{
-	free_if_defined  (ico->recur);
-	lfree_if_defined (ico->exdate);
-}
-
-static GList *
-set_list (char *str)
-{
-	GList *list = 0;
-	char *s;
-
-	for (s = strtok (str, ";"); s; s = strtok (NULL, ";"))
-		list = g_list_prepend (list, g_strdup (s));
-
-	return list;
-}
-
-static GList *
-set_date_list (char *str)
-{
-	GList *list = 0;
-	char *s;
-
-	for (s = strtok (str, ";,"); s; s = strtok (NULL, ";,")){
-		time_t *t = g_new (time_t, 1);
-
-		while (*s && isspace (*s))
-			s++;
-		*t = time_from_isodate (s);
-		list = g_list_prepend (list, t);
-	}
-	return list;
-}
-
-void
-ical_object_add_exdate (iCalObject *o, time_t t)
-{
-	time_t *pt = g_new (time_t, 1);
-
-	*pt = t;
-	o->exdate = g_list_prepend (o->exdate, pt);
-}
-
-static void
-ignore_space(char **str)
-{
-	while (**str && isspace (**str))
-		(*str)++;
-}
-
-static void
-skip_numbers (char **str)
-{
-	while (**str){
-		ignore_space (str);
-		if (!isdigit (**str))
-			return;
-		while (**str && isdigit (**str))
-			(*str)++;
-	}
-}
-
-static void
-weekdaylist (iCalObject *o, char **str)
-{
-	int i;
-	struct {
-		char first_letter, second_letter;
-		int  index;
-	} days [] = {
-		{ 'S', 'U', 0 },
-		{ 'M', 'O', 1 },
-		{ 'T', 'U', 2 },
-		{ 'W', 'E', 3 },
-		{ 'T', 'H', 4 },
-		{ 'F', 'R', 5 },
-		{ 'S', 'A', 6 }
-	};
-
-	ignore_space (str);
-	do {
-		for (i = 0; i < 7; i++){
-			if (**str == days [i].first_letter && *(*str+1) == days [i].second_letter){
-				o->recur->weekday |= 1 << i;
-				*str += 2;
-				if (**str == ' ')
-					(*str)++;
-			}
-		}
-	} while (isalpha (**str));
-
-	if (o->recur->weekday == 0){
-		struct tm tm = *localtime (&o->dtstart);
-
-		o->recur->weekday = 1 << tm.tm_wday;
-	}
-}
-
-static void
-weekdaynum (iCalObject *o, char **str)
-{
-	int i;
-	struct {
-		char first_letter, second_letter;
-		int  index;
-	} days [] = {
-		{ 'S', 'U', 0 },
-		{ 'M', 'O', 1 },
-		{ 'T', 'U', 2 },
-		{ 'W', 'E', 3 },
-		{ 'T', 'H', 4 },
-		{ 'F', 'R', 5 },
-		{ 'S', 'A', 6 }
-	};
-
-	ignore_space (str);
-	do {
-		for (i = 0; i < 7; i++){
-			if (**str == days [i].first_letter && *(*str+1) == days [i].second_letter){
-				o->recur->weekday = i;
-				*str += 2;
-				if (**str == ' ')
-					(*str)++;
-			}
-		}
-	} while (isalpha (**str));
-}
-
-static void
-ocurrencelist (iCalObject *o, char **str)
-{
-	char *p;
-
-	ignore_space (str);
-	p = *str;
-	if (!isdigit (*p))
-		return;
-
-	if (!(*p >= '1' && *p <= '5'))
-		return;
-
-	if (!(*(p+1) == '+' || *(p+1) == '-'))
-		return;
-
-	o->recur->u.month_pos = (*p-'0') * (*(p+1) == '+' ? 1 : -1);
-	*str += 2;
-}
-
-#if 0
-
-static void
-daynumber (iCalObject *o, char **str)
-{
-	int val = 0;
-	char *p = *str;
-
-	ignore_space (str);
-	if (strcmp (p, "LD")){
-		o->recur->u.month_day = DAY_LASTDAY;
-		*str += 2;
-		return;
-	}
-
-	if (!(isdigit (*p)))
-		return;
-
-	while (**str && isdigit (**str)){
-		val = val * 10 + (**str - '0');
-		(*str)++;
-	}
-
-	if (**str == '+')
-		(*str)++;
-
-	if (**str == '-')
-		val *= -1;
-	o->recur->u.month_day = val;
-}
-
-#endif
-
-static void
-daynumberlist (iCalObject *o, char **str)
-{
-	int first = 0;
-	int val = 0;
-
-	ignore_space (str);
-
-	while (**str){
-		if (!isdigit (**str))
-			return;
-		while (**str && isdigit (**str)){
-			val = 10 * val + (**str - '0');
-			(*str)++;
-		}
-		if (!first){
-			/*
-			 * Some broken applications set this to zero
-			 */
-			if (val == 0){
-				struct tm day = *localtime (&o->dtstart);
-
-				val = day.tm_mday;
-			}
-			o->recur->u.month_day = val;
-			first = 1;
-			val = 0;
-		}
-	}
-}
-
-static void
-load_recur_weekly (iCalObject *o, char **str)
-{
-	weekdaylist (o, str);
-}
-
-static void
-load_recur_monthly_pos (iCalObject *o, char **str)
-{
-	ocurrencelist (o, str);
-	weekdaynum (o, str);
-}
-
-static void
-load_recur_monthly_day (iCalObject *o, char **str)
-{
-	daynumberlist (o, str);
-}
-
-static void
-load_recur_yearly_month (iCalObject *o, char **str)
-{
-	/* Skip as we do not support multiple months and we do expect
-	 * the dtstart to agree with the value on this field
-	 */
-	skip_numbers (str);
-}
-
-static void
-load_recur_yearly_day (iCalObject *o, char **str)
-{
-	/* Skip as we do not support multiple days and we do expect
-	 * the dtstart to agree with the value on this field
-	 *
-	 * FIXME: we should support every-n-years
-	 */
-	skip_numbers (str);
-}
-
-static void
-duration (iCalObject *o, char **str)
-{
-	unsigned int duration = 0;
-
-	ignore_space (str);
-	if (**str != '#')
-		return;
-	(*str)++;
-	while (**str && isdigit (**str)){
-		duration = duration * 10 + (**str - '0');
-		(*str)++;
-	}
-	o->recur->duration = duration;
-}
-
-static void
-enddate (iCalObject *o, char **str)
-{
-	ignore_space (str);
-	if (isdigit (**str)){
-		o->recur->_enddate = time_from_isodate (*str);
-		*str += 16;
-	}
-}
-
-static int
-load_recurrence (iCalObject *o, char *str)
-{
-	enum RecurType type;
-	int  interval = 0;
-
-	type = -1;
-	switch (*str++){
-	case 'D':
-		type = RECUR_DAILY;
-		break;
-
-	case 'W':
-		type = RECUR_WEEKLY;
-		break;
-
-	case 'M':
-		if (*str == 'P')
-			type = RECUR_MONTHLY_BY_POS;
-	        else if (*str == 'D')
-			type = RECUR_MONTHLY_BY_DAY;
-		str++;
-		break;
-
-	case 'Y':
-		if (*str == 'M')
-			type = RECUR_YEARLY_BY_MONTH;
-		else if (*str == 'D')
-			type = RECUR_YEARLY_BY_DAY;
-		str++;
-		break;
-	}
-	if (type == -1)
-		return 0;
-
-	o->recur = g_new0 (Recurrence, 1);
-	o->recur->type = type;
-	ignore_space (&str);
-
-	/* Get the interval */
-	for (;*str && isdigit (*str);str++)
-		interval = interval * 10 + (*str-'0');
-
-	if (interval == 0)
-		interval = 1;
-
-	o->recur->interval = interval;
-
-	/* this is the default per the spec */
-	o->recur->duration = 2;
-
-	ignore_space (&str);
-
-	switch (type){
-	case RECUR_DAILY:
-		break;
-	case RECUR_WEEKLY:
-		load_recur_weekly (o, &str);
-		break;
-	case RECUR_MONTHLY_BY_POS:
-		load_recur_monthly_pos (o, &str);
-		break;
-	case RECUR_MONTHLY_BY_DAY:
-		load_recur_monthly_day (o, &str);
-		break;
-	case RECUR_YEARLY_BY_MONTH:
-		load_recur_yearly_month (o, &str);
-		break;
-	case RECUR_YEARLY_BY_DAY:
-		load_recur_yearly_day (o, &str);
-		break;
-	default:
-		g_warning ("Unimplemented recurrence type %d", (int) type);
-		break;
-	}
-	duration (o, &str);
-	enddate (o, &str);
-
-	/* Compute the enddate */
-	if (o->recur->_enddate == 0){
-		if (o->recur->duration != 0){
-			ical_object_compute_end (o);
-		} else
-			o->recur->enddate = 0;
-	} else {
-		o->recur->enddate = o->recur->_enddate;
-	}
-	return 1;
-}
-
-#define is_a_prop_of(obj,prop) isAPropertyOf (obj,prop)
-#define str_val(obj) the_str = fakeCString (vObjectUStringZValue (obj))
-#define has(obj,prop) (vo = isAPropertyOf (obj, prop))
-
-/*
- * FIXME: This is loosing precission.  Enhanec the thresholds
- */
-#define HOURS(n) (n*(60*60))
-
-static void
-setup_alarm_at (iCalObject *ico, CalendarAlarm *alarm, char *iso_time, VObject *vo)
-{
-	time_t alarm_time = time_from_isodate (iso_time);
-	time_t base = ico->dtstart;
-	int d = difftime (base, alarm_time);
-	VObject *a;
-	char *the_str;
-
-	alarm->enabled = 1;
-	if (d > HOURS (2)){
-		if (d > HOURS (48)){
-			alarm->count = d / HOURS (24);
-			alarm->units = ALARM_DAYS;
-		} else {
-			alarm->count = d / (60*60);
-			alarm->units = ALARM_HOURS;
-		}
-	} else {
-		alarm->count = d / 60;
-		alarm->units = ALARM_MINUTES;
-	}
-
-	if ((a = is_a_prop_of (vo, VCSnoozeTimeProp))){
-		alarm->snooze_secs = isodiff_to_secs (str_val (a));
-		free (the_str);
-	}
-
-	if ((a = is_a_prop_of (vo, VCRepeatCountProp))){
-		alarm->snooze_repeat = atoi (str_val (a));
-		free (the_str);
-	}
-}
-
-/*
- * Duplicates an iCalObject.  Implementation is a grand hack.
- * If you need the new ICalObject to have a new uid, free the current one,
- * and call ical_gen_uid() to generate a new one.
- */
-iCalObject *
-ical_object_duplicate (iCalObject *o)
-{
-	VObject *vo;
-	iCalObject *new;
-
-	vo = ical_object_to_vobject (o);
-	switch (o->type){
-	case ICAL_EVENT:
-		new = ical_object_create_from_vobject (vo, VCEventProp);
-		break;
-	case ICAL_TODO:
-		new = ical_object_create_from_vobject (vo, VCTodoProp);
-		break;
-	default:
-		new = NULL;
-	}
-
-	cleanVObject (vo);
-	return new;
-}
-
-/* FIXME: we need to load the recurrence properties */
-iCalObject *
-ical_object_create_from_vobject (VObject *o, const char *object_name)
-{
-	time_t  now = time (NULL);
-	iCalObject *ical;
-	VObject *vo, *a;
-	VObjectIterator i;
-	char *the_str;
-
-	ical = g_new0 (iCalObject, 1);
-
-	if (strcmp (object_name, VCEventProp) == 0)
-		ical->type = ICAL_EVENT;
-	else if (strcmp (object_name, VCTodoProp) == 0)
-		ical->type = ICAL_TODO;
-	else {
-		g_free (ical);
-		return 0;
-	}
-
-	ical->ref_count = 1;
-
-	/* uid */
-	if (has (o, VCUniqueStringProp)){
-		ical->uid = g_strdup (str_val (vo));
-		free (the_str);
-	} else {
-		ical->uid = ical_gen_uid ();
-	}
-
-	/* seq */
-	if (has (o, VCSequenceProp)){
-		ical->seq = atoi (str_val (vo));
-		free (the_str);
-	} else
-		ical->seq = 0;
-
-	/* dtstart */
-	if (has (o, VCDTstartProp)){
-		ical->dtstart = time_from_isodate (str_val (vo));
-		free (the_str);
-	} else
-		ical->dtstart = 0;
-
-	/* dtend */
-	ical->dtend = 0;	/* default value */
-	if (ical->type == ICAL_EVENT){
-		if (has (o, VCDTendProp)){
-			ical->dtend = time_from_isodate (str_val (vo));
-			free (the_str);
-		}
-	} else if (ical->type == ICAL_TODO){
-		if (has (o, VCDueProp)){
-			ical->dtend = time_from_isodate (str_val (vo));
-			free (the_str);
-		}
-	}
-
-	/* dcreated */
-	if (has (o, VCDCreatedProp)){
-		ical->created = time_from_isodate (str_val (vo));
-		free (the_str);
-	}
-
-	/* completed */
-	if (has (o, VCCompletedProp)){
-		ical->completed = time_from_isodate (str_val (vo));
-		free (the_str);
-	}
-
-	/* last_mod */
-	if (has (o, VCLastModifiedProp)){
-		ical->last_mod = time_from_isodate (str_val (vo));
-		free (the_str);
-	} else
-		ical->last_mod = now;
-
-	/* exdate */
-	if (has (o, VCExpDateProp)){
-		ical->exdate = set_date_list (str_val (vo));
-		free (the_str);
-	}
-
-	/* description/comment */
-	if (has (o, VCDescriptionProp)){
-		ical->comment = g_strdup (str_val (vo));
-		free (the_str);
-	}
-
-	/* summary */
-	if (has (o, VCSummaryProp)){
-		ical->summary = g_strdup (str_val (vo));
-		free (the_str);
-
-		/* Convert any CR/LF/CRLF sequences in the summary field to
-		   spaces so we just have a one-line field. */
-		ical_object_normalize_summary (ical);
-	} else 
-		ical->summary = g_strdup ("");
-
-	/* status */
-	if (has (o, VCStatusProp)){
-		ical->status = g_strdup (str_val (vo));
-		free (the_str);
-	} else
-		ical->status = g_strdup ("NEEDS ACTION");
-
-	if (has (o, VCClassProp)){
-		ical->class = g_strdup (str_val (vo));
-		free (the_str);
-	} else
-		ical->class = g_strdup ("PUBLIC");
-
-	/* categories */
-	if (has (o, VCCategoriesProp)){
-		ical->categories = set_list (str_val (vo));
-		free (the_str);
-	}
-
-	/* resources */
-	if (has (o, VCResourcesProp)){
-		ical->resources = set_list (str_val (vo));
-		free (the_str);
-	}
-
-	/* priority */
-	if (has (o, VCPriorityProp)){
-		ical->priority = atoi (str_val (vo));
-		free (the_str);
-	}
-
-	/* tranparency */
-	if (has (o, VCTranspProp)){
-		ical->transp = atoi (str_val (vo)) ? ICAL_TRANSPARENT : ICAL_OPAQUE;
-		free (the_str);
-	}
-
-	/* Organizer */
-	if (has (o, VCOrgNameProp)){
-		ical->organizer = g_new0 (iCalPerson, 1);
-		ical->organizer->addr = g_strdup (str_val (vo));
-		free (the_str);
-	}
-
-	/* related */
-	if (has (o, VCRelatedToProp)){
-		char *str;
-		char *s;
-		iCalRelation *rel;
-		str = str_val (vo);
-		for (s = strtok (str, ";"); s; s = strtok (NULL, ";")) {
-			rel = g_new0 (iCalRelation, 1);
-			rel->uid = g_strdup (s);
-			rel->reltype = g_strdup ("PARENT");
-			ical->related = g_list_prepend (ical->related, rel);
-		}
-		free (the_str);
-	}
-
-	/* attach */
-	initPropIterator (&i, o);
-	while (moreIteration (&i)){
-		vo = nextVObject (&i);
-		if (strcmp (vObjectName (vo), VCAttachProp) == 0){
-			ical->attach = g_list_prepend (ical->attach, g_strdup (str_val (vo)));
-			free (the_str);
-		}
-	}
-
-	/* url */
-	if (has (o, VCURLProp)){
-		/* There seems to be a problem with the URL property. For some
-		   reason an empty property gets saved, vObjectUStringZValue
-		   returns NULL and fakeCString crashes. So we check for NULL.
-		*/
-		const wchar_t *zval;
-
-		zval = vObjectUStringZValue (o);
-		if (zval) {
-			the_str = fakeCString (zval);
-			ical->url = g_strdup (the_str);
-			free (the_str);
-		}
-	}
-
-	/* dalarm */
-	ical->dalarm.type = ALARM_DISPLAY;
-	ical->dalarm.enabled = 0;
-	if (has (o, VCDAlarmProp)){
-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){
-			setup_alarm_at (ical, &ical->dalarm, str_val (a), vo);
-			free (the_str);
-		}
-	}
-
-	/* aalarm */
-	ical->aalarm.type = ALARM_AUDIO;
-	ical->aalarm.enabled = 0;
-	if (has (o, VCAAlarmProp)){
-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){
-			setup_alarm_at (ical, &ical->aalarm, str_val (a), vo);
-			free (the_str);
-		}
-	}
-
-	/* palarm */
-	ical->palarm.type = ALARM_PROGRAM;
-	ical->palarm.enabled = 0;
-	if (has (o, VCPAlarmProp)){
-		ical->palarm.type = ALARM_PROGRAM;
-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){
-			setup_alarm_at (ical, &ical->palarm, str_val (a), vo);
-			free (the_str);
-
-			if ((a = is_a_prop_of (vo, VCProcedureNameProp))){
-				ical->palarm.data = g_strdup (str_val (a));
-				free (the_str);
-			} else
-				ical->palarm.data = g_strdup ("");
-		}
-	}
-
-	/* malarm */
-	ical->malarm.type = ALARM_MAIL;
-	ical->malarm.enabled = 0;
-	if (has (o, VCMAlarmProp)){
-		ical->malarm.type = ALARM_MAIL;
-		if ((a = is_a_prop_of (vo, VCRunTimeProp))){
-			setup_alarm_at (ical, &ical->malarm, str_val (a), vo);
-			free (the_str);
-
-			if ((a = is_a_prop_of (vo, VCEmailAddressProp))){
-				ical->malarm.data = g_strdup (str_val (a));
-				free (the_str);
-			} else
-				ical->malarm.data = g_strdup ("");
-		}
-	}
-
-	/* rrule */
-	if (has (o, VCRRuleProp)){
-		if (!load_recurrence (ical, str_val (vo))) {
-			ical_object_unref (ical);
-			return NULL;
-		}
-		free (the_str);
-	}
-
-	/*
-	 * Pilot
-	 */
-	if (has (o, XPilotIdProp)){
-		ical->pilot_id = atoi (str_val (vo));
-		free (the_str);
-	} else
-		ical->pilot_id = 0;
-
-	if (has (o, XPilotStatusProp)){
-		ical->pilot_status = atoi (str_val (vo));
-		free (the_str);
-	} else
-		ical->pilot_status = ICAL_PILOT_SYNC_MOD;
-
-	return ical;
-}
-
-static char *
-to_str (int num)
-{
-	static char buf [40];
-
-	sprintf (buf, "%d", num);
-	return buf;
-}
-
-/*
- * stores a GList in the property.
- */
-static void
-store_list (VObject *o, char *prop, GList *values)
-{
-	GList *l;
-	int len;
-	char *result, *p;
-
-	for (len = 0, l = values; l; l = l->next)
-		len += strlen (l->data) + 1;
-
-	result = g_malloc (len);
-
-	for (p = result, l = values; l; l = l->next) {
-		int len = strlen (l->data);
-
-		strcpy (p, l->data);
-
-		if (l->next) {
-			p [len] = ';';
-			p += len+1;
-		} else
-			p += len;
-	}
-
-	*p = 0;
-
-	addPropValue (o, prop, result);
-	g_free (result);
-}
-
-static void
-store_rel_list (VObject *o, char *prop, GList *values)
-{
-	GList *l;
-	int len;
-	char *result, *p;
-	
-	for (len = 0, l = values; l; l = l->next)
-		len += strlen (((iCalRelation*)(l->data))->uid) + 1;
-
-	result = g_malloc (len);
-
-	for (p = result, l = values; l; l = l->next) {
-		int len = strlen (((iCalRelation*)(l->data))->uid);
-		
-		strcpy (p, ((iCalRelation*)(l->data))->uid);
-
-		if (l->next) {
-			p [len] = ';';
-			p += len+1;
-		} else
-			p += len;
-	}
-
-	*p = 0;
-
-	addPropValue (o, prop, result);
-	g_free (result);
-}
-
-static void
-store_date_list (VObject *o, char *prop, GList *values)
-{
-	GList *l;
-	int   size, len;
-	char  *s, *p;
-
-	size = g_list_length (values);
-	s = p = g_malloc ((size * 17 + 1) * sizeof (char));
-
-	for (l = values; l; l = l->next){
-		strcpy (s, isodate_from_time_t (*(time_t *)l->data));
-		len = strlen (s);
-		s [len] = ',';
-		s += len + 1;
-	}
-	s--;
-	*s = 0;
-	addPropValue (o, prop, p);
-	g_free (p);
-}
-
-static char *recur_type_name [] = { "D", "W", "MP", "MD", "YM", "YD" };
-static char *recur_day_list  [] = { "SU", "MO", "TU","WE", "TH", "FR", "SA" };
-static char *alarm_names [] = { VCMAlarmProp, VCPAlarmProp, VCDAlarmProp, VCAAlarmProp };
-
-static VObject *
-save_alarm (VObject *o, CalendarAlarm *alarm, iCalObject *ical)
-{
-	VObject *alarm_object;
-	struct tm tm;
-	time_t alarm_time;
-
-	if (!alarm->enabled)
-		return NULL;
-	tm = *localtime (&ical->dtstart);
-	switch (alarm->units){
-	case ALARM_MINUTES:
-		tm.tm_min -= alarm->count;
-		break;
-
-	case ALARM_HOURS:
-		tm.tm_hour -= alarm->count;
-		break;
-
-	case ALARM_DAYS:
-		tm.tm_mday -= alarm->count;
-		break;
-	}
-
-	alarm_time = mktime (&tm);
-	alarm_object = addProp (o, alarm_names [alarm->type]);
-	addPropValue (alarm_object, VCRunTimeProp, isodate_from_time_t (alarm_time));
-
-	if (alarm->snooze_secs)
-		addPropValue (alarm_object, VCSnoozeTimeProp, isodiff_from_secs (alarm->snooze_secs));
-	else
-		addPropValue (alarm_object, VCSnoozeTimeProp, "");
-
-	if (alarm->snooze_repeat){
-		char buf [20];
-
-		sprintf (buf, "%d", alarm->snooze_repeat);
-		addPropValue (alarm_object, VCRepeatCountProp, buf);
-	} else
-		addPropValue (alarm_object, VCRepeatCountProp, "");
-	return alarm_object;
-}
-
-VObject *
-ical_object_to_vobject (iCalObject *ical)
-{
-	VObject *o, *alarm, *s;
-	GList *l;
-
-	if (ical->type == ICAL_EVENT)
-		o = newVObject (VCEventProp);
-	else
-		o = newVObject (VCTodoProp);
-
-	/* uid */
-	if (ical->uid)
-		addPropValue (o, VCUniqueStringProp, ical->uid);
-
-	/* seq */
-	addPropValue (o, VCSequenceProp, to_str (ical->seq));
-
-	/* dtstart */
-	addPropValue (o, VCDTstartProp, isodate_from_time_t (ical->dtstart));
-
-	/* dtend */
-	if (ical->type == ICAL_EVENT){
-		addPropValue (o, VCDTendProp, isodate_from_time_t (ical->dtend));
-	} else if (ical->type == ICAL_TODO){
-		addPropValue (o, VCDueProp, isodate_from_time_t (ical->dtend));
-	}
-
-	/* dcreated */
-	addPropValue (o, VCDCreatedProp, isodate_from_time_t (ical->created));
-
-	/* completed */
-	if (ical->completed)
-		addPropValue (o, VCDTendProp, isodate_from_time_t (ical->completed));
-
-	/* last_mod */
-	addPropValue (o, VCLastModifiedProp, isodate_from_time_t (ical->last_mod));
-
-	/* exdate */
-	if (ical->exdate)
-		store_date_list (o, VCExpDateProp, ical->exdate);
-
-	/* description/comment */
-	if (ical->comment && strlen (ical->comment)){
-		s = addPropValue (o, VCDescriptionProp, ical->comment);
-		if (strchr (ical->comment, '\n'))
-			addProp (s, VCQuotedPrintableProp);
-	}
-
-	/* summary */
-	if (ical->summary && strlen (ical->summary)) {
-		s = addPropValue (o, VCSummaryProp, ical->summary);
-		if (strchr (ical->summary, '\n'))
-			addProp (s, VCQuotedPrintableProp);
-	}
-		
-	/* status */
-	addPropValue (o, VCStatusProp, ical->status);
-
-	/* class */
-	addPropValue (o, VCClassProp, ical->class);
-
-	/* categories */
-	if (ical->categories)
-		store_list (o, VCCategoriesProp, ical->categories);
-
-	/* resources */
-	if (ical->resources)
-		store_list (o, VCCategoriesProp, ical->resources);
-
-	/* priority */
-	addPropValue (o, VCPriorityProp, to_str (ical->priority));
-
-	/* transparency */
-	addPropValue (o, VCTranspProp, to_str (ical->transp));
-
-	/* Owner/organizer */
-	if (ical->organizer && ical->organizer->addr)
-		addPropValue (o, VCOrgNameProp, ical->organizer->addr);
-
-	/* related */
-	if (ical->related)
-		store_rel_list (o, VCRelatedToProp, ical->related);
-
-	/* attach */
-	for (l = ical->attach; l; l = l->next)
-		addPropValue (o, VCAttachProp, l->data);
-
-	/* url */
-	if (ical->url)
-		addPropValue (o, VCURLProp, ical->url);
-
-	if (ical->recur){
-		char result [256];
-		char buffer [80];
-		int i;
-
-		sprintf (result, "%s%d ", recur_type_name [ical->recur->type], ical->recur->interval);
-		switch (ical->recur->type){
-		case RECUR_DAILY:
-			break;
-
-		case RECUR_WEEKLY:
-			for (i = 0; i < 7; i++){
-				if (ical->recur->weekday & (1 << i)){
-					sprintf (buffer, "%s ", recur_day_list [i]);
-					strcat (result, buffer);
-				}
-			}
-			break;
-
-		case RECUR_MONTHLY_BY_POS: {
-			int nega = ical->recur->u.month_pos < 0;
-
-			sprintf (buffer, "%d%s ", nega ? -ical->recur->u.month_pos : ical->recur->u.month_pos,
-				 nega ? "-" : "+");
-			strcat (result, buffer);
-			/* the gui is set up for a single day, not a set here in this case */
-			sprintf (buffer, "%s ", recur_day_list [ical->recur->weekday]);
-			strcat (result, buffer);
-		}
-		break;
-
-		case RECUR_MONTHLY_BY_DAY:
-			sprintf (buffer, "%d ", ical->recur->u.month_pos);
-			strcat (result, buffer);
-			break;
-
-		case RECUR_YEARLY_BY_MONTH:
-			break;
-
-		case RECUR_YEARLY_BY_DAY:
-			break;
-		}
-		if (ical->recur->_enddate == 0)
-			sprintf (buffer, "#%d ",ical->recur->duration);
-		else
-			sprintf (buffer, "%s ", isodate_from_time_t (ical->recur->_enddate));
-		strcat (result, buffer);
-		addPropValue (o, VCRRuleProp, result);
-	}
-
-	save_alarm (o, &ical->aalarm, ical);
-	save_alarm (o, &ical->dalarm, ical);
-
-	if ((alarm = save_alarm (o, &ical->palarm, ical)))
-		addPropValue (alarm, VCProcedureNameProp, ical->palarm.data);
-	if ((alarm = save_alarm (o, &ical->malarm, ical)))
-		addPropValue (alarm, VCEmailAddressProp, ical->malarm.data);
-
-	/* Pilot */
-	{
-		char buffer [20];
-
-		sprintf (buffer, "%d", ical->pilot_id);
-		addPropValue (o, XPilotIdProp, buffer);
-		sprintf (buffer, "%d", ical->pilot_status);
-		addPropValue (o, XPilotStatusProp, buffer);
-	}
-
-	return o;
-}
-
-void
-ical_foreach (GList *events, calendarfn fn, void *closure)
-{
-	for (; events; events = events->next){
-		iCalObject *ical = events->data;
-
-		(*fn) (ical, ical->dtstart, ical->dtend, closure);
-	}
-}
-
-static int
-is_date_in_list (GList *list, struct tm *date)
-{
-	struct tm tm;
-
-	for (; list; list = list->next){
-		time_t *timep = list->data;
-
-		tm = *localtime (timep);
-		if (date->tm_mday == tm.tm_mday &&
-		    date->tm_mon  == tm.tm_mon &&
-		    date->tm_year == tm.tm_year){
-			return 1;
-		}
-	}
-	return 0;
-}
-
-/* Generates an event instance based on the reference time */
-static gboolean
-generate (iCalObject *ico, time_t reference, calendarfn cb, void *closure)
-{
-	time_t offset;
-	struct tm tm_start, ref;
-	time_t start, end;
-
-	offset = ico->dtend - ico->dtstart;
-
-	tm_start = *localtime (&ico->dtstart);
-	ref      = *localtime (&reference);
-
-	tm_start.tm_mday = ref.tm_mday;
-	tm_start.tm_mon  = ref.tm_mon;
-	tm_start.tm_year = ref.tm_year;
-
-	start = mktime (&tm_start);
-	if (start == -1) {
-		g_message ("generate(): Produced invalid start date!");
-		return FALSE;
-	}
-
-	end = start + offset;
-
-#if 0
-	/* FIXME: I think this is not needed, since we are offsetting by full day values,
-	 * and the times should remain the same --- if you have a daily appointment
-	 * at 18:00, it is always at 18:00 even during daylight savings.
-	 *
-	 * However, what should happen on the exact change-of-savings day with
-	 * appointments in the early morning hours?
-	 */
-
-	if (ref.tm_isdst > tm_start.tm_isdst) {
-		tm_start.tm_hour--;
-		tm_end.tm_hour--;
-	} else if (ref.tm_isdst < tm_start.tm_isdst) {
-		tm_start.tm_hour++;
-		tm_end.tm_hour++;
-	}
-#endif
-
-	if (ico->exdate && is_date_in_list (ico->exdate, &tm_start))
-		return TRUE;
-
-	return (*cb) (ico, start, end, closure);
-}
-
-int
-ical_object_get_first_weekday (int weekday_mask)
-{
-	int i;
-
-	for (i = 0; i < 7; i++)
-		if (weekday_mask & (1 << i))
-			return i;
-
-	return -1;
-}
-
-#define time_in_range(t, a, b) ((t >= a) && (b ? (t < b) : 1))
-#define recur_in_range(t, r) (r->enddate ? (t < r->enddate) : 1)
-
-/*
- * Generate every possible event.  Invokes the callback routine for
- * every occurrence of the event in the [START, END] time interval.
- *
- * If END is zero, the event is generated forever.
- * The callback routine is expected to return 0 when no further event
- * generation is requested.
- */
-void
-ical_object_generate_events (iCalObject *ico, time_t start, time_t end, calendarfn cb, void *closure)
-{
-	time_t current;
-	int first_week_day;
-
-	/* If there is no recurrence, just check ranges */
-
-	if (!ico->recur) {
-		if ((end && (ico->dtstart < end) && (ico->dtend > start))
-		    || ((end == 0) && (ico->dtend > start))) {
-			/* The new calendar views expect the times to not be
-			   clipped, so they can show that it continues past
-			   the end of the viewable area. */
-#if 0
-			time_t ev_s, ev_e;
-
-			/* Clip range */
-
-			ev_s = MAX (ico->dtstart, start);
-			ev_e = MIN (ico->dtend, end);
-
-			(* cb) (ico, ev_s, ev_e, closure);
-#else
-			(* cb) (ico, ico->dtstart, ico->dtend, closure);
-#endif
-		}
-		return;
-	}
-
-	/* The event has a recurrence rule -- check that we will generate at least one instance */
-
-	if (end != 0) {
-		if (ico->dtstart > end)
-			return;
-
-		if (!IS_INFINITE (ico->recur) && (ico->recur->enddate < start))
-			return;
-	}
-
-	/* Generate the instances */
-
-	current = ico->dtstart;
-
-	switch (ico->recur->type) {
-	case RECUR_DAILY:
-		do {
-			if (time_in_range (current, start, end) && recur_in_range (current, ico->recur))
-				if (!generate (ico, current, cb, closure))
-					return;
-
-			/* Advance */
-
-			current = time_add_day (current, ico->recur->interval);
-
-			if (current == -1) {
-				g_warning ("RECUR_DAILY: time_add_day() returned invalid time");
-				return;
-			}
-		} while ((current < end) || (end == 0));
-
-		break;
-
-	case RECUR_WEEKLY:
-		do {
-			struct tm tm;
-
-			tm = *localtime (&current);
-
-			if (time_in_range (current, start, end) && recur_in_range (current, ico->recur)) {
-				/* Weekdays to recur on are specified as a bitmask */
-			  if (ico->recur->weekday & (1 << tm.tm_wday)) {
-					if (!generate (ico, current, cb, closure))
-						return;
-			  }
-			}
-
-			/* Advance by day for scanning the week or by interval at week end */
-
-			if (tm.tm_wday == 6)
-				current = time_add_day (current, (ico->recur->interval - 1) * 7 + 1);
-			else
-				current = time_add_day (current, 1);
-
-			if (current == -1) {
-				g_warning ("RECUR_WEEKLY: time_add_day() returned invalid time\n");
-				return;
-			}
-		} while (current < end || (end == 0));
-
-		break;
-
-	case RECUR_MONTHLY_BY_POS:
-		/* FIXME: We only deal with positives now */
-		if (ico->recur->u.month_pos < 0) {
-			g_warning ("RECUR_MONTHLY_BY_POS does not support negative positions yet");
-			return;
-		}
-
-		if (ico->recur->u.month_pos == 0)
-			return;
-
-		first_week_day = /* ical_object_get_first_weekday (ico->recur->weekday);  */
-			ico->recur->weekday; /* the i/f only lets you choose a single day of the week! */
-
-		/* This should not happen, but take it into account */
-		if (first_week_day == -1) {
-			g_warning ("ical_object_get_first_weekday() returned -1");
-			return;
-		}
-
-		do {
-			struct tm tm;
-			time_t t;
-			int    week_day_start;
-
-			tm = *localtime (&current);
-			tm.tm_mday = 1;
-			t = mktime (&tm);
-			tm = *localtime (&t);
-			week_day_start = tm.tm_wday;
-
-			tm.tm_mday = (7 * (ico->recur->u.month_pos - ((week_day_start <= first_week_day ) ? 1 : 0))
-				      - (week_day_start - first_week_day) + 1);
-			if( tm.tm_mday > 31 )
-			{
-				tm.tm_mday = 1;
-				tm.tm_mon += ico->recur->interval;
-				current = mktime (&tm);
-				continue;
-			}
-
-			switch( tm.tm_mon )
-			{
-			case 3:
-			case 5:
-			case 8:
-			case 10:
-				if( tm.tm_mday > 30 )
-				{
-					tm.tm_mday = 1;
-					tm.tm_mon += ico->recur->interval;
-					current = mktime (&tm);
-					continue;
-				}
-				break;
-			case 1:
-				if( ((tm.tm_year+1900)%4) == 0
-					&& ((tm.tm_year+1900)%400) != 100
-					&& ((tm.tm_year+1900)%400) != 200
-					&& ((tm.tm_year+1900)%400) != 300 )
-				{
-
-					if( tm.tm_mday > 29 )
-					{
-						tm.tm_mday = 1;
-						tm.tm_mon += ico->recur->interval;
-						current = mktime (&tm);
-						continue;
-					}
-				}
-				else
-				{
-					if( tm.tm_mday > 28 )
-					{
-						tm.tm_mday = 1;
-						tm.tm_mon += ico->recur->interval;
-						current = mktime (&tm);
-						continue;
-					}
-				}
-				break;
-			}
-
-			t = mktime (&tm);
-
-			if (time_in_range (t, start, end) && recur_in_range (current, ico->recur))
-				if (!generate (ico, t, cb, closure))
-					return;
-
-			/* Advance by the appropriate number of months */
-
-			current = mktime (&tm);
-
-			tm.tm_mday = 1;
-			tm.tm_mon += ico->recur->interval;
-			current = mktime (&tm);
-
-			if (current == -1) {
-				g_warning ("RECUR_MONTHLY_BY_DAY: mktime error\n");
-				return;
-			}
-		} while ((current < end) || (end == 0));
-
-		break;
-
-	case RECUR_MONTHLY_BY_DAY:
-		do {
-			struct tm tm;
-			time_t t;
-			int    p;
-
-			tm = *localtime (&current);
-
-			p = tm.tm_mday;
-			tm.tm_mday = ico->recur->u.month_day;
-			t = mktime (&tm);
-			if (time_in_range (t, start, end) && recur_in_range (current, ico->recur))
-				if (!generate (ico, t, cb, closure))
-					return;
-
-			/* Advance by the appropriate number of months */
-
-			tm.tm_mday = p;
-			tm.tm_mon += ico->recur->interval;
-			current = mktime (&tm);
-
-			if (current == -1) {
-				g_warning ("RECUR_MONTHLY_BY_DAY: mktime error\n");
-				return;
-			}
-		} while (current < end || (end == 0));
-
-		break;
-
-	case RECUR_YEARLY_BY_MONTH:
-	case RECUR_YEARLY_BY_DAY:
-		do {
-			if (time_in_range (current, start, end) && recur_in_range (current, ico->recur))
-				if (!generate (ico, current, cb, closure))
-					return;
-
-			/* Advance */
-
-			current = time_add_year (current, ico->recur->interval);
-		} while (current < end || (end == 0));
-
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-static int
-duration_callback (iCalObject *ico, time_t start, time_t end, void *closure)
-{
-	int *count = closure;
-	struct tm tm;
-
-	tm = *localtime (&start);
-
-	(*count)++;
-	if (ico->recur->duration == *count) {
-		ico->recur->enddate = time_day_end (end);
-		return 0;
-	}
-	return 1;
-}
-
-/* Computes ico->recur->enddate from ico->recur->duration */
-void
-ical_object_compute_end (iCalObject *ico)
-{
-	int count = 0;
-
-	g_return_if_fail (ico->recur != NULL);
-
-	ico->recur->_enddate = 0;
-	ico->recur->enddate = 0;
-	ical_object_generate_events (ico, ico->dtstart, 0, duration_callback, &count);
-}
-
-int
-alarm_compute_offset (CalendarAlarm *a)
-{
-	if (!a->enabled)
-		return -1;
-	switch (a->units){
-	case ALARM_MINUTES:
-		a->offset = a->count * 60;
-		break;
-	case ALARM_HOURS:
-		a->offset = a->count * 3600;
-		break;
-	case ALARM_DAYS:
-		a->offset = a->count * 24 * 3600;
-	}
-	return a->offset;
-}
-
-
-/**
- * ical_object_find_in_string:
- * @uid: Unique identifier of the sought object.
- * @vcalobj: String representation of a complete calendar object.
- * @ico: The resulting #iCalObject is stored here.
- *
- * Parses a complete vCalendar object string and tries to find the calendar
- * object that matches the specified @uid.  If found, it stores the resulting
- * #iCalObject in the @ico parameter.
- *
- * Return value: A result code depending on whether the parse and search were
- * successful.
- **/
-CalObjFindStatus
-ical_object_find_in_string (const char *uid, const char *vcalobj, iCalObject **ico)
-{
-#if 0
-	icalcomponent* comp = NULL;
-	icalcomponent *subcomp;
-	iCalObject    *ical;
-
-	g_return_val_if_fail (vcalobj != NULL, CAL_OBJ_FIND_NOT_FOUND);
-
-	comp = icalparser_parse_string (vcalobj);
-
-	if (!comp) {
-		printf ("CAL_OBJ_FIND_SYNTAX_ERROR #1\n");
-		return CAL_OBJ_FIND_SYNTAX_ERROR;
-	}
-
-	subcomp = icalcomponent_get_first_component (comp,
-						     ICAL_ANY_COMPONENT);
-	if (!subcomp) {
-		printf ("CAL_OBJ_FIND_SYNTAX_ERROR #2\n");
-		return CAL_OBJ_FIND_SYNTAX_ERROR;
-	}
-
-	while (subcomp) {
-		ical = ical_object_create_from_icalcomponent (subcomp);
-		if (ical->type != ICAL_EVENT && 
-		    ical->type != ICAL_TODO  &&
-		    ical->type != ICAL_JOURNAL) {
-			g_warning ("Skipping unsupported iCalendar component");
-		} else {
-			if (strcasecmp (ical->uid, uid) == 0) {
-				(*ico) = ical;
-				(*ico)->ref_count = 1;
-				printf ("CAL_OBJ_FIND_SUCCESS\n");
-
-	printf ("ical_object_find_in_string:\n");
-	printf ("-----------------------------------------------------\n");
-	dump_icalobject (*ico);
-	printf ("-----------------------------------------------------\n");
-
-
-				return CAL_OBJ_FIND_SUCCESS;
-			}
-		}
-		subcomp = icalcomponent_get_next_component (comp,
-							   ICAL_ANY_COMPONENT);
-	}
-
-	printf ("CAL_OBJ_FIND_NOT_FOUND\n");
-	return CAL_OBJ_FIND_NOT_FOUND;
-
-#else /* 1 */
-	VObject *vcal;
-	VObjectIterator i;
-	CalObjFindStatus status;
-
-	g_return_val_if_fail (uid != NULL, CAL_OBJ_FIND_SYNTAX_ERROR);
-	g_return_val_if_fail (vcalobj != NULL, CAL_OBJ_FIND_SYNTAX_ERROR);
-	g_return_val_if_fail (ico != NULL, CAL_OBJ_FIND_SYNTAX_ERROR);
-
-	*ico = NULL;
-	status = CAL_OBJ_FIND_NOT_FOUND;
-
-	vcal = Parse_MIME (vcalobj, strlen (vcalobj));
-
-	if (!vcal)
-		return CAL_OBJ_FIND_SYNTAX_ERROR;
-
-	initPropIterator (&i, vcal);
-
-	while (moreIteration (&i)) {
-		VObject *vobj;
-		VObject *uid_prop;
-		char *the_str;
-
-		vobj = nextVObject (&i);
-
-		uid_prop = isAPropertyOf (vobj, VCUniqueStringProp);
-		if (!uid_prop)
-			continue;
-
-		/* str_val() sets the_str to the string representation of the
-		 * property.
-		 */
-		str_val (uid_prop);
-
-		if (strcmp (the_str, uid) == 0) {
-			const char *object_name;
-
-			object_name = vObjectName (vobj);
-			*ico = ical_object_create_from_vobject (vobj, object_name);
-
-			if (*ico)
-				status = CAL_OBJ_FIND_SUCCESS;
-		}
-
-		free (the_str);
-
-		if (status == CAL_OBJ_FIND_SUCCESS)
-			break;
-	}
-
-	cleanVObject (vcal);
-	cleanStrTbl ();
-
-	return status;
-#endif /* 1 */
-}
-
-
-#if 1
-/* Creates a VObject with the base information of a calendar */
-static VObject *
-get_calendar_base_vobject (void)
-{
-	VObject *vobj;
-	time_t now;
-	struct tm tm;
-
-	/* We call localtime for the side effect of setting tzname */
-
-	now = time (NULL);
-	tm = *localtime (&now);
-
-	vobj = newVObject (VCCalProp);
-
-	addPropValue (vobj, VCProdIdProp, PRODID);
-
-#if defined (HAVE_TM_ZONE)
-	addPropValue (vobj, VCTimeZoneProp, tm.tm_zone);
-#elif defined (HAVE_TZNAME)
-	addPropValue (vobj, VCTimeZoneProp, tzname[0]);
-#endif
-
-	/* Per the vCalendar spec, this must be "1.0" */
-	addPropValue (vobj, VCVersionProp, "1.0");
-
-	return vobj;
-}
-#endif /* 0 */
-
-/**
- * ical_object_to_string:
- * @ico: A calendar object.
- * 
- * Converts a vCalendar object to its string representation.  It is wrapped
- * inside a complete VCALENDAR object because other auxiliary information such
- * as timezones may appear there.
- * 
- * Return value: String representation of the object.
- **/
-char *
-ical_object_to_string (iCalObject *ico)
-{
-#if 0
-	icalcomponent *top = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);
-	char *out_cal_string;
-	icalcomponent *comp;
-
-	printf ("ical_object_to_string:\n");
-	printf ("-----------------------------------------------------\n");
-	dump_icalobject (ico);
-	printf ("-----------------------------------------------------\n");
-
-	comp = icalcomponent_create_from_ical_object (ico);
-	icalcomponent_add_component (top, comp);
-	out_cal_string = icalcomponent_as_ical_string (top);
-	return g_strdup (out_cal_string);
-
-#else /* 1 */
-	VObject *vcalobj, *vobj;
-	char *buf, *gbuf;
-
-	vcalobj = get_calendar_base_vobject ();
-	vobj = ical_object_to_vobject (ico);
-	addVObjectProp (vcalobj, vobj);
-
-	buf = writeMemVObject (NULL, NULL, vcalobj);
-
-	cleanVObject (vcalobj);
-	cleanStrTbl ();
-
-	/* We have to g_strdup() it because libversit uses malloc()/realloc(),
-	 * and we want clients to be able to use g_free().  Sigh.
-	 */
-	gbuf = g_strdup (buf);
-	free (buf);
-
-	return gbuf;
-#endif /* 1 */
-}
-
-
-/**
- * ical_object_compare_dates:
- * @ico1: A calendar event.
- * @ico2: A calendar event to compare with @ico1.
- * 
- * Returns TRUE if the dates of both objects match, including any recurrence
- * rules. Both calendar objects must have a type of ICAL_EVENT.
- * 
- * Return value: TRUE if both calendar objects have the same dates.
- **/
-gboolean
-ical_object_compare_dates (iCalObject *ico1,
-			   iCalObject *ico2)
-{
-	Recurrence *recur1, *recur2;
-	gint num_exdates;
-	GList *elem1, *elem2;
-	time_t *time1, *time2;
-
-	g_return_val_if_fail (ico1 != NULL, FALSE);
-	g_return_val_if_fail (ico2 != NULL, FALSE);
-	g_return_val_if_fail (ico1->type == ICAL_EVENT, FALSE);
-	g_return_val_if_fail (ico2->type == ICAL_EVENT, FALSE);
-
-	/* First check the base dates. */
-	if (ico1->dtstart != ico2->dtstart
-	    || ico1->dtend != ico2->dtend)
-		return FALSE;
-
-	recur1 = ico1->recur;
-	recur2 = ico2->recur;
-
-	/* If the event doesn't recur, we already know it matches. */
-	if (!recur1 && !recur2)
-		return TRUE;
-
-	/* Check that both recur. */
-	if (!(recur1 && recur2))
-		return FALSE;
-
-	/* Now we need to see if the recurrence rules are the same. */
-	if (recur1->type != recur2->type
-	    || recur1->interval != recur2->interval
-	    || recur1->enddate != recur2->enddate
-	    || recur1->weekday != recur2->weekday
-	    || recur1->duration != recur2->duration
-	    || recur1->_enddate != recur2->_enddate
-	    || recur1->__count != recur2->__count)
-		return FALSE;
-
-	switch (recur1->type) {
-	case RECUR_MONTHLY_BY_POS:
-		if (recur1->u.month_pos != recur2->u.month_pos)
-			return FALSE;
-		break;
-	case RECUR_MONTHLY_BY_DAY:
-		if (recur1->u.month_day != recur2->u.month_day)
-			return FALSE;
-		break;
-	default:
-		break;
-	}
-
-	/* Now check if the excluded dates match. */
-	num_exdates = g_list_length (ico1->exdate);
-	if (g_list_length (ico2->exdate) != num_exdates)
-		return FALSE;
-	if (num_exdates == 0)
-		return TRUE;
-
-	ico1->exdate = g_list_sort (ico1->exdate, compare_exdates);
-	ico2->exdate = g_list_sort (ico2->exdate, compare_exdates);
-
-	elem1 = ico1->exdate;
-	elem2 = ico2->exdate;
-	while (elem1) {
-		time1 = (time_t*) elem1->data;
-		time2 = (time_t*) elem2->data;
-
-		if (*time1 != *time2)
-			return FALSE;
-
-		elem1 = elem1->next;
-		elem2 = elem2->next;
-	}
-
-	return TRUE;
-}
-
-
-static gint
-compare_exdates (gconstpointer a, gconstpointer b)
-{
-	const time_t *ca = a, *cb = b;
-	time_t diff = *ca - *cb;
-	return (diff < 0) ? -1 : (diff > 0) ? 1 : 0;
-}
-
-
-/* Converts any CR/LF sequences in the summary field to spaces so we just
-   have a one-line field. The iCalObjects summary field is changed. */
-static void
-ical_object_normalize_summary (iCalObject *ico)
-{
-	gchar *src, *dest, ch;
-	gboolean just_output_space = FALSE;
-
-	src = dest = ico->summary;
-	while ((ch = *src++)) {
-		if (ch == '\n' || ch == '\r') {
-			/* We only output 1 space for each sequence of CR & LF
-			   characters. */
-			if (!just_output_space) {
-				*dest++ = ' ';
-				just_output_space = TRUE;
-			}
-		} else {
-			*dest++ = ch;
-			just_output_space = FALSE;
-		}
-	}
-	*dest = '\0';
-}
-
-
-void dump_icalobject (iCalObject *ico)
-{
-	if (!ico) {
-		printf ("<<NULL>>\n");
-		return;
-	}
-
-	printf ("type ");
-	switch (ico->type) {
-	case ICAL_EVENT: printf ("event"); break;
-	case ICAL_TODO: printf ("todo"); break;
-	case ICAL_JOURNAL: printf ("journal"); break;
-	case ICAL_FBREQUEST: printf ("fbrequest"); break;
-	case ICAL_FBREPLY: printf ("fbreply"); break;
-	case ICAL_BUSYTIME: printf ("busytime"); break;
-	case ICAL_TIMEZONE: printf ("timezone"); break;
-	}
-	printf ("\n");
-
-	printf ("attach-length %d\n", g_list_length (ico->attach));
-
-	printf ("attendee-length %d\n", g_list_length (ico->attendee));
-
-	printf ("catagories-length %d\n", g_list_length (ico->categories));
-
-	printf ("class '%s'\n", ico->class ? ico->class : "NULL");
-
-	printf ("comment '%s'\n", ico->comment ? ico->comment : "NULL");
-
-	printf ("completed %ld=%s",
-		ico->completed, ctime (&ico->completed));
-
-	printf ("created %ld=%s", ico->created, ctime (&ico->created));
-
-	printf ("contact-length %d\n", g_list_length (ico->contact));
-
-	printf ("desc '%s'\n", ico->desc ? ico->desc : "NULL");
-
-	printf ("dtstamp %ld=%s", ico->dtstamp, ctime (&ico->dtstamp));
-
-	printf ("dtstart %ld=%s", ico->dtstart, ctime (&ico->dtstart));
-
-	printf ("dtend %ld=%s", ico->dtend, ctime (&ico->dtend));
-
-	printf ("date_only %d\n", ico->date_only);
-
-	printf ("exdate-length %d\n", g_list_length (ico->exdate));
-
-	printf ("exrule-length %d\n", g_list_length (ico->exrule));
-
-	printf ("iCalGeo %d %f %f\n",
-		ico->geo.valid, ico->geo.latitude, ico->geo.longitude);
-
-	printf ("last_mod %ld=%s", ico->last_mod, ctime (&ico->last_mod));
-
-	printf ("location '%s'\n", ico->location ? ico->location : "NULL");
-
-	printf ("organizer %p\n", ico->organizer);
-
-	printf ("percent %d\n", ico->percent);
-
-	printf ("priority %d\n", ico->priority);
-
-	printf ("rstatus '%s'\n", ico->rstatus ? ico->rstatus : "NULL");
-
-	printf ("related-length %d\n", g_list_length (ico->related));
-
-	printf ("resources-length %d\n", g_list_length (ico->resources));
-
-	printf ("rdate-length %d\n", g_list_length (ico->rdate));
-
-	printf ("rrule-length %d\n", g_list_length (ico->rrule));
-
-	printf ("seq %d\n", ico->seq);
-
-	printf ("status '%s'\n", ico->status ? ico->status : "NULL");
-
-	printf ("summary '%s'\n", ico->summary ? ico->summary : "NULL");
-
-	printf ("transp ");
-	switch (ico->transp) {
-	case ICAL_OPAQUE: printf ("opaque"); break;
-	case ICAL_TRANSPARENT: printf ("transparent"); break;
-	}
-	printf ("\n");
-
-	printf ("uid '%s'\n", ico->uid ? ico->uid : "NULL");
-
-	printf ("url '%s'\n", ico->url ? ico->url : "NULL");
-
-	printf ("recurid %ld=%s", ico->recurid, ctime (&ico->recurid));
-
-	printf ("dalarm %d\n", ico->dalarm.enabled);
-
-	printf ("aalarm %d\n", ico->aalarm.enabled);
-
-	printf ("palarm %d\n", ico->palarm.enabled);
-
-	printf ("malarm %d\n", ico->malarm.enabled);
-
-	printf ("alarms-length %d\n", g_list_length (ico->alarms));
-
-	printf ("recur %p\n", ico->recur);
-
-	printf ("new %d\n", ico->new);
-
-	printf ("user_data %p\n", ico->user_data);
-
-	printf ("ref_count %d\n", ico->ref_count);
-}
diff --git a/calendar/cal-util/calobj.h b/calendar/cal-util/calobj.h
deleted file mode 100644
index 3caef945e2..0000000000
--- a/calendar/cal-util/calobj.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- * Internal representation of a Calendar object.  This is modeled after the
- * iCalendar/vCalendar specificiation
- *
- * Authors: Miguel de Icaza (miguel@gnu.org)
- *          Federico Mena (quartic@gimp.org).
- */
-#ifndef CALOBJ_H
-#define CALOBJ_H
-
-#include <libgnome/libgnome.h>
-#include "libversit/vcc.h"
-
-BEGIN_GNOME_DECLS
-
-/* Alarm types */
-enum AlarmType {
-	ALARM_MAIL,
-	ALARM_PROGRAM,
-	ALARM_DISPLAY,
-	ALARM_AUDIO
-};
-
-/* Whether the alarm should trigger N mins/hours/days before its due time */
-enum AlarmUnit {
-	ALARM_MINUTES,
-	ALARM_HOURS,
-	ALARM_DAYS
-};
-
-/* Field identifiers for the iCalObject structure. These are also used to
-   identify columns in ECalendarTable, so be careful when reordering them. */
-typedef enum {
-	ICAL_OBJECT_FIELD_COMMENT,
-	ICAL_OBJECT_FIELD_COMPLETED,
-	ICAL_OBJECT_FIELD_CREATED,
-	ICAL_OBJECT_FIELD_DESCRIPTION,
-	ICAL_OBJECT_FIELD_DTSTAMP,
-	ICAL_OBJECT_FIELD_DTSTART,
-	ICAL_OBJECT_FIELD_DTEND,
-	ICAL_OBJECT_FIELD_GEO,
-	ICAL_OBJECT_FIELD_LAST_MOD,
-	ICAL_OBJECT_FIELD_LOCATION,
-	ICAL_OBJECT_FIELD_ORGANIZER,
-	ICAL_OBJECT_FIELD_PERCENT,
-	ICAL_OBJECT_FIELD_PRIORITY,
-	ICAL_OBJECT_FIELD_SUMMARY,
-	ICAL_OBJECT_FIELD_URL,
-	ICAL_OBJECT_FIELD_HAS_ALARMS, /* not a real field */
-	ICAL_OBJECT_FIELD_ICON,	      /* not a real field */
-	ICAL_OBJECT_FIELD_COMPLETE,   /* not a real field */
-	ICAL_OBJECT_FIELD_RECURRING,  /* not a real field */
-	ICAL_OBJECT_FIELD_OVERDUE,    /* not a real field */
-	ICAL_OBJECT_FIELD_COLOR,      /* not a real field */
-	ICAL_OBJECT_FIELD_NUM_FIELDS
-} iCalObjectField;
-
-typedef struct {
-	enum AlarmType type;
-	int            enabled;
-	int            count;
-	enum AlarmUnit units;
-	char           *data;	/* not used for iCalendar alarms */
-
-	/* the following pointers are used for iCalendar alarms */
-
-	char           *attach;	           /* AUDIO, EMAIL, PROC */
-	char           *desc;	           /* DISPLAY, EMAIL, PROC */
-	char           *summary;           /* EMAIL */
-	char           *attendee;          /* EMAIL */
-
-	/* Does not get saved, internally used */
-	time_t         offset;
-	time_t         trigger;
-
-	int            snooze_secs;
-	int	       snooze_repeat;
-	
-	/* Widgets */
-	void           *w_count;      /* A GtkEntry */
-	void           *w_enabled;    /* A GtkChecButton */
-	void           *w_timesel;    /* A GtkMenu */
-	void           *w_entry;      /* A GnomeEntryFile/GtkEntry for PROGRAM/MAIL */
-	void           *w_label;
-} CalendarAlarm;
-
-/* Calendar object type */
-typedef enum {
-	ICAL_EVENT,
-	ICAL_TODO,
-	ICAL_JOURNAL,
-	ICAL_FBREQUEST,
-	ICAL_FBREPLY,
-	ICAL_BUSYTIME,
-	ICAL_TIMEZONE
-} iCalType;
-
-/* For keys that might contain binary or text/binary */
-typedef struct {
-	char *data;
-	int  len;
-} iCalValue;
-
-typedef enum {
-	ICAL_PILOT_SYNC_NONE = 0,
-	ICAL_PILOT_SYNC_MOD  = 1,
-	ICAL_PILOT_SYNC_DEL  = 3
-} iCalPilotState;
-
-typedef struct {
-	int     valid;		/* true if the Geography was specified */
-	double  latitude;
-	double  longitude;
-} iCalGeo;
-
-typedef enum {
-	ICAL_OPAQUE,
-	ICAL_TRANSPARENT
-} iCalTransp;
-
-typedef struct {
-	char   *uid;
-	char   *reltype;
-} iCalRelation;
-
-typedef char NotYet;
-
-enum RecurType {
-	RECUR_DAILY,
-	RECUR_WEEKLY,
-	RECUR_MONTHLY_BY_POS,
-	RECUR_MONTHLY_BY_DAY,
-	RECUR_YEARLY_BY_MONTH,
-	RECUR_YEARLY_BY_DAY,
-};
-
-#define DAY_LASTDAY 10000
-
-typedef struct {
-	enum RecurType type;
-
-	int            interval;
-
-	/* Used for recur computation */
-	time_t         enddate;	/* If the value is zero, it is an infinite event
-				 * otherwise, it is either the _enddate value (if
-				 * this is what got specified)  or it is our computed
-				 * ending date (computed from the duration item).
-				 */
-
-	int            weekday;
-
-	union {
-		int    month_pos;
-		int    month_day;
-	} u;
-
-	int            duration;
-	time_t         _enddate; /* As found on the vCalendar file */
-	int            __count;
-} Recurrence;
-
-/* 
-   NOTE: iCalPerson is used for various property values which specify
-   people (e.g. ATTENDEE, ORGANIZER, etc.  Not all fields are valid
-   under RFC 2445 for all property values, but iCalPerson can store
-   them anyway.  Enforcing the RFC is a job for the parser.
-*/
-
-typedef struct {
-	char          *addr;
-	char          *name;
-	char          *role;
-	char          *partstat;
-	gboolean      rsvp;
-	char          *cutype;	/* calendar user type */
-	GList         *member;	/* group memberships */
-	GList         *deleg_to;
-	GList         *deleg_from;
-	char          *sent_by;
-	char          *directory;
-	GList         *altrep;	/* list of char* URI's */
-} iCalPerson;
-
-#define IS_INFINITE(r) (r->duration == 0)
-
-/* Flags to indicate what has changed in an object */
-typedef enum {
-	CHANGE_NEW     = 1 << 0,	/* new object */
-	CHANGE_SUMMARY = 1 << 1,	/* summary */
-	CHANGE_DATES   = 1 << 2,	/* dtstart / dtend */
-	CHANGE_ALL     = CHANGE_SUMMARY | CHANGE_DATES
-} CalObjectChange;
-
-/*
- * This describes an iCalendar object, note that we never store durations, instead we
- * always compute the end time computed from the start + duration.
- */
-typedef struct {
-	iCalType      type;
-
-	GList         *attach;		/* type: one or more URIs or binary data */
-        GList         *attendee; 	/* type: CAL-ADDRESS (list of iCalPerson) */
-	GList         *categories; 	/* type: one or more TEXT */
-	char          *class;
-
-	char          *comment;		/* we collapse one or more TEXTs into one */
-	time_t        completed;
-	time_t        created;
-	GList         *contact;		/* type: one or more TEXT */
-	char          *desc;
-	time_t        dtstamp;
-	time_t        dtstart;
-	time_t        dtend;            /* also duedate for todo's */
-        gboolean      date_only;        /* set if the start/end times were
-   specified using dates, not times (internal use, not stored to disk) */
-	GList         *exdate;		/* type: one or more time_t's */
-	GList         *exrule;		/* type: one or more RECUR */
-	iCalGeo       geo;
-	time_t        last_mod;
-	char          *location;
-	iCalPerson    *organizer;
-	int           percent;
-	int           priority;
-	char          *rstatus;	        /* request status for freebusy */
-	GList         *related;		/* type: one or more TEXT */
-	GList         *resources;	/* type: one or more TEXT */
-	GList         *rdate;		/* type: one or more recurrence date */
-	GList         *rrule;		/* type: one or more recurrence rules */
-	int           seq;
-	char          *status;
-	char          *summary;
-	iCalTransp    transp;
-	char          *uid;
-	char          *url;
-	time_t        recurid;
-
-	CalendarAlarm dalarm;
-	CalendarAlarm aalarm;
-	CalendarAlarm palarm;
-	CalendarAlarm malarm;
-
-	GList         *alarms;
-
-	Recurrence    *recur;
-	
-	int new;
-	void *user_data;		/* Generic data pointer */
-
-	/* Pilot */
-	iCalPilotState pilot_status;    /* Status information */
-	guint32            pilot_id;        /* Pilot ID */
-
-	guint	       ref_count;
-} iCalObject;
-
-/* The callback for the recurrence generator */
-typedef int (*calendarfn) (iCalObject *, time_t, time_t, void *);
-
-iCalObject *ical_new                        (char *comment, char *organizer, char *summary);
-iCalObject *ical_object_new                 (void);
-
-void        ical_object_ref                 (iCalObject *ico);
-void        ical_object_unref               (iCalObject *ico);
-
-iCalObject *ical_object_create_from_vobject (VObject *obj, const char *object_name);
-VObject    *ical_object_to_vobject          (iCalObject *ical);
-iCalObject *ical_object_duplicate           (iCalObject *o);
-void        ical_foreach                    (GList *events, calendarfn fn, void *closure);
-void        ical_object_generate_events     (iCalObject *ico, time_t start, time_t end, calendarfn cb, void *closure);
-void        ical_object_add_exdate          (iCalObject *o, time_t t);
-
-/* Computes the enddate field of the recurrence based on the duration */
-void        ical_object_compute_end         (iCalObject *ico);
-
-typedef enum {
-	CAL_OBJ_FIND_SUCCESS,
-	CAL_OBJ_FIND_SYNTAX_ERROR,
-	CAL_OBJ_FIND_NOT_FOUND
-} CalObjFindStatus;
-
-CalObjFindStatus ical_object_find_in_string (const char *uid, const char *vcalobj, iCalObject **ico);
-
-char       *ical_object_to_string (iCalObject *ico);
-
-
-/* Returns the first toggled day in a weekday mask -- we do this because we do not support multiple
- * days on a monthly-by-pos recurrence.  If no days are toggled, it returns -1.
- */
-int	    ical_object_get_first_weekday (int weekday_mask);
-
-/* Returns the number of seconds configured to trigger the alarm in advance to an event */
-int         alarm_compute_offset (CalendarAlarm *a);
-
-
-/* Returns TRUE if the dates of both objects match, including any recurrence
-   rules. */
-gboolean    ical_object_compare_dates (iCalObject *ico1, iCalObject *ico2);
-
-/* Generates a new uid for a calendar object. Should be g_free'd eventually. */
-char	   *ical_gen_uid (void);
-
-/* This resets any recurrence rules of the iCalObject. */
-void	    ical_object_reset_recurrence (iCalObject *ico);
-
-
-void dump_icalobject (iCalObject *ico);
-
-END_GNOME_DECLS
-
-#endif
-
diff --git a/calendar/cal-util/icalendar-save.c b/calendar/cal-util/icalendar-save.c
deleted file mode 100644
index 8f2335763f..0000000000
--- a/calendar/cal-util/icalendar-save.c
+++ /dev/null
@@ -1,516 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include "icalendar-save.h"
-
-
-static void unparse_person (iCalPerson *person, icalproperty *person_prop);
-static struct icaltimetype timet_to_icaltime (time_t tt);
-static icalproperty *unparse_related (iCalRelation *rel);
-static icalcomponent *unparse_alarm (CalendarAlarm *alarm);
-
-
-icalcomponent*
-icalcomponent_create_from_ical_object (iCalObject *ical)
-{
-	icalcomponent_kind kind;
-	icalcomponent *comp;
-	icalproperty *prop;
-
-	switch (ical->type) {
-	case ICAL_EVENT: kind = ICAL_VEVENT_COMPONENT; break;
-	case ICAL_TODO: kind = ICAL_VTODO_COMPONENT; break;
-	case ICAL_JOURNAL: kind = ICAL_VJOURNAL_COMPONENT; break;
-	case ICAL_FBREQUEST: kind = ICAL_VFREEBUSY_COMPONENT; break;
-	case ICAL_TIMEZONE: kind = ICAL_VTIMEZONE_COMPONENT; break;
-	default:
-		kind = ICAL_NO_COMPONENT; break;
-	}
-
-	comp = icalcomponent_new (kind);
-
-	/*** calscale ***/
-	prop = icalproperty_new_calscale ("GREGORIAN");
-	icalcomponent_add_property (comp, prop);
-
-	/*** catagories ***/
-	if (ical->categories) {		
-		/* ical->categories is a GList of (char *) */
-		GList *cur;
-		for (cur = ical->categories; cur; cur = cur->next) {
-			prop = icalproperty_new_categories ((char *) cur);
-			icalcomponent_add_property (comp, prop);
-		}
-	}
-
-	/*** class ***/
-	if (ical->class) {
-		prop = icalproperty_new_class (ical->class);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** comment ***/
-	if (ical->comment) {
-		prop = icalproperty_new_comment (ical->comment);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** description ***/
-	if (ical->desc) {
-		prop = icalproperty_new_description (ical->desc);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** geo ***/
-	if (ical->geo.valid) {
-		struct icalgeotype v;
-		v.lat = ical->geo.latitude;
-		v.lon = ical->geo.longitude;
-		prop = icalproperty_new_geo (v);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** location ***/
-	if (ical->location) {
-		prop = icalproperty_new_location (ical->location);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** percentcomplete ***/
-	prop = icalproperty_new_percentcomplete (ical->percent);
-	icalcomponent_add_property (comp, prop);
-
-	/*** priority ***/
-	if (ical->priority) {
-		prop = icalproperty_new_priority (ical->priority);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** resources ***/
-	if (ical->resources) {
-		/* ical->resources is a GList of (char *) */
-		GList *cur;
-		for (cur = ical->resources; cur; cur = cur->next) {
-			prop = icalproperty_new_resources ((char *) cur);
-			icalcomponent_add_property (comp, prop);
-		}
-	}
-
-	/*** status ***/
-	if (ical->status) {
-		prop = icalproperty_new_status (ical->status);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** summary ***/
-	if (ical->summary) {
-		prop = icalproperty_new_summary (ical->summary);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** completed ***/
-	if (ical->completed) {
-		struct icaltimetype ictime;
-		ictime = timet_to_icaltime (ical->completed);
-		prop = icalproperty_new_completed (ictime);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** dtend ***/  /*** due ***/
-	if (ical->dtend) {
-		/* FIXME: We should handle timezone specifiers */
-		struct icaltimetype ictime;
-		ictime = timet_to_icaltime (ical->dtend);
-		if (ical->type == ICAL_TODO)
-			prop = icalproperty_new_due (ictime);
-		else
-			prop = icalproperty_new_dtend (ictime);
-		if (ical->date_only) {
-			icalparameter *param;
-			param = icalparameter_new (ICAL_VALUE_PARAMETER);
-			icalparameter_set_value (param, ICAL_VALUE_DATE);
-			icalproperty_add_parameter (prop, param);
-		}
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** dtstart ***/
-	if (ical->dtstart) {
-		/* FIXME: We should handle timezone specifiers */
-		struct icaltimetype ictime;
-		ictime = timet_to_icaltime (ical->dtstart);
-		prop = icalproperty_new_dtstart (ictime);
-		if (ical->date_only) {
-			icalparameter *param;
-			param = icalparameter_new (ICAL_VALUE_PARAMETER);
-			icalparameter_set_value (param, ICAL_VALUE_DATE);
-			icalproperty_add_parameter (prop, param);
-		}
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** duration ***/
-	{
-		/* FIX ME */
-	}
-
-	/*** freebusy ***/
-	{
-		/* FIX ME */
-	}
-
-	/*** transp ***/
-	{
-		if (ical->transp == ICAL_TRANSP_PROPERTY)
-			prop = icalproperty_new_transp ("TRANSPARENT");
-		else
-			prop = icalproperty_new_transp ("OPAQUE");
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*
-	  ICAL_TZID_PROPERTY:
-	  ICAL_TZNAME_PROPERTY:
-	  ICAL_TZOFFSETFROM_PROPERTY:
-	  ICAL_TZOFFSETTO_PROPERTY:
-	  ICAL_TZURL_PROPERTY:
-	*/
-
-	/*** attendee ***/
-	if (ical->attendee) {
-		/* a list of (iCalPerson *) */
-		GList *cur;
-		for (cur = ical->attendee; cur; cur = cur->next) {
-			iCalPerson *person = (iCalPerson *) cur->data;
-			prop = icalproperty_new_attendee (person->addr);
-			unparse_person (person, prop);
-			icalcomponent_add_property (comp, prop);
-		}
-	}
-
-	/*** contact ***/
-	if (ical->contact) {
-		/* a list of (iCalPerson *) */
-		GList *cur;
-		for (cur = ical->contact; cur; cur = cur->next) {
-			iCalPerson *person = (iCalPerson *) cur->data;
-			prop = icalproperty_new_contact (person->addr);
-			unparse_person (person, prop);
-			icalcomponent_add_property (comp, prop);
-		}
-	}
-
-	/*** organizer ***/
-	if (ical->organizer) {
-		prop = icalproperty_new_organizer (ical->organizer->addr);
-		unparse_person (ical->organizer, prop);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** recurrenceid ***/
-	if (ical->recurid) {
-		struct icaltimetype ictime;
-		ictime = timet_to_icaltime (ical->recurid);
-		prop = icalproperty_new_recurrenceid (ictime);
-	}
-
-	/*** relatedto ***/
-
-	if (ical->related) {
-		/* a list of (iCalPerson *) */
-		GList *cur;
-		for (cur = ical->related; cur; cur = cur->next) {
-			iCalRelation *related = (iCalRelation *) cur->data;
-			prop = unparse_related (related);
-			icalcomponent_add_property (comp, prop);
-		}
-	}
-
-
-	/*** url ***/
-	if (ical->url) {
-		prop = icalproperty_new_url (ical->url);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** uid ***/
-	if (ical->uid) {
-		prop = icalproperty_new_uid (ical->uid);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** exdate ***/
-	if (ical->exdate) {
-		struct icaltimetype v;
-		GList *cur;
-		for (cur = ical->exdate; cur; cur = cur->next) {
-			time_t t = (time_t) cur->data;
-			v = timet_to_icaltime (t);
-			prop = icalproperty_new_exdate (v);
-			icalcomponent_add_property (comp, prop);
-		}
-	}
-
-	/*** created ***/
-	if (ical->created) {
-		struct icaltimetype v;
-		v = timet_to_icaltime (ical->created);
-		prop = icalproperty_new_created (v);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** dtstamp ***/
-	if (ical->dtstamp) {
-		struct icaltimetype v;
-		v = timet_to_icaltime (ical->dtstamp);
-		prop = icalproperty_new_created (v);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** lastmodified ***/
-	if (ical->last_mod) {
-		struct icaltimetype v;
-		v = timet_to_icaltime (ical->last_mod);
-		prop = icalproperty_new_created (v);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** sequence ***/
-	if (ical->seq) {
-		prop = icalproperty_new_sequence (ical->seq);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/*** requeststatus ***/
-	if (ical->rstatus) {
-		prop = icalproperty_new_requeststatus (ical->rstatus);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	/* if there is a VALARM subcomponent, add it here */
-
-	if (ical->alarms) {
-		GList *cur;
-		for (cur = ical->alarms; cur; cur = cur->next) {
-			CalendarAlarm *alarm = (CalendarAlarm *) cur->data;
-			icalcomponent *subcomp = unparse_alarm (alarm);
-			icalcomponent_add_component (comp, subcomp);
-		}
-	}
-
-	return comp;
-}
-
-
-/* FIX ME -- same as icaltimetype_from_timet in icaltypes.c */
-static
-struct icaltimetype timet_to_icaltime (time_t tt)
-{
-	struct tm *t;
-	struct icaltimetype i;
-
-	//t = gmtime (&tt);
-	t = localtime (&tt);
-
-	/*return tt - (i->is_utc ? timezone : 0); */
-	i.is_utc = 0;
-
-	i.year = t->tm_year + 1900;
-	i.month = t->tm_mon + 1;
-	i.day = t->tm_mday;
-
-	if (t->tm_hour == 0 && t->tm_min == 0 && t->tm_sec == 0) {
-		i.is_date = 1;
-		i.hour = 0;
-		i.minute = 0;
-		i.second = 0;
-	} else {
-		i.is_date = 0;
-		i.hour = t->tm_hour;
-		i.minute = t->tm_min;
-		i.second = t->tm_sec;
-	}
-
-	return i;
-}
-
-
-/* fills in "person_prop" with information from "person" */
-
-static
-void unparse_person (iCalPerson *person, icalproperty *person_prop)
-{
-	icalparameter *param;
-	GList *cur;
-
-	/* convert iCalPerson to an icalproperty */
-
-	if (person->name) {
-		param = icalparameter_new_cn (person->name);
-		icalproperty_add_parameter (person_prop, param);
-	}
-
-	if (person->role) {
-		if (g_strcasecmp (person->role, "CHAIR") == 0)
-			param = icalparameter_new_role (ICAL_ROLE_CHAIR);
-		else if (g_strcasecmp (person->role, "REQPARTICIPANT") == 0)
-			param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT);
-		else if (g_strcasecmp (person->role, "OPTPARTICIPANT") == 0)
-			param = icalparameter_new_role (ICAL_ROLE_OPTPARTICIPANT);
-		else if (g_strcasecmp (person->role, "NONPARTICIPANT") == 0)
-			param = icalparameter_new_role (ICAL_ROLE_NONPARTICIPANT);
-		else
-			param = icalparameter_new_role (ICAL_ROLE_XNAME);
-		icalproperty_add_parameter (person_prop, param);
-	}
-
-	if (person->partstat) {
-		if (g_strcasecmp (person->partstat, "NEEDSACTION") == 0)
-			param = icalparameter_new_partstat (ICAL_PARTSTAT_NEEDSACTION);
-		else if (g_strcasecmp (person->partstat, "ACCEPTED") == 0)
-			param = icalparameter_new_partstat (ICAL_PARTSTAT_ACCEPTED);
-		else if (g_strcasecmp (person->partstat, "DECLINED") == 0)
-			param = icalparameter_new_partstat (ICAL_PARTSTAT_DECLINED);
-		else if (g_strcasecmp (person->partstat, "TENTATIVE") == 0)
-			param = icalparameter_new_partstat (ICAL_PARTSTAT_TENTATIVE);
-		else if (g_strcasecmp (person->partstat, "DELEGATED") == 0)
-			param = icalparameter_new_partstat (ICAL_PARTSTAT_DELEGATED);
-		else if (g_strcasecmp (person->partstat, "COMPLETED") == 0)
-			param = icalparameter_new_partstat (ICAL_PARTSTAT_COMPLETED);
-		else if (g_strcasecmp (person->partstat, "INPROCESS") == 0)
-			param = icalparameter_new_partstat (ICAL_PARTSTAT_INPROCESS);
-		else /* FIX ME, NEEDSACTION instead? */
-			param = icalparameter_new_partstat (ICAL_PARTSTAT_XNAME);
-		icalproperty_add_parameter (person_prop, param);
-	}
-
-	if (person->rsvp != FALSE) {
-		param = icalparameter_new_rsvp (TRUE);
-		icalproperty_add_parameter (person_prop, param);
-	}
-
-	if (person->cutype) {
-		if (g_strcasecmp (person->cutype, "INDIVIDUAL") == 0)
-			param = icalparameter_new_cutype (ICAL_CUTYPE_INDIVIDUAL);
-		else if (g_strcasecmp (person->cutype, "GROUP") == 0)
-			param = icalparameter_new_cutype (ICAL_CUTYPE_GROUP);
-		else if (g_strcasecmp (person->cutype, "RESOURCE") == 0)
-			param = icalparameter_new_cutype (ICAL_CUTYPE_RESOURCE);
-		else if (g_strcasecmp (person->cutype, "ROOM") == 0)
-			param = icalparameter_new_cutype (ICAL_CUTYPE_ROOM);
-		else /* FIX ME, INDIVIDUAL instead? */
-			param = icalparameter_new_cutype (ICAL_CUTYPE_UNKNOWN);
-		icalproperty_add_parameter (person_prop, param);
-	}
-
-	/* person->member is a list of ICAL_MEMBER_PARAMETER */
-	for (cur = person->member; cur; cur = cur->next) {
-		gchar *member = (gchar *) cur->data;
-		param = icalparameter_new_member (member);
-		icalproperty_add_parameter (person_prop, param);
-	}
-
-	/* person->deleg_to is a list of ICAL_DELEGATEDTO_PARAMETER */
-	for (cur = person->deleg_to; cur; cur = cur->next) {
-		gchar *deleg_to = (gchar *) cur->data;
-		param = icalparameter_new_delegatedto (deleg_to);
-		icalproperty_add_parameter (person_prop, param);
-	}
-
-	/* ret->deleg_from is a list of ICAL_DELEGATEDFROM_PARAMETER */
-	for (cur = person->deleg_from; cur; cur = cur->next) {
-		gchar *deleg_from = (gchar *) cur->data;
-		param = icalparameter_new_delegatedfrom (deleg_from);
-		icalproperty_add_parameter (person_prop, param);
-	}
-
-	if (person->sent_by) {
-		param = icalparameter_new_sentby (person->sent_by);
-		icalproperty_add_parameter (person_prop, param);
-	}
-
-	/* ret->deleg_to is a list of ICAL_DIR_PARAMETER */
-	/* FIX ME ... */
-}
-
-
-static
-icalproperty *unparse_related (iCalRelation *rel)
-{
-	icalproperty *prop;
-
-	prop = icalproperty_new_relatedto (rel->reltype);
-
-	icalproperty_set_relatedto (prop, rel->uid);
-
-	/* FIX ME  RELTYPE_XNAME ? */
-	
-	return prop;
-}
-
-
-static
-icalcomponent *unparse_alarm (CalendarAlarm *alarm)
-{
-	icalcomponent *comp = icalcomponent_new (ICAL_VALARM_COMPONENT);
-	icalproperty *prop;
-
-	prop = NULL;
-	switch (alarm->type){
-	case ALARM_AUDIO:
-		prop = icalproperty_new_action ("AUDIO");
-		break;
-	case ALARM_DISPLAY:
-		prop = icalproperty_new_action ("DISPLAY");
-		break;
-	case ALARM_MAIL:
-		prop = icalproperty_new_action ("EMAIL");
-		break;
-	case ALARM_PROGRAM:
-		prop = icalproperty_new_action ("PROCEDURE");
-		break;
-	default:
-		g_warning ("Unsupported alarm type!");
-		break;
-	}
-	if (prop)
-		icalcomponent_add_property (comp, prop);
-
-	if (alarm->snooze_repeat)
-		prop = icalproperty_new_repeat (alarm->snooze_repeat);
-
-	if (alarm->snooze_secs) {
-		struct icaldurationtype dur;
-		dur = icaldurationtype_from_timet (alarm->snooze_secs);
-		prop = icalproperty_new_duration (dur);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	if (alarm->attach) {
-		struct icalattachtype *attach;
-		attach = icalattachtype_new ();
-		icalattachtype_set_url (attach, alarm->attach);
-		prop = icalproperty_new_attach (*attach);
-		icalattachtype_free (attach);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	if (alarm->desc) {
-		prop = icalproperty_new_description (alarm->desc);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	if (alarm->summary) {
-		prop = icalproperty_new_summary (alarm->summary);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	if (alarm->attendee) {
-		icalproperty_new_attendee (alarm->attendee);
-		icalcomponent_add_property (comp, prop);
-	}
-
-	return comp;
-}
diff --git a/calendar/cal-util/icalendar-save.h b/calendar/cal-util/icalendar-save.h
deleted file mode 100644
index 1e0ab59e70..0000000000
--- a/calendar/cal-util/icalendar-save.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef ICALENDAR_SAVE_H
-#define ICALENDAR_SAVE_H
-
-#include <ical.h>
-#include <cal-util/calobj.h>
-
-
-
-icalcomponent *icalcomponent_create_from_ical_object (iCalObject *ical);
-
-
-
-#endif
diff --git a/calendar/cal-util/icalendar-test.c b/calendar/cal-util/icalendar-test.c
deleted file mode 100644
index 921e109a2c..0000000000
--- a/calendar/cal-util/icalendar-test.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include <cal-util/calobj.h>
-#include "libversit/vcc.h"
-
-#include "icalendar-save.h"
-#include "icalendar.h"
-
-
-static icalcomponent* 
-icalendar_parse_file (char* fname)
-{
-	FILE* fp;
-	icalcomponent* comp = NULL;
-	gchar* str;
-	struct stat st;
-	int n;
-
-	fp = fopen (fname, "r");
-	if (!fp) {
-		g_warning ("Cannot open open calendar file.");
-		return NULL;
-	}
-	
-	stat (fname, &st);
-	
-	str = g_malloc (st.st_size + 2);
-	
-	n = fread ((gchar*) str, 1, st.st_size, fp);
-	if (n != st.st_size) {
-		g_warning ("Read error.");
-	}
-	str[n] = '\0';
-
-	fclose (fp);
-	
-	comp = icalparser_parse_string (str);
-	g_free (str);
-
-	return comp;
-}
-
-
-static GList *
-icalendar_calendar_load (GList *icals, char *fname)
-{
-	icalcomponent *comp;
-	icalcomponent *subcomp;
-	iCalObject    *ical;
-
-	comp = icalendar_parse_file (fname);
-	subcomp = icalcomponent_get_first_component (comp,
-						     ICAL_ANY_COMPONENT);
-	while (subcomp) {
-		ical = ical_object_create_from_icalcomponent (subcomp);
-		if (ical->type != ICAL_EVENT && 
-		    ical->type != ICAL_TODO  &&
-		    ical->type != ICAL_JOURNAL) {
-			g_warning ("Skipping unsupported iCalendar component");
-		} else {
-			printf ("prepending %p\n", ical);
-			icals = g_list_prepend (icals, ical);
-		}
-		subcomp = icalcomponent_get_next_component (comp,
-							   ICAL_ANY_COMPONENT);
-	}
-
-	return icals;
-}
-
-
-
-
-static void
-icalendar_calendar_save (GList *icals, char *fname)
-{
-	GList *cur;
-	icalcomponent *top = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);
-	char *out_cal_string;
-
-	for (cur=icals; cur; cur=cur->next) {
-		iCalObject *ical = (iCalObject *) cur->data;
-		icalcomponent *comp;
-		comp = icalcomponent_create_from_ical_object (ical);
-		icalcomponent_add_component (top, comp);
-	}
-
-	out_cal_string = icalcomponent_as_ical_string (top);
-
-	printf ("---------------------------------------------------------\n");
-	printf ("%s", out_cal_string);
-}
-
-
-
-int main (int argc, char *argv[])
-{
-	GList *icals = NULL;
-	int i;
-	long int n0, n1;
-        struct icaldurationtype dt;
-
-
-	/* test icaldurationtype_from_timet */
-	srandom (time (0));
-
-	for (i=0; i<10; i++) {
-		n0 = random () % ((60 * 60 * 24 * 7) * 4);
-		dt = icaldurationtype_from_timet (n0);
-		n1 = icaldurationtype_as_timet (dt);
-
-		printf ("%ld -> (%d %d %d %d %d) -> %ld\n",
-			n0,
-			dt.weeks, dt.days, dt.hours, dt.minutes, dt.seconds,
-			n1);
-		if (n0 != n1) abort ();
-	}
-
-	/*****************/
-	/* test conversion of icalcomponents to and from iCalObjects */
-	/*****************/
-
-	/* load an ical file */
-
-	if (argc < 2) {
-		printf ("give ical file as argument.\n");
-		return 1;
-	}
-
-	icals = icalendar_calendar_load (icals, argv[ 1 ]);
-
-	printf ("loaded %d ical components\n", g_list_length (icals));
-
-
-	/* save it back out */
-
-	icalendar_calendar_save (icals, "out.ical");
-
-	return 0;
-}
diff --git a/calendar/cal-util/icalendar.c b/calendar/cal-util/icalendar.c
deleted file mode 100644
index c43d0fba77..0000000000
--- a/calendar/cal-util/icalendar.c
+++ /dev/null
@@ -1,673 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * icalendar server for gnomecal
- * 
- * This module interfaces between libical and the gnomecal internal
- * representation
- *
- * Copyright (C) 1999 The Free Software Foundation
- * Authors:
- *   Russell Steinthal (rms39@columbia.edu)
- * 
- */
-
-#include <config.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include "icalendar.h"
-
-static time_t icaltime_to_timet (struct icaltimetype* i);
-static CalendarAlarm* parse_alarm (icalproperty *prop);
-static iCalPerson* parse_person (icalproperty *prop, gchar *value);
-static iCalRelation* parse_related (icalproperty *prop);
-
-/* Duplicate a string without memory leaks */
-static gchar* copy_str (gchar** store, gchar* src)
-{
-	if (*store)
-		g_free (*store);
-	return (*store = g_strdup (src));
-}
-
-static GList* 
-copy_to_list (GList** store, gchar* src)
-{
-	*store = g_list_prepend (*store, g_strdup (src));
-	return *store;
-}
-
-	
-iCalObject *
-ical_object_create_from_icalcomponent (icalcomponent* comp)
-{
-	iCalObject    *ical = NULL;
-	iCalPerson    *person;
-	icalcomponent *subcomp;
-	icalproperty  *prop;
-	icalparameter *param;
-	struct icaltimetype ictime;
-	time_t *pt;	
-	CalendarAlarm *alarm = NULL;
-	icalcomponent_kind compType;
-	struct icalgeotype geo;
-	struct icalperiodtype period; 
-
-	gboolean root = FALSE;
-	gboolean attachment = FALSE;
-
-	char *tmpStr;		/* this is a library-owned string */
-
-	ical  = g_new0 (iCalObject, 1);
-
-	compType = icalcomponent_isa (comp);
-	
-	switch (compType) {
-	case ICAL_XROOT_COMPONENT:
-	     root = TRUE;
-	     break;
-	case ICAL_XATTACH_COMPONENT:
-	     attachment = TRUE;
-	     break;
-	case ICAL_VEVENT_COMPONENT:
-	     ical->type = ICAL_EVENT;
-	     break;
-	case ICAL_VTODO_COMPONENT:
-	     ical->type = ICAL_TODO;
-	     break;
-	case ICAL_VJOURNAL_COMPONENT:
-	     ical->type = ICAL_JOURNAL;
-	     break;
-	case ICAL_VCALENDAR_COMPONENT:
-	     /* FIXME: what does this mean? */
-	     break;
-	case ICAL_VFREEBUSY_COMPONENT:
-	     ical->type = ICAL_FBREQUEST;
-	     /* NOTE: This is not conclusive- you need to analyze
-		properties to determine whether this is an
-		FBREQUEST or an FBREPLY */
-	     break;
-	case ICAL_VTIMEZONE_COMPONENT:
-	     ical->type = ICAL_TIMEZONE;
-	     break;
-	case ICAL_VALARM_COMPONENT:
-	case ICAL_XAUDIOALARM_COMPONENT:
-	case ICAL_XDISPLAYALARM_COMPONENT:
-	case ICAL_XEMAILALARM_COMPONENT:
-	case ICAL_XPROCEDUREALARM_COMPONENT:
-	     /* this should not be reached, since this loop should
-		only be processing first level components */
-	     break;
-	case ICAL_XSTANDARD_COMPONENT:
-	     /* FIXME: what does this mean? */
-	     break;
-	case ICAL_XDAYLIGHT_COMPONENT:
-	     /* FIXME: what does this mean? */
-	     break;
-	case ICAL_X_COMPONENT:
-	     /* FIXME: what does this mean? */
-	     break;
-	case ICAL_VSCHEDULE_COMPONENT:
-	     /* FIXME: what does this mean? */
-	     break;
-	case ICAL_XLICINVALID_COMPONENT:
-	     /* FIXME: what does this mean? */
-	     break;
-	case ICAL_NO_COMPONENT:
-	case ICAL_ANY_COMPONENT:
-	     /* should not occur */
-	     break;
-	case ICAL_VQUERY_COMPONENT:
-	case ICAL_VCAR_COMPONENT:
-	case ICAL_VCOMMAND_COMPONENT:
-	     /* FIXME: what does this mean? */
-	     break;
-	}
-	
-	prop = icalcomponent_get_first_property (comp, ICAL_ANY_PROPERTY);
-	while (prop) {
-		switch (icalproperty_isa (prop)) {
-		case ICAL_CALSCALE_PROPERTY:
-			if (g_strcasecmp (icalproperty_get_calscale (prop),
-					  "GREGORIAN"))
-				g_warning ("Unknown calendar format.");
-			break;
-		case ICAL_METHOD_PROPERTY:
-			/* FIXME: implement something here */
-			break;
-		case ICAL_ATTACH_PROPERTY:
-			/* FIXME: not yet implemented */
-			break;
-		case ICAL_CATEGORIES_PROPERTY:
-			copy_to_list (&ical->categories,
-				      icalproperty_get_categories (prop));
-			break;
-		case ICAL_CLASS_PROPERTY:
-			copy_str (&ical->class, icalproperty_get_class (prop));
-			break;
-		case ICAL_COMMENT_PROPERTY:
-			/*tmpStr = icalproperty_get_comment (prop);*/
-			tmpStr = g_strconcat (icalproperty_get_comment (prop),
-					      ical->comment,
-					      NULL);
-			if (ical->comment)
-				g_free (ical->comment);
-			ical->comment = tmpStr;
-			break;
-		case ICAL_DESCRIPTION_PROPERTY:
-			copy_str (&ical->desc, 
-				  icalproperty_get_description (prop));
-			break;
-		case ICAL_GEO_PROPERTY:
-			geo = icalproperty_get_geo (prop);
-			ical->geo.latitude = geo.lat;
-			ical->geo.longitude = geo.lon;
-			ical->geo.valid = TRUE;
-			break;
-		case ICAL_LOCATION_PROPERTY:
-			copy_str (&ical->location,
-				  icalproperty_get_location (prop));
-			break;
-		case ICAL_PERCENTCOMPLETE_PROPERTY:
-			ical->percent = icalproperty_get_percentcomplete (prop);
-			break;
-		case ICAL_PRIORITY_PROPERTY:
-			ical->priority = icalproperty_get_priority (prop);
-			if (ical->priority < 0 || ical->priority > 9)
-				g_warning ("Priority out-of-range (see RFC2445)");
-			break;
-		case ICAL_RESOURCES_PROPERTY:
-			copy_to_list (&ical->resources,
-				      icalproperty_get_resources (prop));
-			break;
-		case ICAL_STATUS_PROPERTY:
-			copy_str (&ical->status,
-				  icalproperty_get_status (prop));
-			break;
-		case ICAL_SUMMARY_PROPERTY:
-			copy_str (&ical->summary,
-				  icalproperty_get_summary (prop));
-			break;
-		case ICAL_COMPLETED_PROPERTY:
-			ictime = icalproperty_get_completed (prop);
-			ical->completed = icaltime_to_timet (&ictime);
-			break;
-		case ICAL_DTEND_PROPERTY:
-			ictime = icalproperty_get_dtend (prop);
-			ical->dtend = icaltime_to_timet (&ictime);
-			param = icalproperty_get_first_parameter (prop,
-								  ICAL_VALUE_PARAMETER);
-			if (param)
-				ical->date_only = (icalparameter_get_value (param) == ICAL_VALUE_DATE);
-			/* FIXME: We should handle timezone specifiers */
-			break;
-		case ICAL_DUE_PROPERTY:
-			ictime = icalproperty_get_due (prop);
-			ical->dtend = icaltime_to_timet (&ictime);
-			param = icalproperty_get_first_parameter (prop,
-								  ICAL_VALUE_PARAMETER);
-			ical->date_only = (icalparameter_get_value (param) == 
-					   ICAL_VALUE_DATE);
-			/* FIXME: We should handle timezone specifiers */
-			break;
-		case ICAL_DTSTART_PROPERTY:
-			ictime = icalproperty_get_dtstart (prop);
-			ical->dtstart = icaltime_to_timet (&ictime);
-			param = icalproperty_get_first_parameter (prop,
-								  ICAL_VALUE_PARAMETER);
-			if (param)
-				ical->date_only = (icalparameter_get_value (param) == ICAL_VALUE_DATE);
-			/* FIXME: We should handle timezone specifiers */
-			break;
-		case ICAL_DURATION_PROPERTY:
-			/* FIXME: I don't see the necessary libical function */
-			break;
-		case ICAL_FREEBUSY_PROPERTY:
-			period = icalproperty_get_freebusy (prop);
-			ical->dtstart = icaltime_to_timet (&(period.start));
-			/* FIXME: period.end is specified as being relative
-			   to start, so this may not be correct */
-			ical->dtend   = icaltime_to_timet (&(period.end));
-			break;
-		case ICAL_TRANSP_PROPERTY:
-			tmpStr = icalproperty_get_transp (prop);
-			/* do not i18n the following string constant! */
-			if (!g_strcasecmp (tmpStr, "TRANSPARENT"))
-				ical->transp = ICAL_TRANSPARENT;
-			else
-				ical->transp = ICAL_OPAQUE;
-			break;
-		case ICAL_TZID_PROPERTY:
-		case ICAL_TZNAME_PROPERTY:
-		case ICAL_TZOFFSETFROM_PROPERTY:
-		case ICAL_TZOFFSETTO_PROPERTY:
-		case ICAL_TZURL_PROPERTY:
-			/* no implementation for now */
-			break;
-		case ICAL_ATTENDEE_PROPERTY:
-			tmpStr = icalproperty_get_attendee (prop);
-			person  = parse_person (prop, tmpStr);
-			ical->attendee = g_list_prepend (ical->attendee, 
-							 person);
-			break;
-		case ICAL_CONTACT_PROPERTY:
-			tmpStr = icalproperty_get_contact (prop);
-			person  = parse_person (prop, tmpStr);
-			ical->contact = g_list_prepend (ical->contact, person);
-			break;
-		case ICAL_ORGANIZER_PROPERTY:
-			tmpStr = icalproperty_get_organizer (prop);
-			person  = parse_person (prop, tmpStr);
-			if (ical->organizer)
-				g_free (ical->organizer);
-			ical->organizer = person;
-			break;
-		case ICAL_RECURRENCEID_PROPERTY:
-			ictime = icalproperty_get_recurrenceid (prop);
-			ical->recurid = icaltime_to_timet (&ictime);
-			/* FIXME: Range parameter not implemented */
-			break;
-		case ICAL_RELATEDTO_PROPERTY:
-			ical->related = g_list_prepend (ical->related,
-							parse_related (prop));
-			break;
-		case ICAL_URL_PROPERTY:
-			copy_str (&ical->url, 
-				  icalproperty_get_url (prop));
-			break;
-		case ICAL_UID_PROPERTY:
-			copy_str (&ical->uid,
-				  icalproperty_get_uid (prop));
-			break;
-		case ICAL_EXDATE_PROPERTY:
-			/* FIXME: This does not appear to parse
-                           multiple exdate values in one property, as
-                           allowed by the RFC; needs a libical fix */
-			ictime = icalproperty_get_exdate (prop);
-			pt = g_new0 (time_t, 1);
-			*pt = icaltime_to_timet (&ictime);
-			ical->exdate = g_list_prepend (ical->exdate, pt);
-			break;
-		case ICAL_EXRULE_PROPERTY:
-		case ICAL_RDATE_PROPERTY:
-		case ICAL_RRULE_PROPERTY:
-			/* FIXME: need recursion processing */
-			break;
-		case ICAL_ACTION_PROPERTY:
-		case ICAL_REPEAT_PROPERTY:
-		case ICAL_TRIGGER_PROPERTY:
-			/* should only occur in VALARM's, handled below */
-			g_assert_not_reached();
-			break;
-		case ICAL_CREATED_PROPERTY:
-			ictime = icalproperty_get_created (prop);
-			ical->created = icaltime_to_timet (&ictime);
-			break;
-		case ICAL_DTSTAMP_PROPERTY:
-			ictime = icalproperty_get_dtstamp (prop);
-			ical->dtstamp = icaltime_to_timet (&ictime);
-			break;
-		case ICAL_LASTMODIFIED_PROPERTY:
-			ictime = icalproperty_get_lastmodified (prop);
-			ical->last_mod = icaltime_to_timet (&ictime);
-			break;
-		case ICAL_SEQUENCE_PROPERTY:
-			ical->seq = icalproperty_get_sequence (prop);
-			break;
-		case ICAL_REQUESTSTATUS_PROPERTY:
-			copy_str (&ical->rstatus,
-				  icalproperty_get_requeststatus (prop));
-			break;
-		case ICAL_X_PROPERTY:
-			g_warning ("Unsupported X-property: %s",
-				   icalproperty_as_ical_string (prop));
-			break;
-		case ICAL_XLICERROR_PROPERTY:
-			g_warning ("Unsupported property: %s",
-				   icalproperty_get_xlicerror (prop));
-			break;
-		case ICAL_PRODID_PROPERTY:
-		case ICAL_VERSION_PROPERTY:
-			/* nothing to do for this property */
-			break;
-		default:
-			g_warning ("Unsupported property: %s", icalproperty_as_ical_string (prop));
-			break;
-			
-		}
-		
-		prop = icalcomponent_get_next_property (comp,
-							ICAL_ANY_PROPERTY);
-	}
-	
-	/* now parse subcomponents --- should only be VALARM's */
-	subcomp = icalcomponent_get_first_component (comp,
-						     ICAL_ANY_COMPONENT);
-	while (subcomp) {
-		compType = icalcomponent_isa (subcomp);
-		switch (compType) {
-		case ICAL_VALARM_COMPONENT:
-			alarm = parse_alarm (subcomp);
-			if (alarm)
-				ical->alarms = g_list_prepend (ical->alarms,
-							       alarm);
-			break;
-		default:
-			g_warning ("Only nested VALARM components are supported.");
-		}
-
-		subcomp = icalcomponent_get_next_component (comp,
-							    ICAL_ANY_COMPONENT);
-	}
-
-	return ical;
-}
-
-
-static time_t icaltime_to_timet (struct icaltimetype* i)
-{
-	struct tm t;
-	time_t ret;
-
-	t.tm_year = i->year - 1900;
-	t.tm_mon  = i->month - 1;
-	t.tm_mday = i->day;
-	if (!i->is_date) {
-		t.tm_hour = i->hour;
-		t.tm_min  = i->minute;
-		t.tm_sec  = i->second;
-	} else {
-		t.tm_hour = 0;
-		t.tm_min  = 0;
-		t.tm_sec  = 0;
-	}
-
-	ret = mktime(&t);
-
-	if (i->is_utc) {
-#ifdef HAVE_TIMEZONE
-	  	extern long timezone;
-		ret -= timezone;
-#else
-		struct tm *tmp;
-		time_t tod = time(NULL);
-		tmp = localtime (&tod);
-		ret += tmp->tm_gmtoff;
-#endif
-	} 
-
-	return ret;
-}
-	
-static iCalPerson*
-parse_person (icalproperty* prop, gchar* value)
-{
-	icalparameter* param;
-	icalparameter_role role;
-	icalparameter_partstat partstat;
-	icalparameter_cutype cutype;
-
-	iCalPerson* ret;
-	
-	ret = g_new0 (iCalPerson, 1);
-
-	ret->addr = g_strdup (value);
-
-	param = icalproperty_get_first_parameter (prop,
-						  ICAL_CN_PARAMETER);
-	if (param)
-		ret->name = g_strdup (icalparameter_get_cn (param));
-	else
-		ret->name = NULL;
-	
-	
-	param = icalproperty_get_first_parameter (prop,
-						  ICAL_ROLE_PARAMETER);
-	if (param) {
-		role  = icalparameter_get_role (param);
-		switch (role) {
-		case ICAL_ROLE_CHAIR:
-			ret->role = g_strdup ("CHAIR");
-			break;
-		case ICAL_ROLE_REQPARTICIPANT:
-			ret->role = g_strdup ("REQPARTICIPANT");
-			break;
-		case ICAL_ROLE_OPTPARTICIPANT:
-			ret->role = g_strdup ("OPTPARTICIPANT");
-			break;
-		case ICAL_ROLE_NONPARTICIPANT:
-			ret->role = g_strdup ("NONPARTICIPANT");
-			break;
-		case ICAL_ROLE_XNAME:
-		default:
-			ret->role = g_strdup ("UNKNOWN");
-			break;
-		}
-	} else
-		ret->role = g_strdup ("REQPARTICIPANT");
-	
-	param = icalproperty_get_first_parameter (prop, ICAL_PARTSTAT_PARAMETER);
-	if (param) {
-		partstat = icalparameter_get_partstat (param);
-		switch (partstat) {
-		case ICAL_PARTSTAT_NEEDSACTION:
-			ret->partstat = g_strdup ("NEEDSACTION");
-			break;
-		case ICAL_PARTSTAT_ACCEPTED:
-			ret->partstat = g_strdup ("ACCEPTED");
-			break;
-		case ICAL_PARTSTAT_DECLINED:
-			ret->partstat = g_strdup ("DECLINED");
-			break;
-		case ICAL_PARTSTAT_TENTATIVE:
-			ret->partstat = g_strdup ("TENTATIVE");
-			break;
-		case ICAL_PARTSTAT_DELEGATED:
-			ret->partstat = g_strdup ("DELEGATED");
-			break;
-		case ICAL_PARTSTAT_COMPLETED:
-			ret->partstat = g_strdup ("COMPLETED");
-			break;
-		case ICAL_PARTSTAT_INPROCESS:
-			ret->partstat = g_strdup ("INPROCESS");
-			break;
-		case ICAL_PARTSTAT_XNAME:
-			ret->partstat = g_strdup (icalparameter_get_xvalue (param));
-			break;
-		default:
-			ret->partstat = g_strdup ("UNKNOWN");
-			break;
-		}
-	} else
-		ret->partstat = g_strdup ("NEEDSACTION");
-
-	param = icalproperty_get_first_parameter (prop, ICAL_RSVP_PARAMETER);
-	if (param)
-		ret->rsvp = icalparameter_get_rsvp (param);
-	else
-		ret->rsvp = FALSE;
-
-	param = icalproperty_get_first_parameter (prop, ICAL_CUTYPE_PARAMETER
-);
-	if (param) {
-		cutype = icalparameter_get_cutype (param);
-		switch (cutype) {
-		case ICAL_CUTYPE_INDIVIDUAL:
-			ret->cutype = g_strdup ("INDIVIDUAL");
-			break;
-		case ICAL_CUTYPE_GROUP:
-			ret->cutype = g_strdup ("GROUP");
-			break;
-		case ICAL_CUTYPE_RESOURCE:
-			ret->cutype = g_strdup ("RESOURCE");
-			break;
-		case ICAL_CUTYPE_ROOM:
-			ret->cutype = g_strdup ("ROOM");
-			break;
-		case ICAL_CUTYPE_UNKNOWN:
-		case ICAL_CUTYPE_XNAME:
-		default:
-			ret->cutype = g_strdup ("UNKNOWN");
-			break;
-		}
-	} else 
-		ret->cutype = g_strdup ("INDIVIDUAL");
-	
-	param = icalproperty_get_first_parameter (prop, ICAL_MEMBER_PARAMETER
-);
-	while (param) {
-		copy_to_list (&ret->member, icalparameter_get_member (param));
-		param = icalproperty_get_next_parameter (prop, 
-							 ICAL_MEMBER_PARAMETER);
-	}
-	
-	param = icalproperty_get_first_parameter (prop, ICAL_DELEGATEDTO_PARAMETER);
-	while (param) {
-		copy_to_list (&ret->deleg_to, 
-			      icalparameter_get_delegatedto (param));
-		param = icalproperty_get_next_parameter (prop,
-							 ICAL_DELEGATEDTO_PARAMETER);
-	}
-
-	param = icalproperty_get_first_parameter (prop, ICAL_DELEGATEDFROM_PARAMETER);
-	while (param) {
-		copy_to_list (&ret->deleg_from, 
-			      icalparameter_get_delegatedfrom (param));
-		param = icalproperty_get_next_parameter (prop,
-							 ICAL_DELEGATEDFROM_PARAMETER);
-	}
-
-	param = icalproperty_get_first_parameter (prop, ICAL_SENTBY_PARAMETER);
-	if (param)
-		copy_str (&ret->sent_by, icalparameter_get_sentby (param));
-	else
-		ret->sent_by = NULL;
-
-	param = icalproperty_get_first_parameter (prop, ICAL_DIR_PARAMETER);
-	while (param) {
-		copy_to_list (&ret->deleg_to, 
-			      icalparameter_get_delegatedto (param));
-		param = icalproperty_get_next_parameter (prop,
-							 ICAL_DIR_PARAMETER);
-	}
-
-	return ret;
-}
-
-static iCalRelation* 
-parse_related (icalproperty* prop)
-{
-	iCalRelation* rel;
-	icalparameter* param;
-	icalparameter_reltype type;
-
-	rel = g_new0 (iCalRelation, 1);
-	rel->uid = g_strdup (icalproperty_get_relatedto (prop));
-	
-	param = icalproperty_get_first_parameter (prop, 
-						  ICAL_RELTYPE_PARAMETER);
-	if (param) {
-		type = icalparameter_get_reltype (param);
-		switch (type) {
-		case ICAL_RELTYPE_PARENT:
-			rel->reltype = g_strdup ("PARENT");
-			break;
-		case ICAL_RELTYPE_CHILD:
-			rel->reltype = g_strdup ("CHILD");
-			break;
-		case ICAL_RELTYPE_SIBLING:
-			rel->reltype = g_strdup ("SIBLING");
-			break;
-		case ICAL_RELTYPE_XNAME:
-			rel->reltype = g_strdup (icalparameter_get_xvalue (param));
-			break;
-		default:
-			rel->reltype = g_strdup ("UNKNOWN");
-			break;
-		}
-	} else
-		rel->reltype = g_strdup ("PARENT");
-
-	return rel;
-}
-	
-#ifdef TEST
-
-int main(int argc, char* argv[])
-{
-	icalcomponent* comp;
-	comp = icalendar_parse_file (argv[1]);
-	printf ("%s\n", icalcomponent_as_ical_string (comp));
-	return 0;
-}
-
-#endif
-	
-	
-static CalendarAlarm*
-parse_alarm (icalcomponent* comp)
-{
-	CalendarAlarm *alarm;
-	icalproperty  *prop;
-	char          *tmpStr;
-	struct icaldurationtype dur;
-	struct icalattachtype attach;
-
-	g_return_val_if_fail (comp != NULL, NULL);
-	
-	alarm = g_new0 (CalendarAlarm, 1);
-	
-	prop = icalcomponent_get_first_property (comp, ICAL_ANY_PROPERTY);
-	while (prop) {
-		switch (icalproperty_isa (prop)) {
-		case ICAL_ACTION_PROPERTY:
-			tmpStr = icalproperty_get_action (prop);
-			if (!g_strcasecmp (tmpStr, "AUDIO"))
-				alarm->type = ALARM_AUDIO;
-			else if (!g_strcasecmp (tmpStr, "DISPLAY"))
-				alarm->type = ALARM_DISPLAY;
-			else if (!g_strcasecmp (tmpStr, "EMAIL"))
-				alarm->type = ALARM_MAIL;
-			else if (!g_strcasecmp (tmpStr, "PROCEDURE"))
-				alarm->type = ALARM_PROGRAM;
-			else
-				g_warning ("Unsupported alarm type!");
-			break;
-		case ICAL_TRIGGER_PROPERTY:
-			/* FIXME: waiting on proper libical support */
-			break;
-		case ICAL_REPEAT_PROPERTY:
-			alarm->snooze_repeat = icalproperty_get_repeat (prop);
-			break;
-		case ICAL_DURATION_PROPERTY:
-			dur = icalproperty_get_duration (prop);
-			alarm->snooze_secs = icaldurationtype_as_timet (dur);
-			break;
-		case ICAL_ATTACH_PROPERTY:
-			attach = icalproperty_get_attach (prop);
-			copy_str (&alarm->attach,
-				  icalattachtype_get_url (&attach));
-			break;
-		case ICAL_DESCRIPTION_PROPERTY:
-			copy_str (&alarm->desc,
-				  icalproperty_get_description (prop));
-			break;
-		case ICAL_SUMMARY_PROPERTY:
-			copy_str (&alarm->summary,
-				  icalproperty_get_summary (prop));
-			break;
-		case ICAL_ATTENDEE_PROPERTY:
-			copy_str (&alarm->attendee,
-				  icalproperty_get_attendee (prop));
-			break;
-		default:
-			g_warning ("Unsupported alarm property: %s",
-				   icalproperty_as_ical_string (prop));
-			break;
-		}
-		
-		prop = icalcomponent_get_next_property (comp, 
-							ICAL_ANY_PROPERTY);
-	}
-
-	return alarm;
-}
diff --git a/calendar/cal-util/icalendar.h b/calendar/cal-util/icalendar.h
deleted file mode 100644
index 2a22fbab71..0000000000
--- a/calendar/cal-util/icalendar.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef ICALENDAR_H
-#define ICALENDAR_H
-
-#include <ical.h>
-#include <cal-util/calobj.h>
-
-
-
-iCalObject *ical_object_create_from_icalcomponent (icalcomponent* comp);
-
-
-
-#endif
diff --git a/calendar/cal-util/test-recur.c b/calendar/cal-util/test-recur.c
deleted file mode 100644
index 620e65c185..0000000000
--- a/calendar/cal-util/test-recur.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * This tests the recurrence rule expansion functions.
- * FIXME: Needs to be updated to just use the public interface.
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <gtk/gtk.h>
-#include <cal-util/cal-recur.h>
-
-
-/* Since events can recur infinitely, we set a limit to the number of
-   occurrences we output. */
-#define MAX_OCCURRENCES	1000
-
-static void usage			(void);
-static icalcomponent* scan_ics_file	(char		*filename);
-static char* get_line			(char		*s,
-					 size_t		 size,
-					 void		*data);
-static void generate_occurrences	(icalcomponent	*comp);
-static gboolean occurrence_cb		(CalComponent	*comp,
-					 time_t		 instance_start,
-					 time_t		 instance_end,
-					 gpointer	 data);
-
-
-int
-main			(int		 argc,
-			 char		*argv[])
-{
-	gchar *filename;
-	icalcomponent *icalcomp;
-
-	gtk_init (&argc, &argv);
-
-	if (argc != 2)
-		usage ();
-
-	filename = argv[1];
-
-	icalcomp = scan_ics_file (filename);
-	if (icalcomp)
-		generate_occurrences	(icalcomp);
-
-	return 0;
-}
-
-
-static void
-usage			(void)
-{
-	g_print ("Usage: test-recur <filename>\n");
-	exit (1);
-}
-
-
-static icalcomponent*
-scan_ics_file		(char		*filename)
-{
-	FILE *fp;
-	icalcomponent *icalcomp;
-	icalparser *parser;
-
-	g_print ("Opening file: %s\n", filename);
-	fp = fopen (filename, "r");
-
-	if (!fp) {
-		g_print ("Can't open file: %s\n", filename);
-		return NULL;
-	}
-
-	parser = icalparser_new ();
-	icalparser_set_gen_data (parser, fp);
-
-	icalcomp = icalparser_parse (parser, get_line);
-	icalparser_free (parser);
-
-	return icalcomp;
-}
-
-
-/* Callback used from icalparser_parse() */
-static char *
-get_line		(char		*s,
-			 size_t		 size,
-			 void		*data)
-{
-	return fgets (s, size, (FILE*) data);
-}
-
-
-static void
-generate_occurrences	(icalcomponent	*icalcomp)
-{
-	icalcomponent *tmp_icalcomp;
-	CalComponent *comp;
-	gint occurrences;
-
-	for (tmp_icalcomp = icalcomponent_get_first_component (icalcomp, ICAL_ANY_COMPONENT);
-	     tmp_icalcomp;
-	     tmp_icalcomp = icalcomponent_get_next_component (icalcomp, ICAL_ANY_COMPONENT)) {
-		icalcomponent_kind kind;
-
-		kind = icalcomponent_isa (tmp_icalcomp);
-
-		if (!(kind == ICAL_VEVENT_COMPONENT
-		      || kind == ICAL_VTODO_COMPONENT
-		      || kind == ICAL_VJOURNAL_COMPONENT))
-			continue;
-
-		comp = cal_component_new ();
-
-		if (!cal_component_set_icalcomponent (comp, tmp_icalcomp))
-			continue;
-
-		g_print ("#############################################################################\n");
-		g_print ("%s\n\n", icalcomponent_as_ical_string (tmp_icalcomp));
-
-		cal_recur_generate_instances (comp, -1, -1,
-					      occurrence_cb, &occurrences);
-
-		g_print ("%s\n\n", icalcomponent_as_ical_string (tmp_icalcomp));
-	}
-}
-
-
-static gboolean
-occurrence_cb		(CalComponent	*comp,
-			 time_t		 instance_start,
-			 time_t		 instance_end,
-			 gpointer	 data)
-{
-	char start[32], finish[32];
-	gint *occurrences;
-
-	occurrences = (gint*) data;
-
-	strcpy (start, ctime (&instance_start));
-	start[24] = '\0';
-	strcpy (finish, ctime (&instance_end));
-	finish[24] = '\0';
-
-	g_print ("%s - %s\n", start, finish);
-
-	(*occurrences)++;
-	return (*occurrences == MAX_OCCURRENCES) ? FALSE : TRUE;
-}
diff --git a/calendar/cal-util/timeutil.c b/calendar/cal-util/timeutil.c
deleted file mode 100644
index 1281e6fe92..0000000000
--- a/calendar/cal-util/timeutil.c
+++ /dev/null
@@ -1,559 +0,0 @@
-/* Miscellaneous time-related utilities
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Authors: Federico Mena <federico@nuclecu.unam.mx>
- *          Miguel de Icaza <miguel@nuclecu.unam.mx>
- */
-
-#include <libgnome/libgnome.h>
-#include <string.h>
-#include "timeutil.h"
-
-
-
-#define digit_at(x,y) (x [y] - '0')
-	
-time_t
-time_from_isodate (char *str)
-{
-	struct tm my_tm;
-	time_t t;
-
-	if (strlen (str) < 14)
-		return -1;
-	
-	my_tm.tm_year = (digit_at (str, 0) * 1000 + digit_at (str, 1) * 100 +
-		digit_at (str, 2) * 10 + digit_at (str, 3)) - 1900;
-
-	my_tm.tm_mon  = digit_at (str, 4) * 10 + digit_at (str, 5) - 1;
-	my_tm.tm_mday = digit_at (str, 6) * 10 + digit_at (str, 7);
-	my_tm.tm_hour = digit_at (str, 9) * 10 + digit_at (str, 10);
-	my_tm.tm_min  = digit_at (str, 11) * 10 + digit_at (str, 12);
-	my_tm.tm_sec  = digit_at (str, 13) * 10 + digit_at (str, 14);
-	my_tm.tm_isdst = -1;
-	
-	t = mktime (&my_tm);
-
-	if (str [15] == 'Z')
-#if defined(HAVE_TM_GMTOFF)
-		t -= my_tm.tm_gmtoff
-#elsif defined(HAVE_TIMEZONE)
-		t -= timezone
-#endif
-		;
-	    
-	return t;
-}
-
-void
-print_time_t (time_t t)
-{
-	struct tm *tm = localtime (&t);
-	
-	printf ("TIEMPO: %d/%d/%d %d:%d:%d\n",
-		tm->tm_mon+1, tm->tm_mday, tm->tm_year,
-		tm->tm_hour, tm->tm_min, tm->tm_sec);
-}
-
-int
-get_time_t_hour (time_t t)
-{
-	struct tm *tm;
-
-	tm = localtime (&t);
-	return tm->tm_hour;
-}
-
-char *
-isodate_from_time_t (time_t t)
-{
-	struct tm *tm;
-	static char isotime [40];
-
-	tm = localtime (&t);
-	strftime (isotime, sizeof (isotime)-1, "%Y%m%dT%H%M%S", tm);
-	return isotime;
-}
-
-time_t
-time_from_start_duration (time_t start, char *duration)
-{
-	printf ("Not yet implemented\n");
-	return 0;
-}
-
-char *
-format_simple_hour (int hour, int use_am_pm)
-{
-	static char buf[256];
-
-	/* I don't know whether this is the best way to internationalize it.
-	 * Does any language use different conventions? - Federico
-	 */
-
-	if (use_am_pm)
-		g_snprintf (buf, sizeof(buf), "%d%s",
-			 (hour == 0) ? 12 : (hour > 12) ? (hour - 12) : hour,
-			 (hour < 12) ? _("am") : _("pm"));
-	else
-		g_snprintf (buf, sizeof(buf), "%02d%s", hour, _("h"));
-
-	return buf;
-
-}
-
-time_t
-time_add_minutes (time_t time, int minutes)
-{
-	struct tm *tm = localtime (&time);
-	time_t new_time;
-
-	tm->tm_min += minutes;
-	if ((new_time = mktime (tm)) == -1){
-		g_message ("time_add_minutes(): mktime() could not handle "
-			   "adding %d minutes with\n", minutes);
-		print_time_t (time);
-		return time;
-	}
-	return new_time;
-}
-
-/* Adds a day onto the time, using local time.
-   Note that if clocks go forward due to daylight savings time, there are
-   some non-existent local times, so the hour may be changed to make it a
-   valid time. This also means that it may not be wise to keep calling
-   time_add_day() to step through a certain period - if the hour gets changed
-   to make it valid time, any further calls to time_add_day() will also return
-   this hour, which may not be what you want. */
-time_t
-time_add_day (time_t time, int days)
-{
-	struct tm *tm = localtime (&time);
-	time_t new_time;
-#if 0
-	int dst_flag = tm->tm_isdst;
-#endif
-
-	tm->tm_mday += days;
-
-	if ((new_time = mktime (tm)) == -1){
-		g_message ("time_add_day(): mktime() could not handling adding %d days with\n",
-			   days);
-		print_time_t (time);
-		return time;
-	}
-
-#if 0
-	/* I don't know what this is for. See also time_day_begin() and
-	   time_day_end(). - Damon. */
-	if (dst_flag > tm->tm_isdst){
-		tm->tm_hour++;
-		new_time += 3600;
-	} else if (dst_flag < tm->tm_isdst){
-		tm->tm_hour--;
-		new_time -= 3600;
-	}
-#endif
-
-	return new_time;
-}
-
-time_t
-time_add_week (time_t time, int weeks)
-{
-	return time_add_day (time, weeks * 7);
-}
-
-time_t
-time_add_month (time_t time, int months)
-{
-	struct tm *tm = localtime (&time);
-	time_t new_time;
-	int mday;
-
-	mday = tm->tm_mday;
-	
-	tm->tm_mon += months;
-	tm->tm_isdst = -1;
-	if ((new_time = mktime (tm)) == -1){
-		g_message ("time_add_month(): mktime() could not handling adding %d months with\n",
-			   months);
-		print_time_t (time);
-		return time;
-	}
-	tm = localtime (&new_time);
-	if (tm->tm_mday < mday){
-		tm->tm_mon--;
-		tm->tm_mday = time_days_in_month (tm->tm_year+1900, tm->tm_mon);
-		return new_time = mktime (tm);
-	}
-	else
-		return new_time;
-}
-
-time_t
-time_add_year (time_t time, int years)
-{
-	struct tm *tm = localtime (&time);
-	time_t new_time;
-	
-	tm->tm_year += years;
-	if ((new_time = mktime (tm)) == -1){
-		g_message ("time_add_year(): mktime() could not handling adding %d years with\n",
-			   years);
-		print_time_t (time);
-		return time;
-	}
-	return new_time;
-}
-
-time_t
-time_day_hour (time_t t, int hour)
-{
-	struct tm tm;
-	
-	tm = *localtime (&t);
-	tm.tm_hour = hour;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-
-	return mktime (&tm);
-}
-
-/* Number of days in a month, for normal and leap years */
-static const int days_in_month[2][12] = {
-	{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
-	{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-};
-
-/* Returns whether the specified year is a leap year */
-static int
-is_leap_year (int year)
-{
-	if (year <= 1752)
-		return !(year % 4);
-	else
-		return (!(year % 4) && (year % 100)) || !(year % 400);
-}
-
-int
-time_days_in_month (int year, int month)
-{
-	g_return_val_if_fail (year >= 1900, 0);
-	g_return_val_if_fail ((month >= 0) && (month < 12), 0);
-
-	return days_in_month [is_leap_year (year)][month];
-}
-
-time_t
-time_from_day (int year, int month, int day)
-{
-	struct tm tm;
-
-	memset (&tm, 0, sizeof (tm));
-	tm.tm_year = year - 1900;
-	tm.tm_mon = month;
-	tm.tm_mday = day;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_year_begin (time_t t)
-{
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mon  = 0;
-	tm.tm_mday = 1;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_year_end (time_t t)
-{
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mon  = 0;
-	tm.tm_mday = 1;
-	tm.tm_year++;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_month_begin (time_t t)
-{
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mday = 1;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_month_end (time_t t)
-{
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mday = 1;
-	tm.tm_mon++;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_week_begin (time_t t)
-{
-	struct tm tm;
-
-	/* FIXME: make it take week_starts_on_monday into account */
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mday -= tm.tm_wday;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-time_t
-time_week_end (time_t t)
-{
-	struct tm tm;
-
-	/* FIXME: make it take week_starts_on_monday into account */
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_mday += 7 - tm.tm_wday;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-}
-
-/* Returns the start of the day, according to the local time. */
-time_t
-time_day_begin (time_t t)
-{
-#if 1
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-
-#else
-	/* This is the original code which sometimes produces a time of 1:00.
-	   I don't understand why it looked at the tm_isdst flags at all.
-	   - Damon. */
-
-	struct tm tm;
-	time_t temp = t - 43200;
-	int dstflag, dstflag2;
-	
-	tm = *localtime(&temp); /* one day */
-	dstflag = tm.tm_isdst;
-
-	tm = *localtime (&t);
-	dstflag2 = tm.tm_isdst;
-
-	if (dstflag < dstflag2)
-		tm.tm_hour = 1;
-	else
-		tm.tm_hour = 0;
-
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	
-	temp = mktime(&tm);
-	if (dstflag > dstflag2){
-		temp += 3600; 
-	}
-
-	return temp;
-#endif
-}
-
-/* Returns the end of the day, according to the local time. */
-time_t
-time_day_end (time_t t)
-{
-#if 1
-	struct tm tm;
-
-	tm = *localtime (&t);
-	tm.tm_mday++;
-	tm.tm_hour = 0;
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	tm.tm_isdst = -1;
-
-	return mktime (&tm);
-
-#else
-	/* This is the original code which has more problems than
-	   time_day_begin(). - Damon. */
-
-	struct tm tm;
-	time_t temp;
-	int dstflag, dstflag2;
-
-	t += 10800;
-	temp = t - 86400;
-
-	tm = *localtime(&temp); /* one day */
-	dstflag = tm.tm_isdst;
-
-	tm = *localtime (&t);
-	dstflag2 = tm.tm_isdst;
-
-	if (dstflag < dstflag2)
-		tm.tm_hour = 23;
-	else {
-		tm.tm_mday++;
-		tm.tm_hour = 0;
-	}
-	tm.tm_min  = 0;
-	tm.tm_sec  = 0;
-	
-	temp = mktime(&tm);
-	if(dstflag > dstflag2) {
-	}
-	return temp;
-#endif
-}
-
-static char *
-pcat (char *dest, int num, char key)
-{
-	int c;
-
-	c = sprintf (dest, "%d%c", num, key);
-	return dest + c;
-}
-
-/* Converts secs into the ISO difftime representation */
-char *
-isodiff_from_secs (int secs)
-{
-	static char buffer [60], *p;
-	int years, months, weeks, days, hours, minutes;
-	
-	years = months = weeks = days = hours = minutes = 0;
-	
-	years    = secs / (365 * 86400);
-	secs    %= (365 * 86400);
-	months   = secs / (30 * 86400);
-	secs    %= (30 * 86400);
-	weeks    = secs / (7 * 86400);
-	secs    %= (7 * 86400);
-	days     = secs / 86400;
-	secs    %= 86400;
-	hours    = secs / 3600;
-	secs    %= 3600;
-	minutes  = secs / 60;
-	secs    %= 60;
-
-	strcpy (buffer, "P");
-	p = buffer + 1;
-	if (years)
-		p = pcat (p, years, 'Y');
-	if (months)
-		p = pcat (p, months, 'M');
-	if (weeks)
-		p = pcat (p, weeks, 'W');
-	if (days)
-		p = pcat (p, days, 'D');
-	if (hours || minutes || secs){
-		*p++ = 'T';
-		if (hours)
-			p = pcat (p, hours, 'H');
-		if (minutes)
-			p = pcat (p, minutes, 'M');
-		if (secs)
-			p = pcat (p, secs, 'S');
-	}
-	
-	return buffer;
-}
-
-int
-isodiff_to_secs (char *str)
-{
-	int value, time;
-	int years, months, weeks, days, hours, minutes, seconds;
-
-	value = years = months = weeks = days = hours = minutes = time = seconds = 0;
-	if (*str != 'P')
-		return 0;
-
-	str++;
-	while (*str){
-		switch (*str){
-		case '0': case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			value = value * 10 + (*str - '0');
-			break;
-		case 'Y':
-			years = value; value = 0;
-			break;
-		case 'M':
-			if (time)
-				minutes = value;
-			else
-				months = value;
-			value = 0;
-			break;
-		case 'W':
-			weeks = value; value = 0;
-			break;
-		case 'D':
-			days = value; value = 0;
-			break;
-		case 'T':
-			value = 0; time = 1;
-			break;
-		case 'H':
-			hours = value; value = 0;
-			break;
-		case 'S':
-			seconds = value; value = 0;
-			break;
-		}
-		str++;
-	}
-	return seconds + (minutes * 60) + (hours * 3600) +
-	       (days * 86400) + (weeks * 7 * 86400) +
-	       (months * 30 * 86400) + (years * 365 * 86400);
-}
diff --git a/calendar/cal-util/timeutil.h b/calendar/cal-util/timeutil.h
deleted file mode 100644
index b8fa6400d2..0000000000
--- a/calendar/cal-util/timeutil.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Miscellaneous time-related utilities
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Authors: Federico Mena <federico@nuclecu.unam.mx>
- *          Miguel de Icaza <miguel@nuclecu.unam.mx>
- */
-
-#ifndef TIMEUTIL_H
-#define TIMEUTIL_H
-
-
-#include <time.h>
-#include <icaltypes.h>
-
-
-time_t time_from_isodate        (char *str);
-time_t time_from_start_duration (time_t start, char *duration);
-char   *isodate_from_time_t     (time_t t);
-int    get_time_t_hour          (time_t t);
-int    isodiff_to_secs          (char *str);
-char   *isodiff_from_secs       (int secs);
-
-time_t time_add_minutes (time_t time, int minutes);
-time_t time_add_day (time_t time, int days);
-time_t time_add_week (time_t time, int weeks);
-time_t time_add_month (time_t time, int months);
-time_t time_add_year (time_t time, int years);
-
-
-/* Returns pointer to a statically-allocated buffer with a string of the form
- * 3am, 4am, 12pm, 08h, 17h, etc.
- * The string is internationalized, hopefully correctly.
- */
-char *format_simple_hour (int hour, int use_am_pm);
-
-/* Returns the number of days in the specified month.  Years are full years (starting from year 1).
- * Months are in [0, 11].
- */
-int time_days_in_month (int year, int month);
-
-/* Converts the specified date to a time_t at the start of the specified day.  Years are full years
- * (starting from year 1).  Months are in [0, 11].  Days are 1-based.
- */
-time_t time_from_day (int year, int month, int day);
-
-time_t time_day_hour     (time_t t, int hour);
-
-/* For the functions below, time ranges are considered to contain the start time, but not the end
- * time.
- */
-
-/* These two functions take a time value and return the beginning or end of the corresponding year,
- * respectively.
- */
-time_t time_year_begin (time_t t);
-time_t time_year_end (time_t t);
-
-/* These two functions take a time value and return the beginning or end of the corresponding month,
- * respectively.
- */
-time_t time_month_begin (time_t t);
-time_t time_month_end (time_t t);
-
-/* These functions take a time value and return the beginning or end of the corresponding week,
- * respectively.  This takes into account the global week_starts_on_monday flag.
- */
-time_t time_week_begin (time_t t);
-time_t time_week_end (time_t t);
-
-/* These two functions take a time value and return the beginning or end of the corresponding day,
- * respectively.
- */
-time_t time_day_begin (time_t t);
-time_t time_day_end (time_t t);
-
-time_t parse_date (char *str);
-void print_time_t (time_t t);
-
-
-#endif
diff --git a/calendar/conduits/.cvsignore b/calendar/conduits/.cvsignore
deleted file mode 100644
index b840c21800..0000000000
--- a/calendar/conduits/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
-\ No newline at end of file
diff --git a/calendar/conduits/Makefile.am b/calendar/conduits/Makefile.am
deleted file mode 100644
index 906ea61971..0000000000
--- a/calendar/conduits/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = calendar todo
diff --git a/calendar/conduits/calendar/.cvsignore b/calendar/conduits/calendar/.cvsignore
deleted file mode 100644
index 83c86fa189..0000000000
--- a/calendar/conduits/calendar/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile.in
-Makefile
-.deps
-e-calendar.conduit
-*.lo
-.libs
-libecalendar_conduit.la
-e-calendar-conduit-control-applet
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
deleted file mode 100644
index e0f1d76e18..0000000000
--- a/calendar/conduits/calendar/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/calendar		\
-	-I$(top_srcdir)/libical/src/libical	\
-	-I$(top_builddir)/libical/src/libical	\
-	$(BONOBO_VFS_GNOME_CFLAGS)		\
-	$(GNOME_PILOT_CFLAGS)
-
-# Calendar Capplet
-bin_PROGRAMS = e-calendar-conduit-control-applet
-
-e_calendar_conduit_control_applet_SOURCES = calendar-conduit-control-applet.c
-
-e_calendar_conduit_control_applet_LDADD = \
-		$(CAPPLET_LIBS)  \
-		$(GNOME_LIBDIR) \
-		$(GNOME_PILOT_LIBS) \
-		$(PISOCK_LIBDIR) $(PISOCK_LIBS) \
-		$(GNOME_CAPPLET_LIBS) \
-		$(BONOBO_VFS_GNOME_LIBS) \
-		$(GNOME_XML_LIB) \
-	        $(GNOMEUI_LIBS) \
-                $(INTLLIBS)
-
-# Calendar Conduit
-e_calendar_conduitsdir=$(libdir)/gnome-pilot/conduits
-e_calendar_conduits_LTLIBRARIES = libecalendar_conduit.la
-
-libecalendar_conduit_la_SOURCES = calendar-conduit.c
-
-libecalendar_conduit_la_LIBADD = 					\
-	$(top_builddir)/calendar/cal-client/libcal-client-static.la	\
-	$(top_builddir)/calendar/cal-util/libcal-util-static.la		\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/libical/src/libical/libical-static.la		\
-	$(BONOBO_VFS_GNOME_LIBS)					\
-	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 				\
-	$(GNOME_LIBDIR) 						\
-	$(GNOME_LIBS)
-
-e-calendar.conduit: e-calendar.conduit.in Makefile
-	sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/e-calendar.conduit.in > e-calendar.conduit.tmp \
-	&& mv e-calendar.conduit.tmp e-calendar.conduit
-
-ccenterdir = $(datadir)/control-center
-ccenterPalmPilotdir = $(ccenterdir)/Peripherals
-ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
-ccenterConduits_DATA = e-calendar-conduit-control-applet.desktop 
-
-panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-panelConduits_DATA = $(ccenterConduits_DATA)
-
-Conduitdir = $(datadir)/gnome-pilot/conduits/
-Conduit_DATA = e-calendar.conduit
-
-EXTRA_DIST = \
-	e-calendar.conduit.in \
-        $(ccenterConduits_DATA)
-
-install-data-local:
-	$(mkinstalldirs) $(ccenterConduitsdir)
-	$(mkinstalldirs) $(Conduitdir)
diff --git a/calendar/conduits/calendar/calendar-conduit-config.h b/calendar/conduits/calendar/calendar-conduit-config.h
deleted file mode 100644
index e353142aaa..0000000000
--- a/calendar/conduits/calendar/calendar-conduit-config.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Calendar Conduit Configuration
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __CAL_CONDUIT_CONFIG_H__
-#define __CAL_CONDUIT_CONFIG_H__
-
-#include <gnome.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-
-/* This is the configuration of the GnomeCal conduit. */
-typedef struct _ECalConduitCfg ECalConduitCfg;
-struct _ECalConduitCfg {
-	gboolean open_secret;
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;   /* only used by capplet */
-};
-
-#ifdef CAL_CONFIG_LOAD
-/* Loads the configuration data */
-static void 
-calconduit_load_configuration (ECalConduitCfg **c, guint32 pilot_id) 
-{
-	gchar prefix[256];
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    pilot_id);
-	
-	*c = g_new0 (ECalConduitCfg,1);
-	g_assert (*c != NULL);
-
-	gnome_config_push_prefix (prefix);
-	(*c)->open_secret = gnome_config_get_bool ("open_secret=FALSE");
-
-        /* set in capplets main */
-	(*c)->sync_type = GnomePilotConduitSyncTypeCustom; 
-	gnome_config_pop_prefix ();
-	
-	(*c)->pilot_id = pilot_id;
-}
-#endif
-
-#ifdef CAL_CONFIG_SAVE
-/* Saves the configuration data. */
-static void
-calconduit_save_configuration (ECalConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    c->pilot_id);
-
-	gnome_config_push_prefix (prefix);
-	gnome_config_set_bool ("open_secret", c->open_secret);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-#endif
-
-#ifdef CAL_CONFIG_DUPE
-/* Creates a duplicate of the configuration data */
-static ECalConduitCfg*
-calconduit_dupe_configuration (ECalConduitCfg *c) 
-{
-	ECalConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (ECalConduitCfg, 1);
-	retval->sync_type = c->sync_type;
-	retval->open_secret = c->open_secret;
-	retval->pilot_id = c->pilot_id;
-
-	return retval;
-}
-#endif
-
-#ifdef CAL_CONFIG_DESTROY
-/* Destroy a configuration */
-static void 
-calconduit_destroy_configuration (ECalConduitCfg **c) 
-{
-	g_return_if_fail (c != NULL);
-	g_return_if_fail (*c != NULL);
-
-	g_free (*c);
-	*c = NULL;
-}
-#endif
-
-#endif __CAL_CONDUIT_CONFIG_H__ 
-
-
-
-
-
-
-
diff --git a/calendar/conduits/calendar/calendar-conduit-control-applet.c b/calendar/conduits/calendar/calendar-conduit-control-applet.c
deleted file mode 100644
index ecd8d84e65..0000000000
--- a/calendar/conduits/calendar/calendar-conduit-control-applet.c
+++ /dev/null
@@ -1,342 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Calendar Conduit Capplet
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <pwd.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <gnome.h>
-
-#include <config.h>
-#include <capplet-widget.h>
-
-#include <gpilotd/gnome-pilot-client.h>
-
-#define CAL_CONFIG_LOAD 1
-#define CAL_CONFIG_SAVE 1
-#define CAL_CONFIG_DUPE 1
-#define CAL_CONFIG_DESTROY 1
-#include <calendar-conduit-config.h>
-#undef CAL_CONFIG_LOAD
-#undef CAL_CONFIG_SAVE
-#undef CAL_CONFIG_DUPE
-#undef CAL_CONFIG_DESTROY
-
-/* tell changes callbacks to ignore changes or not */
-static gboolean ignore_changes=FALSE;
-
-/* capplet widget */
-static GtkWidget *capplet=NULL;
-
-/* host/device/pilot configuration windows */
-GtkWidget *cfgOptionsWindow=NULL;
-GtkWidget *cfgStateWindow=NULL;
-GtkWidget *dialogWindow=NULL;
-
-gboolean activated,org_activation_state;
-GnomePilotConduitManagement *conduit;
-GnomePilotConduitConfig *conduit_config;
-ECalConduitCfg *origState = NULL;
-ECalConduitCfg *curState = NULL;
-
-static void doTrySettings(GtkWidget *widget, ECalConduitCfg *c);
-static void doRevertSettings(GtkWidget *widget, ECalConduitCfg *c);
-static void doSaveSettings(GtkWidget *widget, ECalConduitCfg *c);
-
-static void setStateCfg (GtkWidget *w, ECalConduitCfg *c);
-
-gint pilotId;
-static GnomePilotClient *gpc;
-
-
-
-/* This array must be in the same order as enumerations
-   in GnomePilotConduitSyncType as they are used as index.
-   Custom type implies Disabled state.
-*/
-static gchar* sync_options[] ={ N_("Disabled"),
-				N_("Synchronize"),
-				N_("Copy From Pilot"),
-				N_("Copy To Pilot"),
-				N_("Merge From Pilot"),
-				N_("Merge To Pilot")};
-#define SYNC_OPTIONS_COUNT 6
-
-static void
-doTrySettings (GtkWidget *widget, ECalConduitCfg *c)
-{
-	if (c->sync_type != GnomePilotConduitSyncTypeCustom)
-		gnome_pilot_conduit_config_enable_with_first_sync (conduit_config,
-								   c->sync_type,
-								   c->sync_type,
-								   TRUE);
-	else
-		gnome_pilot_conduit_config_disable (conduit_config);
-
-	calconduit_save_configuration (c);
-}
-
-static void
-doRevertSettings (GtkWidget *widget, ECalConduitCfg *c)
-{
-	activated = org_activation_state;
-	*c = *origState;
-	setStateCfg (cfgStateWindow, c);
-	doTrySettings (widget, c);
-}
-
-static void
-doSaveSettings (GtkWidget *widget, ECalConduitCfg *c)
-{
-	*origState = *c;
-	doTrySettings (widget, c);
-}
-
-
-static void 
-doHelp (GtkWidget *widget, gpointer data) 
-{
-	GtkWidget *about;
-	const gchar *authors[] = {
-		_("JP Rosevear <jpr@helixcode.com>"),
-		"", _("Original Author:"), 
-		_("Eskil Heyn Olsen <deity@eskil.dk>"), 
-		NULL};
-  
-	about = gnome_about_new (
-		_("Evolution Calendar Conduit"), VERSION,
-		_("(C) 1998-2000 the Free Software Foundation and Helix Code"),
-		authors,
-		_("Configuration utility for the evolution calendar conduit.\n"),
-		_("gnome-unknown.xpm"));
-	gtk_widget_show (about);
-  
-	return;
-}
-
-
-/* called by the sync_type GtkOptionMenu */
-static void
-activate_sync_type (GtkMenuItem *widget, gpointer data)
-{
-	curState->sync_type = GPOINTER_TO_INT (data);
-	if (!ignore_changes)
-		capplet_widget_state_changed (CAPPLET_WIDGET (capplet), TRUE);
-}
-
-
-static GtkWidget * 
-createStateCfgWindow(void)
-{
-	GtkWidget *vbox, *table;
-	GtkWidget *label;
-	GtkWidget *optionMenu,*menuItem;
-	GtkMenu   *menu;
-	gint i;
-	
-	vbox = gtk_vbox_new(FALSE, GNOME_PAD);
-
-	table =  gtk_hbox_new(FALSE, 0); 
-	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, GNOME_PAD);
-
-	label = gtk_label_new(_("Synchronize Action"));
-	gtk_box_pack_start(GTK_BOX(table), label, FALSE, FALSE, GNOME_PAD);    
-
-	optionMenu=gtk_option_menu_new();
-	gtk_object_set_data(GTK_OBJECT(vbox), "conduit_state", optionMenu);
-	menu = GTK_MENU(gtk_menu_new());
-
-	for (i=0; i<SYNC_OPTIONS_COUNT;i++) {
-		sync_options[i]=_(sync_options[i]);
-		menuItem = gtk_menu_item_new_with_label(sync_options[i]);
-		gtk_widget_show(menuItem);
-		gtk_signal_connect(GTK_OBJECT(menuItem),"activate",
-				   GTK_SIGNAL_FUNC(activate_sync_type),
-				   GINT_TO_POINTER(i));
-		gtk_menu_append(menu,menuItem);
-	}
-
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optionMenu),GTK_WIDGET(menu));
-	gtk_box_pack_start(GTK_BOX(table), optionMenu, FALSE, FALSE, 0);    
-	
-	return vbox;
-}
-
-
-static void
-setStateCfg (GtkWidget *w, ECalConduitCfg *c)
-{
-	GtkOptionMenu *optionMenu;
-	GtkMenu *menu;
-	
-	optionMenu = gtk_object_get_data (GTK_OBJECT(w), "conduit_state");
-	g_assert (optionMenu != NULL);
-	menu = GTK_MENU (gtk_option_menu_get_menu (optionMenu));
-  
-	ignore_changes = TRUE;
-	/* Here were are relying on the items in menu being the same 
-	   order as in GnomePilotConduitSyncType. */
-	gtk_option_menu_set_history (optionMenu, (int) c->sync_type);
-	ignore_changes = FALSE;
-}
-
-
-static void
-pilot_capplet_setup(void)
-{
-	GtkWidget *frame, *table;
-
-	capplet = capplet_widget_new();
-
-	table = gtk_table_new(1, 2, FALSE);
-	gtk_container_border_width(GTK_CONTAINER(table), GNOME_PAD);
-	gtk_container_add(GTK_CONTAINER(capplet), table); 
-
-	frame = gtk_frame_new(_("Conduit state"));
-	gtk_container_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);
-	gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 1, 0, 1);
-	cfgStateWindow = createStateCfgWindow();
-	gtk_container_add(GTK_CONTAINER(frame), cfgStateWindow);
-
-	gtk_signal_connect(GTK_OBJECT(capplet), "try",
-			   GTK_SIGNAL_FUNC(doTrySettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "revert",
-			   GTK_SIGNAL_FUNC(doRevertSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "ok",
-			   GTK_SIGNAL_FUNC(doSaveSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "help",
-			   GTK_SIGNAL_FUNC(doHelp), NULL);
-
-
-	setStateCfg (cfgStateWindow, curState);
-
-	gtk_widget_show_all (capplet);
-}
-
-
-static void 
-run_error_dialog(gchar *mesg,...) 
-{
-	char tmp[80];
-	va_list ap;
-
-	va_start(ap,mesg);
-	vsnprintf(tmp,79,mesg,ap);
-	dialogWindow = gnome_message_box_new(mesg,GNOME_MESSAGE_BOX_ERROR,GNOME_STOCK_BUTTON_OK,NULL);
-	gnome_dialog_run_and_close(GNOME_DIALOG(dialogWindow));
-	va_end(ap);
-}
-
-
-static gint 
-get_pilot_id_from_gpilotd() 
-{
-	GList *pilots=NULL;
-	gint pilot;
-	int i,err;
-  
-	i=0;
-	/* we don't worry about leaking here, so pilots isn't freed */
-	switch(err = gnome_pilot_client_get_pilots(gpc,&pilots)) {
-	case GPILOTD_OK: {
-		if(pilots) {
-			for(i=0;i<g_list_length(pilots);i++) {
-				g_message("pilot %d = \"%s\"",i,(gchar*)g_list_nth(pilots,i)->data); 
-			}
-			if(i==0) {
-				run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));
-				return -1;
-			} else {
-				gnome_pilot_client_get_pilot_id_by_name(gpc,
-									pilots->data,  /* this is the first pilot */
-									&pilot);
-				if(i>1) {
-					g_message("too many pilots...");
-					/* need a choose here */
-				}
-				return pilot;
-			}
-		} else {
-			run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));
-			return -1;
-		}    
-		break;
-	}
-	case GPILOTD_ERR_NOT_CONNECTED:
-		run_error_dialog(_("Not connected to the gnome-pilot daemon"));
-		return -1;
-		break;
-	default:
-		g_warning("gnome_pilot_client_get_pilot_ids(...) = %d",err);
-		run_error_dialog(_("An error occured when trying to fetch\npilot list from the gnome-pilot daemon"));
-		return -1;
-		break;
-	}
-}
-
-
-int
-main (int argc, char *argv[])
-{
-	g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
-				G_LOG_LEVEL_CRITICAL |
-				G_LOG_LEVEL_WARNING);
-	
-	/* Init capplet */
-	gnome_capplet_init ("Evolution Calendar conduit control applet", 
-			    NULL, argc, argv, 
-			    NULL, 0, NULL);
-   
-	/* Setup Client */
-	gpc = gnome_pilot_client_new ();
-	gnome_pilot_client_connect_to_daemon (gpc);
-	pilotId = get_pilot_id_from_gpilotd ();
-	if (!pilotId) 
-		return -1;
-
-	
-	/* Put all code to set things up in here */
-	conduit = gnome_pilot_conduit_management_new ("e_calendar_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	if (conduit == NULL) 
-		return -1;
-
-	calconduit_load_configuration (&origState, pilotId);
-	conduit_config = gnome_pilot_conduit_config_new (conduit, pilotId);
-	org_activation_state = activated =
-		gnome_pilot_conduit_config_is_enabled (conduit_config,
-						       &origState->sync_type);
-
-	curState = calconduit_dupe_configuration (origState);
-    
-	pilot_capplet_setup ();
-
-	/* Done setting up, now run main loop */
-	capplet_gtk_main();
-
-	/* Clean up */
-	gnome_pilot_conduit_management_destroy (conduit);
-	calconduit_destroy_configuration (&origState);
-	calconduit_destroy_configuration (&curState);
-	
-	return 0;
-}    
diff --git a/calendar/conduits/calendar/calendar-conduit-control-applet.desktop b/calendar/conduits/calendar/calendar-conduit-control-applet.desktop
deleted file mode 100644
index 348c2b66d1..0000000000
--- a/calendar/conduits/calendar/calendar-conduit-control-applet.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Name=Calendar conduit
-Name[da]=Gnome kalender
-Name[es]=Enlace de calendario
-Name[fr]=Conduit Calendrier
-Name[no]=GNOME kalender
-Name[sv]=Kalenderkanal
-Name[tr]=Takvim par�as�
-Comment=Configure the GnomeCal conduit
-Comment[da]=Konfigur�r GnomeCal-komponent
-Comment[es]=Configurar el enlace de calendario
-Comment[fr]=Configuration du conduit calendrier
-Comment[no]=Konfigur�r GnomeCal-komponent
-Comment[sv]=Konfigurera GnomeCal-kanalen
-Comment[tr]=GnomeCal takvim par�as� ayarlar�
-Exec=calendar-conduit-control-applet --cap-id=1
-Terminal=0
-Type=Application
-Icon=gnome-calendar-conduit.png
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
deleted file mode 100644
index 3ba6e7d931..0000000000
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ /dev/null
@@ -1,1239 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Calendar Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <sys/stat.h>
-#include <utime.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <signal.h>
-#include <errno.h>
-
-#include <liboaf/liboaf.h>
-#include <bonobo.h>
-#include <gnome-xml/parser.h>
-#include <cal-client/cal-client.h>
-#include <cal-util/timeutil.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-file.h>
-#include <pi-dlp.h>
-#include <pi-version.h>
-#include <libical/src/libical/icaltypes.h>
-
-#define CAL_CONFIG_LOAD 1
-#define CAL_CONFIG_DESTROY 1
-#include <calendar-conduit-config.h>
-#undef CAL_CONFIG_LOAD
-#undef CAL_CONFIG_DESTROY
-
-#include <calendar-conduit.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.0"
-#ifdef G_LOG_DOMAIN
-#undef G_LOG_DOMAIN
-#endif
-#define G_LOG_DOMAIN "ecalconduit"
-
-#define DEBUG_CALCONDUIT 1
-/* #undef DEBUG_CALCONDUIT */
-
-#ifdef DEBUG_CALCONDUIT
-#define LOG(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-#else
-#define LOG(e...)
-#endif 
-
-#define WARN(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, e)
-#define INFO(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-
-/* debug spew DELETE ME */
-static char *
-print_local (ECalLocalRecord *local)
-{
-	static char buff[ 4096 ];
-
-	if (local == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	if (local->appt && local->appt->description) {
-		sprintf (buff, "[%ld %ld '%s' '%s']",
-			 mktime (&local->appt->begin),
-			 mktime (&local->appt->end),
-			 local->appt->description,
-			 local->appt->note);
-		return buff;
-	}
-
-	return "";
-	
-	return cal_component_get_as_string (local->comp);
-}
-
-
-/* debug spew DELETE ME */
-static char *print_remote (GnomePilotRecord *remote)
-{
-	static char buff[ 4096 ];
-	struct Appointment appt;
-
-	if (remote == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	memset (&appt, 0, sizeof (struct Appointment));
-	unpack_Appointment (&appt, remote->record, remote->length);
-
-	sprintf (buff, "[%ld %ld '%s' '%s']",
-		 mktime (&appt.begin),
-		 mktime (&appt.end),
-		 appt.description,
-		 appt.note);
-
-	return buff;
-}
-
-/* Context Routines */
-static void
-e_calendar_context_new (ECalConduitContext **ctxt, guint32 pilot_id) 
-{
-	*ctxt = g_new0 (ECalConduitContext,1);
-	g_assert (ctxt!=NULL);
-
-	calconduit_load_configuration (&(*ctxt)->cfg, pilot_id);
-}
-
-static void
-e_calendar_context_destroy (ECalConduitContext **ctxt)
-{
-	g_return_if_fail (ctxt!=NULL);
-	g_return_if_fail (*ctxt!=NULL);
-
-	if ((*ctxt)->client != NULL)
-		gtk_object_unref (GTK_OBJECT ((*ctxt)->client));
-
-	if ((*ctxt)->cfg != NULL)
-		calconduit_destroy_configuration (&(*ctxt)->cfg);
-
-	g_free (*ctxt);
-	*ctxt = NULL;
-}
-
-/* Map routines */
-static char *
-map_name (ECalConduitContext *ctxt) 
-{
-	char *filename;
-	
-	filename = g_strdup_printf ("%s/evolution/local/Calendar/pilot-map-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
-
-	return filename;
-}
-
-static void
-map_set_node_timet (xmlNodePtr node, const char *name, time_t t)
-{
-	char *tstring;
-	
-	tstring = g_strdup_printf ("%ld", t);
-	xmlSetProp (node, name, tstring);
-}
-
-static void
-map_sax_start_element (void *data, const xmlChar *name, 
-		       const xmlChar **attrs)
-{
-	ECalConduitContext *ctxt = (ECalConduitContext *)data;
-
-	if (!strcmp (name, "PilotMap")) {
-		while (attrs && *attrs != NULL) {
-			const xmlChar **val = attrs;
-			
-			val++;
-			if (!strcmp (*attrs, "timestamp")) 
-				ctxt->since = (time_t)strtoul (*val, NULL, 0);
-
-			attrs = ++val;
-		}
-	}
-	 
-	if (!strcmp (name, "map")) {
-		char *uid = NULL;
-		guint32 *pid = g_new (guint32, 1);
-
-		*pid = 0;
-
-		while (attrs && *attrs != NULL) {
-			const xmlChar **val = attrs;
-			
-			val++;
-			if (!strcmp (*attrs, "uid")) 
-				uid = g_strdup (*val);
-			
-			if (!strcmp (*attrs, "pilot_id"))
-				*pid = strtoul (*val, NULL, 0);
-				
-			attrs = ++val;
-		}
-			
-		if (uid && *pid != 0) {
-			g_hash_table_insert (ctxt->pid_map, pid, uid);
-			g_hash_table_insert (ctxt->uid_map, uid, pid);
-		} else {
-			g_free (pid);
-		}	
-	}
-}
-
-static void
-map_write_foreach (gpointer key, gpointer value, gpointer data)
-{
-	xmlNodePtr root = data;
-	xmlNodePtr mnode;
-	unsigned long *pid = key;
-	const char *uid = value;
-	char *pidstr;
-	
-	mnode = xmlNewChild (root, NULL, "map", NULL);
-	xmlSetProp (mnode, "uid", uid);
-	pidstr = g_strdup_printf ("%lu", *pid);
-	xmlSetProp (mnode, "pilot_id", pidstr);
-	g_free (pidstr);
-}
-		
-static int
-map_write (ECalConduitContext *ctxt, char *filename)
-{
-	xmlDocPtr doc;
-	int ret;
-	
-	if (ctxt->pid_map == NULL)
-		return 0;
-	
-	doc = xmlNewDoc ("1.0");
-	if (doc == NULL) {
-		WARN ("Pilot map file could not be created\n");
-		return -1;
-	}
-	doc->root = xmlNewDocNode(doc, NULL, "PilotMap", NULL);
-	map_set_node_timet (doc->root, "timestamp", time (NULL));
-
-	g_hash_table_foreach (ctxt->pid_map, map_write_foreach, doc->root);
-	
-	/* Write the file */
-	xmlSetDocCompressMode (doc, 0);
-	ret = xmlSaveFile (filename, doc);
-	if (ret < 0) {
-		g_warning ("Pilot map file '%s' could not be saved\n", filename);
-		return -1;
-	}
-	
-	xmlFreeDoc (doc);
-
-	return 0;
-}
-
-/* Calendar Server routines */
-static void
-start_calendar_server_cb (GtkWidget *cal_client,
-			  CalClientLoadStatus status,
-			  ECalConduitContext *ctxt)
-{
-	CalClient *client = CAL_CLIENT (cal_client);
-
-	LOG ("  entering start_calendar_server_load_cb, tried=%d\n",
-		ctxt->calendar_load_tried);
-
-	if (status == CAL_CLIENT_LOAD_SUCCESS) {
-		ctxt->calendar_load_success = TRUE;
-		LOG ("    success\n");
-		gtk_main_quit (); /* end the sub event loop */
-	} else {
-		if (ctxt->calendar_load_tried) {
-			LOG ("    load and create of calendar failed\n");
-			gtk_main_quit (); /* end the sub event loop */
-			return;
-		}
-
-		cal_client_create_calendar (client, ctxt->calendar_file);
-		ctxt->calendar_load_tried = TRUE;
-	}
-}
-
-static int
-start_calendar_server (ECalConduitContext *ctxt)
-{
-	
-	g_return_val_if_fail (ctxt != NULL, -2);
-
-	ctxt->client = cal_client_new ();
-
-	/* FIX ME */
-	ctxt->calendar_file = g_concat_dir_and_file (g_get_home_dir (),
-			       "evolution/local/Calendar/calendar.ics");
-
-	gtk_signal_connect (GTK_OBJECT (ctxt->client), "cal_loaded",
-			    start_calendar_server_cb, ctxt);
-
-	LOG ("    calling cal_client_load_calendar\n");
-	cal_client_load_calendar (ctxt->client, ctxt->calendar_file);
-
-	/* run a sub event loop to turn cal-client's async load
-	   notification into a synchronous call */
-	gtk_main ();
-
-	if (ctxt->calendar_load_success)
-		return 0;
-
-	return -1;
-}
-
-/* Utility routines */
-static icalrecurrencetype_weekday
-get_ical_day (int day) 
-{
-	switch (day) {
-	case 0:
-		return ICAL_MONDAY_WEEKDAY;
-	case 1:
-		return ICAL_TUESDAY_WEEKDAY;
-	case 2:
-		return ICAL_WEDNESDAY_WEEKDAY;
-	case 3:
-		return ICAL_THURSDAY_WEEKDAY;
-	case 4:
-		return ICAL_FRIDAY_WEEKDAY;
-	case 5:
-		return ICAL_SATURDAY_WEEKDAY;
-	case 6:
-		return ICAL_SUNDAY_WEEKDAY;
-	}
-
-	return ICAL_NO_WEEKDAY;
-}
-
-static void
-compute_pid (ECalConduitContext *ctxt, ECalLocalRecord *local, const char *uid)
-{
-	guint32 *pid;
-	
-	pid = g_hash_table_lookup (ctxt->uid_map, uid);
-	
-	if (pid)
-		local->local.ID = *pid;
-	else
-		local->local.ID = 0;
-}
-
-static void
-compute_status (ECalConduitContext *ctxt, ECalLocalRecord *local, const char *uid)
-{
-	local->local.archived = FALSE;
-	local->local.secret = FALSE;
-	
-	if (g_hash_table_lookup (ctxt->added, uid))
-		local->local.attr = GnomePilotRecordNew;
-	else if (g_hash_table_lookup (ctxt->modified, uid))
-		local->local.attr = GnomePilotRecordModified;
-	else if (g_hash_table_lookup (ctxt->deleted, uid))
-		local->local.attr = GnomePilotRecordDeleted;
-	else
-		local->local.attr = GnomePilotRecordNothing;
-}
-
-static GnomePilotRecord *
-local_record_to_pilot_record (ECalLocalRecord *local,
-			      ECalConduitContext *ctxt)
-{
-	GnomePilotRecord *p = NULL;
-	
-	g_return_val_if_fail (local != NULL, NULL);
-	g_assert (local->comp != NULL);
-	g_assert (local->appt != NULL );
-	
-	LOG ("local_record_to_remote_record\n");
-
-	p = g_new0 (GnomePilotRecord, 1);
-
-	p->ID = local->local.ID;
-	p->category = 0;
-	p->attr = local->local.attr;
-	p->archived = local->local.archived;
-	p->secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p->record = g_new0 (char,0xffff);
-	p->length = pack_Appointment (local->appt, p->record, 0xffff);
-
-	return p;	
-}
-
-/*
- * converts a CalComponent object to a ECalLocalRecord
- */
-static void
-local_record_from_comp (ECalLocalRecord *local, CalComponent *comp, ECalConduitContext *ctxt) 
-{
-	const char *uid;
-	CalComponentText summary;
-	GSList *d_list = NULL;
-	CalComponentText *description;
-	CalComponentDateTime dt;
-	time_t dt_time;
-	CalComponentClassification classif;
-	int i;
-	
-	LOG ("local_record_from_comp\n");
-
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (comp != NULL);
-
-	local->comp = comp;
-
-	cal_component_get_uid (local->comp, &uid);
-	compute_pid (ctxt, local, uid);
-	compute_status (ctxt, local, uid);
-
-	local->appt = g_new0 (struct Appointment,1);
-
-	/* STOP: don't replace these with g_strdup, since free_Appointment
-	   uses free to deallocate */
-	cal_component_get_summary (comp, &summary);
-	if (summary.value) 
-		local->appt->description = strdup ((char *) summary.value);
-
-	cal_component_get_description_list (comp, &d_list);
-	if (d_list) {
-		description = (CalComponentText *) d_list->data;
-		if (description && description->value)
-			local->appt->note = strdup (description->value);
-		else
-			local->appt->note = NULL;
-	} else {
-		local->appt->note = NULL;
-	}
-
-	cal_component_get_dtstart (comp, &dt);	
-	if (dt.value) {
-		dt_time = icaltime_as_timet (*dt.value);
-		
-		local->appt->begin = *localtime (&dt_time);
-	}
-
-	cal_component_get_dtend (comp, &dt);	
-	if (dt.value) {
-		dt_time = icaltime_as_timet (*dt.value);
-		
-		local->appt->end = *localtime (&dt_time);
-		local->appt->event = 0;
-	} else {
-		local->appt->event = 1;
-	}
-
-	/* Recurrence Rules */
-	local->appt->repeatType = repeatNone;
-
-	if (cal_component_has_rrules (comp)) {
-		GSList *list;
-		struct icalrecurrencetype *recur;
-		
-		cal_component_get_rrule_list (comp, &list);
-		recur = list->data;
-		
-		switch (recur->freq) {
-		case ICAL_DAILY_RECURRENCE:
-			local->appt->repeatType = repeatDaily;
-			break;
-		case ICAL_WEEKLY_RECURRENCE:
-			local->appt->repeatType = repeatWeekly;
-			for (i = 0; i<= 7 && recur->by_day[i] != SHRT_MAX; i++)
-				local->appt->repeatDays[0] = 0;
-			break;
-		case ICAL_MONTHLY_RECURRENCE:
-			if (recur->by_month_day[0] != SHRT_MAX) {
-				local->appt->repeatType = repeatMonthlyByDate;
-			}
-			break;
-		case ICAL_YEARLY_RECURRENCE:
-			local->appt->repeatType = repeatYearly;
-			break;
-		default:
-			break;
-		}
-
-		if (local->appt->repeatType != repeatNone) {
-			local->appt->repeatFrequency = recur->interval;
-		}
-		
-		cal_component_free_recur_list (list);
-	}
-
-	cal_component_get_classification (comp, &classif);
-
-	if (classif == CAL_COMPONENT_CLASS_PRIVATE)
-		local->local.secret = 1;
-	else
-		local->local.secret = 0;
-
-	local->local.archived = 0;  
-}
-
-static void 
-local_record_from_uid (ECalLocalRecord *local,
-		       char *uid,
-		       ECalConduitContext *ctxt)
-{
-	CalComponent *comp;
-	CalClientGetStatus status;
-
-	g_assert(local!=NULL);
-
-	status = cal_client_get_object (ctxt->client, uid, &comp);
-
-	if (status == CAL_CLIENT_GET_SUCCESS) {
-		local_record_from_comp (local, comp, ctxt);
-	} else if (status == CAL_CLIENT_GET_NOT_FOUND) {
-		comp = cal_component_new ();
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-		cal_component_set_uid (comp, uid);
-		local_record_from_comp (local, comp, ctxt);
-	} else {
-		INFO ("Object did not exist");
-	}	
-}
-
-static CalComponent *
-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
-			 GnomePilotRecord *remote,
-			 CalComponent *in_comp)
-{
-	CalComponent *comp;
-	struct Appointment appt;
-	struct icaltimetype now = icaltime_from_timet (time (NULL), FALSE, FALSE), it;
-	struct icalrecurrencetype recur;
-	int pos, i;
-	CalComponentText summary = {NULL, NULL};
-	CalComponentText description = {NULL, NULL};
-	CalComponentDateTime dt = {NULL, NULL};
- 	GSList *d_list;
-
-	g_return_val_if_fail (remote != NULL, NULL);
-
-	memset (&appt, 0, sizeof (struct Appointment));
-	unpack_Appointment (&appt, remote->record, remote->length);
-
-	if (in_comp == NULL) {
-		comp = cal_component_new ();
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-		cal_component_set_created (comp, &now);
-	} else {
-		comp = cal_component_clone (in_comp);
-	}
-
- 	LOG ("        comp_from_remote_record: "
- 	     "creating from remote %s and comp %s\n", 
-  	     print_remote (remote), cal_component_get_as_string (comp));
-
-	cal_component_set_last_modified (comp, &now);
-
-	summary.value = appt.description;
-	cal_component_set_summary (comp, &summary);
-
-	description.value = appt.note;
-	d_list = g_slist_append (NULL, &description);
-	cal_component_set_comment_list (comp, d_list);
-	g_slist_free (d_list);
-
-
-	/* FIX ME This is a bit hackish, how else can we tell if there is
-	 * no due date set?
-	 */
-	if (appt.begin.tm_sec || appt.begin.tm_min || appt.begin.tm_hour 
-	    || appt.begin.tm_mday || appt.begin.tm_mon || appt.begin.tm_year) {
-		it = icaltime_from_timet (mktime (&appt.begin), FALSE, FALSE);
-		dt.value = &it;
-		cal_component_set_dtstart (comp, &dt);
-	}
-
-	if (appt.end.tm_sec || appt.end.tm_min || appt.end.tm_hour 
-	    || appt.end.tm_mday || appt.end.tm_mon || appt.end.tm_year) {
-		it = icaltime_from_timet (mktime (&appt.end), FALSE, FALSE);
-		dt.value = &it;
-		cal_component_set_dtend (comp, &dt);
-	}
-
-	/* Recurrence information */
-  	icalrecurrencetype_clear (&recur);
-
-	switch (appt.repeatType) {
-	case repeatNone:
-		recur.freq = ICAL_NO_RECURRENCE;
-		/* nothing */
-		break;
-
-	case repeatDaily:
-		recur.freq = ICAL_DAILY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		break;
-
-	case repeatWeekly:
-		recur.freq = ICAL_WEEKLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-
-		pos = 0;
-		for (i = 0; i < 7; i++) {
-			if (appt.repeatDays[i])
-				recur.by_day[pos++] = get_ical_day (i);
-		}
-		
-		break;
-
-	case repeatMonthlyByDay:
-		recur.freq = ICAL_MONTHLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		recur.by_month_day[0] = appt.begin.tm_mday;
-		break;
-		
-	case repeatMonthlyByDate:
-		recur.freq = ICAL_MONTHLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		/* Not handled! */
-		break;
-
-	case repeatYearly:
-		recur.freq = ICAL_YEARLY_RECURRENCE;
-		recur.interval = appt.repeatFrequency;
-		break;
-		
-	default:
-		g_assert_not_reached ();
-	}
-
-	if (recur.freq != ICAL_NO_RECURRENCE) {
-		GSList *list = NULL;
-		
-		/* recurrence start of week */
-		recur.week_start = get_ical_day (appt.repeatWeekstart);
-
-		if (appt.repeatEnd.tm_sec || appt.repeatEnd.tm_min || appt.repeatEnd.tm_hour 
-		    || appt.repeatEnd.tm_mday || appt.repeatEnd.tm_mon || appt.repeatEnd.tm_year) {
-			time_t t = mktime (&appt.repeatEnd);
-			t = time_add_day (t, 1);
-			recur.until = icaltime_from_timet (t, FALSE, FALSE);
-		}
-
-		list = g_slist_append (list, &recur);
-		cal_component_set_rrule_list (comp, list);
-		g_slist_free (list);
-	} else {
-		cal_component_set_rrule_list (comp, NULL);		
-	}
-	
-	cal_component_set_transparency (comp, CAL_COMPONENT_TRANSP_NONE);
-
-	if (remote->attr & dlpRecAttrSecret)
-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PRIVATE);
-	else
-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PUBLIC);
-
-	cal_component_commit_sequence (comp);
-	
-	free_Appointment (&appt);
-
-	return comp;
-}
-
-static void
-update_comp (GnomePilotConduitSyncAbs *conduit, CalComponent *comp,
-	     ECalConduitContext *ctxt) 
-{
-	gboolean success;
-
-	g_return_if_fail (conduit != NULL);
-	g_return_if_fail (comp != NULL);
-
-	LOG ("update_comp: saving to desktop\n%s\n", 
-	     cal_component_get_as_string (comp));
-
-	success = cal_client_update_object (ctxt->client, comp);
-
-	if (!success)
-		WARN (_("Error while communicating with calendar server"));
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, ECalConduitContext *ctxt)
-{
-	int count, map_count;
-
-	count = g_list_length (ctxt->uids);
-	map_count = g_hash_table_size (ctxt->pid_map);
-	
-	/* If there are no objects or objects but no log */
-	if ((count == 0) || (count > 0 && map_count == 0)) {
-		GnomePilotConduitStandard *conduit;
-		LOG ("    doing slow sync\n");
-		conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-		gnome_pilot_conduit_standard_set_slow (conduit);
-	} else {
-		LOG ("    doing fast sync\n");
-	}
-}
-
-/* Pilot syncing callbacks */
-static gint
-pre_sync (GnomePilotConduit *conduit,
-	  GnomePilotDBInfo *dbi,
-	  ECalConduitContext *ctxt)
-{
-	GnomePilotConduitSyncAbs *abs_conduit;
-	GList *l;
-	int len;
-	unsigned char *buf;
-	char *filename;
-	xmlSAXHandler handler;
-	gint num_records;
-
-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
-
-	LOG ("---------------------------------------------------------\n");
-	LOG ("pre_sync: Calendar Conduit v.%s", CONDUIT_VERSION);
-	g_message ("Calendar Conduit v.%s", CONDUIT_VERSION);
-
-	ctxt->client = NULL;
-	
-	if (start_calendar_server (ctxt) != 0) {
-		WARN(_("Could not start wombat server"));
-		gnome_pilot_conduit_error (conduit, _("Could not start wombat"));
-		return -1;
-	}
-
-	/* Get the local database */
-	ctxt->uids = cal_client_get_uids (ctxt->client, CALOBJ_TYPE_EVENT);
-	
-	/* Load the uid <--> pilot id mapping */
-	ctxt->pid_map = g_hash_table_new (g_int_hash, g_int_equal);
-	ctxt->uid_map = g_hash_table_new (g_str_hash, g_str_equal);
-
-	filename = map_name (ctxt);
-	if (g_file_exists (filename)) {
-		memset (&handler, 0, sizeof (xmlSAXHandler));
-		handler.startElement = map_sax_start_element;
-		
-		if (xmlSAXUserParseFile (&handler, ctxt, filename) < 0)
-			return -1;
-	}
-	
-	g_free (filename);
-
-	/* Find the added, modified and deleted items */
-	ctxt->added = g_hash_table_new (g_str_hash, g_str_equal);
-	ctxt->modified = g_hash_table_new (g_str_hash, g_str_equal);
-	ctxt->deleted = g_hash_table_new (g_str_hash, g_str_equal);
-
-	ctxt->changed = cal_client_get_changed_uids (ctxt->client, 
-						     CALOBJ_TYPE_EVENT,
-						     ctxt->since + 1);
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		CalObjChange *coc = l->data;
-		
-		switch (coc->type) {
-		case CALOBJ_UPDATED:
-			if (g_hash_table_lookup (ctxt->uid_map, coc->uid))
-				g_hash_table_insert (ctxt->modified, coc->uid, coc);
-			else
-				g_hash_table_insert (ctxt->added, coc->uid, coc);
-			break;
-		case CALOBJ_REMOVED:
-			g_hash_table_insert (ctxt->deleted, coc->uid, coc);
-			break;
-		}
-	}
-
-	/* Set the count information */
-	num_records = cal_client_get_n_objects (ctxt->client, CALOBJ_TYPE_EVENT);
-	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
-	num_records = g_hash_table_size (ctxt->added);
-	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, num_records);
-	num_records = g_hash_table_size (ctxt->modified);
-	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, num_records);
-	num_records = g_hash_table_size (ctxt->deleted);
-	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, num_records);
-
-	gtk_object_set_data (GTK_OBJECT (conduit), "dbinfo", dbi);
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's Calendar application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's Calendar application block"));
-		return -1;
-	}
-	unpack_AppointmentAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-
-	check_for_slow_setting (conduit, ctxt);
-
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   ECalConduitContext *ctxt)
-{
-	gchar *filename;
-	
-	LOG ("post_sync: Calendar Conduit v.%s", CONDUIT_VERSION);
-	LOG ("---------------------------------------------------------\n");
-
-	filename = map_name (ctxt);
-	map_write (ctxt, filename);
-	g_free (filename);
-	
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      ECalLocalRecord *local,
-	      guint32 ID,
-	      ECalConduitContext *ctxt)
-{
-	const char *uid;
-	char *new_uid;
-	guint32 *pid = g_new (guint32, 1);
-
-	LOG ("set_pilot_id: setting to %d\n", ID);
-	
-	cal_component_get_uid (local->comp, &uid);
-	*pid = ID;
-	new_uid = g_strdup (uid);
-	g_hash_table_insert (ctxt->pid_map, pid, new_uid);
-	g_hash_table_insert (ctxt->uid_map, new_uid, pid);
-
-        return 0;
-}
-
-static gint
-for_each (GnomePilotConduitSyncAbs *conduit,
-	  ECalLocalRecord **local,
-	  ECalConduitContext *ctxt)
-{
-	static GList *uids, *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each");
-
-		uids = ctxt->uids;
-		count = 0;
-		
-		if (uids != NULL) {
-			LOG ("iterating over %d records", g_list_length (uids));
-
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_uid (*local, uids->data, ctxt);
-
-			iterator = uids;
-		} else {
-			LOG ("no events");
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_uid (*local, iterator->data, ctxt);
-		} else {
-			LOG ("for_each ending");
-
-			/* Tell the pilot the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-for_each_modified (GnomePilotConduitSyncAbs *conduit,
-		   ECalLocalRecord **local,
-		   ECalConduitContext *ctxt)
-{
-	static GList *changes, *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, 0);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each_modified: beginning\n");
-		
-		changes = ctxt->changed;
-		
-		count = 0;
-		
-		if (changes != NULL) {
-			CalObjChange *coc = changes->data;
-			
-			LOG ("iterating over %d records", g_list_length (changes));
-			 
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_uid (*local, coc->uid, ctxt);
-
-			iterator = changes;
-		} else {
-			LOG ("no events");
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			CalObjChange *coc;
-
-			iterator = g_list_next (iterator);
-			coc = iterator->data;
-
-			*local = g_new0 (ECalLocalRecord, 1);
-			local_record_from_uid (*local, coc->uid, ctxt);
-		} else {
-			LOG ("for_each_modified ending");
-
-			/* Tell the pilot the iteration is over */
-			(*local) = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-compare (GnomePilotConduitSyncAbs *conduit,
-	 ECalLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 ECalConduitContext *ctxt)
-{
-	/* used by the quick compare */
-	GnomePilotRecord *local_pilot;
-	int retval = 0;
-
-	LOG ("compare: local=%s remote=%s...\n",
-		print_local (local), print_remote (remote));
-
-	g_return_val_if_fail (local!=NULL,-1);
-	g_return_val_if_fail (remote!=NULL,-1);
-
-	local_pilot = local_record_to_pilot_record (local, ctxt);
-	if (!local_pilot) 
-		return -1;
-
-	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");
-	
-	g_free (local_pilot);
-	
-	return retval;
-}
-
-static gint
-add_record (GnomePilotConduitSyncAbs *conduit,
-	    GnomePilotRecord *remote,
-	    ECalConduitContext *ctxt)
-{
-	CalComponent *comp;
-	const char *uid;
-	char *new_uid;
-	guint32 *pid = g_new (guint32, 1);
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("add_record: adding %s to desktop\n", print_remote (remote));
-
-	comp = comp_from_remote_record (conduit, remote, NULL);
-	update_comp (conduit, comp, ctxt);
-
-	*pid = remote->ID;
-	cal_component_get_uid (comp, &uid);
-	new_uid = g_strdup (uid);
-	g_hash_table_insert (ctxt->pid_map, pid, new_uid);
-	g_hash_table_insert (ctxt->uid_map, new_uid, pid);
-
-	return retval;
-}
-
-static gint
-add_archive_record (GnomePilotConduitSyncAbs *conduit,
-		    ECalLocalRecord *local,
-		    GnomePilotRecord *remote,
-		    ECalConduitContext *ctxt)
-{
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1); 
-	g_return_val_if_fail (local != NULL, -1);
-
-	LOG ("add_archive_record: doing nothing with %s\n",
-	     print_local (local));
-
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		ECalLocalRecord *local,
-		GnomePilotRecord *remote,
-		ECalConduitContext *ctxt)
-{
-	CalComponent *new_comp;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("replace_record: replace %s with %s\n",
-	     print_local (local), print_remote (remote));
-
-	new_comp = comp_from_remote_record (conduit, remote, local->comp);
-	gtk_object_unref (GTK_OBJECT (local->comp));
-	local->comp = new_comp;
-	update_comp (conduit, local->comp, ctxt);
-
-	gtk_object_unref (GTK_OBJECT (new_comp));
-
-	return retval;
-}
-
-static gint
-delete_record (GnomePilotConduitSyncAbs *conduit,
-	       ECalLocalRecord *local,
-	       ECalConduitContext *ctxt)
-{
-	const char *uid;
-
-	g_return_val_if_fail (local != NULL, -1);
-	g_assert (local->comp != NULL);
-
-	cal_component_get_uid (local->comp, &uid);
-
-	LOG ("delete_record: deleting %s\n", uid);
-
-	cal_client_remove_object (ctxt->client, uid);
-	
-        return 0;
-}
-
-static gint
-delete_archive_record (GnomePilotConduitSyncAbs *conduit,
-		       ECalLocalRecord *local,
-		       ECalConduitContext *ctxt)
-{
-	g_return_val_if_fail(local!=NULL,-1);
-
-	LOG ("delete_archive_record: doing nothing\n");
-
-        return -1;
-}
-
-static gint
-match (GnomePilotConduitSyncAbs *conduit,
-       GnomePilotRecord *remote,
-       ECalLocalRecord **local,
-       ECalConduitContext *ctxt)
-{
-	char *uid;
-	
-	LOG ("match: looking for local copy of %s\n",
-	     print_remote (remote));	
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	*local = NULL;
-	uid = g_hash_table_lookup (ctxt->pid_map, &remote->ID);
-	
-	if (!uid)
-		return 0;
-
-	LOG ("  matched\n");
-	
-	*local = g_new0 (ECalLocalRecord, 1);
-	local_record_from_uid (*local, uid, ctxt);
-	
-	return 0;
-}
-
-static gint
-free_match (GnomePilotConduitSyncAbs *conduit,
-	    ECalLocalRecord *local,
-	    ECalConduitContext *ctxt)
-{
-	LOG ("free_match: freeing\n");
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	gtk_object_unref (GTK_OBJECT (local->comp));
-	g_free (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 ECalLocalRecord *local,
-	 GnomePilotRecord **remote,
-	 ECalConduitContext *ctxt)
-{
-	LOG ("prepare: encoding local %s\n", print_local (local));
-
-	*remote = local_record_to_pilot_record (local, ctxt);
-
-	if (!*remote)
-		return -1;
-	
-	return 0;
-}
-
-static gint
-free_prepare (GnomePilotConduitSyncAbs *conduit,
-	      ECalLocalRecord *local,
-	      GnomePilotRecord **remote,
-	      ECalConduitContext *ctxt)
-{
-	LOG ("free_prepare: freeing\n");
-
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	g_free (*remote);
-	*remote = NULL;
-
-        return 0;
-}
-
-static ORBit_MessageValidationResult
-accept_all_cookies (CORBA_unsigned_long request_id,
-		    CORBA_Principal *principal,
-		    CORBA_char *operation)
-{
-	/* allow ALL cookies */
-	return ORBIT_MESSAGE_ALLOW_ALL;
-}
-
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	ECalConduitContext *ctxt;
-
-	LOG ("in calendar's conduit_get_gpilot_conduit\n");
-
-	/* we need to find wombat with oaf, so make sure oaf
-	   is initialized here.  once the desktop is converted
-	   to oaf and gpilotd is built with oaf, this can go away */
-	if (!oaf_is_initialized ()) {
-		char *argv[ 1 ] = {"hi"};
-		oaf_init (1, argv);
-
-		if (bonobo_init (CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL) == FALSE)
-			g_error (_("Could not initialize Bonobo"));
-
-		ORBit_set_request_validation_handler (accept_all_cookies);
-	}
-
-	retval = gnome_pilot_conduit_sync_abs_new ("DatebookDB", 0x64617465);
-	g_assert (retval != NULL);
-
-	gnome_pilot_conduit_construct (GNOME_PILOT_CONDUIT (retval),
-				       "e_calendar_conduit");
-
-	e_calendar_context_new (&ctxt, pilot_id);
-	gtk_object_set_data (GTK_OBJECT (retval), "calconduit_context", ctxt);
-
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
-
-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
-
-  	gtk_signal_connect (retval, "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, "add_archive_record", (GtkSignalFunc) add_archive_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, "delete_archive_record", (GtkSignalFunc) delete_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);
-  	gtk_signal_connect (retval, "free_prepare", (GtkSignalFunc) free_prepare, ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-	ECalConduitContext *ctxt;
-
-	ctxt = gtk_object_get_data (GTK_OBJECT (conduit), 
-				    "calconduit_context");
-
-	e_calendar_context_destroy (&ctxt);
-
-	gtk_object_destroy (GTK_OBJECT (conduit));
-}
diff --git a/calendar/conduits/calendar/calendar-conduit.h b/calendar/conduits/calendar/calendar-conduit.h
deleted file mode 100644
index b0065610fb..0000000000
--- a/calendar/conduits/calendar/calendar-conduit.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - Calendar Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __CALENDAR_CONDUIT_H__
-#define __CALENDAR_CONDUIT_H__
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <gnome.h>
-#include <pi-datebook.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <cal-client/cal-client.h>
-
-
-/* This is the local record structure for the Evolution Calendar conduit. */
-typedef struct _ECalLocalRecord ECalLocalRecord;
-struct _ECalLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding Comp object */
-	CalComponent *comp;
-
-        /* pilot-link todo structure, used for implementing Transmit. */
-	struct Appointment *appt;
-};
-
-/* This is the context for all the GnomeCal conduit methods. */
-typedef struct _ECalConduitContext ECalConduitContext;
-struct _ECalConduitContext {
-	ECalConduitCfg *cfg;
-
-	struct AppointmentAppInfo ai;
-
-	CalClient *client;
-	char *calendar_file;
-	gboolean calendar_load_tried;
-	gboolean calendar_load_success;
-
-	time_t since;
-	GList *uids;
-	GList *changed;
-
-	GHashTable *added;
-	GHashTable *modified;
-	GHashTable *deleted;
-	
-	GHashTable *uid_map;
-	GHashTable *pid_map;
-};
-
-#endif __CALENDAR_CONDUIT_H__ 
-
-
-
-
-
-
diff --git a/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop b/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop
deleted file mode 100644
index 51ee34d2bd..0000000000
--- a/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Name=Evolution Calendar conduit
-Name[da]=Gnome kalender
-Name[es]=Enlace con el calendario de Evolution
-Name[fr]=Conduit Calendrier
-Name[no]=GNOME kalender
-Name[sv]=Kalenderkanal
-Name[tr]=Takvim par�as�
-Comment=Configure the GnomeCal conduit
-Comment[da]=Konfigur�r GnomeCal-komponent
-Comment[es]=Configurar el enlace con GnomeCal
-Comment[fr]=Configuration du conduit calendrier
-Comment[no]=Konfigur�r GnomeCal-komponent
-Comment[sv]=Konfigurera GnomeCal-kanalen
-Comment[tr]=GnomeCal takvim par�as� ayarlar�
-Exec=e-calendar-conduit-control-applet --cap-id=1
-Terminal=0
-Type=Application
-Icon=gnome-calendar-conduit.png
diff --git a/calendar/conduits/calendar/e-calendar.conduit.in b/calendar/conduits/calendar/e-calendar.conduit.in
deleted file mode 100644
index 6143978e8b..0000000000
--- a/calendar/conduits/calendar/e-calendar.conduit.in
+++ /dev/null
@@ -1,8 +0,0 @@
-<gnome-pilot-conduit version="1.0">
-<conduit id="e_calendar_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libecalendar_conduit.so"/>
-<name value="ECalendar"/>
-<conduit-attribute name="description" value="Synchronizes Calendar with Evolution"/>
-<conduit-attribute name="default-synctype" value="synchronize"/>
-<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-calendar-conduit.png"/>
-<conduit-attribute name="settings" value="TRUE"/>
-</gnome-pilot-conduit>
diff --git a/calendar/conduits/todo/.cvsignore b/calendar/conduits/todo/.cvsignore
deleted file mode 100644
index 6b94f92c38..0000000000
--- a/calendar/conduits/todo/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.libs
-*.lo
-*.la
-e-todo-conduit-control-applet
-e-todo.conduit
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
deleted file mode 100644
index 619a11657b..0000000000
--- a/calendar/conduits/todo/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-INCLUDES = 					\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/calendar		\
-	-I$(top_srcdir)/libical/src/libical	\
-	-I$(top_builddir)/libical/src/libical	\
-	$(BONOBO_VFS_GNOME_CFLAGS)		\
-	$(GNOME_PILOT_CFLAGS)
-
-# ToDo Capplet
-bin_PROGRAMS = e-todo-conduit-control-applet
-
-e_todo_conduit_control_applet_SOURCES = todo-conduit-control-applet.c
-
-e_todo_conduit_control_applet_LDADD = \
-		$(CAPPLET_LIBS)  \
-		$(GNOME_LIBDIR) \
-		$(GNOME_PILOT_LIBS) \
-		$(PISOCK_LIBDIR) $(PISOCK_LIBS) \
-		$(GNOME_CAPPLET_LIBS) \
-		$(BONOBO_VFS_GNOME_LIBS) \
-		$(GNOME_XML_LIB) \
-	        $(GNOMEUI_LIBS) \
-                $(INTLLIBS)
-
-# ToDo Conduit
-e_todo_conduitsdir=$(libdir)/gnome-pilot/conduits
-e_todo_conduits_LTLIBRARIES = libetodo_conduit.la
-
-libetodo_conduit_la_SOURCES = todo-conduit.c
-
-libetodo_conduit_la_LIBADD = 					\
-	$(top_builddir)/calendar/cal-client/libcal-client-static.la	\
-	$(top_builddir)/calendar/cal-util/libcal-util-static.la		\
-	$(top_builddir)/libversit/libversit.la				\
-	$(top_builddir)/libical/src/libical/libical-static.la		\
-	$(BONOBO_VFS_GNOME_LIBS)					\
-	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 				\
-	$(UNICODE_LIBS)							\
-	$(GNOME_LIBDIR) 						\
-	$(GNOME_LIBS)
-
-e-todo.conduit: e-todo.conduit.in Makefile
-	sed -e 's^\@prefix\@^$(prefix)^g' < $(srcdir)/e-todo.conduit.in > e-todo.conduit.tmp \
-	&& mv e-todo.conduit.tmp e-todo.conduit
-
-
-ccenterdir = $(datadir)/control-center
-ccenterPalmPilotdir = $(ccenterdir)/Peripherals
-ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
-ccenterConduits_DATA = e-todo-conduit-control-applet.desktop 
-
-panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
-panelConduits_DATA = $(ccenterConduits_DATA)
-
-Conduitdir = $(datadir)/gnome-pilot/conduits/
-Conduit_DATA = e-todo.conduit
-
-EXTRA_DIST = \
-	e-todo.conduit.in \
-        $(ccenterConduits_DATA)
-
-install-data-local:
-	$(mkinstalldirs) $(ccenterConduitsdir)
-	$(mkinstalldirs) $(Conduitdir)
-
-
-
-
-
-
-
-
-
-
-
diff --git a/calendar/conduits/todo/e-todo-conduit-control-applet.desktop b/calendar/conduits/todo/e-todo-conduit-control-applet.desktop
deleted file mode 100644
index 2d392f322b..0000000000
--- a/calendar/conduits/todo/e-todo-conduit-control-applet.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Name=Evolution ToDo conduit 
-Name[da]=Udst�ende
-Name[es]=Enlace con el componente `Por Hacer' de Evolution
-Name[fr]=Conduit Evolution `A Faire'
-Name[no]=Oppgaver
-Name[sv]=Att g�ra-lista
-Name[tr]=Yap�lacaklar par�as�
-Comment=Configure the todo conduit
-Comment[da]=Konfigur�r Udst�ende
-Comment[es]=Configurar el enlace con el componente `Por Hacer'
-Comment[fr]=Configuration du conduit `A Faire'
-Comment[no]=Konfigur�r oppgavelisten
-Comment[sv]=Konfigurerar att g�ra-listan
-Comment[tr]=Yap�lacaklar par�as� ayarlar�
-Exec=e-todo-conduit-control-applet --cap-id=1
-Terminal=0
-Type=Application
diff --git a/calendar/conduits/todo/e-todo.conduit.in b/calendar/conduits/todo/e-todo.conduit.in
deleted file mode 100644
index 40e6fd620c..0000000000
--- a/calendar/conduits/todo/e-todo.conduit.in
+++ /dev/null
@@ -1,8 +0,0 @@
-<gnome-pilot-conduit version="1.0">
-<conduit id="e_todo_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libetodo_conduit.so"/>
-<name value="EToDo"/>
-<conduit-attribute name="description" value="Synchronizes ToDo List with Evolution"/>
-<conduit-attribute name="default-synctype" value="synchronize"/>
-<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-calendar-conduit.png"/>
-<conduit-attribute name="settings" value="TRUE"/>
-</gnome-pilot-conduit>
diff --git a/calendar/conduits/todo/todo-conduit-config.h b/calendar/conduits/todo/todo-conduit-config.h
deleted file mode 100644
index 7a23475839..0000000000
--- a/calendar/conduits/todo/todo-conduit-config.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Configuration
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __TODO_CONDUIT_CONFIG_H__
-#define __TODO_CONDUIT_CONFIG_H__
-
-#include <gnome.h>
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
-
-/* This is the configuration of the GnomeCal conduit. */
-typedef struct _EToDoConduitCfg EToDoConduitCfg;
-struct _EToDoConduitCfg {
-	gboolean open_secret;
-	guint32 pilot_id;
-	GnomePilotConduitSyncType  sync_type;   /* only used by capplet */
-};
-
-#ifdef TODO_CONFIG_LOAD
-/* Load the configuration data */
-static void 
-todoconduit_load_configuration (EToDoConduitCfg **c, guint32 pilot_id) 
-{
-	gchar prefix[256];
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    pilot_id);
-	
-	*c = g_new0 (EToDoConduitCfg,1);
-	g_assert (*c != NULL);
-
-	gnome_config_push_prefix (prefix);
-	(*c)->open_secret = gnome_config_get_bool ("open_secret=FALSE");
-
-        /* set in capplets main */
-	(*c)->sync_type = GnomePilotConduitSyncTypeCustom; 
-	gnome_config_pop_prefix ();
-	
-	(*c)->pilot_id = pilot_id;
-}
-#endif
-
-#ifdef TODO_CONFIG_SAVE
-/* Saves the configuration data. */
-static void
-todoconduit_save_configuration (EToDoConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
-		    c->pilot_id);
-
-	gnome_config_push_prefix (prefix);
-	gnome_config_set_bool ("open_secret", c->open_secret);
-	gnome_config_pop_prefix ();
-
-	gnome_config_sync ();
-	gnome_config_drop_all ();
-}
-#endif
-
-#ifdef TODO_CONFIG_DUPE
-/* Creates a duplicate of the configuration data */
-static EToDoConduitCfg*
-todoconduit_dupe_configuration (EToDoConduitCfg *c) 
-{
-	EToDoConduitCfg *retval;
-
-	g_return_val_if_fail (c != NULL, NULL);
-
-	retval = g_new0 (EToDoConduitCfg, 1);
-	retval->sync_type = c->sync_type;
-	retval->open_secret = c->open_secret;
-	retval->pilot_id = c->pilot_id;
-
-	return retval;
-}
-#endif
-
-#ifdef TODO_CONFIG_DESTROY
-/* Destroy a configuration */
-static void 
-todoconduit_destroy_configuration (EToDoConduitCfg **c) 
-{
-	g_return_if_fail (c != NULL);
-	g_return_if_fail (*c != NULL);
-
-	g_free (*c);
-	*c = NULL;
-}
-#endif
-
-#endif __TODO_CONDUIT_CONFIG_H__ 
-
-
-
-
-
-
-
diff --git a/calendar/conduits/todo/todo-conduit-control-applet.c b/calendar/conduits/todo/todo-conduit-control-applet.c
deleted file mode 100644
index 7140522b55..0000000000
--- a/calendar/conduits/todo/todo-conduit-control-applet.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Capplet
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <pwd.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <gnome.h>
-
-#include <config.h>
-#include <capplet-widget.h>
-
-#include <gpilotd/gnome-pilot-client.h>
-
-#define TODO_CONFIG_LOAD 1
-#define TODO_CONFIG_SAVE 1
-#define TODO_CONFIG_DUPE 1
-#define TODO_CONFIG_DESTROY 1
-#include <todo-conduit-config.h>
-#undef TODO_CONFIG_LOAD
-#undef TODO_CONFIG_SAVE
-#undef TODO_CONFIG_DUPE
-#undef TODO_CONFIG_DESTROY
-
-/* tell changes callbacks to ignore changes or not */
-static gboolean ignore_changes=FALSE;
-
-/* capplet widget */
-static GtkWidget *capplet=NULL;
-
-/* host/device/pilot configuration windows */
-GtkWidget *cfgOptionsWindow=NULL;
-GtkWidget *cfgStateWindow=NULL;
-GtkWidget *dialogWindow=NULL;
-
-gboolean activated,org_activation_state;
-GnomePilotConduitManagement *conduit;
-GnomePilotConduitConfig *conduit_config;
-EToDoConduitCfg *origState = NULL;
-EToDoConduitCfg *curState = NULL;
-
-static void doTrySettings(GtkWidget *widget, EToDoConduitCfg *c);
-static void doRevertSettings(GtkWidget *widget, EToDoConduitCfg *c);
-static void doSaveSettings(GtkWidget *widget, EToDoConduitCfg *c);
-
-static void setStateCfg (GtkWidget *w, EToDoConduitCfg *c);
-
-gint pilotId;
-static GnomePilotClient *gpc;
-
-
-
-/* This array must be in the same order as enumerations
-   in GnomePilotConduitSyncType as they are used as index.
-   Custom type implies Disabled state.
-*/
-static gchar* sync_options[] ={ N_("Disabled"),
-				N_("Synchronize"),
-				N_("Copy From Pilot"),
-				N_("Copy To Pilot"),
-				N_("Merge From Pilot"),
-				N_("Merge To Pilot")};
-#define SYNC_OPTIONS_COUNT 6
-
-static void
-doTrySettings (GtkWidget *widget, EToDoConduitCfg *c)
-{
-	if (c->sync_type != GnomePilotConduitSyncTypeCustom)
-		gnome_pilot_conduit_config_enable_with_first_sync (conduit_config,
-								   c->sync_type,
-								   c->sync_type,
-								   TRUE);
-	else
-		gnome_pilot_conduit_config_disable (conduit_config);
-
-	todoconduit_save_configuration (c);
-}
-
-static void
-doRevertSettings (GtkWidget *widget, EToDoConduitCfg *c)
-{
-	activated = org_activation_state;
-	*c = *origState;
-	setStateCfg (cfgStateWindow, c);
-	doTrySettings (widget, c);
-}
-
-static void
-doSaveSettings (GtkWidget *widget, EToDoConduitCfg *c)
-{
-	*origState = *c;
-	doTrySettings (widget, c);
-}
-
-
-static void 
-doHelp (GtkWidget *widget, gpointer data) 
-{
-	GtkWidget *about;
-	const gchar *authors[] = {
-		_("JP Rosevear <jpr@helixcode.com>"),
-		"", _("Original Author:"), 
-		_("Eskil Heyn Olsen <deity@eskil.dk>"), 
-		NULL};
-  
-	about = gnome_about_new (
-		_("Evolution ToDo Conduit"), VERSION,
-		_("(C) 1998-2000 the Free Software Foundation and Helix Code"),
-		authors,
-		_("Configuration utility for the evolution todo conduit.\n"),
-		_("gnome-unknown.xpm"));
-	gtk_widget_show (about);
-  
-	return;
-}
-
-
-/* called by the sync_type GtkOptionMenu */
-static void
-activate_sync_type (GtkMenuItem *widget, gpointer data)
-{
-	curState->sync_type = GPOINTER_TO_INT (data);
-	if (!ignore_changes)
-		capplet_widget_state_changed (CAPPLET_WIDGET (capplet), TRUE);
-}
-
-
-static GtkWidget * 
-createStateCfgWindow(void)
-{
-	GtkWidget *vbox, *table;
-	GtkWidget *label;
-	GtkWidget *optionMenu,*menuItem;
-	GtkMenu   *menu;
-	gint i;
-	
-	vbox = gtk_vbox_new(FALSE, GNOME_PAD);
-
-	table =  gtk_hbox_new(FALSE, 0); 
-	gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, GNOME_PAD);
-
-	label = gtk_label_new(_("Synchronize Action"));
-	gtk_box_pack_start(GTK_BOX(table), label, FALSE, FALSE, GNOME_PAD);    
-
-	optionMenu=gtk_option_menu_new();
-	gtk_object_set_data(GTK_OBJECT(vbox), "conduit_state", optionMenu);
-	menu = GTK_MENU(gtk_menu_new());
-
-	for (i=0; i<SYNC_OPTIONS_COUNT;i++) {
-		sync_options[i]=_(sync_options[i]);
-		menuItem = gtk_menu_item_new_with_label(sync_options[i]);
-		gtk_widget_show(menuItem);
-		gtk_signal_connect(GTK_OBJECT(menuItem),"activate",
-				   GTK_SIGNAL_FUNC(activate_sync_type),
-				   GINT_TO_POINTER(i));
-		gtk_menu_append(menu,menuItem);
-	}
-
-	gtk_option_menu_set_menu(GTK_OPTION_MENU(optionMenu),GTK_WIDGET(menu));
-	gtk_box_pack_start(GTK_BOX(table), optionMenu, FALSE, FALSE, 0);    
-	
-	return vbox;
-}
-
-
-static void
-setStateCfg (GtkWidget *w, EToDoConduitCfg *c)
-{
-	GtkOptionMenu *optionMenu;
-	GtkMenu *menu;
-	
-	optionMenu = gtk_object_get_data (GTK_OBJECT(w), "conduit_state");
-	g_assert (optionMenu != NULL);
-	menu = GTK_MENU (gtk_option_menu_get_menu (optionMenu));
-  
-	ignore_changes = TRUE;
-	/* Here were are relying on the items in menu being the same 
-	   order as in GnomePilotConduitSyncType. */
-	gtk_option_menu_set_history (optionMenu, (int) c->sync_type);
-	ignore_changes = FALSE;
-}
-
-static void
-pilot_capplet_setup(void)
-{
-	GtkWidget *frame, *table;
-
-	capplet = capplet_widget_new();
-
-	table = gtk_table_new(1, 2, FALSE);
-	gtk_container_border_width(GTK_CONTAINER(table), GNOME_PAD);
-	gtk_container_add(GTK_CONTAINER(capplet), table); 
-
-	frame = gtk_frame_new(_("Conduit state"));
-	gtk_container_border_width(GTK_CONTAINER(frame), GNOME_PAD_SMALL);
-	gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 1, 0, 1);
-	cfgStateWindow = createStateCfgWindow();
-	gtk_container_add(GTK_CONTAINER(frame), cfgStateWindow);
-
-	gtk_signal_connect(GTK_OBJECT(capplet), "try",
-			   GTK_SIGNAL_FUNC(doTrySettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "revert",
-			   GTK_SIGNAL_FUNC(doRevertSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "ok",
-			   GTK_SIGNAL_FUNC(doSaveSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "help",
-			   GTK_SIGNAL_FUNC(doHelp), NULL);
-
-
-	setStateCfg (cfgStateWindow, curState);
-
-	gtk_widget_show_all (capplet);
-}
-
-
-static void 
-run_error_dialog(gchar *mesg,...) 
-{
-	char tmp[80];
-	va_list ap;
-
-	va_start(ap,mesg);
-	vsnprintf(tmp,79,mesg,ap);
-	dialogWindow = gnome_message_box_new(mesg,GNOME_MESSAGE_BOX_ERROR,GNOME_STOCK_BUTTON_OK,NULL);
-	gnome_dialog_run_and_close(GNOME_DIALOG(dialogWindow));
-	va_end(ap);
-}
-
-
-static gint 
-get_pilot_id_from_gpilotd() 
-{
-	GList *pilots=NULL;
-	gint pilot;
-	int i,err;
-  
-	i=0;
-	/* we don't worry about leaking here, so pilots isn't freed */
-	switch(err = gnome_pilot_client_get_pilots(gpc,&pilots)) {
-	case GPILOTD_OK: {
-		if(pilots) {
-			for(i=0;i<g_list_length(pilots);i++) {
-				g_message("pilot %d = \"%s\"",i,(gchar*)g_list_nth(pilots,i)->data); 
-			}
-			if(i==0) {
-				run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));
-				return -1;
-			} else {
-				gnome_pilot_client_get_pilot_id_by_name(gpc,
-									pilots->data,  /* this is the first pilot */
-									&pilot);
-				if(i>1) {
-					g_message("too many pilots...");
-					/* need a choose here */
-				}
-				return pilot;
-			}
-		} else {
-			run_error_dialog(_("No pilot configured, please choose the\n'Pilot Link Properties' capplet first."));
-			return -1;
-		}    
-		break;
-	}
-	case GPILOTD_ERR_NOT_CONNECTED:
-		run_error_dialog(_("Not connected to the gnome-pilot daemon"));
-		return -1;
-		break;
-	default:
-		g_warning("gnome_pilot_client_get_pilot_ids(...) = %d",err);
-		run_error_dialog(_("An error occured when trying to fetch\npilot list from the gnome-pilot daemon"));
-		return -1;
-		break;
-	}
-}
-
-
-int
-main (int argc, char *argv[])
-{
-	g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
-				G_LOG_LEVEL_CRITICAL |
-				G_LOG_LEVEL_WARNING);
-	
-	/* Init capplet */
-	gnome_capplet_init ("Evolution ToDo conduit control applet", 
-			    NULL, argc, argv, 
-			    NULL, 0, NULL);
-   
-	/* Setup Client */
-	gpc = gnome_pilot_client_new ();
-	gnome_pilot_client_connect_to_daemon (gpc);
-	pilotId = get_pilot_id_from_gpilotd ();
-	if (!pilotId) 
-		return -1;
-
-	
-	/* Put all code to set things up in here */
-	conduit = gnome_pilot_conduit_management_new ("e_todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	if (conduit == NULL) 
-		return -1;
-
-	todoconduit_load_configuration (&origState, pilotId);
-	conduit_config = gnome_pilot_conduit_config_new (conduit, pilotId);
-	org_activation_state = activated =
-		gnome_pilot_conduit_config_is_enabled (conduit_config,
-						       &origState->sync_type);
-
-	curState = todoconduit_dupe_configuration (origState);
-    
-	pilot_capplet_setup ();
-
-	/* Done setting up, now run main loop */
-	capplet_gtk_main();
-
-	/* Clean up */
-	gnome_pilot_conduit_management_destroy (conduit);
-	todoconduit_destroy_configuration (&origState);
-	todoconduit_destroy_configuration (&curState);
-	
-	return 0;
-}    
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
deleted file mode 100644
index 646f850b42..0000000000
--- a/calendar/conduits/todo/todo-conduit.c
+++ /dev/null
@@ -1,1120 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <sys/stat.h>
-#include <utime.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <signal.h>
-#include <errno.h>
-
-#include <liboaf/liboaf.h>
-#include <bonobo.h>
-#include <gnome-xml/parser.h>
-#include <cal-client/cal-client.h>
-#include <cal-util/timeutil.h>
-#include <pi-source.h>
-#include <pi-socket.h>
-#include <pi-file.h>
-#include <pi-dlp.h>
-#include <pi-version.h>
-#include <libical/src/libical/icaltypes.h>
-
-#define TODO_CONFIG_LOAD 1
-#define TODO_CONFIG_DESTROY 1
-#include <todo-conduit-config.h>
-#undef TODO_CONFIG_LOAD
-#undef TODO_CONFIG_DESTROY
-
-#include <todo-conduit.h>
-
-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);
-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);
-
-#define CONDUIT_VERSION "0.1.0"
-#ifdef G_LOG_DOMAIN
-#undef G_LOG_DOMAIN
-#endif
-#define G_LOG_DOMAIN "etodoconduit"
-
-#define DEBUG_CALCONDUIT 1
-/* #undef DEBUG_CALCONDUIT */
-
-#ifdef DEBUG_CALCONDUIT
-#define LOG(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-#else
-#define LOG(e...)
-#endif 
-
-#define WARN(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, e)
-#define INFO(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)
-
-/* debug spew DELETE ME */
-static char *
-print_local (EToDoLocalRecord *local)
-{
-	static char buff[ 4096 ];
-
-	if (local == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	if (local->todo && local->todo->description) {
-		sprintf (buff, "[%d %ld %d %d '%s' '%s']",
-			 local->todo->indefinite,
-			 mktime (& local->todo->due),
-			 local->todo->priority,
-			 local->todo->complete,
-			 local->todo->description,
-			 local->todo->note);
-		return buff;
-	}
-
-	return "";
-	
-	return cal_component_get_as_string (local->comp);
-}
-
-
-/* debug spew DELETE ME */
-static char *print_remote (GnomePilotRecord *remote)
-{
-	static char buff[ 4096 ];
-	struct ToDo todo;
-
-	if (remote == NULL) {
-		sprintf (buff, "[NULL]");
-		return buff;
-	}
-
-	memset (&todo, 0, sizeof (struct ToDo));
-	unpack_ToDo (&todo, remote->record, remote->length);
-
-	sprintf (buff, "[%d %ld %d %d '%s' '%s']",
-		 todo.indefinite,
-		 mktime (& todo.due),
-		 todo.priority,
-		 todo.complete,
-		 todo.description,
-		 todo.note);
-
-	return buff;
-}
-
-/* Context Routines */
-static void
-e_todo_context_new (EToDoConduitContext **ctxt, guint32 pilot_id) 
-{
-	*ctxt = g_new0 (EToDoConduitContext,1);
-	g_assert (ctxt!=NULL);
-
-	todoconduit_load_configuration (&(*ctxt)->cfg, pilot_id);
-}
-
-static void
-e_todo_context_destroy (EToDoConduitContext **ctxt)
-{
-	g_return_if_fail (ctxt!=NULL);
-	g_return_if_fail (*ctxt!=NULL);
-
-	if ((*ctxt)->client != NULL)
-		gtk_object_unref (GTK_OBJECT ((*ctxt)->client));
-
-	if ((*ctxt)->cfg != NULL)
-		todoconduit_destroy_configuration (&(*ctxt)->cfg);
-
-	g_free (*ctxt);
-	*ctxt = NULL;
-}
-
-/* Map routines */
-static char *
-map_name (EToDoConduitContext *ctxt) 
-{
-	char *filename;
-	
-	filename = g_strdup_printf ("%s/evolution/local/Calendar/pilot-map-%d.xml", g_get_home_dir (), ctxt->cfg->pilot_id);
-
-	return filename;
-}
-
-static void
-map_set_node_timet (xmlNodePtr node, const char *name, time_t t)
-{
-	char *tstring;
-	
-	tstring = g_strdup_printf ("%ld", t);
-	xmlSetProp (node, name, tstring);
-}
-
-static void
-map_sax_start_element (void *data, const xmlChar *name, 
-		       const xmlChar **attrs)
-{
-	EToDoConduitContext *ctxt = (EToDoConduitContext *)data;
-
-	if (!strcmp (name, "PilotMap")) {
-		while (attrs && *attrs != NULL) {
-			const xmlChar **val = attrs;
-			
-			val++;
-			if (!strcmp (*attrs, "timestamp")) 
-				ctxt->since = (time_t)strtoul (*val, NULL, 0);
-
-			attrs = ++val;
-		}
-	}
-	 
-	if (!strcmp (name, "map")) {
-		char *uid = NULL;
-		guint32 *pid = g_new (guint32, 1);
-
-		*pid = 0;
-
-		while (attrs && *attrs != NULL) {
-			const xmlChar **val = attrs;
-			
-			val++;
-			if (!strcmp (*attrs, "uid")) 
-				uid = g_strdup (*val);
-			
-			if (!strcmp (*attrs, "pilot_id"))
-				*pid = strtoul (*val, NULL, 0);
-				
-			attrs = ++val;
-		}
-			
-		if (uid && *pid != 0) {
-			g_hash_table_insert (ctxt->pid_map, pid, uid);
-			g_hash_table_insert (ctxt->uid_map, uid, pid);
-		} else {
-			g_free (pid);
-		}
-	}
-}
-
-static void
-map_write_foreach (gpointer key, gpointer value, gpointer data)
-{
-	xmlNodePtr root = data;
-	xmlNodePtr mnode;
-	unsigned long *pid = key;
-	const char *uid = value;
-	char *pidstr;
-	
-	mnode = xmlNewChild (root, NULL, "map", NULL);
-	xmlSetProp (mnode, "uid", uid);
-	pidstr = g_strdup_printf ("%lu", *pid);
-	xmlSetProp (mnode, "pilot_id", pidstr);
-	g_free (pidstr);
-}
-		
-static int
-map_write (EToDoConduitContext *ctxt, char *filename)
-{
-	xmlDocPtr doc;
-	int ret;
-	
-	if (ctxt->pid_map == NULL)
-		return 0;
-	
-	doc = xmlNewDoc ("1.0");
-	if (doc == NULL) {
-		WARN ("Pilot map file could not be created\n");
-		return -1;
-	}
-	doc->root = xmlNewDocNode(doc, NULL, "PilotMap", NULL);
-	map_set_node_timet (doc->root, "timestamp", time (NULL));
-
-	g_hash_table_foreach (ctxt->pid_map, map_write_foreach, doc->root);
-	
-	/* Write the file */
-	xmlSetDocCompressMode (doc, 0);
-	ret = xmlSaveFile (filename, doc);
-	if (ret < 0) {
-		g_warning ("Pilot map file '%s' could not be saved\n", filename);
-		return -1;
-	}
-	
-	xmlFreeDoc (doc);
-
-	return 0;
-}
-
-/* Calendar Server routines */
-static void
-start_calendar_server_cb (GtkWidget *cal_client,
-			  CalClientLoadStatus status,
-			  EToDoConduitContext *ctxt)
-{
-	CalClient *client = CAL_CLIENT (cal_client);
-
-	LOG ("  entering start_calendar_server_load_cb, tried=%d\n",
-		ctxt->calendar_load_tried);
-
-	if (status == CAL_CLIENT_LOAD_SUCCESS) {
-		ctxt->calendar_load_success = TRUE;
-		LOG ("    success\n");
-		gtk_main_quit (); /* end the sub event loop */
-	} else {
-		if (ctxt->calendar_load_tried) {
-			LOG ("    load and create of calendar failed\n");
-			gtk_main_quit (); /* end the sub event loop */
-			return;
-		}
-
-		cal_client_create_calendar (client, ctxt->calendar_file);
-		ctxt->calendar_load_tried = TRUE;
-	}
-}
-
-static int
-start_calendar_server (EToDoConduitContext *ctxt)
-{
-	
-	g_return_val_if_fail (ctxt != NULL, -2);
-
-	ctxt->client = cal_client_new ();
-
-	/* FIX ME */
-	ctxt->calendar_file = g_concat_dir_and_file (g_get_home_dir (),
-			       "evolution/local/Calendar/calendar.ics");
-
-	gtk_signal_connect (GTK_OBJECT (ctxt->client), "cal_loaded",
-			    start_calendar_server_cb, ctxt);
-
-	LOG ("    calling cal_client_load_calendar\n");
-	cal_client_load_calendar (ctxt->client, ctxt->calendar_file);
-
-	/* run a sub event loop to turn cal-client's async load
-	   notification into a synchronous call */
-	gtk_main ();
-
-	if (ctxt->calendar_load_success)
-		return 0;
-
-	return -1;
-}
-
-/* Utility routines */
-static void
-compute_pid (EToDoConduitContext *ctxt, EToDoLocalRecord *local, const char *uid)
-{
-	guint32 *pid;
-	
-	pid = g_hash_table_lookup (ctxt->uid_map, uid);
-	
-	if (pid)
-		local->local.ID = *pid;
-	else
-		local->local.ID = 0;
-}
-
-static void
-compute_status (EToDoConduitContext *ctxt, EToDoLocalRecord *local, const char *uid)
-{
-	local->local.archived = FALSE;
-	local->local.secret = FALSE;
-	
-	if (g_hash_table_lookup (ctxt->added, uid))
-		local->local.attr = GnomePilotRecordNew;
-	else if (g_hash_table_lookup (ctxt->modified, uid))
-		local->local.attr = GnomePilotRecordModified;
-	else if (g_hash_table_lookup (ctxt->deleted, uid))
-		local->local.attr = GnomePilotRecordDeleted;
-	else
-		local->local.attr = GnomePilotRecordNothing;
-}
-
-static GnomePilotRecord *
-local_record_to_pilot_record (EToDoLocalRecord *local,
-			      EToDoConduitContext *ctxt)
-{
-	GnomePilotRecord *p = NULL;
-	
-	g_return_val_if_fail (local != NULL, NULL);
-	g_assert (local->comp != NULL);
-	g_assert (local->todo != NULL );
-	
-	LOG ("local_record_to_remote_record\n");
-
-	p = g_new0 (GnomePilotRecord, 1);
-
-	p->ID = local->local.ID;
-	p->category = 0;
-	p->attr = local->local.attr;
-	p->archived = local->local.archived;
-	p->secret = local->local.secret;
-
-	/* Generate pilot record structure */
-	p->record = g_new0 (char,0xffff);
-	p->length = pack_ToDo (local->todo, p->record, 0xffff);
-
-	return p;	
-}
-
-/*
- * converts a CalComponent object to a EToDoLocalRecord
- */
-static void
-local_record_from_comp (EToDoLocalRecord *local, CalComponent *comp, EToDoConduitContext *ctxt) 
-{
-	const char *uid;
-	int *priority;
-	struct icaltimetype *completed;
-	CalComponentText summary;
-	GSList *d_list = NULL;
-	CalComponentText *description;
-	CalComponentDateTime due;
-	time_t due_time;
-	CalComponentClassification classif;
-
-	LOG ("local_record_from_comp\n");
-
-	g_return_if_fail (local != NULL);
-	g_return_if_fail (comp != NULL);
-
-	local->comp = comp;
-
-	cal_component_get_uid (local->comp, &uid);
-	compute_pid (ctxt, local, uid);
-	compute_status (ctxt, local, uid);
-
-	local->todo = g_new0 (struct ToDo,1);
-
-	/* STOP: don't replace these with g_strdup, since free_ToDo
-	   uses free to deallocate */
-	cal_component_get_summary (comp, &summary);
-	if (summary.value) 
-		local->todo->description = strdup ((char *) summary.value);
-
-	cal_component_get_description_list (comp, &d_list);
-	if (d_list) {
-		description = (CalComponentText *) d_list->data;
-		if (description && description->value)
-			local->todo->note = strdup (description->value);
-		else
-			local->todo->note = NULL;
-	} else {
-		local->todo->note = NULL;
-	}
-
-	cal_component_get_due (comp, &due);	
-	if (due.value) {
-		due_time = icaltime_as_timet (*due.value);
-		
-		local->todo->due = *localtime (&due_time);
-		local->todo->indefinite = 0;
-	} else {
-		local->todo->indefinite = 1;
-	}
-
-	cal_component_get_completed (comp, &completed);
-	if (completed) {
-		local->todo->complete = 1;
-		cal_component_free_icaltimetype (completed);
-	}	
-
-	cal_component_get_priority (comp, &priority);
-	if (priority) {
-		local->todo->priority = *priority;
-		cal_component_free_priority (priority);
-	}
-	
-	cal_component_get_classification (comp, &classif);
-
-	if (classif == CAL_COMPONENT_CLASS_PRIVATE)
-		local->local.secret = 1;
-	else
-		local->local.secret = 0;
-
-	local->local.archived = 0;
-}
-
-static void 
-local_record_from_uid (EToDoLocalRecord *local,
-		       char *uid,
-		       EToDoConduitContext *ctxt)
-{
-	CalComponent *comp;
-	CalClientGetStatus status;
-
-	g_assert(local!=NULL);
-
-	status = cal_client_get_object (ctxt->client, uid, &comp);
-
-	if (status == CAL_CLIENT_GET_SUCCESS) {
-		local_record_from_comp (local, comp, ctxt);
-	} else if (status == CAL_CLIENT_GET_NOT_FOUND) {
-		comp = cal_component_new ();
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-		cal_component_set_uid (comp, uid);
-		local_record_from_comp (local, comp, ctxt);
-	} else {
-		INFO ("Object did not exist");
-	}	
-}
-
-
-static CalComponent *
-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
-			 GnomePilotRecord *remote,
-			 CalComponent *in_comp)
-{
-	CalComponent *comp;
-	struct ToDo todo;
-	struct icaltimetype now = icaltime_from_timet (time (NULL), FALSE, FALSE);
-	CalComponentText summary = {NULL, NULL};
-	CalComponentText description = {NULL, NULL};
-	CalComponentDateTime dt = {NULL, NULL};
-	struct icaltimetype due;
- 	GSList *d_list;
-
-	g_return_val_if_fail (remote != NULL, NULL);
-
-	memset (&todo, 0, sizeof (struct ToDo));
-	unpack_ToDo (&todo, remote->record, remote->length);
-
-	if (in_comp == NULL) {
-		comp = cal_component_new ();
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-		cal_component_set_created (comp, &now);
-	} else {
-		comp = cal_component_clone (in_comp);
-	}
-
- 	LOG ("        comp_from_remote_record: "
- 	     "creating from remote %s and comp %s\n", 
-  	     print_remote (remote), cal_component_get_as_string (comp));
-
-	cal_component_set_last_modified (comp, &now);
-
-	summary.value = todo.description;
-	cal_component_set_summary (comp, &summary);
-
-	description.value = todo.note;
-	d_list = g_slist_append (NULL, &description);
-	cal_component_set_comment_list (comp, d_list);
-	g_slist_free (d_list);
-
-	if (todo.complete) {
-		int percent = 100;
-		cal_component_set_completed (comp, &now);
-		cal_component_set_percent (comp, &percent);
-	}
-
-	/* FIX ME This is a bit hackish, how else can we tell if there is
-	 * no due date set?
-	 */
-	if (todo.due.tm_sec || todo.due.tm_min || todo.due.tm_hour 
-	    || todo.due.tm_mday || todo.due.tm_mon || todo.due.tm_year) {
-		due = icaltime_from_timet (mktime (&todo.due), FALSE, FALSE);
-		dt.value = &due;
-		cal_component_set_due (comp, &dt);
-	}
-	
-	cal_component_set_priority (comp, &todo.priority);
-	cal_component_set_transparency (comp, CAL_COMPONENT_TRANSP_NONE);
-
-	if (remote->attr & dlpRecAttrSecret)
-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PRIVATE);
-	else
-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PUBLIC);
-
-	cal_component_commit_sequence (comp);
-	
-	free_ToDo(&todo);
-
-	return comp;
-}
-
-static void
-update_comp (GnomePilotConduitSyncAbs *conduit, CalComponent *comp,
-	     EToDoConduitContext *ctxt) 
-{
-	gboolean success;
-
-	g_return_if_fail (conduit != NULL);
-	g_return_if_fail (comp != NULL);
-
-	LOG ("update_comp: saving to desktop\n%s\n", 
-	     cal_component_get_as_string (comp));
-
-	success = cal_client_update_object (ctxt->client, comp);
-
-	if (!success)
-		WARN (_("Error while communicating with calendar server"));
-}
-
-static void
-check_for_slow_setting (GnomePilotConduit *c, EToDoConduitContext *ctxt)
-{
-	int count, map_count;
-
-	count = g_list_length (ctxt->uids);
-	map_count = g_hash_table_size (ctxt->pid_map);
-	
-	/* If there are no objects or objects but no log */
-	if ((count == 0) || (count > 0 && map_count == 0)) {
-		GnomePilotConduitStandard *conduit;
-		LOG ("    doing slow sync\n");
-		conduit = GNOME_PILOT_CONDUIT_STANDARD (c);
-		gnome_pilot_conduit_standard_set_slow (conduit);
-	} else {
-		LOG ("    doing fast sync\n");
-	}
-}
-
-/* Pilot syncing callbacks */
-static gint
-pre_sync (GnomePilotConduit *conduit,
-	  GnomePilotDBInfo *dbi,
-	  EToDoConduitContext *ctxt)
-{
-	GnomePilotConduitSyncAbs *abs_conduit;
-	GList *l;
-	int len;
-	unsigned char *buf;
-	char *filename;
-	xmlSAXHandler handler;
-	gint num_records;
-
-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);
-
-	LOG ("---------------------------------------------------------\n");
-	LOG ("pre_sync: ToDo Conduit v.%s", CONDUIT_VERSION);
-	g_message ("ToDo Conduit v.%s", CONDUIT_VERSION);
-
-	ctxt->client = NULL;
-	
-	if (start_calendar_server (ctxt) != 0) {
-		WARN(_("Could not start wombat server"));
-		gnome_pilot_conduit_error (conduit, _("Could not start wombat"));
-		return -1;
-	}
-
-	/* Get the local database */
-	ctxt->uids = cal_client_get_uids (ctxt->client, CALOBJ_TYPE_TODO);
-	
-	/* Load the uid <--> pilot id mappings */
-	ctxt->pid_map = g_hash_table_new (g_int_hash, g_int_equal);
-	ctxt->uid_map = g_hash_table_new (g_str_hash, g_str_equal);
-
-	filename = map_name (ctxt);
-	if (g_file_exists (filename)) {
-		memset (&handler, 0, sizeof (xmlSAXHandler));
-		handler.startElement = map_sax_start_element;
-		
-		if (xmlSAXUserParseFile (&handler, ctxt, filename) < 0)
-			return -1;
-	}
-	
-	g_free (filename);
-
-	/* Find the added, modified and deleted items */
-	ctxt->added = g_hash_table_new (g_str_hash, g_str_equal);
-	ctxt->modified = g_hash_table_new (g_str_hash, g_str_equal);
-	ctxt->deleted = g_hash_table_new (g_str_hash, g_str_equal);
-
-	ctxt->changed = cal_client_get_changed_uids (ctxt->client, 
-						     CALOBJ_TYPE_TODO,
-						     ctxt->since + 1);
-	for (l = ctxt->changed; l != NULL; l = l->next) {
-		CalObjChange *coc = l->data;
-		
-		switch (coc->type) {
-		case CALOBJ_UPDATED:
-			if (g_hash_table_lookup (ctxt->uid_map, coc->uid))
-				g_hash_table_insert (ctxt->modified, coc->uid, coc);
-			else
-				g_hash_table_insert (ctxt->added, coc->uid, coc);
-			break;
-		case CALOBJ_REMOVED:
-			g_hash_table_insert (ctxt->deleted, coc->uid, coc);
-			break;
-		}
-	}
-
-	/* Set the count information */
-	num_records = cal_client_get_n_objects (ctxt->client, CALOBJ_TYPE_TODO);
-	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);
-	num_records = g_hash_table_size (ctxt->added);
-	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, num_records);
-	num_records = g_hash_table_size (ctxt->modified);
-	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, num_records);
-	num_records = g_hash_table_size (ctxt->deleted);
-	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, num_records);
-
-	gtk_object_set_data (GTK_OBJECT (conduit), "dbinfo", dbi);
-
-	buf = (unsigned char*)g_malloc (0xffff);
-	len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
-			      (unsigned char *)buf, 0xffff);
-	
-	if (len < 0) {
-		WARN (_("Could not read pilot's ToDo application block"));
-		WARN ("dlp_ReadAppBlock(...) = %d", len);
-		gnome_pilot_conduit_error (conduit,
-					   _("Could not read pilot's ToDo application block"));
-		return -1;
-	}
-	unpack_ToDoAppInfo (&(ctxt->ai), buf, len);
-	g_free (buf);
-
-	check_for_slow_setting (conduit, ctxt);
-
-	return 0;
-}
-
-static gint
-post_sync (GnomePilotConduit *conduit,
-	   GnomePilotDBInfo *dbi,
-	   EToDoConduitContext *ctxt)
-{
-	gchar *filename;
-	
-	LOG ("post_sync: ToDo Conduit v.%s", CONDUIT_VERSION);
-	LOG ("---------------------------------------------------------\n");
-
-	filename = map_name (ctxt);
-	map_write (ctxt, filename);
-	g_free (filename);
-	
-	return 0;
-}
-
-static gint
-set_pilot_id (GnomePilotConduitSyncAbs *conduit,
-	      EToDoLocalRecord *local,
-	      guint32 ID,
-	      EToDoConduitContext *ctxt)
-{
-	const char *uid;
-	char *new_uid;
-	guint32 *pid = g_new (guint32, 1);
-
-	LOG ("set_pilot_id: setting to %d\n", ID);
-	
-	cal_component_get_uid (local->comp, &uid);
-	*pid = ID;
-	new_uid = g_strdup (uid);
-	g_hash_table_insert (ctxt->pid_map, pid, new_uid);
-	g_hash_table_insert (ctxt->uid_map, new_uid, pid);
-
-        return 0;
-}
-
-static gint
-for_each (GnomePilotConduitSyncAbs *conduit,
-	  EToDoLocalRecord **local,
-	  EToDoConduitContext *ctxt)
-{
-	static GList *uids, *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each");
-
-		uids = ctxt->uids;
-		count = 0;
-		
-		if (uids != NULL) {
-			LOG ("iterating over %d records", g_list_length (uids));
-
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_uid (*local, uids->data, ctxt);
-
-			iterator = uids;
-		} else {
-			LOG ("no events");
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			iterator = g_list_next (iterator);
-
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_uid (*local, iterator->data, ctxt);
-		} else {
-			LOG ("for_each ending");
-
-			/* Tell the pilot the iteration is over */
-			*local = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-for_each_modified (GnomePilotConduitSyncAbs *conduit,
-		   EToDoLocalRecord **local,
-		   EToDoConduitContext *ctxt)
-{
-	static GList *changes, *iterator;
-	static int count;
-
-	g_return_val_if_fail (local != NULL, 0);
-
-	if (*local == NULL) {
-		LOG ("beginning for_each_modified: beginning\n");
-		
-		changes = ctxt->changed;
-		
-		count = 0;
-		
-		if (changes != NULL) {
-			CalObjChange *coc = changes->data;
-			
-			LOG ("iterating over %d records", g_list_length (changes));
-			 
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_uid (*local, coc->uid, ctxt);
-
-			iterator = changes;
-		} else {
-			LOG ("no events");
-			(*local) = NULL;
-			return 0;
-		}
-	} else {
-		count++;
-		if (g_list_next (iterator)) {
-			CalObjChange *coc;
-
-			iterator = g_list_next (iterator);
-			coc = iterator->data;
-
-			*local = g_new0 (EToDoLocalRecord, 1);
-			local_record_from_uid (*local, coc->uid, ctxt);
-		} else {
-			LOG ("for_each_modified ending");
-
-			/* Tell the pilot the iteration is over */
-			(*local) = NULL;
-
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-static gint
-compare (GnomePilotConduitSyncAbs *conduit,
-	 EToDoLocalRecord *local,
-	 GnomePilotRecord *remote,
-	 EToDoConduitContext *ctxt)
-{
-	/* used by the quick compare */
-	GnomePilotRecord *local_pilot;
-	int retval = 0;
-
-	LOG ("compare: local=%s remote=%s...\n",
-	     print_local (local), print_remote (remote));
-
-	g_return_val_if_fail (local!=NULL,-1);
-	g_return_val_if_fail (remote!=NULL,-1);
-
-	local_pilot = local_record_to_pilot_record (local, ctxt);
-	if (!local_pilot) 
-		return -1;
-
-	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");
-	
-	g_free (local_pilot);
-	
-	return retval;
-}
-
-static gint
-add_record (GnomePilotConduitSyncAbs *conduit,
-	    GnomePilotRecord *remote,
-	    EToDoConduitContext *ctxt)
-{
-	CalComponent *comp;
-	const char *uid;
-	char *new_uid;
-	guint32 *pid = g_new (guint32, 1);
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("add_record: adding %s to desktop\n", print_remote (remote));
-
-	comp = comp_from_remote_record (conduit, remote, NULL);
-	update_comp (conduit, comp, ctxt);
-
-	*pid = remote->ID;
-	cal_component_get_uid (comp, &uid);
-	new_uid = g_strdup (uid);
-	g_hash_table_insert (ctxt->pid_map, pid, new_uid);
-	g_hash_table_insert (ctxt->uid_map, new_uid, pid);
-
-	return retval;
-}
-
-static gint
-add_archive_record (GnomePilotConduitSyncAbs *conduit,
-		    EToDoLocalRecord *local,
-		    GnomePilotRecord *remote,
-		    EToDoConduitContext *ctxt)
-{
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1); 
-	g_return_val_if_fail (local != NULL, -1);
-
-	LOG ("add_archive_record: doing nothing with %s\n",
-	     print_local (local));
-
-	return retval;
-}
-
-static gint
-replace_record (GnomePilotConduitSyncAbs *conduit,
-		EToDoLocalRecord *local,
-		GnomePilotRecord *remote,
-		EToDoConduitContext *ctxt)
-{
-	CalComponent *new_comp;
-	int retval = 0;
-	
-	g_return_val_if_fail (remote != NULL, -1);
-
-	LOG ("replace_record: replace %s with %s\n",
-	     print_local (local), print_remote (remote));
-
-	new_comp = comp_from_remote_record (conduit, remote, local->comp);
-	gtk_object_unref (GTK_OBJECT (local->comp));
-	local->comp = new_comp;
-	update_comp (conduit, local->comp, ctxt);
-
-	gtk_object_unref (GTK_OBJECT (new_comp));
-
-	return retval;
-}
-
-static gint
-delete_record (GnomePilotConduitSyncAbs *conduit,
-	       EToDoLocalRecord *local,
-	       EToDoConduitContext *ctxt)
-{
-	const char *uid;
-
-	g_return_val_if_fail (local != NULL, -1);
-	g_assert (local->comp != NULL);
-
-	cal_component_get_uid (local->comp, &uid);
-
-	LOG ("delete_record: deleting %s\n", uid);
-
-	cal_client_remove_object (ctxt->client, uid);
-	
-        return 0;
-}
-
-static gint
-delete_archive_record (GnomePilotConduitSyncAbs *conduit,
-		       EToDoLocalRecord *local,
-		       EToDoConduitContext *ctxt)
-{
-	g_return_val_if_fail(local!=NULL,-1);
-
-	LOG ("delete_archive_record: doing nothing\n");
-
-        return -1;
-}
-
-static gint
-match (GnomePilotConduitSyncAbs *conduit,
-       GnomePilotRecord *remote,
-       EToDoLocalRecord **local,
-       EToDoConduitContext *ctxt)
-{
-	char *uid;
-	
-	LOG ("match: looking for local copy of %s\n",
-	     print_remote (remote));	
-	
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	*local = NULL;
-	uid = g_hash_table_lookup (ctxt->pid_map, &remote->ID);
-	
-	if (!uid)
-		return 0;
-
-	LOG ("  matched\n");
-	
-	*local = g_new0 (EToDoLocalRecord, 1);
-	local_record_from_uid (*local, uid, ctxt);
-	
-	return 0;
-}
-
-static gint
-free_match (GnomePilotConduitSyncAbs *conduit,
-	    EToDoLocalRecord *local,
-	    EToDoConduitContext *ctxt)
-{
-	LOG ("free_match: freeing\n");
-
-	g_return_val_if_fail (local != NULL, -1);
-
-	gtk_object_unref (GTK_OBJECT (local->comp));
-	g_free (local);
-
-	return 0;
-}
-
-static gint
-prepare (GnomePilotConduitSyncAbs *conduit,
-	 EToDoLocalRecord *local,
-	 GnomePilotRecord **remote,
-	 EToDoConduitContext *ctxt)
-{
-	LOG ("prepare: encoding local %s\n", print_local (local));
-
-	*remote = local_record_to_pilot_record (local, ctxt);
-
-	if (!*remote)
-		return -1;
-	
-	return 0;
-}
-
-static gint
-free_prepare (GnomePilotConduitSyncAbs *conduit,
-	      EToDoLocalRecord *local,
-	      GnomePilotRecord **remote,
-	      EToDoConduitContext *ctxt)
-{
-	LOG ("free_prepare: freeing\n");
-
-	g_return_val_if_fail (local != NULL, -1);
-	g_return_val_if_fail (remote != NULL, -1);
-
-	g_free (*remote);
-	*remote = NULL;
-
-        return 0;
-}
-
-static ORBit_MessageValidationResult
-accept_all_cookies (CORBA_unsigned_long request_id,
-		    CORBA_Principal *principal,
-		    CORBA_char *operation)
-{
-	/* allow ALL cookies */
-	return ORBIT_MESSAGE_ALLOW_ALL;
-}
-
-
-GnomePilotConduit *
-conduit_get_gpilot_conduit (guint32 pilot_id)
-{
-	GtkObject *retval;
-	EToDoConduitContext *ctxt;
-
-	LOG ("in todo's conduit_get_gpilot_conduit\n");
-
-	/* we need to find wombat with oaf, so make sure oaf
-	   is initialized here.  once the desktop is converted
-	   to oaf and gpilotd is built with oaf, this can go away */
-	if (!oaf_is_initialized ()) {
-		char *argv[ 1 ] = {"hi"};
-		oaf_init (1, argv);
-
-		if (bonobo_init (CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL,
-				 CORBA_OBJECT_NIL) == FALSE)
-			g_error (_("Could not initialize Bonobo"));
-
-		ORBit_set_request_validation_handler (accept_all_cookies);
-	}
-
-	retval = gnome_pilot_conduit_sync_abs_new ("ToDoDB", 0x746F646F);
-	g_assert (retval != NULL);
-
-	gnome_pilot_conduit_construct (GNOME_PILOT_CONDUIT (retval),
-				       "e_todo_conduit");
-
-	e_todo_context_new (&ctxt, pilot_id);
-	gtk_object_set_data (GTK_OBJECT (retval), "todoconduit_context", ctxt);
-
-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);
-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);
-
-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
-
-  	gtk_signal_connect (retval, "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, "add_archive_record", (GtkSignalFunc) add_archive_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, "delete_archive_record", (GtkSignalFunc) delete_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);
-  	gtk_signal_connect (retval, "free_prepare", (GtkSignalFunc) free_prepare, ctxt);
-
-	return GNOME_PILOT_CONDUIT (retval);
-}
-
-void
-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)
-{ 
-	EToDoConduitContext *ctxt;
-
-	ctxt = gtk_object_get_data (GTK_OBJECT (conduit), 
-				    "todoconduit_context");
-
-	e_todo_context_destroy (&ctxt);
-
-	gtk_object_destroy (GTK_OBJECT (conduit));
-}
diff --git a/calendar/conduits/todo/todo-conduit.h b/calendar/conduits/todo/todo-conduit.h
deleted file mode 100644
index ecec89c35a..0000000000
--- a/calendar/conduits/todo/todo-conduit.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Capplet
- *
- * Copyright (C) 1998 Free Software Foundation
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk> 
- *          JP Rosevear <jpr@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __TODO_CONDUIT_H__
-#define __TODO_CONDUIT_H__
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <gnome.h>
-#include <pi-todo.h>
-#include <gpilotd/gnome-pilot-conduit.h>
-#include <gpilotd/gnome-pilot-conduit-sync-abs.h>
-#include <cal-client/cal-client.h>
-
-
-/* This is the local record structure for the Evolution ToDo conduit. */
-typedef struct _EToDoLocalRecord EToDoLocalRecord;
-struct _EToDoLocalRecord {
-	/* The stuff from gnome-pilot-conduit-standard-abs.h
-	   Must be first in the structure, or instances of this
-	   structure cannot be used by gnome-pilot-conduit-standard-abs.
-	*/
-	GnomePilotDesktopRecord local;
-
-	/* The corresponding Comp object */
-	CalComponent *comp;
-
-        /* pilot-link todo structure, used for implementing Transmit. */
-	struct ToDo *todo;
-};
-
-/* This is the context for all the GnomeCal conduit methods. */
-typedef struct _EToDoConduitContext EToDoConduitContext;
-struct _EToDoConduitContext {
-	EToDoConduitCfg *cfg;
-
-	struct ToDoAppInfo ai;
-
-	CalClient *client;
-	char *calendar_file;
-	gboolean calendar_load_tried;
-	gboolean calendar_load_success;
-
-	time_t since;
-	GList *uids;
-	GList *changed;
-
-	GHashTable *added;
-	GHashTable *modified;
-	GHashTable *deleted;
-	
-	GHashTable *uid_map;
-	GHashTable *pid_map;
-};
-
-#endif __TODO_CONDUIT_H__ 
-
-
-
-
-
-
diff --git a/calendar/gui/.cvsignore b/calendar/gui/.cvsignore
deleted file mode 100644
index c55e5d266f..0000000000
--- a/calendar/gui/.cvsignore
+++ /dev/null
@@ -1,21 +0,0 @@
-Makefile.in
-Makefile
-.deps
-_libs
-.libs
-.pure
-gncal
-evolution-calendar
-evolution-calendar.pure
-test-calendar-widget
-getdate.c
-GnomeCal-skels.c
-GnomeCal-common.c
-GnomeCal.h
-calendar-pilot-sync
-evolution-calendar-stubs.c
-evolution-calendar-skels.c
-evolution-calendar-common.c
-evolution-calendar.h
-GnomeCal-stubs.c
-*.lo
diff --git a/calendar/gui/GNOME_Evolution_Calendar.oaf.in b/calendar/gui/GNOME_Evolution_Calendar.oaf.in
deleted file mode 100644
index 74fb43af70..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar.oaf.in
+++ /dev/null
@@ -1,89 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad"
-            type="factory"
-            location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-		<item value="text/x-calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       value="Evolution calendar iTip/iMip viewer"/>
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution calendar component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling the calendar."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-calendar.png"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"
-		type="exe"
-		location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the Calendar Summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c"
-	    type="factory"
-	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Evolution calendar executive summary component."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/GNOME_Evolution_Calendar.oafinfo b/calendar/gui/GNOME_Evolution_Calendar.oafinfo
deleted file mode 100644
index 74fb43af70..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar.oafinfo
+++ /dev/null
@@ -1,89 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad"
-            type="factory"
-            location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-		<item value="text/x-calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       value="Evolution calendar iTip/iMip viewer"/>
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution calendar component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling the calendar."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-calendar.png"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"
-		type="exe"
-		location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the Calendar Summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c"
-	    type="factory"
-	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Evolution calendar executive summary component."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in b/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in
deleted file mode 100644
index fb0f138caf..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in
+++ /dev/null
@@ -1,28 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the sample Calendar control"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:calendar:dd34ddae-25c6-486b-a8a8-3e8f0286b54c"
-            type="factory"
-            location="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/calendar-control:1.0"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="A sample Bonobo control which displays an calendar."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo b/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo
deleted file mode 100644
index fb0f138caf..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar_Control.oafinfo
+++ /dev/null
@@ -1,28 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the sample Calendar control"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:calendar:dd34ddae-25c6-486b-a8a8-3e8f0286b54c"
-            type="factory"
-            location="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/calendar-control:1.0"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="A sample Bonobo control which displays an calendar."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in
deleted file mode 100644
index 74fb43af70..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in
+++ /dev/null
@@ -1,89 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad"
-            type="factory"
-            location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-		<item value="text/x-calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       value="Evolution calendar iTip/iMip viewer"/>
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution calendar component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling the calendar."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-calendar.png"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"
-		type="exe"
-		location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the Calendar Summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c"
-	    type="factory"
-	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Evolution calendar executive summary component."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo
deleted file mode 100644
index 74fb43af70..0000000000
--- a/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo
+++ /dev/null
@@ -1,89 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad"
-            type="factory"
-            location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-		<item value="text/x-calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       value="Evolution calendar iTip/iMip viewer"/>
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution calendar component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling the calendar."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-calendar.png"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"
-		type="exe"
-		location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the Calendar Summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c"
-	    type="factory"
-	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Evolution calendar executive summary component."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
deleted file mode 100644
index 9b5a81a68a..0000000000
--- a/calendar/gui/Makefile.am
+++ /dev/null
@@ -1,142 +0,0 @@
-SUBDIRS = dialogs
-
-help_base = $(datadir)/gnome/help/cal
-
-bin_PROGRAMS = evolution-calendar
-
-INCLUDES = 						\
-	-DG_LOG_DOMAIN=\"calendar-gui\"			\
-	-I$(top_builddir)/shell				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(top_srcdir)/widgets				\
-	-I$(includedir)					\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)				\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-
-LINK_FLAGS =							\
-	$(BONOBO_VFS_GNOME_LIBS)				\
-	$(EXTRA_GNOME_LIBS)					\
-	$(INTLLIBS)						\
-	dialogs/libcal-dialogs.a				\
-	$(top_builddir)/calendar/cal-client/libcal-client.la	\
-	$(top_builddir)/calendar/cal-util/libcal-util.la	\
-	$(top_builddir)/widgets/misc/libemiscwidgets.a		\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(top_builddir)/libversit/libversit.la			\
-	$(top_builddir)/libical/src/libical/libical.a
-
-gladedir   = $(datadir)/evolution/glade
-
-glade_DATA = 					\
-	event-editor-dialog.glade		\
-	e-meeting-dialog.glade			\
-	e-itip-control.glade
-
-glade_messages = event-editor-dialog.glade.h
-
-evolution_calendar_SOURCES =			\
-	alarm.c					\
-	alarm.h					\
-	calendar-config.c			\
-	calendar-config.h			\
-	calendar-commands.c			\
-	calendar-commands.h			\
-	calendar-model.c			\
-	calendar-model.h			\
-	control-factory.c			\
-	control-factory.h			\
-	component-factory.c			\
-	component-factory.h			\
-	e-calendar-table.h			\
-	e-calendar-table.c			\
-	e-day-view-main-item.c			\
-	e-day-view-main-item.h			\
-	e-day-view-time-item.c			\
-	e-day-view-time-item.h			\
-	e-day-view-top-item.c			\
-	e-day-view-top-item.h			\
-	e-day-view.c				\
-	e-day-view.h				\
-	e-week-view-event-item.c		\
-	e-week-view-event-item.h		\
-	e-week-view-main-item.c			\
-	e-week-view-main-item.h			\
-	e-week-view-titles-item.c		\
-	e-week-view-titles-item.h		\
-	e-week-view.c				\
-	e-week-view.h				\
-	e-meeting-edit.h			\
-	e-meeting-edit.c			\
-	e-itip-control.h			\
-	e-itip-control.c			\
-	event-editor.c				\
-	event-editor.h				\
-	getdate.y				\
-	gncal-todo.c				\
-	gncal-todo.h				\
-	gnome-cal.c				\
-	gnome-cal.h				\
-	gnome-month-item.c			\
-	gnome-month-item.h			\
-	goto.c					\
-	main.c					\
-	mark.c					\
-	mark.h					\
-	popup-menu.c				\
-	popup-menu.h				\
-	print.c					\
-	print.h					\
-	prop.c
-
-evolution_calendar_LDADD =					\
-	$(top_builddir)/shell/libeshell.a			\
-	$(EXTRA_GNOME_LIBS)					\
-	$(BONOBO_HTML_GNOME_LIBS)				\
-	$(top_builddir)/e-util/libeutil.la			\
-	$(LINK_FLAGS)
-
-evolution_calendar_LDFLAGS = `gnome-config --libs gdk_pixbuf`
-
-oafdir = $(datadir)/oaf
-oaf_DATA = calendar-control.oafinfo evolution-calendar.oafinfo 
-
-EXTRA_DIST =	 			\
-	$(glade_DATA)			\
-	bell.xpm			\
-	check-filled.xpm		\
-	dayview.xpm			\
-	jump.xpm			\
-	monthview.xpm			\
-	recur.xpm			\
-	task-assigned-to.xpm		\
-	task-assigned.xpm		\
-	task-recurring.xpm		\
-	task.xpm			\
-	weekview.xpm			\
-	workweekview.xpm		\
-	yearview.xpm			\
-	calendar-control.oafinfo	\
-	evolution-calendar.oafinfo
-
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(help_base)/C
-	$(mkinstalldirs) $(Conduitsdir)
-
-if ENABLE_PURIFY
-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-
-all-local: evolution-calendar.pure
-
-evolution-calendar.pure: evolution-calendar
-	@rm -f evolution-calendar.pure
-	$(PLINK) $(evolution_calendar_LDFLAGS) $(evolution_calendar_OBJECTS) $(evolution_calendar_LDADD) $(LIBS)
-
-endif
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
deleted file mode 100644
index 7d8357599c..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include "alarm-notify-dialog.h"
-
-
-
-/* The useful contents of the alarm notify dialog */
-typedef struct {
-	GladeXML *xml;
-
-	GtkWidget *dialog;
-	GtkWidget *close;
-	GtkWidget *snooze;
-	GtkWidget *edit;
-	GtkWidget *heading;
-	GtkWidget *summary;
-	GtkWidget *snooze_time;
-
-	AlarmNotifyFunc func;
-	gpointer func_data;
-} AlarmNotify;
-
-
-
-/* Callback used when the notify dialog is destroyed */
-static void
-dialog_destroy_cb (GtkObject *object, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	gtk_object_unref (GTK_OBJECT (an->xml));
-	g_free (an);
-}
-
-/* Delete_event handler for the alarm notify dialog */
-static gint
-delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (widget);
-	return TRUE;
-}
-
-/* Callback for the close button */
-static void
-close_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the snooze button */
-static void
-snooze_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-	int snooze_time;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	snooze_time = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (an->snooze_time));
-	(* an->func) (ALARM_NOTIFY_SNOOZE, snooze_time, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the edit button */
-static void
-edit_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_EDIT, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/**
- * alarm_notify_dialog:
- * @trigger: Trigger time for the alarm.
- * @occur: Occurrence time for the event.
- * @comp: Calendar component object which corresponds to the alarm.
- * @func: Function to be called when a dialog action is invoked.
- * @func_data: Closure data for @func.
- * 
- * Runs the alarm notification dialog.  The specified @func will be used to
- * notify the client about result of the actions in the dialog.
- * 
- * Return value: TRUE on success, FALSE if the dialog could not be created.
- **/
-gboolean
-alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp,
-		     AlarmNotifyFunc func, gpointer func_data)
-{
-	AlarmNotify *an;
-	char buf[256];
-	struct tm tm_trigger;
-	struct tm tm_occur;
-	CalComponentText summary;
-
-	g_return_val_if_fail (trigger != -1, FALSE);
-	g_return_val_if_fail (occur != -1, FALSE);
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-	g_return_val_if_fail (func != NULL, FALSE);
-
-	an = g_new0 (AlarmNotify, 1);
-
-	an->func = func;
-	an->func_data = func_data;
-
-	an->xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-notify.glade", NULL);
-	if (!an->xml) {
-		g_message ("alarm_notify_dialog(): Could not load the Glade XML file!");
-		g_free (an);
-		return FALSE;
-	}
-
-	an->dialog = glade_xml_get_widget (an->xml, "alarm-notify");
-	an->close = glade_xml_get_widget (an->xml, "close");
-	an->snooze = glade_xml_get_widget (an->xml, "snooze");
-	an->edit = glade_xml_get_widget (an->xml, "edit");
-	an->heading = glade_xml_get_widget (an->xml, "heading");
-	an->summary = glade_xml_get_widget (an->xml, "summary");
-	an->snooze_time = glade_xml_get_widget (an->xml, "snooze-time");
-
-	if (!(an->dialog && an->close && an->snooze && an->edit && an->heading && an->summary
-	      && an->snooze_time)) {
-		g_message ("alarm_notify_dialog(): Could not find all widgets in Glade file!");
-		gtk_object_unref (GTK_OBJECT (an->xml));
-		g_free (an);
-		return FALSE;
-	}
-
-	gtk_object_set_data (GTK_OBJECT (an->dialog), "alarm-notify", an);
-	gtk_signal_connect (GTK_OBJECT (an->dialog), "destroy",
-			    GTK_SIGNAL_FUNC (dialog_destroy_cb), an);
-
-	/* Title */
-
-	/* FIXME: use am_pm_flag or 24-hour time */
-
-	tm_trigger = *localtime (&trigger);
-	strftime (buf, sizeof (buf), _("Alarm on %A %b %d %Y %H:%M"), &tm_trigger);
-	gtk_window_set_title (GTK_WINDOW (an->dialog), buf);
-
-	/* Heading */
-
-	tm_occur = *localtime (&occur);
-	strftime (buf, sizeof (buf),
-		  _("Notification about your appointment on %A %b %d %Y %H:%M"),
-		  &tm_occur);
-	gtk_label_set_text (GTK_LABEL (an->heading), buf);
-
-	/* Summary */
-
-	cal_component_get_summary (comp, &summary);
-
-	if (summary.value)
-		gtk_label_set_text (GTK_LABEL (an->summary), summary.value);
-	else
-		gtk_label_set_text (GTK_LABEL (an->summary), _("No summary available."));
-
-	/* Connect actions */
-
-	gtk_signal_connect (GTK_OBJECT (an->dialog), "delete_event",
-			    GTK_SIGNAL_FUNC (delete_event_cb),
-			    an);
-			    
-	gtk_signal_connect (GTK_OBJECT (an->close), "clicked",
-			    GTK_SIGNAL_FUNC (close_clicked_cb),
-			    an);
-
-	gtk_signal_connect (GTK_OBJECT (an->snooze), "clicked",
-			    GTK_SIGNAL_FUNC (snooze_clicked_cb),
-			    an);
-
-	gtk_signal_connect (GTK_OBJECT (an->edit), "clicked",
-			    GTK_SIGNAL_FUNC (edit_clicked_cb),
-			    an);
-
-	/* Run! */
-
-	gtk_widget_show (an->dialog);
-	return TRUE;
-}
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.h b/calendar/gui/alarm-notify/alarm-notify-dialog.h
deleted file mode 100644
index 1e56f1c586..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_NOTIFY_DIALOG_H
-#define ALARM_NOTIFY_DIALOG_H
-
-#include <time.h>
-#include <glib.h>
-#include <cal-util/cal-component.h>
-
-
-
-typedef enum {
-	ALARM_NOTIFY_CLOSE,
-	ALARM_NOTIFY_SNOOZE,
-	ALARM_NOTIFY_EDIT
-} AlarmNotifyResult;
-
-typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, int snooze_mins, gpointer data);
-
-gboolean alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp,
-			      AlarmNotifyFunc func, gpointer func_data);
-
-
-
-#endif
diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade
deleted file mode 100644
index 32d7e03f8b..0000000000
--- a/calendar/gui/alarm-notify/alarm-notify.glade
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Evolution Calendar</name>
-  <program_name>evolution-calendar</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>False</use_widget_names>
-  <output_main_file>True</output_main_file>
-  <output_support_files>True</output_support_files>
-  <output_build_files>True</output_build_files>
-  <backup_source_files>True</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>alarm-notify.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>alarm-notify</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <title></title>
-  <type>GTK_WINDOW_DIALOG</type>
-  <position>GTK_WIN_POS_CENTER</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkVBox</class>
-    <name>vbox2</name>
-    <border_width>4</border_width>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox3</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <homogeneous>False</homogeneous>
-      <spacing>8</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox5</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>heading</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>summary</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox4</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>close</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Close</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>snooze</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Snooze</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>edit</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Edit appointment</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHSeparator</class>
-      <name>hseparator1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox4</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Snooze time (minutes)</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkSpinButton</class>
-	<name>snooze-time</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_focus>True</can_focus>
-	<climb_rate>1</climb_rate>
-	<digits>0</digits>
-	<numeric>False</numeric>
-	<update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	<snap>False</snap>
-	<wrap>False</wrap>
-	<value>5</value>
-	<lower>1</lower>
-	<upper>1440</upper>
-	<step>1</step>
-	<page>5</page>
-	<page_size>5</page_size>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
deleted file mode 100644
index 085111498b..0000000000
--- a/calendar/gui/alarm-notify/alarm.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/* Evolution calendar - alarm notification support
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Miguel de Icaza <miguel@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <time.h>
-#include <gnome.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/time.h>
-#include "alarm.h"
-
-
-
-/* The pipes used to notify about an alarm */
-static int alarm_pipes [2];
-
-/* The list of pending alarms */
-static GList *alarms;
-
-/* A queued alarm structure */
-typedef struct {
-	time_t             trigger;
-	AlarmFunction      alarm_fn;
-	gpointer           data;
-	AlarmDestroyNotify destroy_notify_fn;
-} AlarmRecord;
-
-
-
-/* SIGALRM handler.  Notifies the callback about the alarm. */
-static void
-alarm_signal (int arg)
-{
-	char c = 0;
-
-	write (alarm_pipes [1], &c, 1);
-}
-
-/* Sets up an itimer and returns a success code */
-static gboolean
-setup_itimer (time_t diff)
-{
-	struct itimerval itimer;
-	int v;
-
-	itimer.it_interval.tv_sec = 0;
-	itimer.it_interval.tv_usec = 0;
-	itimer.it_value.tv_sec = diff;
-	itimer.it_value.tv_usec = 0;
-
-	v = setitimer (ITIMER_REAL, &itimer, NULL);
-
-	return (v == 0) ? TRUE : FALSE;
-}
-
-/* Removes the head alarm, returns it, and schedules the next alarm in the
- * queue.
- */
-static AlarmRecord *
-pop_alarm (void)
-{
-	AlarmRecord *ar;
-	GList *l;
-
-	if (!alarms)
-		return NULL;
-
-	ar = alarms->data;
-
-	l = alarms;
-	alarms = g_list_remove_link (alarms, l);
-	g_list_free_1 (l);
-
-	if (alarms) {
-		time_t now;
-		AlarmRecord *new_ar;
-
-		now = time (NULL);
-		new_ar = alarms->data;
-
-		if (!setup_itimer (new_ar->trigger - now)) {
-			g_message ("pop_alarm(): Could not reset the timer!  "
-				   "Weird things will happen.");
-
-			/* FIXME: should we free the alarm list?  What
-			 * about further alarm removal requests that
-			 * will fail?
-			 */
-		}
-	} else {
-		struct itimerval itimer;
-		int v;
-
-		itimer.it_interval.tv_sec = 0;
-		itimer.it_interval.tv_usec = 0;
-		itimer.it_value.tv_sec = 0;
-		itimer.it_value.tv_usec = 0;
-
-		v = setitimer (ITIMER_REAL, &itimer, NULL);
-		if (v != 0)
-			g_message ("pop_alarm(): Could not clear the timer!  "
-				   "Weird things may happen.");
-	}
-
-	return ar;
-}
-
-/* Input handler for our own alarm notification pipe */
-static void
-alarm_ready (gpointer data, gint fd, GdkInputCondition cond)
-{
-	AlarmRecord *ar;
-	char c;
-
-	if (read (alarm_pipes [0], &c, 1) != 1) {
-		g_message ("alarm_ready(): Uh?  Could not read from notification pipe.");
-		return;
-	}
-
-	g_assert (alarms != NULL);
-	ar = pop_alarm ();
-
-	g_print ("alarm_ready(): Notifying about alarm on %s\n", ctime (&ar->trigger));
-
-	(* ar->alarm_fn) (ar, ar->trigger, ar->data);
-
-	if (ar->destroy_notify_fn)
-		(* ar->destroy_notify_fn) (ar->data);
-
-	g_free (ar);
-}
-
-static int
-compare_alarm_by_time (gconstpointer a, gconstpointer b)
-{
-	const AlarmRecord *ara = a;
-	const AlarmRecord *arb = b;
-	time_t diff;
-
-	diff = ara->trigger - arb->trigger;
-	return (diff < 0) ? -1 : (diff > 0) ? 1 : 0;
-}
-
-/* Adds an alarm to the queue and sets up the timer */
-static gboolean
-queue_alarm (time_t now, AlarmRecord *ar)
-{
-	time_t diff;
-	AlarmRecord *old_head;
-
-	if (alarms)
-		old_head = alarms->data;
-	else
-		old_head = NULL;
-
-	alarms = g_list_insert_sorted (alarms, ar, compare_alarm_by_time);
-
-	if (old_head == alarms->data)
-		return TRUE;
-
-	/* Set the timer for removal upon activation */
-
-	diff = ar->trigger - now;
-	if (!setup_itimer (diff)) {
-		GList *l;
-
-		g_message ("queue_alarm(): Could not set up timer!  Not queueing alarm.");
-
-		l = g_list_find (alarms, ar);
-		g_assert (l != NULL);
-
-		alarms = g_list_remove_link (alarms, l);
-		g_list_free_1 (l);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/**
- * alarm_add:
- * @trigger: Time at which alarm will trigger.
- * @alarm_fn: Callback for trigger.
- * @data: Closure data for callback.
- *
- * Adds an alarm to trigger at the specified time.  The @alarm_fn will be called
- * with the provided data and the alarm will be removed from the trigger list.
- *
- * Return value: An identifier for this alarm; it can be used to remove the
- * alarm later with alarm_remove().  If the trigger time occurs in the past, then
- * the alarm will not be queued and the function will return NULL.
- **/
-gpointer
-alarm_add (time_t trigger, AlarmFunction alarm_fn, gpointer data,
-	   AlarmDestroyNotify destroy_notify_fn)
-{
-	time_t now;
-	AlarmRecord *ar;
-
-	now = time (NULL);
-	if (trigger < now)
-		return NULL;
-
-	ar = g_new (AlarmRecord, 1);
-	ar->trigger = trigger;
-	ar->alarm_fn = alarm_fn;
-	ar->data = data;
-	ar->destroy_notify_fn = destroy_notify_fn;
-
-	g_print ("alarm_add(): Adding alarm for %s\n", ctime (&trigger));
-
-	if (!queue_alarm (now, ar)) {
-		if (ar->destroy_notify_fn)
-			(* ar->destroy_notify_fn) (ar->data);
-
-		g_free (ar);
-		ar = NULL;
-	}
-
-	return ar;
-}
-
-/**
- * alarm_remove:
- * @alarm: A queued alarm identifier.
- * 
- * Removes an alarm from the alarm queue.
- **/
-void
-alarm_remove (gpointer alarm)
-{
-	AlarmRecord *ar;
-	AlarmRecord *old_head;
-	GList *l;
-
-	ar = alarm;
-
-	l = g_list_find (alarms, ar);
-	if (!l) {
-		g_message ("alarm_remove(): Requested removal of nonexistent alarm!");
-		return;
-	}
-
-	old_head = alarms->data;
-
-	if (old_head == ar)
-		pop_alarm ();
-	else {
-		alarms = g_list_remove_link (alarms, l);
-		g_list_free_1 (l);
-	}
-
-	if (ar->destroy_notify_fn)
-		(* ar->destroy_notify_fn) (ar->data);
-
-	g_free (ar);
-}
-
-/**
- * alarm_init:
- * @void:
- *
- * Initializes the alarm notification system.  This must be called near the
- * beginning of the program.
- **/
-void
-alarm_init (void)
-{
-	struct sigaction sa;
-	int flags;
-
-	pipe (alarm_pipes);
-
-	/* set non blocking mode */
-	flags = 0;
-	fcntl (alarm_pipes [0], F_GETFL, &flags);
-	fcntl (alarm_pipes [0], F_SETFL, flags | O_NONBLOCK);
-	gdk_input_add (alarm_pipes [0], GDK_INPUT_READ, alarm_ready, NULL);
-
-	/* Setup the signal handler */
-	sa.sa_handler = alarm_signal;
-	sigemptyset (&sa.sa_mask);
-	sa.sa_flags = SA_RESTART;
-	sigaction (SIGALRM, &sa, NULL);
-}
diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h
deleted file mode 100644
index 2394d28024..0000000000
--- a/calendar/gui/alarm-notify/alarm.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Evolution calendar - alarm notification support
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Miguel de Icaza <miguel@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_H
-#define ALARM_H
-
-#include <time.h>
-
-
-
-typedef void (* AlarmFunction) (gpointer alarm_id, time_t trigger, gpointer data);
-typedef void (* AlarmDestroyNotify) (gpointer data);
-
-void     alarm_init   (void);
-gpointer alarm_add    (time_t trigger, AlarmFunction alarm_fn, gpointer data,
-		       AlarmDestroyNotify destroy_notify_fn);
-void     alarm_remove (gpointer alarm);
-
-
-
-#endif
diff --git a/calendar/gui/alarm.c b/calendar/gui/alarm.c
deleted file mode 100644
index 085111498b..0000000000
--- a/calendar/gui/alarm.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/* Evolution calendar - alarm notification support
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Miguel de Icaza <miguel@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <time.h>
-#include <gnome.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/time.h>
-#include "alarm.h"
-
-
-
-/* The pipes used to notify about an alarm */
-static int alarm_pipes [2];
-
-/* The list of pending alarms */
-static GList *alarms;
-
-/* A queued alarm structure */
-typedef struct {
-	time_t             trigger;
-	AlarmFunction      alarm_fn;
-	gpointer           data;
-	AlarmDestroyNotify destroy_notify_fn;
-} AlarmRecord;
-
-
-
-/* SIGALRM handler.  Notifies the callback about the alarm. */
-static void
-alarm_signal (int arg)
-{
-	char c = 0;
-
-	write (alarm_pipes [1], &c, 1);
-}
-
-/* Sets up an itimer and returns a success code */
-static gboolean
-setup_itimer (time_t diff)
-{
-	struct itimerval itimer;
-	int v;
-
-	itimer.it_interval.tv_sec = 0;
-	itimer.it_interval.tv_usec = 0;
-	itimer.it_value.tv_sec = diff;
-	itimer.it_value.tv_usec = 0;
-
-	v = setitimer (ITIMER_REAL, &itimer, NULL);
-
-	return (v == 0) ? TRUE : FALSE;
-}
-
-/* Removes the head alarm, returns it, and schedules the next alarm in the
- * queue.
- */
-static AlarmRecord *
-pop_alarm (void)
-{
-	AlarmRecord *ar;
-	GList *l;
-
-	if (!alarms)
-		return NULL;
-
-	ar = alarms->data;
-
-	l = alarms;
-	alarms = g_list_remove_link (alarms, l);
-	g_list_free_1 (l);
-
-	if (alarms) {
-		time_t now;
-		AlarmRecord *new_ar;
-
-		now = time (NULL);
-		new_ar = alarms->data;
-
-		if (!setup_itimer (new_ar->trigger - now)) {
-			g_message ("pop_alarm(): Could not reset the timer!  "
-				   "Weird things will happen.");
-
-			/* FIXME: should we free the alarm list?  What
-			 * about further alarm removal requests that
-			 * will fail?
-			 */
-		}
-	} else {
-		struct itimerval itimer;
-		int v;
-
-		itimer.it_interval.tv_sec = 0;
-		itimer.it_interval.tv_usec = 0;
-		itimer.it_value.tv_sec = 0;
-		itimer.it_value.tv_usec = 0;
-
-		v = setitimer (ITIMER_REAL, &itimer, NULL);
-		if (v != 0)
-			g_message ("pop_alarm(): Could not clear the timer!  "
-				   "Weird things may happen.");
-	}
-
-	return ar;
-}
-
-/* Input handler for our own alarm notification pipe */
-static void
-alarm_ready (gpointer data, gint fd, GdkInputCondition cond)
-{
-	AlarmRecord *ar;
-	char c;
-
-	if (read (alarm_pipes [0], &c, 1) != 1) {
-		g_message ("alarm_ready(): Uh?  Could not read from notification pipe.");
-		return;
-	}
-
-	g_assert (alarms != NULL);
-	ar = pop_alarm ();
-
-	g_print ("alarm_ready(): Notifying about alarm on %s\n", ctime (&ar->trigger));
-
-	(* ar->alarm_fn) (ar, ar->trigger, ar->data);
-
-	if (ar->destroy_notify_fn)
-		(* ar->destroy_notify_fn) (ar->data);
-
-	g_free (ar);
-}
-
-static int
-compare_alarm_by_time (gconstpointer a, gconstpointer b)
-{
-	const AlarmRecord *ara = a;
-	const AlarmRecord *arb = b;
-	time_t diff;
-
-	diff = ara->trigger - arb->trigger;
-	return (diff < 0) ? -1 : (diff > 0) ? 1 : 0;
-}
-
-/* Adds an alarm to the queue and sets up the timer */
-static gboolean
-queue_alarm (time_t now, AlarmRecord *ar)
-{
-	time_t diff;
-	AlarmRecord *old_head;
-
-	if (alarms)
-		old_head = alarms->data;
-	else
-		old_head = NULL;
-
-	alarms = g_list_insert_sorted (alarms, ar, compare_alarm_by_time);
-
-	if (old_head == alarms->data)
-		return TRUE;
-
-	/* Set the timer for removal upon activation */
-
-	diff = ar->trigger - now;
-	if (!setup_itimer (diff)) {
-		GList *l;
-
-		g_message ("queue_alarm(): Could not set up timer!  Not queueing alarm.");
-
-		l = g_list_find (alarms, ar);
-		g_assert (l != NULL);
-
-		alarms = g_list_remove_link (alarms, l);
-		g_list_free_1 (l);
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/**
- * alarm_add:
- * @trigger: Time at which alarm will trigger.
- * @alarm_fn: Callback for trigger.
- * @data: Closure data for callback.
- *
- * Adds an alarm to trigger at the specified time.  The @alarm_fn will be called
- * with the provided data and the alarm will be removed from the trigger list.
- *
- * Return value: An identifier for this alarm; it can be used to remove the
- * alarm later with alarm_remove().  If the trigger time occurs in the past, then
- * the alarm will not be queued and the function will return NULL.
- **/
-gpointer
-alarm_add (time_t trigger, AlarmFunction alarm_fn, gpointer data,
-	   AlarmDestroyNotify destroy_notify_fn)
-{
-	time_t now;
-	AlarmRecord *ar;
-
-	now = time (NULL);
-	if (trigger < now)
-		return NULL;
-
-	ar = g_new (AlarmRecord, 1);
-	ar->trigger = trigger;
-	ar->alarm_fn = alarm_fn;
-	ar->data = data;
-	ar->destroy_notify_fn = destroy_notify_fn;
-
-	g_print ("alarm_add(): Adding alarm for %s\n", ctime (&trigger));
-
-	if (!queue_alarm (now, ar)) {
-		if (ar->destroy_notify_fn)
-			(* ar->destroy_notify_fn) (ar->data);
-
-		g_free (ar);
-		ar = NULL;
-	}
-
-	return ar;
-}
-
-/**
- * alarm_remove:
- * @alarm: A queued alarm identifier.
- * 
- * Removes an alarm from the alarm queue.
- **/
-void
-alarm_remove (gpointer alarm)
-{
-	AlarmRecord *ar;
-	AlarmRecord *old_head;
-	GList *l;
-
-	ar = alarm;
-
-	l = g_list_find (alarms, ar);
-	if (!l) {
-		g_message ("alarm_remove(): Requested removal of nonexistent alarm!");
-		return;
-	}
-
-	old_head = alarms->data;
-
-	if (old_head == ar)
-		pop_alarm ();
-	else {
-		alarms = g_list_remove_link (alarms, l);
-		g_list_free_1 (l);
-	}
-
-	if (ar->destroy_notify_fn)
-		(* ar->destroy_notify_fn) (ar->data);
-
-	g_free (ar);
-}
-
-/**
- * alarm_init:
- * @void:
- *
- * Initializes the alarm notification system.  This must be called near the
- * beginning of the program.
- **/
-void
-alarm_init (void)
-{
-	struct sigaction sa;
-	int flags;
-
-	pipe (alarm_pipes);
-
-	/* set non blocking mode */
-	flags = 0;
-	fcntl (alarm_pipes [0], F_GETFL, &flags);
-	fcntl (alarm_pipes [0], F_SETFL, flags | O_NONBLOCK);
-	gdk_input_add (alarm_pipes [0], GDK_INPUT_READ, alarm_ready, NULL);
-
-	/* Setup the signal handler */
-	sa.sa_handler = alarm_signal;
-	sigemptyset (&sa.sa_mask);
-	sa.sa_flags = SA_RESTART;
-	sigaction (SIGALRM, &sa, NULL);
-}
diff --git a/calendar/gui/alarm.h b/calendar/gui/alarm.h
deleted file mode 100644
index 2394d28024..0000000000
--- a/calendar/gui/alarm.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Evolution calendar - alarm notification support
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Miguel de Icaza <miguel@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_H
-#define ALARM_H
-
-#include <time.h>
-
-
-
-typedef void (* AlarmFunction) (gpointer alarm_id, time_t trigger, gpointer data);
-typedef void (* AlarmDestroyNotify) (gpointer data);
-
-void     alarm_init   (void);
-gpointer alarm_add    (time_t trigger, AlarmFunction alarm_fn, gpointer data,
-		       AlarmDestroyNotify destroy_notify_fn);
-void     alarm_remove (gpointer alarm);
-
-
-
-#endif
diff --git a/calendar/gui/bell.xpm b/calendar/gui/bell.xpm
deleted file mode 100644
index b1ab537a17..0000000000
--- a/calendar/gui/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/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
deleted file mode 100644
index f7f815c5c5..0000000000
--- a/calendar/gui/calendar-commands.c
+++ /dev/null
@@ -1,726 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Main file for the GNOME Calendar program
- * Copyright (C) 1998 the Free Software Foundation
- *
- * Authors:
- *          Miguel de Icaza (miguel@kernel.org)
- *          Federico Mena (federico@helixcode.com)
- */
-
-#include <config.h>
-#include <pwd.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <gnome.h>
-#include <libgnorba/gnorba.h>
-#include <bonobo.h>
-#include <cal-util/timeutil.h>
-#include "gnome-cal.h"
-#include "calendar-commands.h"
-#include "print.h"
-#include "dialogs/cal-prefs-dialog.h"
-
-#include "dayview.xpm"
-#include "workweekview.xpm"
-#include "weekview.xpm"
-#include "monthview.xpm"
-#if 0
-#include "yearview.xpm"
-#endif
-
-
-/* The username, used to set the `owner' field of the event */
-char *user_name;
-
-/* The full user name from the Gecos field */
-char *full_name;
-
-/* a gnome-config string prefix that can be used to access the calendar config info */
-char *calendar_settings;
-
-/* Day begin, day end parameters */
-int day_begin, day_end;
-
-/* Whether weeks starts on Sunday or Monday */
-int week_starts_on_monday;
-
-/* If AM/PM indicators should be used. This may not be supported by the new
-   views. */
-int am_pm_flag = 0;
-
-/* The array of color properties -- keep in sync with the enumeration defined in main.h.  The color
- * values specified here are the defaults for the program.
- */
-struct color_prop color_props[] = {
-	{ 0x3e72, 0x35ec, 0x8ba2, N_("Outline:"),              "/calendar/Colors/outline" },
-	{ 0xffff, 0xffff, 0xffff, N_("Headings:"),             "/calendar/Colors/headings" },
-	{ 0xf26c, 0xecec, 0xbbe7, N_("Empty days:"),           "/calendar/Colors/empty_bg" },
-	{ 0xfc1e, 0xf87f, 0x5f80, N_("Appointments:"),         "/calendar/Colors/mark_bg" },
-	{ 0xd364, 0xc6b7, 0x7969, N_("Highlighted day:"),      "/calendar/Colors/prelight_bg" },
-	{ 0x01f0, 0x01f0, 0x01f0, N_("Day numbers:"),          "/calendar/Colors/day_fg" },
-	{ 0x0000, 0x0000, 0xffff, N_("Current day's number:"), "/calendar/Colors/current_fg" },
-	{ 0xbbbb, 0xbbbb, 0x0000, N_("To-Do item that is not yet due:"), "/calendar/Colors/todo_not_yet" },
-	{ 0xdddd, 0xbbbb, 0x0000, N_("To-Do item that is due today:"),   "/calendar/Colors/todo_today" },
-	{ 0xbbbb, 0xdddd, 0x0000, N_("To-Do item that is overdue:"),     "/calendar/Colors/todo_overdue" }
-};
-
-/* Number of active calendars */
-int active_calendars = 0;
-
-/* A list of all of the calendars started */
-GList *all_calendars = NULL;
-
-/* If set, beep on display alarms */
-gboolean beep_on_display = 0;
-
-/* If true, timeout the beeper on audio alarms */
-
-gboolean enable_aalarm_timeout = 0;
-guint audio_alarm_timeout = 0;
-const guint MAX_AALARM_TIMEOUT = 3600;
-const guint MAX_SNOOZE_SECS = 3600;
-gboolean enable_snooze = 0;
-guint snooze_secs = 60;
-
-#if 0
-CalendarAlarm alarm_defaults[4] = {
-        { ALARM_MAIL, 0, 15, ALARM_MINUTES },
-        { ALARM_PROGRAM, 0, 15, ALARM_MINUTES },
-        { ALARM_DISPLAY, 0, 15, ALARM_MINUTES },
-        { ALARM_AUDIO, 0, 15, ALARM_MINUTES }
-};
-#endif
-
-/* We have one global preferences dialog. */
-static CalPrefsDialog *preferences_dialog = NULL;
-
-
-static void update_pixmaps	(BonoboUIComponent *uic);
-static void set_pixmap		(BonoboUIComponent *uic,
-				 const char        *xml_path,
-				 char		  **xpm_data);
-
-
-
-static void
-init_username (void)
-{
-        user_name = g_strdup(g_get_user_name());
-        full_name = g_strdup(g_get_real_name());
-}
-
-static int
-range_check_hour (int hour)
-{
-	if (hour < 0)
-		hour = 0;
-	else if (hour >= 24)
-		hour = 23;
-
-	return hour;
-}
-
-#if 0
-static void
-init_default_alarms (void)
-{
-	int i;
-	gboolean def;
-
-	alarm_defaults [ALARM_DISPLAY].type = ALARM_DISPLAY;
-	alarm_defaults [ALARM_AUDIO].type   = ALARM_AUDIO;
-	alarm_defaults [ALARM_PROGRAM].type = ALARM_PROGRAM;
-	alarm_defaults [ALARM_MAIL].type    = ALARM_MAIL;
-
-	for (i = 0; i < 4; i++) {
-		switch (alarm_defaults [i].type) {
-		case ALARM_DISPLAY:
-			gnome_config_push_prefix ("/calendar/alarms/def_disp_");
-			break;
-		case ALARM_AUDIO:
-			gnome_config_push_prefix ("/calendar/alarms/def_audio_");
-			break;
-		case ALARM_PROGRAM:
-			gnome_config_push_prefix ("/calendar/alarms/def_prog_");
-			break;
-		case ALARM_MAIL:
-			gnome_config_push_prefix ("/calendar/alarms/def_mail_");
-			break;
-		}
-
-		alarm_defaults[i].enabled = gnome_config_get_int ("enabled=0");
-		if (alarm_defaults[i].type != ALARM_MAIL) {
-			alarm_defaults[i].count   = gnome_config_get_int ("count=15");
-			alarm_defaults[i].units   = gnome_config_get_int ("units=0");
-		} else {
-			alarm_defaults[i].count   = gnome_config_get_int ("count=1");
-			alarm_defaults[i].count   = gnome_config_get_int ("count=2");
-		}
-
-		alarm_defaults[i].data = gnome_config_get_string_with_default ("data=",
-									       &def);
-		if (def)
-			alarm_defaults[i].data = NULL;
-
-		gnome_config_pop_prefix ();
-	}
-}
-#endif
-
-/* Callback for the new appointment command */
-static void
-new_appointment_cb (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (user_data);
-	gnome_calendar_new_appointment (gcal);
-}
-
-/* Prints the calendar at its current view and time range */
-static void
-print (GnomeCalendar *gcal, gboolean preview)
-{
-	time_t start;
-	const char *view;
-	PrintView print_view;
-
-	gnome_calendar_get_current_time_range (gcal, &start, NULL);
-	view = gnome_calendar_get_current_view_name (gcal);
-
-	if (strcmp (view, "dayview") == 0)
-		print_view = PRINT_VIEW_DAY;
-	else if (strcmp (view, "workweekview") == 0 || strcmp (view, "weekview") == 0)
-		print_view = PRINT_VIEW_WEEK;
-	else if (strcmp (view, "monthview") == 0)
-		print_view = PRINT_VIEW_MONTH;
-	else {
-		g_assert_not_reached ();
-		print_view = PRINT_VIEW_DAY;
-	}
-
-	print_calendar (gcal, preview, start, print_view);
-}
-
-/* File/Print callback */
-static void
-file_print_cb (BonoboUIHandler *uih, void *data, const char *path)
-{
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-	print (gcal, FALSE);
-}
-
-
-/* This iterates over each calendar telling them to update their config
-   settings. */
-void
-update_all_config_settings (void)
-{
-	GList *l;
-
-	for (l = all_calendars; l; l = l->next)
-		gnome_calendar_update_config_settings (GNOME_CALENDAR (l->data), FALSE);
-}
-
-
-/* These are all for the old config code and will eventually be removed. */
-void
-time_format_changed (void)
-{
-	GList *l;
-
-	for (l = all_calendars; l; l = l->next)
-		gnome_calendar_time_format_changed (GNOME_CALENDAR (l->data));
-}
-
-void
-colors_changed (void)
-{
-	GList *l;
-
-	for (l = all_calendars; l; l = l->next)
-		gnome_calendar_colors_changed (GNOME_CALENDAR (l->data));
-}
-
-void
-todo_properties_changed(void)
-{
-        GList *l;
-
-	for (l = all_calendars; l; l = l->next)
-		gnome_calendar_todo_properties_changed (GNOME_CALENDAR (l->data));
-}
-
-/* Sets a clock cursor for the specified calendar window */
-static void
-set_clock_cursor (GnomeCalendar *gcal)
-{
-	GdkCursor *cursor;
-
-	cursor = gdk_cursor_new (GDK_WATCH);
-	gdk_window_set_cursor (GTK_WIDGET (gcal)->window, cursor);
-	gdk_cursor_destroy (cursor);
-	gdk_flush ();
-}
-
-/* Resets the normal cursor for the specified calendar window */
-static void
-set_normal_cursor (GnomeCalendar *gcal)
-{
-	gdk_window_set_cursor (GTK_WIDGET (gcal)->window, NULL);
-	gdk_flush ();
-}
-
-static void
-previous_clicked (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);
-	set_clock_cursor (gcal);
-	gnome_calendar_previous (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-next_clicked (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);
-	set_clock_cursor (gcal);
-	gnome_calendar_next (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-today_clicked (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);
-	set_clock_cursor (gcal);
-	gnome_calendar_goto_today (gcal);
-	set_normal_cursor (gcal);
-}
-
-static void
-goto_clicked (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);
-	goto_dialog (gcal);
-}
-
-static void
-show_day_view_clicked (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);
-
-	gnome_calendar_set_view (gcal, "dayview", FALSE, TRUE);
-}
-
-static void
-show_work_week_view_clicked (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);
-
-	gnome_calendar_set_view (gcal, "workweekview", FALSE, TRUE);
-}
-
-static void
-show_week_view_clicked (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);
-
-	gnome_calendar_set_view (gcal, "weekview", FALSE, TRUE);
-}
-
-static void
-show_month_view_clicked (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);
-
-	gnome_calendar_set_view (gcal, "monthview", FALSE, TRUE);
-}
-
-
-static void
-new_calendar_cmd (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	new_calendar (full_name, NULL, FALSE);
-}
-
-static void
-close_cmd (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	GnomeCalendar *gcal = GNOME_CALENDAR (user_data);
-	all_calendars = g_list_remove (all_calendars, gcal);
-
-	gtk_widget_destroy (GTK_WIDGET (gcal));
-	active_calendars--;
-
-	if (active_calendars == 0)
-		gtk_main_quit ();
-}
-
-
-void
-quit_cmd (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	while (all_calendars){
-		GnomeCalendar *cal = GNOME_CALENDAR (all_calendars->data);
-
-		close_cmd (uih, cal, path);
-	}
-}
-
-
-static void
-open_ok (GtkWidget *widget, GtkFileSelection *fs)
-{
-	GtkWidget *error_dialog;
-	int ret;
-	if(!g_file_exists (gtk_file_selection_get_filename (fs))) {
-		error_dialog = gnome_message_box_new (
-			_("File not found"),
-			GNOME_MESSAGE_BOX_ERROR,
-			GNOME_STOCK_BUTTON_OK,
-			NULL);
-
-		gnome_dialog_set_parent (GNOME_DIALOG (error_dialog), GTK_WINDOW (fs));
-		ret = gnome_dialog_run (GNOME_DIALOG (error_dialog));
-	} else {
-		/* FIXME: find out who owns this calendar and use that name */
-#ifndef NO_WARNINGS
-#warning "FIXME: find out who owns this calendar and use that name"
-#endif
-		/*
-		new_calendar ("Somebody", gtk_file_selection_get_filename (fs), NULL, FALSE);
-		*/
-		gtk_widget_destroy (GTK_WIDGET (fs));
-	}
-}
-
-static void
-open_calendar_cmd (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	GtkFileSelection *fs;
-
-	fs = GTK_FILE_SELECTION (gtk_file_selection_new (_("Open calendar")));
-
-	gtk_signal_connect (GTK_OBJECT (fs->ok_button), "clicked",
-			    (GtkSignalFunc) open_ok,
-			    fs);
-	gtk_signal_connect_object (GTK_OBJECT (fs->cancel_button), "clicked",
-				   (GtkSignalFunc) gtk_widget_destroy,
-				   GTK_OBJECT (fs));
-
-	gtk_widget_show (GTK_WIDGET (fs));
-	gtk_grab_add (GTK_WIDGET (fs)); /* Yes, it is modal, so sue me */
-}
-
-static void
-save_ok (GtkWidget *widget, GtkFileSelection *fs)
-{
-	GnomeCalendar *gcal;
-	gchar *fname;
-
-	gcal = GNOME_CALENDAR (gtk_object_get_user_data (GTK_OBJECT (fs)));
-	gtk_window_set_wmclass (GTK_WINDOW (gcal), "gnomecal", "gnomecal");
-
-	fname = g_strdup (gtk_file_selection_get_filename (fs));
-	g_free(fname);
-	gtk_main_quit ();
-}
-
-static gint
-close_save (GtkWidget *w)
-{
-	gtk_main_quit ();
-	return TRUE;
-}
-
-static void
-save_as_calendar_cmd (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	GtkFileSelection *fs;
-
-	fs = GTK_FILE_SELECTION (gtk_file_selection_new (_("Save calendar")));
-	gtk_object_set_user_data (GTK_OBJECT (fs), user_data);
-
-	gtk_signal_connect (GTK_OBJECT (fs->ok_button), "clicked",
-			    (GtkSignalFunc) save_ok,
-			    fs);
-	gtk_signal_connect_object (GTK_OBJECT (fs->cancel_button), "clicked",
-				   (GtkSignalFunc) close_save,
-				   GTK_OBJECT (fs));
-	gtk_signal_connect_object (GTK_OBJECT (fs), "delete_event",
-				   GTK_SIGNAL_FUNC (close_save),
-				   GTK_OBJECT (fs));
-	gtk_widget_show (GTK_WIDGET (fs));
-	gtk_grab_add (GTK_WIDGET (fs)); /* Yes, it is modal, so sue me even more */
-	gtk_main ();
-	gtk_widget_destroy (GTK_WIDGET (fs));
-}
-
-static void
-properties_cmd (BonoboUIHandler *uih, void *user_data, const char *path)
-{
-	if (!preferences_dialog)
-		preferences_dialog = cal_prefs_dialog_new ();
-	else
-		cal_prefs_dialog_show (preferences_dialog);
-}
-
-
-static BonoboUIVerb verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("CalendarNew", new_calendar_cmd),
-	BONOBO_UI_UNSAFE_VERB ("CalendarOpen", open_calendar_cmd),
-	BONOBO_UI_UNSAFE_VERB ("CalendarSaveAs", save_as_calendar_cmd),
-	BONOBO_UI_UNSAFE_VERB ("CalendarPrint", file_print_cb),
-	BONOBO_UI_UNSAFE_VERB ("EditNewAppointment", new_appointment_cb),
-	BONOBO_UI_UNSAFE_VERB ("CalendarPreferences", properties_cmd),
-
-	BONOBO_UI_UNSAFE_VERB ("CalendarPrev", previous_clicked),
-	BONOBO_UI_UNSAFE_VERB ("CalendarToday", today_clicked),
-	BONOBO_UI_UNSAFE_VERB ("CalendarNext", next_clicked),
-	BONOBO_UI_UNSAFE_VERB ("CalendarGoto", goto_clicked),
-
-	BONOBO_UI_UNSAFE_VERB ("ShowDayView", show_day_view_clicked),
-	BONOBO_UI_UNSAFE_VERB ("ShowWorkWeekView", show_work_week_view_clicked),
-	BONOBO_UI_UNSAFE_VERB ("ShowWeekView", show_week_view_clicked),
-	BONOBO_UI_UNSAFE_VERB ("ShowMonthView", show_month_view_clicked),
-
-	BONOBO_UI_VERB_END
-};
-
-void
-calendar_control_activate (BonoboControl *control,
-			   GnomeCalendar *cal)
-{
-	Bonobo_UIContainer remote_uih;
-	BonoboUIComponent *uic;
-
-	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	remote_uih = bonobo_control_get_remote_ui_container (control);
-	bonobo_ui_component_set_container (uic, remote_uih);
-	bonobo_object_release_unref (remote_uih, NULL);
-
-#if 0
-	/* FIXME: Need to update this to use new Bonobo ui stuff somehow.
-	   Also need radio buttons really. */
-
-	/* Note that these indices should correspond with the button indices
-	   in the gnome_toolbar_view_buttons UIINFO struct. */
-	gnome_calendar_set_view_buttons (cal,
-					 gnome_toolbar_view_buttons[0].widget,
-					 gnome_toolbar_view_buttons[1].widget,
-					 gnome_toolbar_view_buttons[2].widget,
-					 gnome_toolbar_view_buttons[3].widget);
-
-	/* This makes the appropriate radio button in the toolbar active. */
-	gnome_calendar_update_view_buttons (cal);
-#endif
-	
-	bonobo_ui_component_add_verb_list_with_data (
-		uic, verbs, cal);
-
-	bonobo_ui_component_freeze (uic, NULL);
-
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
-			       "evolution-calendar.xml",
-			       "evolution-calendar");
-
-	update_pixmaps (uic);
-
-	bonobo_ui_component_thaw (uic, NULL);
-}
-
-
-static void
-update_pixmaps (BonoboUIComponent *uic)
-{
-	set_pixmap (uic, "/Toolbar/DayView",	  dayview_xpm);
-	set_pixmap (uic, "/Toolbar/WorkWeekView", workweekview_xpm);
-	set_pixmap (uic, "/Toolbar/WeekView",	  weekview_xpm);
-	set_pixmap (uic, "/Toolbar/MonthView",	  monthview_xpm);
-}
-
-
-static void
-set_pixmap (BonoboUIComponent *uic,
-	    const char        *xml_path,
-	    char	     **xpm_data)
-{
-	GdkPixbuf *pixbuf;
-
-	pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) xpm_data);
-	g_return_if_fail (pixbuf != NULL);
-
-	bonobo_ui_util_set_pixbuf (uic, xml_path, pixbuf);
-
-	gdk_pixbuf_unref (pixbuf);
-}
-
-
-void
-calendar_control_deactivate (BonoboControl *control)
-{
-	BonoboUIComponent *uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
-
-	bonobo_ui_component_rm (uic, "/", NULL);
- 	bonobo_ui_component_unset_container (uic);
-}
-
-
-
-
-static gint
-calendar_close_event (GtkWidget *widget, GdkEvent *event, GnomeCalendar *gcal)
-{
-	close_cmd (NULL, gcal, NULL);
-	return TRUE;
-}
-
-
-GnomeCalendar *
-new_calendar (char *full_name, char *geometry, gboolean hidden)
-{
-	GtkWidget   *toplevel;
-	int         xpos, ypos, width, height;
-
-
-	toplevel = gnome_calendar_new ();
-
-	if (gnome_parse_geometry (geometry, &xpos, &ypos, &width, &height)) {
-		if (xpos != -1)
-			gtk_widget_set_uposition (toplevel, xpos, ypos);
-	}
-
-	gtk_signal_connect (GTK_OBJECT (toplevel), "delete_event",
-			    GTK_SIGNAL_FUNC(calendar_close_event), toplevel);
-
-	active_calendars++;
-	all_calendars = g_list_prepend (all_calendars, toplevel);
-
-	if (hidden){
-		GnomeWinState state;
-
-		/* Realize the toplevel window to prevent a segfault */
-		gtk_widget_realize (toplevel);
-		state = gnome_win_hints_get_state (toplevel);
-
-		state |= WIN_STATE_MINIMIZED;
-		gnome_win_hints_set_state (toplevel, state);
-	}
-
-	gtk_widget_show (toplevel);
-
-	return GNOME_CALENDAR (toplevel);
-}
-
-
-void calendar_set_uri (GnomeCalendar *gcal, char *calendar_file)
-{
-	gboolean    success;
-
-	g_return_if_fail (gcal);
-	g_return_if_fail (calendar_file);
-
-	printf ("calendar_set_uri: calendar_file is '%s'\n", calendar_file);
-
-	success = gnome_calendar_open (gcal,
-				       calendar_file,
-				       CALENDAR_OPEN_OR_CREATE);
-
-	printf ("    load or create returned %d\n", success);
-}
-
-
-
-
-
-/*
- * Initializes the calendar internal variables, loads defaults
- */
-void
-init_calendar (void)
-{
-	int i;
-	char *cspec, *color;
-	char *str;
-
-	init_username ();
-	/*user_calendar_file = g_concat_dir_and_file (gnome_util_user_home (), ".gnome/user-cal.vcf");*/
-
-	gnome_config_push_prefix (calendar_settings);
-
-	/* Read calendar settings */
-
-	day_begin  = range_check_hour (gnome_config_get_int  ("/calendar/Calendar/Day start=8"));
-	day_end    = range_check_hour (gnome_config_get_int  ("/calendar/Calendar/Day end=17"));
-	am_pm_flag = gnome_config_get_bool ("/calendar/Calendar/AM PM flag=0");
-	week_starts_on_monday = gnome_config_get_bool ("/calendar/Calendar/Week starts on Monday=0");
-
-	if (day_end < day_begin) {
-		day_begin = 8;
-		day_end   = 17;
-	}
-
-	/* Read color settings */
-
-	for (i = 0; i < COLOR_PROP_LAST; i++) {
-		cspec = build_color_spec (color_props[i].r, color_props[i].g, color_props[i].b);
-		str = g_strconcat (color_props[i].key, "=", cspec, NULL);
-
-		color = gnome_config_get_string (str);
-		parse_color_spec (color, &color_props[i].r, &color_props[i].g, &color_props[i].b);
-
-		g_free (str);
-		g_free (color);
-	}
-
-	/* read todolist settings */
-
-	todo_show_time_remaining = gnome_config_get_bool("/calendar/Todo/show_time_remain");
-	todo_show_due_date = gnome_config_get_bool("/calendar/Todo/show_due_date");
-
-	todo_item_dstatus_highlight_overdue = gnome_config_get_bool("/calendar/Todo/highlight_overdue");
-
-	todo_item_dstatus_highlight_due_today = gnome_config_get_bool("/calendar/Todo/highlight_due_today");
-
-	todo_item_dstatus_highlight_not_due_yet = gnome_config_get_bool("/calendar/Todo/highlight_not_due_yet");
-
-        todo_current_sort_column = gnome_config_get_int("/calendar/Todo/sort_column");
-
-	todo_current_sort_type = gnome_config_get_int("/calendar/Todo/sort_type");
-
-	todo_show_priority = gnome_config_get_bool("/calendar/Todo/show_priority");
-
-	/* read alarm settings */
-	beep_on_display = gnome_config_get_bool ("/calendar/alarms/beep_on_display=FALSE");
-	enable_aalarm_timeout = gnome_config_get_bool ("/calendar/alarms/enable_audio_timeout=FALSE");
-	audio_alarm_timeout = gnome_config_get_int ("/calendar/alarms/audio_alarm_timeout=60");
-	if (audio_alarm_timeout < 1)
-		audio_alarm_timeout = 1;
-	if (audio_alarm_timeout > MAX_AALARM_TIMEOUT)
-		audio_alarm_timeout = MAX_AALARM_TIMEOUT;
-	enable_snooze = gnome_config_get_bool ("/calendar/alarms/enable_snooze=FALSE");
-	snooze_secs = gnome_config_get_int ("/calendar/alarms/snooze_secs=300");
-	if (snooze_secs < 1)
-		snooze_secs = 1;
-	if (snooze_secs > MAX_SNOOZE_SECS)
-		snooze_secs = MAX_SNOOZE_SECS;
-
-#if 0
-	init_default_alarms ();
-#endif
-
-	/* Done */
-
-	gnome_config_pop_prefix ();
-}
diff --git a/calendar/gui/calendar-commands.h b/calendar/gui/calendar-commands.h
deleted file mode 100644
index f63c29e1fc..0000000000
--- a/calendar/gui/calendar-commands.h
+++ /dev/null
@@ -1,135 +0,0 @@
-#ifndef CALENDAR_COMMANDS_H
-#define CALENDAR_COMMANDS_H
-
-#include <bonobo/bonobo-control.h>
-#include "gnome-cal.h"
-
-/* This enum and the following array define the color preferences */
-
-typedef enum {
-	COLOR_PROP_OUTLINE_COLOR,	/* Color of calendar outline */
-	COLOR_PROP_HEADING_COLOR,	/* Color for headings */
-	COLOR_PROP_EMPTY_DAY_BG,	/* Background color for empty days */
-	COLOR_PROP_MARK_DAY_BG,		/* Background color for days with appointments */
-	COLOR_PROP_PRELIGHT_DAY_BG,	/* Background color for prelighted day */
-	COLOR_PROP_DAY_FG,		/* Color for day numbers */
-	COLOR_PROP_CURRENT_DAY_FG,	/* Color for current day's number */
-	COLOR_PROP_TODO_NOT_DUE_YET,    /* Color for Todo items not yet due */
-	COLOR_PROP_TODO_DUE_TODAY,      /* Color for Todo items due today */ 
-	COLOR_PROP_TODO_OVERDUE,        /* Color for Todo items that are overdue */
-	COLOR_PROP_LAST			/* Number of color properties */
-} ColorProp;
-
-struct color_prop {
-	int r;		/* Values are in [0, 65535] */
-	int g;
-	int b;
-	char *label;	/* Label for properties dialog */
-	char *key;	/* Key for gnome_config */
-};
-
-extern struct color_prop color_props[];
-
-
-#define COOKIE_USER_HOME_DIR ((char *) -1)
-
- 
-/* Calendar preferences */
-
-extern int day_begin, day_end;
-extern char *user_name;
-extern int am_pm_flag;
-extern int week_starts_on_monday;
-
-/* todo preferences */
-extern int todo_show_due_date;
-
-extern int todo_item_dstatus_highlight_overdue;
-extern int todo_item_dstatus_highlight_due_today;
-extern int todo_item_dstatus_highlight_not_due_yet;
-
-extern int todo_show_time_remaining;
-extern int todo_show_priority;
-extern char *todo_overdue_font_text;
-extern gint todo_current_sort_column;
-extern gint todo_current_sort_type;
-
-/* alarm stuff */
-#if 0
-extern CalendarAlarm alarm_defaults[4];
-#endif
-extern gboolean beep_on_display;
-extern gboolean enable_aalarm_timeout;
-extern guint audio_alarm_timeout;
-extern const guint MAX_AALARM_TIMEOUT;
-extern gboolean enable_snooze;
-extern guint snooze_secs;
-extern const guint MAX_SNOOZE_SECS;
-
-
-
-/* This tells all the calendars to reload the config settings. */
-void update_all_config_settings (void);
-
-/*
- * FIXME: These are for the old config code and will be removed eventually.
- */
-
-/* Creates and runs the preferences dialog box */
-void properties (GtkWidget *toplevel);
-
-/* Asks for all the time-related displays to be updated when the user changes the time format
- * preferences.
- */
-void time_format_changed (void);
-
-/* Asks for all the month items' colors to be reset */
-void colors_changed (void);
-
-/* Asks for all todo lists to reflect the accurate properties */
-void todo_properties_changed(void);
-
-
-
-
-/* Creates and runs the Go-to date dialog */
-void goto_dialog (GnomeCalendar *gcal);
-
-/* Returns a pointer to a statically-allocated string with a representation of the specified color.
- * Values must be in [0, 65535].
- */
-char *build_color_spec (int r, int g, int b);
-
-/* Parses a color specification of the form "#%04x%04x%04x" and returns the color components. */
-void parse_color_spec (char *spec, int *r, int *g, int *b);
-
-/* Calls build_color_spec() for the color in the specified property number */
-char *color_spec_from_prop (ColorProp propnum);
-
-GnomeCalendar *new_calendar (char *full_name,
-			     char *geometry,
-			     gboolean hidden);
-
-void calendar_set_uri (GnomeCalendar *gcal, char *calendar_file);
-
-
-/*----------------------------------------------------------------------*/
-/* FIXME -- where should this stuff go?                                 */
-/*----------------------------------------------------------------------*/
-
-void init_calendar (void);
-
-void calendar_control_activate (BonoboControl *control,
-				GnomeCalendar *cal);
-void calendar_control_deactivate (BonoboControl *control);
-
-void quit_cmd (BonoboUIHandler *uih, void *user_data, const char *path);
-
-/*extern char *user_calendar_file;*/
-extern char *user_name;
-extern char *full_name;
-extern int debug_alarms;
-extern int active_calendars;
-extern GList *all_calendars;
-
-#endif /* CALENDAR_COMMANDS_H */
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
deleted file mode 100644
index b30bae6a02..0000000000
--- a/calendar/gui/calendar-component.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#include <config.h>
-#include <bonobo.h>
-#include "evolution-shell-component.h"
-#ifdef WANT_THE_EXECUTIVE_SUMMARY
-#include <executive-summary/evolution-services/executive-summary-component.h>
-#endif
-#include "component-factory.h"
-#include "control-factory.h"
-#include "calendar-config.h"
-#if WANT_THE_EXECUTIVE_SUMMARY
-#include "calendar-summary.h"
-#endif
-
-
-#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"
-#define SUMMARY_FACTORY_ID "OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"
-
-static BonoboGenericFactory *factory = NULL;
-static BonoboGenericFactory *summary_factory = NULL;
-char *evolution_dir;
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "calendar", "evolution-calendar.png" },
-	{ NULL, NULL }
-};
-
-
-/* EvolutionShellComponent methods and signals.  */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *type,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	BonoboControl *control;
-
-	if (g_strcasecmp (type, "calendar") != 0)
-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-
-	control = control_factory_new_control ();
-	bonobo_control_set_property (control, "folder_uri", physical_uri, NULL);
-
-	*control_return = control;
-
-	return EVOLUTION_SHELL_COMPONENT_OK;
-}
-
-static gint owner_count = 0;
-
-static void
-owner_set_cb (EvolutionShellComponent *shell_component,
-	      EvolutionShellClient *shell_client,
-	      const char *evolution_homedir,
-	      gpointer user_data)
-{
-	evolution_dir = g_strdup (evolution_homedir);
-	calendar_config_init ();
-	owner_count ++;
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component,
-		gpointer user_data)
-{
-	owner_count --;
-	if (owner_count <= 0)
-		gtk_main_quit();
-}
-
-
-/* The factory function.  */
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory,
-	    void *closure)
-{
-	EvolutionShellComponent *shell_component;
-
-	shell_component = evolution_shell_component_new (folder_types, create_view, NULL, NULL, NULL, NULL);
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
-
-	return BONOBO_OBJECT (shell_component);
-}
-
-#ifdef WANT_THE_EXECUTIVE_SUMMARY
-static BonoboObject *
-summary_fn (BonoboGenericFactory *factory, 
-	    void *closure)
-{
-	ExecutiveSummaryComponent *summary_component;
-
-	summary_component = executive_summary_component_new (NULL,
-							     create_summary_view,
-							     NULL,
-							     evolution_dir);
-	return BONOBO_OBJECT (summary_component);
-}
-#endif
-
-
-void
-component_factory_init (void)
-{
-	if (factory != NULL && factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);
-
-#ifdef WANT_THE_EXECUTIVE_SUMMARY
-	summary_factory = bonobo_generic_factory_new (SUMMARY_FACTORY_ID, summary_fn, NULL);
-#endif
-	if (factory == NULL)
-		g_error ("Cannot initialize Evolution's calendar component.");
-
-#ifdef WANT_THE_EXECUTIVE_SUMMARY
-	if (summary_factory == NULL)
-		g_error ("Cannot initialize Evolution's calendar summary component.");
-#endif
-}
diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h
deleted file mode 100644
index 8e5cd6605f..0000000000
--- a/calendar/gui/calendar-component.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _COMPONENT_FACTORY_H_
-#define _COMPONENT_FACTORY_H_
-
-extern char *evolution_dir;
-
-void  component_factory_init  (void);
-
-#endif /* _COMPONENT_FACTORY_H_ */
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
deleted file mode 100644
index 6664ca775d..0000000000
--- a/calendar/gui/calendar-config.c
+++ /dev/null
@@ -1,405 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * calendar-config.c - functions to load/save/get/set user settings.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "component-factory.h"
-#include "calendar-config.h"
-
-
-typedef struct
-{
-	CalWeekdays	working_days;
-	gboolean	use_24_hour_format;
-	gint		week_start_day;
-	gint		day_start_hour;
-	gint		day_start_minute;
-	gint		day_end_hour;
-	gint		day_end_minute;
-	gint		time_divisions;
-	gboolean	dnav_show_week_no;
-	gfloat		hpane_pos;
-	gfloat		vpane_pos;
-	gfloat		month_hpane_pos;
-	gfloat		month_vpane_pos;
-	gboolean	compress_weekend;
-	gboolean	show_event_end;
-} CalendarConfig;
-
-
-static CalendarConfig *config = NULL;
-
-static void config_read			(void);
-
-
-void
-calendar_config_init			(void)
-{
-	if (config)
-		return;
-	
-	config = g_new0 (CalendarConfig, 1);
-
-	config_read ();
-}
-
-
-static void
-config_read				(void)
-{
-	gchar *prefix;
-	gboolean is_default;
-
-	/* 'Display' settings. */
-	prefix = g_strdup_printf ("=%s/config/Calendar=/Display/",
-				  evolution_dir);
-	gnome_config_push_prefix (prefix);
-	g_free (prefix);
-
-	config->working_days = gnome_config_get_int_with_default ("WorkingDays", &is_default);
-	if (is_default) {
-		config->working_days = CAL_MONDAY | CAL_TUESDAY
-			| CAL_WEDNESDAY | CAL_THURSDAY | CAL_FRIDAY;
-	}
-	config->use_24_hour_format = gnome_config_get_bool ("Use24HourFormat=0");
-	config->week_start_day = gnome_config_get_int ("WeekStartDay=1");
-	config->day_start_hour = gnome_config_get_int ("DayStartHour=9");
-	config->day_start_minute = gnome_config_get_int ("DayStartMinute=0");
-	config->day_end_hour = gnome_config_get_int ("DayEndHour=17");
-	config->day_end_minute = gnome_config_get_int ("DayEndMinute=0");
-	config->time_divisions = gnome_config_get_int ("TimeDivisions=30");
-	config->hpane_pos = gnome_config_get_float ("HPanePosition=1");
-	config->vpane_pos = gnome_config_get_float ("VPanePosition=1");
-	config->month_hpane_pos = gnome_config_get_float ("MonthHPanePosition=0");
-	config->month_vpane_pos = gnome_config_get_float ("MonthVPanePosition=0");
-	config->compress_weekend = gnome_config_get_bool ("CompressWeekend=1");
-	config->show_event_end = gnome_config_get_bool ("ShowEventEndTime=1");
-
-	gnome_config_pop_prefix ();
-
-
-	/* 'DateNavigator' settings. */
-	prefix = g_strdup_printf ("=%s/config/Calendar=/DateNavigator/",
-				  evolution_dir);
-	gnome_config_push_prefix (prefix);
-	g_free (prefix);
-
-	config->dnav_show_week_no = gnome_config_get_bool ("ShowWeekNumbers=0");
-
-	gnome_config_pop_prefix ();
-
-
-	gnome_config_sync ();
-}
-
-
-void
-calendar_config_write			(void)
-{
-	gchar *prefix;
-	
-	/* 'Display' settings. */
-	prefix = g_strdup_printf ("=%s/config/Calendar=/Display/",
-				  evolution_dir);
-	gnome_config_push_prefix (prefix);
-	g_free (prefix);
-
-	gnome_config_set_int ("WorkingDays", config->working_days);
-	gnome_config_set_bool ("Use24HourFormat", config->use_24_hour_format);
-	gnome_config_set_int ("WeekStartDay", config->week_start_day);
-	gnome_config_set_int ("DayStartHour", config->day_start_hour);
-	gnome_config_set_int ("DayStartMinute", config->day_start_minute);
-	gnome_config_set_int ("DayEndHour", config->day_end_hour);
-	gnome_config_set_int ("DayEndMinute", config->day_end_minute);
-	gnome_config_set_bool ("CompressWeekend", config->compress_weekend);
-	gnome_config_set_bool ("ShowEventEndTime", config->show_event_end);
-
-	gnome_config_pop_prefix ();
-
-
-	/* 'DateNavigator' settings. */
-	prefix = g_strdup_printf ("=%s/config/Calendar=/DateNavigator/",
-				  evolution_dir);
-	gnome_config_push_prefix (prefix);
-	g_free (prefix);
-
-	gnome_config_set_bool ("ShowWeekNumbers", config->dnav_show_week_no);
-
-	gnome_config_pop_prefix ();
-
-
-	gnome_config_sync ();
-}
-
-
-void
-calendar_config_write_on_exit		(void)
-{
-	gchar *prefix;
-	
-	/* 'Display' settings. */
-	prefix = g_strdup_printf ("=%s/config/Calendar=/Display/",
-				  evolution_dir);
-	gnome_config_push_prefix (prefix);
-	g_free (prefix);
-
-	gnome_config_set_int ("TimeDivisions", config->time_divisions);
-	gnome_config_set_float ("HPanePosition", config->hpane_pos);
-	gnome_config_set_float ("VPanePosition", config->vpane_pos);
-	gnome_config_set_float ("MonthHPanePosition", config->month_hpane_pos);
-	gnome_config_set_float ("MonthVPanePosition", config->month_vpane_pos);
-
-	gnome_config_pop_prefix ();
-
-
-	gnome_config_sync ();
-}
-
-
-/*
- * Calendar Settings.
- */
-
-/* Whether we use 24-hour format or 12-hour format (AM/PM). */
-gboolean
-calendar_config_get_24_hour_format	(void)
-{
-	return config->use_24_hour_format;
-}
-
-
-void
-calendar_config_set_24_hour_format	(gboolean     use_24_hour)
-{
-	config->use_24_hour_format = use_24_hour;
-}
-
-
-/* The start day of the week (0 = Sun to 6 = Mon). */
-gint
-calendar_config_get_week_start_day	(void)
-{
-	return config->week_start_day;
-}
-
-
-void
-calendar_config_set_week_start_day	(gint	      week_start_day)
-{
-	config->week_start_day = week_start_day;
-}
-
-
-/* The start and end times of the work-day. */
-gint
-calendar_config_get_day_start_hour	(void)
-{
-	return config->day_start_hour;
-}
-
-
-void
-calendar_config_set_day_start_hour	(gint	      day_start_hour)
-{
-	config->day_start_hour = day_start_hour;
-}
-
-
-gint
-calendar_config_get_day_start_minute	(void)
-{
-	return config->day_start_minute;
-}
-
-
-void
-calendar_config_set_day_start_minute	(gint	      day_start_min)
-{
-	config->day_start_minute = day_start_min;
-}
-
-
-gint
-calendar_config_get_day_end_hour	(void)
-{
-	return config->day_end_hour;
-}
-
-
-void
-calendar_config_set_day_end_hour	(gint	      day_end_hour)
-{
-	config->day_end_hour = day_end_hour;
-}
-
-
-gint
-calendar_config_get_day_end_minute	(void)
-{
-	return config->day_end_minute;
-}
-
-
-void
-calendar_config_set_day_end_minute	(gint	      day_end_min)
-{
-	config->day_end_minute = day_end_min;
-}
-
-
-/* The time divisions in the Day/Work-Week view in minutes (5/10/15/30/60). */
-gint
-calendar_config_get_time_divisions	(void)
-{
-	return config->time_divisions;
-}
-
-
-void
-calendar_config_set_time_divisions	(gint	      divisions)
-{
-	config->time_divisions = divisions;
-}
-
-
-/* Whether we show week numbers in the Date Navigator. */
-gboolean
-calendar_config_get_dnav_show_week_no	(void)
-{
-	return config->dnav_show_week_no;
-}
-
-
-void
-calendar_config_set_dnav_show_week_no	(gboolean     show_week_no)
-{
-	config->dnav_show_week_no = show_week_no;
-}
-
-
-/* The positions of the panes in the normal and month views. */
-gfloat
-calendar_config_get_hpane_pos		(void)
-{
-	return config->hpane_pos;
-}
-
-
-void
-calendar_config_set_hpane_pos		(gfloat	      hpane_pos)
-{
-	config->hpane_pos = hpane_pos;
-}
-
-
-gfloat
-calendar_config_get_vpane_pos		(void)
-{
-	return config->vpane_pos;
-}
-
-
-void
-calendar_config_set_vpane_pos		(gfloat	      vpane_pos)
-{
-	config->vpane_pos = vpane_pos;
-}
-
-
-gfloat
-calendar_config_get_month_hpane_pos	(void)
-{
-	return config->month_hpane_pos;
-}
-
-
-void
-calendar_config_set_month_hpane_pos	(gfloat	      hpane_pos)
-{
-	config->month_hpane_pos = hpane_pos;
-}
-
-
-gfloat
-calendar_config_get_month_vpane_pos	(void)
-{
-	return config->month_vpane_pos;
-}
-
-
-void
-calendar_config_set_month_vpane_pos	(gfloat	      vpane_pos)
-{
-	config->month_vpane_pos = vpane_pos;
-}
-
-
-/* Whether we compress the weekend in the week/month views. */
-gboolean
-calendar_config_get_compress_weekend	(void)
-{
-	return config->compress_weekend;
-}
-
-
-void
-calendar_config_set_compress_weekend	(gboolean     compress)
-{
-	config->compress_weekend = compress;
-}
-
-
-/* Whether we show event end times. */
-gboolean
-calendar_config_get_show_event_end	(void)
-{
-	return config->show_event_end;
-}
-
-
-void
-calendar_config_set_show_event_end	(gboolean     show_end)
-{
-	config->show_event_end = show_end;
-}
-
-
-/* The working days of the week, a bit-wise combination of flags. */
-CalWeekdays
-calendar_config_get_working_days	(void)
-{
-	return config->working_days;
-}
-
-
-void
-calendar_config_set_working_days	(CalWeekdays  days)
-{
-	config->working_days = days;
-}
-
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
deleted file mode 100644
index a636e3f185..0000000000
--- a/calendar/gui/calendar-config.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * calendar-config.h - functions to load/save/get/set user settings.
- */
-
-#ifndef _CALENDAR_CONFIG_H_
-#define _CALENDAR_CONFIG_H_
-
-
-/* These are used to get/set the working days in the week. The bit-flags are
-   combined together. The bits must be from 0 (Sun) to 6 (Sat) to match the
-   day values used by localtime etc. */
-typedef enum
-{
-	CAL_SUNDAY	= 1 << 0,
-	CAL_MONDAY	= 1 << 1,
-	CAL_TUESDAY	= 1 << 2,
-	CAL_WEDNESDAY	= 1 << 3,
-	CAL_THURSDAY	= 1 << 4,
-	CAL_FRIDAY	= 1 << 5,
-	CAL_SATURDAY	= 1 << 6
-} CalWeekdays;
-
-
-
-void	  calendar_config_init			(void);
-void	  calendar_config_write			(void);
-void	  calendar_config_write_on_exit		(void);
-
-
-/*
- * Calendar Settings.
- */
-
-/* The working days of the week, a bit-wise combination of flags. */
-CalWeekdays calendar_config_get_working_days	(void);
-void	  calendar_config_set_working_days	(CalWeekdays  days);
-
-/* The start day of the week (0 = Sun to 6 = Sat). */
-gint	  calendar_config_get_week_start_day	(void);
-void	  calendar_config_set_week_start_day	(gint	      week_start_day);
-
-/* The start and end times of the work-day. */
-gint	  calendar_config_get_day_start_hour	(void);
-void	  calendar_config_set_day_start_hour	(gint	      day_start_hour);
-
-gint	  calendar_config_get_day_start_minute	(void);
-void	  calendar_config_set_day_start_minute	(gint	      day_start_min);
-
-gint	  calendar_config_get_day_end_hour	(void);
-void	  calendar_config_set_day_end_hour	(gint	      day_end_hour);
-
-gint	  calendar_config_get_day_end_minute	(void);
-void	  calendar_config_set_day_end_minute	(gint	      day_end_min);
-
-/* Whether we use 24-hour format or 12-hour format (AM/PM). */
-gboolean  calendar_config_get_24_hour_format	(void);
-void	  calendar_config_set_24_hour_format	(gboolean     use_24_hour);
-
-/* The time divisions in the Day/Work-Week view in minutes (5/10/15/30/60). */
-gint	  calendar_config_get_time_divisions	(void);
-void	  calendar_config_set_time_divisions	(gint	      divisions);
-
-/* Whether we show event end times. */
-gboolean  calendar_config_get_show_event_end	(void);
-void	  calendar_config_set_show_event_end	(gboolean     show_end);
-
-/* Whether we compress the weekend in the week/month views. */
-gboolean  calendar_config_get_compress_weekend	(void);
-void	  calendar_config_set_compress_weekend	(gboolean     compress);
-
-/* Whether we show week numbers in the Date Navigator. */
-gboolean  calendar_config_get_dnav_show_week_no	(void);
-void	  calendar_config_set_dnav_show_week_no	(gboolean     show_week_no);
-
-/* The positions of the panes in the normal and month views. */
-gfloat    calendar_config_get_hpane_pos		(void);
-void	  calendar_config_set_hpane_pos		(gfloat	      hpane_pos);
-
-gfloat    calendar_config_get_vpane_pos		(void);
-void	  calendar_config_set_vpane_pos		(gfloat	      vpane_pos);
-
-gfloat    calendar_config_get_month_hpane_pos	(void);
-void	  calendar_config_set_month_hpane_pos	(gfloat	      hpane_pos);
-
-gfloat    calendar_config_get_month_vpane_pos	(void);
-void	  calendar_config_set_month_vpane_pos	(gfloat	      vpane_pos);
-
-
-#endif /* _CALENDAR_CONFIG_H_ */
diff --git a/calendar/gui/calendar-control.oafinfo b/calendar/gui/calendar-control.oafinfo
deleted file mode 100644
index fb0f138caf..0000000000
--- a/calendar/gui/calendar-control.oafinfo
+++ /dev/null
@@ -1,28 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the sample Calendar control"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:calendar:dd34ddae-25c6-486b-a8a8-3e8f0286b54c"
-            type="factory"
-            location="OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:BonoboControl/calendar-control:1.0"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="A sample Bonobo control which displays an calendar."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c
deleted file mode 100644
index fa05ba407a..0000000000
--- a/calendar/gui/calendar-model.c
+++ /dev/null
@@ -1,2025 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* Evolution calendar - Data model for ETable
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/* We need this for strptime. */
-#define _XOPEN_SOURCE
-
-#include <config.h>
-#include <ctype.h>
-#include <math.h>
-#undef _XOPEN_SOURCE
-#include <sys/time.h>
-#define _XOPEN_SOURCE
-#include <time.h>
-#include <gnome.h>
-#include <cal-util/timeutil.h>
-#include "calendar-model.h"
-#include "calendar-commands.h"
-
-
-
-/* Private part of the ECalendarModel structure */
-struct _CalendarModelPrivate {
-	/* Calendar client we are using */
-	CalClient *client;
-
-	/* Types of objects we are dealing with */
-	CalObjType type;
-
-	/* Array of pointers to calendar objects */
-	GArray *objects;
-
-	/* UID -> array index hash */
-	GHashTable *uid_index_hash;
-
-	/* Whether we display dates in 24-hour format. */
-	gboolean use_24_hour_format;
-
-	/* HACK: so that ETable can do its stupid append_row() thing */
-	guint appending_row : 1;
-};
-
-
-
-static void calendar_model_class_init (CalendarModelClass *class);
-static void calendar_model_init (CalendarModel *model);
-static void calendar_model_destroy (GtkObject *object);
-
-static int calendar_model_column_count (ETableModel *etm);
-static int calendar_model_row_count (ETableModel *etm);
-static void *calendar_model_value_at (ETableModel *etm, int col, int row);
-static void calendar_model_set_value_at (ETableModel *etm, int col, int row, const void *value);
-static gboolean calendar_model_is_cell_editable (ETableModel *etm, int col, int row);
-static void calendar_model_append_row (ETableModel *etm, ETableModel *source, gint row);
-static void *calendar_model_duplicate_value (ETableModel *etm, int col, const void *value);
-static void calendar_model_free_value (ETableModel *etm, int col, void *value);
-static void *calendar_model_initialize_value (ETableModel *etm, int col);
-static gboolean calendar_model_value_is_empty (ETableModel *etm, int col, const void *value);
-#if 0
-static char * calendar_model_value_to_string (ETableModel *etm, int col, const void *value);
-#endif
-static void load_objects (CalendarModel *model);
-static int remove_object (CalendarModel *model, const char *uid);
-static void ensure_task_complete (CalComponent *comp,
-				  time_t completed_date);
-static void ensure_task_not_complete (CalComponent *comp);
-
-static ETableModelClass *parent_class;
-
-
-
-/**
- * calendar_model_get_type:
- * @void:
- *
- * Registers the #CalendarModel class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #CalendarModel class.
- **/
-GtkType
-calendar_model_get_type (void)
-{
-	static GtkType calendar_model_type = 0;
-
-	if (!calendar_model_type) {
-		static GtkTypeInfo calendar_model_info = {
-			"CalendarModel",
-			sizeof (CalendarModel),
-			sizeof (CalendarModelClass),
-			(GtkClassInitFunc) calendar_model_class_init,
-			(GtkObjectInitFunc) calendar_model_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		calendar_model_type = gtk_type_unique (E_TABLE_MODEL_TYPE, &calendar_model_info);
-	}
-
-	return calendar_model_type;
-}
-
-/* Class initialization function for the calendar table model */
-static void
-calendar_model_class_init (CalendarModelClass *class)
-{
-	GtkObjectClass *object_class;
-	ETableModelClass *etm_class;
-
-	object_class = (GtkObjectClass *) class;
-	etm_class = (ETableModelClass *) class;
-
-	parent_class = gtk_type_class (E_TABLE_MODEL_TYPE);
-
-	object_class->destroy = calendar_model_destroy;
-
-	etm_class->column_count = calendar_model_column_count;
-	etm_class->row_count = calendar_model_row_count;
-	etm_class->value_at = calendar_model_value_at;
-	etm_class->set_value_at = calendar_model_set_value_at;
-	etm_class->is_cell_editable = calendar_model_is_cell_editable;
-	etm_class->append_row = calendar_model_append_row;
-	etm_class->duplicate_value = calendar_model_duplicate_value;
-	etm_class->free_value = calendar_model_free_value;
-	etm_class->initialize_value = calendar_model_initialize_value;
-	etm_class->value_is_empty = calendar_model_value_is_empty;
-#if 0
-	etm_class->value_to_string = calendar_model_value_to_string;
-#endif
-}
-
-/* Object initialization function for the calendar table model */
-static void
-calendar_model_init (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-
-	priv = g_new0 (CalendarModelPrivate, 1);
-	model->priv = priv;
-
-	priv->objects = g_array_new (FALSE, TRUE, sizeof (CalComponent *));
-	priv->uid_index_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->use_24_hour_format = TRUE;
-}
-
-/* Called from g_hash_table_foreach_remove(), frees a stored UID->index
- * mapping.
- */
-static gboolean
-free_uid_index (gpointer key, gpointer value, gpointer data)
-{
-	int *idx;
-
-	idx = value;
-	g_free (idx);
-
-	return TRUE;
-}
-
-/* Frees the objects stored in the calendar model */
-static void
-free_objects (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-	int i;
-
-	priv = model->priv;
-
-	g_hash_table_foreach_remove (priv->uid_index_hash, free_uid_index, NULL);
-
-	for (i = 0; i < priv->objects->len; i++) {
-		CalComponent *comp;
-
-		comp = g_array_index (priv->objects, CalComponent *, i);
-		g_assert (comp != NULL);
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-
-	g_array_set_size (priv->objects, 0);
-}
-
-/* Destroy handler for the calendar table model */
-static void
-calendar_model_destroy (GtkObject *object)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CALENDAR_MODEL (object));
-
-	model = CALENDAR_MODEL (object);
-	priv = model->priv;
-
-	/* Free the calendar client interface object */
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), model);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-		priv->client = NULL;
-	}
-
-	/* Free the uid->index hash data and the array of UIDs */
-
-	free_objects (model);
-
-	g_hash_table_destroy (priv->uid_index_hash);
-	priv->uid_index_hash = NULL;
-
-	g_array_free (priv->objects, TRUE);
-	priv->objects = NULL;
-
-	/* Free the private structure */
-
-	g_free (priv);
-	model->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* ETableModel methods */
-
-/* column_count handler for the calendar table model */
-static int
-calendar_model_column_count (ETableModel *etm)
-{
-	return CAL_COMPONENT_FIELD_NUM_FIELDS;
-}
-
-/* row_count handler for the calendar table model */
-static int
-calendar_model_row_count (ETableModel *etm)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	return priv->objects->len;
-}
-
-/* Creates a nice string representation of a time value */
-static char*
-get_time_t (CalendarModel *model, time_t *t, gboolean skip_midnight)
-{
-	static char buffer[64];
-	struct tm *tmp_tm;
-	char *format;
-
-	if (*t <= 0) {
-		buffer[0] = '\0';
-	} else {
-		tmp_tm = localtime (t);
-
-		if (skip_midnight && tmp_tm->tm_hour == 0
-		    && tmp_tm->tm_min == 0 && tmp_tm->tm_sec == 0)
-			/* strftime format of a weekday and a date. */
-			format = _("%a %m/%d/%Y");
-		else if (model->priv->use_24_hour_format)
-			/* strftime format of a weekday, a date and a time,
-			   in 24-hour format. */
-			format = _("%a %m/%d/%Y %H:%M:%S");
-		else
-			/* strftime format of a weekday, a date and a time,
-			   in 12-hour format. */
-			format = _("%a %m/%d/%Y %I:%M:%S %p");
-			
-		strftime (buffer, sizeof (buffer), format, tmp_tm);
-	}
-
-	return buffer;
-}
-
-/* Builds a string based on the list of CATEGORIES properties of a calendar
- * component.
- */
-static char *
-get_categories (CalComponent *comp)
-{
-	GSList *categories;
-	GString *str;
-	char *s;
-	GSList *l;
-
-	cal_component_get_categories_list (comp, &categories);
-
-	str = g_string_new (NULL);
-
-	for (l = categories; l; l = l->next) {
-		const char *category;
-
-		category = l->data;
-		g_string_append (str, category);
-
-		if (l->next != NULL)
-			g_string_append (str, ", ");
-	}
-
-	s = str->str;
-
-	g_string_free (str, FALSE);
-	cal_component_free_categories_list (categories);
-
-	return s;
-}
-
-/* Returns a string based on the CLASSIFICATION property of a calendar component */
-static char *
-get_classification (CalComponent *comp)
-{
-	CalComponentClassification classif;
-
-	cal_component_get_classification (comp, &classif);
-
-	switch (classif) {
-	case CAL_COMPONENT_CLASS_NONE:
-		return "";
-
-	case CAL_COMPONENT_CLASS_PUBLIC:
-		return _("Public");
-
-	case CAL_COMPONENT_CLASS_PRIVATE:
-		return _("Private");
-
-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:
-		return _("Confidential");
-
-	case CAL_COMPONENT_CLASS_UNKNOWN:
-		return _("Unknown");
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* Builds a string for the COMPLETED property of a calendar component */
-static char *
-get_completed	(CalendarModel *model,
-		 CalComponent  *comp)
-{
-	struct icaltimetype *completed;
-	time_t t;
-
-	cal_component_get_completed (comp, &completed);
-
-	if (!completed)
-		t = 0;
-	else {
-		t = icaltime_as_timet (*completed);
-		cal_component_free_icaltimetype (completed);
-	}
-
-	return get_time_t (model, &t, FALSE);
-}
-
-/* Builds a string for and frees a date/time value */
-static char *
-get_and_free_datetime (CalendarModel *model, CalComponentDateTime dt)
-{
-	time_t t;
-
-	if (!dt.value)
-		t = 0;
-	else
-		t = icaltime_as_timet (*dt.value);
-
-	cal_component_free_datetime (&dt);
-
-	return get_time_t (model, &t, FALSE);
-}
-
-/* Builds a string for the DTEND property of a calendar component */
-static char *
-get_dtend (CalendarModel *model, CalComponent *comp)
-{
-	CalComponentDateTime dt;
-
-	cal_component_get_dtend (comp, &dt);
-	return get_and_free_datetime (model, dt);
-}
-
-/* Builds a string for the DTSTART property of a calendar component */
-static char *
-get_dtstart (CalendarModel *model, CalComponent *comp)
-{
-	CalComponentDateTime dt;
-
-	cal_component_get_dtstart (comp, &dt);
-	return get_and_free_datetime (model, dt);
-}
-
-/* Builds a string for the DUE property of a calendar component */
-static char *
-get_due (CalendarModel *model, CalComponent *comp)
-{
-	CalComponentDateTime dt;
-
-	cal_component_get_due (comp, &dt);
-	return get_and_free_datetime (model, dt);
-}
-
-/* Builds a string for the GEO property of a calendar component */
-static char*
-get_geo (CalComponent *comp)
-{
-	struct icalgeotype *geo;
-	static gchar buf[32];
-
-	cal_component_get_geo (comp, &geo);
-
-	if (!geo)
-		buf[0] = '\0';
-	else {
-		g_snprintf (buf, sizeof (buf), "%g %s, %g %s",
-			    fabs (geo->lat),
-			    geo->lat >= 0.0 ? _("N") : _("S"),
-			    fabs (geo->lon),
-			    geo->lon >= 0.0 ? _("E") : _("W"));
-		cal_component_free_geo (geo);
-	}
-
-	return buf;
-}
-
-/* Builds a string for the PERCENT property of a calendar component */
-static char *
-get_percent (CalComponent *comp)
-{
-	int *percent;
-	static char buf[32];
-
-	cal_component_get_percent (comp, &percent);
-
-	if (!percent)
-		buf[0] = '\0';
-	else {
-		g_snprintf (buf, sizeof (buf), "%d%%", *percent);
-		cal_component_free_percent (percent);
-	}
-
-	return buf;
-}
-
-/* Builds a string for the PRIORITY property of a calendar component */
-static char *
-get_priority (CalComponent *comp)
-{
-	int *priority;
-	static char buf[32];
-
-	cal_component_get_priority (comp, &priority);
-
-	if (!priority)
-		buf[0] = '\0';
-	else {
-		g_snprintf (buf, sizeof (buf), "%d", *priority);
-		cal_component_free_priority (priority);
-	}
-
-	return buf;
-}
-
-/* Builds a string for the SUMMARY property of a calendar component */
-static char *
-get_summary (CalComponent *comp)
-{
-	CalComponentText summary;
-
-	cal_component_get_summary (comp, &summary);
-
-	if (summary.value)
-		return (char *) summary.value;
-	else
-		return "";
-}
-
-/* Builds a string for the TRANSPARENCY property of a calendar component */
-static char *
-get_transparency (CalComponent *comp)
-{
-	CalComponentTransparency transp;
-
-	cal_component_get_transparency (comp, &transp);
-
-	switch (transp) {
-	case CAL_COMPONENT_TRANSP_NONE:
-		return "";
-
-	case CAL_COMPONENT_TRANSP_TRANSPARENT:
-		return _("Transparent");
-
-	case CAL_COMPONENT_TRANSP_OPAQUE:
-		return _("Opaque");
-
-	case CAL_COMPONENT_TRANSP_UNKNOWN:
-		return _("Unknown");
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* Builds a string for the URL property of a calendar component */
-static char *
-get_url (CalComponent *comp)
-{
-	const char *url;
-
-	cal_component_get_url (comp, &url);
-
-	if (url)
-		return (char *) url;
-	else
-		return "";
-}
-
-/* Returns whether the component has any alarms defined for it */
-static gboolean
-get_has_alarms (CalComponent *comp)
-{
-	CalComponentAlarm *alarm;
-	gboolean retval;
-
-	alarm = cal_component_get_first_alarm (comp);
-	retval = (alarm != NULL);
-
-	cal_component_alarm_free (alarm);
-	return retval;
-}
-
-/* Returns whether the completion date has been set on a component */
-static gboolean
-get_is_complete (CalComponent *comp)
-{
-	struct icaltimetype *t;
-	gboolean retval;
-
-	cal_component_get_completed (comp, &t);
-	retval = (t != NULL);
-
-	if (retval)
-		cal_component_free_icaltimetype (t);
-
-	return retval;
-}
-
-/* Returns whether a calendar component is overdue.
- *
- * FIXME: This will only get called when the component is scrolled into the
- * ETable.  There should be some sort of dynamic update thingy for if a component
- * becomes overdue while it is being viewed.
- */
-static gboolean
-get_is_overdue (CalComponent *comp)
-{
-	CalComponentDateTime dt;
-	gboolean retval;
-
-	cal_component_get_due (comp, &dt);
-
-	/* First, do we have a due date? */
-
-	if (!dt.value)
-		retval = FALSE;
-	else {
-		time_t t;
-
-		/* Second, is it already completed? */
-
-		if (get_is_complete (comp)) {
-			retval = FALSE;
-			goto out;
-		}
-
-		/* Third, are we overdue as of right now? */
-
-		t = icaltime_as_timet (*dt.value);
-
-		if (t < time (NULL))
-			retval = TRUE;
-		else
-			retval = FALSE;
-	}
-
- out:
-
-	cal_component_free_datetime (&dt);
-
-	return retval;
-}
-
-/* value_at handler for the calendar table model */
-static void *
-calendar_model_value_at (ETableModel *etm, int col, int row)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-	CalComponent *comp;
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);
-	g_return_val_if_fail (row >= 0 && row < priv->objects->len, NULL);
-
-	comp = g_array_index (priv->objects, CalComponent *, row);
-	g_assert (comp != NULL);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-		return get_categories (comp);
-
-	case CAL_COMPONENT_FIELD_CLASSIFICATION:
-		return get_classification (comp);
-
-	case CAL_COMPONENT_FIELD_COMPLETED:
-		return get_completed (model, comp);
-
-	case CAL_COMPONENT_FIELD_DTEND:
-		return get_dtend (model, comp);
-
-	case CAL_COMPONENT_FIELD_DTSTART:
-		return get_dtstart (model, comp);
-
-	case CAL_COMPONENT_FIELD_DUE:
-		return get_due (model, comp);
-
-	case CAL_COMPONENT_FIELD_GEO:
-		return get_geo (comp);
-
-	case CAL_COMPONENT_FIELD_PERCENT:
-		return get_percent (comp);
-
-	case CAL_COMPONENT_FIELD_PRIORITY:
-		return get_priority (comp);
-
-	case CAL_COMPONENT_FIELD_SUMMARY:
-		return get_summary (comp);
-
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-		return get_transparency (comp);
-
-	case CAL_COMPONENT_FIELD_URL:
-		return get_url (comp);
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-		return GINT_TO_POINTER (get_has_alarms (comp));
-
-	case CAL_COMPONENT_FIELD_ICON:
-		/* FIXME: Also support 'Assigned to me' & 'Assigned to someone
-		   else'. */
-		if (cal_component_has_recurrences (comp))
-			return GINT_TO_POINTER (1);
-		else
-			return GINT_TO_POINTER (0);
-
-	case CAL_COMPONENT_FIELD_COMPLETE:
-		return GINT_TO_POINTER (get_is_complete (comp));
-
-	case CAL_COMPONENT_FIELD_RECURRING:
-		return GINT_TO_POINTER (cal_component_has_recurrences (comp));
-
-	case CAL_COMPONENT_FIELD_OVERDUE:
-		return GINT_TO_POINTER (get_is_overdue (comp));
-
-	case CAL_COMPONENT_FIELD_COLOR:
-		if (get_is_overdue (comp))
-			return "red";
-		else
-			return NULL;
-
-	default:
-		g_message ("calendar_model_value_at(): Requested invalid column %d", col);
-		return NULL;
-	}
-}
-
-/* Returns whether a string is NULL, empty, or full of whitespace */
-static gboolean
-string_is_empty (const char *value)
-{
-	const char *p;
-	gboolean empty = TRUE;
-
-	if (value) {
-		p = value;
-		while (*p) {
-			if (!isspace (*p)) {
-				empty = FALSE;
-				break;
-			}
-			p++;
-		}
-	}
-	return empty;
-}
-
-
-/* FIXME: We need to set the "transient_for" property for the dialog, but
-   the model doesn't know anything about the windows. */
-static void
-show_date_warning (CalendarModel *model)
-{
-	GtkWidget *dialog;
-	char buffer[64], message[256], *format;
-	time_t t;
-	struct tm *tmp_tm;
-
-	t = time (NULL);
-	tmp_tm = localtime (&t);
-
-	if (model->priv->use_24_hour_format)
-		/* strftime format of a weekday, a date and a time, 24-hour. */
-		format = _("%a %m/%d/%Y %H:%M:%S");
-	else
-		/* strftime format of a weekday, a date and a time, 12-hour. */
-		format = _("%a %m/%d/%Y %I:%M:%S %p");
-
-	strftime (buffer, sizeof (buffer), format, tmp_tm);
-
-	g_snprintf (message, 256,
-		    _("The date must be entered in the format: \n\n%s"),
-		    buffer);
-
-	dialog = gnome_message_box_new (message,
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
-/* Builds a list of categories from a comma-delimited string */
-static GSList *
-categories_from_string (const char *value)
-{
-	GSList *list;
-	const char *categ_start;
-	const char *categ_end;
-	const char *p;
-
-	if (!value)
-		return NULL;
-
-	list = NULL;
-
-	categ_start = categ_end = NULL;
-
-	for (p = value; *p; p++) {
-		if (categ_start) {
-			if (*p == ',') {
-				char *c;
-
-				c = g_strndup (categ_start, categ_end - categ_start + 1);
-				list = g_slist_prepend (list, c);
-
-				categ_start = categ_end = NULL;
-			} else if (!isspace (*p))
-				categ_end = p;
-		} else if (!isspace (*p) && *p != ',')
-			categ_start = categ_end = p;
-	}
-
-	if (categ_start) {
-		char *c;
-
-		c = g_strndup (categ_start, categ_end - categ_start + 1);
-		list = g_slist_prepend (list, c);
-	}
-
-	return g_slist_reverse (list);
-}
-
-/* Sets the list of categories from a comma-delimited string */
-static void
-set_categories (CalComponent *comp, const char *value)
-{
-	GSList *list;
-	GSList *l;
-
-	list = categories_from_string (value);
-
-	cal_component_set_categories_list (comp, list);
-
-	for (l = list; l; l = l->next) {
-		char *s;
-
-		s = l->data;
-		g_free (s);
-	}
-
-	g_slist_free (list);
-}
-
-/* Parses a time value entered by the user; returns -1 if it could not be
- * parsed.  Returns 0 for an empty time.
- */
-static time_t
-parse_time (const char *value)
-{
-	struct tm discard_tm, date_tm, time_tm;
-	struct tm *today_tm;
-	time_t t;
-	const char *pos, *parse_end;
-	char *format[4];
-	gboolean parsed_date = FALSE, parsed_time = FALSE;
-	gint i;
-
-	if (string_is_empty (value))
-		return 0;
-
-	pos = value;
-
-	/* Skip any whitespace. */
-	while (isspace (*pos))
-		pos++;
-
-	/* Skip any weekday name, full or abbreviated. */
-	parse_end = strptime (pos, "%a ", &discard_tm);
-	if (parse_end)
-		pos = parse_end;
-
-	memset (&date_tm, 0, sizeof (date_tm));
-	/* strptime format for a date. */
-	parse_end = strptime (pos, _("%m/%d/%Y"), &date_tm);
-	if (parse_end) {
-		pos = parse_end;
-		parsed_date = TRUE;
-	}
-
-	/* Skip any whitespace. */
-	while (isspace (*pos))
-		pos++;
-
-	/* Skip any weekday name, full or abbreviated, again. */
-	parse_end = strptime (pos, "%a ", &discard_tm);
-	if (parse_end)
-		pos = parse_end;
-
-
-	/* strptime format for a time of day, in 12-hour format.
-	   If it is is not appropriate in the locale set to an empty string. */
-	format[0] = _("%I:%M:%S %p%n");
-
-	/* strptime format for a time of day, in 24-hour format. */
-	format[1] = _("%H:%M:%S%n");
-
-	/* strptime format for time of day, without seconds, 12-hour format.
-	   If it is is not appropriate in the locale set to an empty string. */
-	format[2] = _("%I:%M %p%n");
-
-	/* strptime format for time of day, without seconds 24-hour format. */
-	format[3] = _("%H:%M%n");
-
-	for (i = 0; i < sizeof (format) / sizeof (format[0]); i++) {
-		memset (&time_tm, 0, sizeof (time_tm));
-		parse_end = strptime (pos, format[i], &time_tm);
-		if (parse_end) {
-			pos = parse_end;
-			parsed_time = TRUE;
-			break;
-		}
-	}
-
-	/* Skip any whitespace. */
-	while (isspace (*pos))
-		pos++;
-
-	/* If we haven't already parsed a date, try again. */
-	if (!parsed_date) {
-		memset (&date_tm, 0, sizeof (date_tm));
-		/* strptime format for a date. */
-		parse_end = strptime (pos, _("%m/%d/%Y"), &date_tm);
-		if (parse_end) {
-			pos = parse_end;
-			parsed_date = TRUE;
-		}
-	}
-
-	/* If we don't have a date or a time it must be invalid. */
-	if (!parsed_date && !parsed_time)
-		return -1;
-
-
-	if (parsed_date) {
-		/* If a 2-digit year was used we use the current century. */
-		if (date_tm.tm_year < 0) {
-			t = time (NULL);
-			today_tm = localtime (&t);
-
-			/* This should convert it into a value from 0 to 99. */
-			date_tm.tm_year += 1900;
-
-			/* Now add on the century. */
-			date_tm.tm_year += today_tm->tm_year
-				- (today_tm->tm_year % 100);
-		}
-	} else {
-		/* If we didn't get a date we use the current day. */
-		t = time (NULL);
-		today_tm = localtime (&t);
-		date_tm.tm_mday = today_tm->tm_mday;
-		date_tm.tm_mon  = today_tm->tm_mon;
-		date_tm.tm_year = today_tm->tm_year;
-	}
-
-	if (parsed_time) {
-		date_tm.tm_hour = time_tm.tm_hour;
-		date_tm.tm_min = time_tm.tm_min;
-		date_tm.tm_sec = time_tm.tm_sec;
-	} else {
-		date_tm.tm_hour = 0;
-		date_tm.tm_min = 0;
-		date_tm.tm_sec = 0;
-	}
-
-
-	date_tm.tm_isdst = -1;
-	return mktime (&date_tm);
-}
-
-/* Called to set the "Date Completed" field. We also need to update the
-   Status and Percent fields to make sure they match. */
-static void
-set_completed (CalendarModel *model, CalComponent *comp, const char *value)
-{
-	time_t t;
-
-	t = parse_time (value);
-	if (t == -1) {
-		show_date_warning (model);
-	} else if (t == 0) {
-		ensure_task_not_complete (comp);
-	} else {
-		ensure_task_complete (comp, t);
-	}
-}
-
-/* Sets a CalComponentDateTime value */
-static void
-set_datetime (CalendarModel *model, CalComponent *comp, const char *value,
-	      void (* set_func) (CalComponent *comp, CalComponentDateTime *dt))
-{
-	time_t t;
-
-	t = parse_time (value);
-	if (t == -1) {
-		show_date_warning (model);
-		return;
-	} else if (t == 0) {
-		(* set_func) (comp, NULL);
-		return;
-	} else {
-		CalComponentDateTime dt;
-		struct icaltimetype itt;
-
-		itt = icaltime_from_timet (t, FALSE, TRUE);
-		dt.value = &itt;
-		dt.tzid = NULL;
-
-		(* set_func) (comp, &dt);
-	}
-}
-
-/* FIXME: We need to set the "transient_for" property for the dialog, but the
- * model doesn't know anything about the windows.
- */
-static void
-show_geo_warning (void)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("The geographical position must be entered "
-					  "in the format: \n\n45.436845,125.862501"),
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
-/* Sets the geographical position value of a component */
-static void
-set_geo (CalComponent *comp, const char *value)
-{
-	double latitude, longitude;
-	int matched;
-	struct icalgeotype geo;
-
-	if (string_is_empty (value)) {
-		cal_component_set_geo (comp, NULL);
-		return;
-	}
-
-	matched = sscanf (value, "%lg , %lg", &latitude, &longitude);
-
-	if (matched != 2) {
-		show_geo_warning ();
-		return;
-	}
-
-	geo.lat = latitude;
-	geo.lon = longitude;
-	cal_component_set_geo (comp, &geo);
-}
-
-/* FIXME: We need to set the "transient_for" property for the dialog, but the
- * model doesn't know anything about the windows.
- */
-static void
-show_percent_warning (void)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("The percent value must be between 0 and 100, inclusive"),
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
-/* Sets the percent value of a calendar component */
-static void
-set_percent (CalComponent *comp, const char *value)
-{
-	int matched, percent;
-
-	if (string_is_empty (value)) {
-		cal_component_set_percent (comp, NULL);
-		ensure_task_not_complete (comp);
-		return;
-	}
-
-	matched = sscanf (value, "%i", &percent);
-
-	if (matched != 1 || percent < 0 || percent > 100) {
-		show_percent_warning ();
-		return;
-	}
-
-	cal_component_set_percent (comp, &percent);
-
-	if (percent == 100)
-		ensure_task_complete (comp, -1);
-	else
-		ensure_task_not_complete (comp);
-}
-
-/* FIXME: We need to set the "transient_for" property for the dialog, but the
- * model doesn't know anything about the windows.  */
-static void
-show_priority_warning (void)
-{
-	GtkWidget *dialog;
-
-	dialog = gnome_message_box_new (_("The priority must be between 1 and 9, inclusive"),
-					GNOME_MESSAGE_BOX_ERROR,
-					GNOME_STOCK_BUTTON_OK, NULL);
-	gtk_widget_show (dialog);
-}
-
-/* Sets the priority of a calendar component */
-static void
-set_priority (CalComponent *comp, const char *value)
-{
-	int matched, priority;
-
-	if (string_is_empty (value)) {
-		cal_component_set_priority (comp, NULL);
-		return;
-	}
-
-	matched = sscanf (value, "%i", &priority);
-
-	if (matched != 1 || priority < 1 || priority > 9) {
-		show_priority_warning ();
-		return;
-	}
-
-	cal_component_set_priority (comp, &priority);
-}
-
-/* Sets the summary of a calendar component */
-static void
-set_summary (CalComponent *comp, const char *value)
-{
-	CalComponentText text;
-
-	if (string_is_empty (value)) {
-		cal_component_set_summary (comp, NULL);
-		return;
-	}
-
-	text.value = value;
-	text.altrep = NULL; /* FIXME: should we preserve the old ALTREP? */
-
-	cal_component_set_summary (comp, &text);
-}
-
-/* Sets the URI of a calendar component */
-static void
-set_url (CalComponent *comp, const char *value)
-{
-	if (string_is_empty (value)) {
-		cal_component_set_url (comp, NULL);
-		return;
-	}
-
-	cal_component_set_url (comp, value);
-}
-
-/* Called to set the checkbutton field which indicates whether a task is
-   complete. */
-static void
-set_complete (CalComponent *comp, const void *value)
-{
-	gint state = GPOINTER_TO_INT (value);
-
-	if (state) {
-		ensure_task_complete (comp, -1);
-	} else {
-		ensure_task_not_complete (comp);
-	}
-}
-
-/* set_value_at handler for the calendar table model */
-static void
-calendar_model_set_value_at (ETableModel *etm, int col, int row, const void *value)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-	CalComponent *comp;
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	g_return_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS);
-	g_return_if_fail (row >= 0 && row < priv->objects->len);
-
-	comp = g_array_index (priv->objects, CalComponent *, row);
-	g_assert (comp != NULL);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-		set_categories (comp, value);
-		break;
-
-	/* FIXME: CLASSIFICATION requires an option menu cell renderer */
-
-	case CAL_COMPONENT_FIELD_COMPLETED:
-		set_completed (model, comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_DTEND:
-		/* FIXME: Need to reset dtstart if dtend happens before it */
-		set_datetime (model, comp, value, cal_component_set_dtend);
-		break;
-
-	case CAL_COMPONENT_FIELD_DTSTART:
-		/* FIXME: Need to reset dtend if dtstart happens after it */
-		set_datetime (model, comp, value, cal_component_set_dtstart);
-		break;
-
-	case CAL_COMPONENT_FIELD_DUE:
-		set_datetime (model, comp, value, cal_component_set_due);
-		break;
-
-	case CAL_COMPONENT_FIELD_GEO:
-		set_geo (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_PERCENT:
-		set_percent (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_PRIORITY:
-		set_priority (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_SUMMARY:
-		set_summary (comp, value);
-		break;
-
-	/* FIXME: TRANSPARENCY requires an option menu cell renderer */
-
-	case CAL_COMPONENT_FIELD_URL:
-		set_url (comp, value);
-		break;
-
-	case CAL_COMPONENT_FIELD_COMPLETE:
-		set_complete (comp, value);
-		break;
-
-	default:
-		g_message ("calendar_model_set_value_at(): Requested invalid column %d", col);
-		break;
-	}
-
-	/* FIXME: this is an ugly HACK.  ETable needs a better API for the
-	 * "click here to add an element" thingy.
-	 */
-	if (priv->appending_row)
-		return;
-
-	if (!cal_client_update_object (priv->client, comp))
-		g_message ("calendar_model_set_value_at(): Could not update the object!");
-}
-
-/* is_cell_editable handler for the calendar table model */
-static gboolean
-calendar_model_is_cell_editable (ETableModel *etm, int col, int row)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, FALSE);
-
-	/* FIXME: We can't check this as 'click-to-add' passes row 0. */
-	/*g_return_val_if_fail (row >= 0 && row < priv->objects->len, FALSE);*/
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PERCENT:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-	case CAL_COMPONENT_FIELD_URL:
-	case CAL_COMPONENT_FIELD_ICON:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-		return TRUE;
-
-	default:
-		return FALSE;
-	}
-}
-
-/* append_row handler for the calendar model */
-static void
-calendar_model_append_row (ETableModel *etm, ETableModel *source, gint row)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-	CalComponent *comp;
-	int *new_idx, col;
-	const char *uid;
-
-	model = CALENDAR_MODEL (etm);
-	priv = model->priv;
-
-	/* This is a HACK */
-	priv->appending_row = TRUE;
-
-	/* FIXME: This should support other types of components, but for now it
-	 * is only used for the task list.
-	 */
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-
-	cal_component_get_uid (comp, &uid);
-
-	g_array_append_val (priv->objects, comp);
-	new_idx = g_new (int, 1);
-	*new_idx = priv->objects->len - 1;
-	g_hash_table_insert (priv->uid_index_hash, (char *) uid, new_idx);
-
-	/* Notify the views about the new row. I think we have to do that here,
-	   or the views may become confused when they start getting
-	   "row_changed" or "cell_changed" signals for this new row. */
-	e_table_model_row_inserted (etm, *new_idx);
-
-	for (col = 0; col < CAL_COMPONENT_FIELD_NUM_FIELDS; col++) {
-		const void *val;
-
-		if (!e_table_model_is_cell_editable (etm, col, *new_idx))
-			continue;
-
-		val = e_table_model_value_at(source, col, row);
-		e_table_model_set_value_at (etm, col, *new_idx, val);
-	}
-
-	/* This is the end of the HACK */
-	priv->appending_row = FALSE;
-
-	if (!cal_client_update_object (priv->client, comp)) {
-		/* FIXME: Show error dialog. */
-		g_message ("calendar_model_append_row(): Could not add new object!");
-		remove_object (model, uid);
-		e_table_model_row_deleted (etm, *new_idx);
-	}
-}
-
-/* Duplicates a string value */
-static char *
-dup_string (const char *value)
-{
-	return g_strdup (value);
-}
-
-/* duplicate_value handler for the calendar table model */
-static void *
-calendar_model_duplicate_value (ETableModel *etm, int col, const void *value)
-{
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);
-
-	/* They are almost all dup_string()s for now, but we'll have real fields
-	 * later.
-	 */
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-		return dup_string (value);
-
-	case CAL_COMPONENT_FIELD_CLASSIFICATION:
-		return (void *) value;
-
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PERCENT:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-		return dup_string (value);
-
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-		return (void *) value;
-
-	case CAL_COMPONENT_FIELD_URL:
-		return dup_string (value);
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-	case CAL_COMPONENT_FIELD_ICON:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_RECURRING:
-	case CAL_COMPONENT_FIELD_OVERDUE:
-	case CAL_COMPONENT_FIELD_COLOR:
-		return (void *) value;
-
-	default:
-		g_message ("calendar_model_duplicate_value(): Requested invalid column %d", col);
-		return NULL;
-	}
-}
-
-/* free_value handler for the calendar table model */
-static void
-calendar_model_free_value (ETableModel *etm, int col, void *value)
-{
-	g_return_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-		g_free (value);
-
-	case CAL_COMPONENT_FIELD_CLASSIFICATION:
-		return;
-
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PERCENT:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-		g_free (value);
-
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-		return;
-
-	case CAL_COMPONENT_FIELD_URL:
-		g_free (value);
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-	case CAL_COMPONENT_FIELD_ICON:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_RECURRING:
-	case CAL_COMPONENT_FIELD_OVERDUE:
-	case CAL_COMPONENT_FIELD_COLOR:
-		return;
-
-	default:
-		g_message ("calendar_model_free_value(): Requested invalid column %d", col);
-		return;
-	}
-}
-
-/* Initializes a string value */
-static char *
-init_string (void)
-{
-	return g_strdup ("");
-}
-
-/* initialize_value handler for the calendar table model */
-static void *
-calendar_model_initialize_value (ETableModel *etm, int col)
-{
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-		return init_string ();
-
-	case CAL_COMPONENT_FIELD_CLASSIFICATION:
-		return NULL;
-
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PERCENT:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-		return init_string ();
-
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-		return NULL;
-
-	case CAL_COMPONENT_FIELD_URL:
-		return init_string ();
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-	case CAL_COMPONENT_FIELD_ICON:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_RECURRING:
-	case CAL_COMPONENT_FIELD_OVERDUE:
-	case CAL_COMPONENT_FIELD_COLOR:
-		return NULL;
-
-	default:
-		g_message ("calendar_model_initialize_value(): Requested invalid column %d", col);
-		return NULL;
-	}
-}
-
-/* value_is_empty handler for the calendar model. This should return TRUE
-   unless a significant value has been set. The 'click-to-add' feature
-   checks all fields to see if any are not empty and if so it adds a new
-   row, so we only want to return FALSE if we have a useful object. */
-static gboolean
-calendar_model_value_is_empty (ETableModel *etm, int col, const void *value)
-{
-	g_return_val_if_fail (col >= 0 && col < CAL_COMPONENT_FIELD_NUM_FIELDS, TRUE);
-
-	switch (col) {
-	case CAL_COMPONENT_FIELD_CATEGORIES:
-	case CAL_COMPONENT_FIELD_CLASSIFICATION: /* actually goes here, not by itself */
-	case CAL_COMPONENT_FIELD_COMPLETED:
-	case CAL_COMPONENT_FIELD_DTEND:
-	case CAL_COMPONENT_FIELD_DTSTART:
-	case CAL_COMPONENT_FIELD_DUE:
-	case CAL_COMPONENT_FIELD_GEO:
-	case CAL_COMPONENT_FIELD_PERCENT:
-	case CAL_COMPONENT_FIELD_PRIORITY:
-	case CAL_COMPONENT_FIELD_SUMMARY:
-	case CAL_COMPONENT_FIELD_TRANSPARENCY:
-	case CAL_COMPONENT_FIELD_URL:
-		return string_is_empty (value);
-
-	case CAL_COMPONENT_FIELD_HAS_ALARMS:
-	case CAL_COMPONENT_FIELD_ICON:
-	case CAL_COMPONENT_FIELD_COMPLETE:
-	case CAL_COMPONENT_FIELD_RECURRING:
-	case CAL_COMPONENT_FIELD_OVERDUE:
-	case CAL_COMPONENT_FIELD_COLOR:
-		return TRUE;
-
-	default:
-		g_message ("calendar_model_value_is_empty(): Requested invalid column %d", col);
-		return TRUE;
-	}
-}
-
-
-
-/**
- * calendar_model_new:
- *
- * Creates a new calendar model.  It must be told about the calendar client
- * interface object it will monitor with calendar_model_set_cal_client().
- *
- * Return value: A newly-created calendar model.
- **/
-CalendarModel *
-calendar_model_new (void)
-{
-	return CALENDAR_MODEL (gtk_type_new (TYPE_CALENDAR_MODEL));
-}
-
-
-/* Callback used when a calendar is loaded into the server */
-static void
-cal_loaded_cb (CalClient *client,
-	       CalClientLoadStatus status,
-	       CalendarModel *model)
-{
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	e_table_model_pre_change (E_TABLE_MODEL (model));
-
-	if (status == CAL_CLIENT_LOAD_SUCCESS)
-		load_objects (model);
-
-	e_table_model_changed (E_TABLE_MODEL (model));
-}
-
-
-/* Removes an object from the model and updates all the indices that follow.
- * Returns the index of the object that was removed, or -1 if no object with
- * such UID was found.
- */
-static int
-remove_object (CalendarModel *model, const char *uid)
-{
-	CalendarModelPrivate *priv;
-	int *idx;
-	CalComponent *orig_comp;
-	int i;
-	int n;
-
-	priv = model->priv;
-
-	/* Find the index of the object to be removed */
-
-	idx = g_hash_table_lookup (priv->uid_index_hash, uid);
-	if (!idx)
-		return -1;
-
-	orig_comp = g_array_index (priv->objects, CalComponent *, *idx);
-	g_assert (orig_comp != NULL);
-
-	/* Decrease the indices of all the objects that follow in the array */
-
-	for (i = *idx + 1; i < priv->objects->len; i++) {
-		CalComponent *comp;
-		int *comp_idx;
-		const char *comp_uid;
-
-		comp = g_array_index (priv->objects, CalComponent *, i);
-		g_assert (comp != NULL);
-
-		cal_component_get_uid (comp, &comp_uid);
-
-		comp_idx = g_hash_table_lookup (priv->uid_index_hash, comp_uid);
-		g_assert (comp_idx != NULL);
-
-		(*comp_idx)--;
-		g_assert (*comp_idx >= 0);
-	}
-
-	/* Remove this object from the array and hash */
-
-	g_hash_table_remove (priv->uid_index_hash, uid);
-	g_array_remove_index (priv->objects, *idx);
-
-	gtk_object_unref (GTK_OBJECT (orig_comp));
-
-	n = *idx;
-	g_free (idx);
-
-	return n;
-}
-
-/* Returns whether a component's type matches the types we support */
-static gboolean
-matches_type (CalObjType type, CalComponentVType vtype)
-{
-	return ((vtype == CAL_COMPONENT_EVENT && (type & CALOBJ_TYPE_EVENT))
-		|| (vtype == CAL_COMPONENT_TODO && (type & CALOBJ_TYPE_TODO))
-		|| (vtype == CAL_COMPONENT_JOURNAL && (type & CALOBJ_TYPE_JOURNAL)));
-}
-
-/* Callback used when an object is updated in the server */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	CalendarModel *model;
-	CalendarModelPrivate *priv;
-	int orig_idx;
-	CalComponent *new_comp;
-	CalComponentVType new_comp_vtype;
-	const char *new_comp_uid;
-	int *new_idx;
-	CalClientGetStatus status;
-
-	model = CALENDAR_MODEL (data);
-	priv = model->priv;
-
-	orig_idx = remove_object (model, uid);
-
-	status = cal_client_get_object (priv->client, uid, &new_comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Check if we are interested in this type of object */
-
-		new_comp_vtype = cal_component_get_vtype (new_comp);
-		if (!matches_type (priv->type, new_comp_vtype)) {
-			gtk_object_unref (GTK_OBJECT (new_comp));
-			break;
-		}
-
-		/* Insert the object into the model */
-
-		cal_component_get_uid (new_comp, &new_comp_uid);
-
-		if (orig_idx == -1) {
-			/* The object not in the model originally, so we just append it */
-
-			g_array_append_val (priv->objects, new_comp);
-
-			new_idx = g_new (int, 1);
-			*new_idx = priv->objects->len - 1;
-
-			g_hash_table_insert (priv->uid_index_hash, (char *) new_comp_uid, new_idx);
-		} else {
-			int i;
-
-			/* Insert the new version of the object in its old position */
-
-			g_array_insert_val (priv->objects, orig_idx, new_comp);
-
-			new_idx = g_new (int, 1);
-			*new_idx = orig_idx;
-			g_hash_table_insert (priv->uid_index_hash, (char *) new_comp_uid, new_idx);
-
-			/* Increase the indices of all subsequent objects */
-
-			for (i = orig_idx + 1; i < priv->objects->len; i++) {
-				CalComponent *comp;
-				int *comp_idx;
-				const char *comp_uid;
-
-				comp = g_array_index (priv->objects, CalComponent *, i);
-				g_assert (comp != NULL);
-
-				cal_component_get_uid (comp, &comp_uid);
-
-				comp_idx = g_hash_table_lookup (priv->uid_index_hash, comp_uid);
-				g_assert (comp_idx != NULL);
-
-				(*comp_idx)++;
-			}
-		}
-
-		e_table_model_row_changed (E_TABLE_MODEL (model), *new_idx);
-		break;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* Nothing; the object may have been removed from the server.  We just
-		 * notify that the old object was deleted.
-		 */
-		if (orig_idx != -1)
-			e_table_model_row_deleted (E_TABLE_MODEL (model), orig_idx);
-
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);
-
-		/* Same notification as above */
-		if (orig_idx != -1)
-			e_table_model_row_deleted (E_TABLE_MODEL (model), orig_idx);
-
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-/* Callback used when an object is removed in the server */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	CalendarModel *model;
-	int idx;
-
-	model = CALENDAR_MODEL (data);
-
-	idx = remove_object (model, uid);
-
-	if (idx != -1)
-		e_table_model_row_deleted (E_TABLE_MODEL (model), idx);
-}
-
-/* Loads the required objects from the calendar client */
-static void
-load_objects (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-	GList *uids;
-	GList *l;
-
-	priv = model->priv;
-
-	if (!cal_client_is_loaded (priv->client))
-		return;
-
-	uids = cal_client_get_uids (priv->client, priv->type);
-
-	for (l = uids; l; l = l->next) {
-		char *uid;
-		CalComponent *comp;
-		const char *comp_uid;
-		CalClientGetStatus status;
-		CalComponentVType comp_vtype;
-		int *idx;
-
-		uid = l->data;
-		status = cal_client_get_object (priv->client, uid, &comp);
-
-		switch (status) {
-		case CAL_CLIENT_GET_SUCCESS:
-			break;
-
-		case CAL_CLIENT_GET_NOT_FOUND:
-			/* Nothing; the object may have been removed from the server */
-			continue;
-
-		case CAL_CLIENT_GET_SYNTAX_ERROR:
-			g_message ("load_objects(): Syntax error when getting object `%s'", uid);
-			continue;
-
-		default:
-			g_assert_not_reached ();
-		}
-
-		/* Check if we are interested in this type of object */
-
-		comp_vtype = cal_component_get_vtype (comp);
-		if (!matches_type (priv->type, comp_vtype)) {
-			gtk_object_unref (GTK_OBJECT (comp));
-			continue;
-		}
-
-		/* Insert the object into the model */
-
-		idx = g_new (int, 1);
-
-		g_array_append_val (priv->objects, comp);
-		*idx = priv->objects->len - 1;
-
-		cal_component_get_uid (comp, &comp_uid);
-		g_hash_table_insert (priv->uid_index_hash, (char *) comp_uid, idx);
-	}
-
-	cal_obj_uid_list_free (uids);
-}
-
-/**
- * calendar_model_get_cal_client:
- * @model: A calendar model.
- * 
- * Queries the calendar client interface object that a calendar model is using.
- * 
- * Return value: A calendar client interface object.
- **/
-CalClient *
-calendar_model_get_cal_client (CalendarModel *model)
-{
-	CalendarModelPrivate *priv;
-
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), NULL);
-
-	priv = model->priv;
-
-	return priv->client;
-}
-
-
-/**
- * calendar_model_set_cal_client:
- * @model: A calendar model.
- * @client: A calendar client interface object.
- * @type: Type of objects to present.
- *
- * Sets the calendar client interface object that a calendar model will monitor.
- * It also sets the types of objects this model will present to an #ETable.
- **/
-void
-calendar_model_set_cal_client (CalendarModel *model, CalClient *client, CalObjType type)
-{
-	CalendarModelPrivate *priv;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	if (client)
-		g_return_if_fail (IS_CAL_CLIENT (client));
-
-	priv = model->priv;
-
-	if (priv->client == client && priv->type == type)
-		return;
-
-	e_table_model_pre_change (E_TABLE_MODEL(model));
-
-	if (client)
-		gtk_object_ref (GTK_OBJECT (client));
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), model);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-	}
-
-	free_objects (model);
-
-	priv->client = client;
-	priv->type = type;
-
-	if (priv->client) {
-		gtk_signal_connect (GTK_OBJECT (priv->client), "cal_loaded",
-				    GTK_SIGNAL_FUNC (cal_loaded_cb), model);
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated",
-				    GTK_SIGNAL_FUNC (obj_updated_cb), model);
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed",
-				    GTK_SIGNAL_FUNC (obj_removed_cb), model);
-
-		load_objects (model);
-	}
-
-	e_table_model_changed (E_TABLE_MODEL (model));
-}
-
-
-void
-calendar_model_delete_task (CalendarModel *model,
-			    gint row)
-{
-	CalendarModelPrivate *priv;
-	CalComponent *comp;
-	const char *uid;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	priv = model->priv;
-
-	g_return_if_fail (row >= 0 && row < priv->objects->len);
-
-	comp = g_array_index (priv->objects, CalComponent *, row);
-	g_assert (comp != NULL);
-
-	cal_component_get_uid (comp, &uid);
-
-	/* We don't check the return value; FALSE can mean the object was not in
-	 * the server anyways.
-	 */
-	cal_client_remove_object (priv->client, uid);
-}
-
-
-void
-calendar_model_mark_task_complete (CalendarModel *model,
-				   gint row)
-{
-	CalendarModelPrivate *priv;
-	CalComponent *comp;
-
-	g_return_if_fail (model != NULL);
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	priv = model->priv;
-
-	g_return_if_fail (row >= 0 && row < priv->objects->len);
-
-	comp = g_array_index (priv->objects, CalComponent *, row);
-	g_assert (comp != NULL);
-
-	ensure_task_complete (comp, -1);
-
-	if (!cal_client_update_object (priv->client, comp))
-		g_message ("calendar_model_mark_task_complete(): Could not update the object!");
-}
-
-
-/* Frees the objects stored in the calendar model */
-CalComponent *
-calendar_model_get_cal_object (CalendarModel *model,
-			       gint	      row)
-{
-	CalendarModelPrivate *priv;
-
-	g_return_val_if_fail (model != NULL, NULL);
-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), NULL);
-
-	priv = model->priv;
-
-	g_return_val_if_fail (row >= 0 && row < priv->objects->len, NULL);
-
-	return g_array_index (priv->objects, CalComponent *, row);
-}
-
-
-/* This makes sure a task is marked as complete.
-   It makes sure the "Date Completed" property is set. If the completed_date
-   is not -1, then that is used, otherwise if the "Date Completed" property
-   is not already set it is set to the current time.
-   It makes sure the percent is set to 100, and that the status is "Completed".
-   Note that this doesn't update the component on the client. */
-static void
-ensure_task_complete (CalComponent *comp,
-		      time_t completed_date)
-{
-	struct icaltimetype *old_completed = NULL;
-	struct icaltimetype new_completed;
-	const char *old_status;
-	int *old_percent, new_percent;
-	gboolean set_completed = TRUE;
-
-	/* Date Completed. */
-	if (completed_date == -1) {
-		cal_component_get_completed (comp, &old_completed);
-
-		if (old_completed) {
-			cal_component_free_icaltimetype (old_completed);
-			set_completed = FALSE;
-		} else {
-			completed_date = time (NULL);
-		}
-	}
-
-	if (set_completed) {
-		new_completed = icaltime_from_timet (completed_date, FALSE,
-						     TRUE);
-		cal_component_set_completed (comp, &new_completed);
-	}
-
-	/* Percent. */
-	cal_component_get_percent (comp, &old_percent);
-	if (!old_percent || *old_percent != 100) {
-		new_percent = 100;
-		cal_component_set_percent (comp, &new_percent);
-	}
-	if (old_percent)
-		cal_component_free_percent (old_percent);
-
-	/* Status. */
-	cal_component_get_status (comp, &old_status);
-}
-
-
-/* This makes sure a task is marked as incomplete. It clears the
-   "Date Completed" property. If the percent is set to 100 it removes it,
-   and if the status is "Completed" it sets it to "Needs Action".
-   Note that this doesn't update the component on the client. */
-static void
-ensure_task_not_complete (CalComponent *comp)
-{
-	const char *old_status;
-	int *old_percent;
-
-	/* Date Completed. */
-	cal_component_set_completed (comp, NULL);
-
-	/* Percent. */
-	cal_component_get_percent (comp, &old_percent);
-	if (old_percent && *old_percent == 100)
-		cal_component_set_percent (comp, NULL);
-	if (old_percent)
-		cal_component_free_percent (old_percent);
-
-	/* Status. */
-	cal_component_get_status (comp, &old_status);
-	if (old_status && !strcmp (old_status, "COMPLETED"))
-		cal_component_set_status (comp, "NEEDS-ACTION");
-}
-
-
-/* Whether we use 24 hour format to display the times. */
-gboolean
-calendar_model_get_use_24_hour_format (CalendarModel *model)
-{
-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), TRUE);
-
-	return model->priv->use_24_hour_format;
-}
-
-
-void
-calendar_model_set_use_24_hour_format (CalendarModel *model,
-				       gboolean	      use_24_hour_format)
-{
-	g_return_if_fail (IS_CALENDAR_MODEL (model));
-
-	if (model->priv->use_24_hour_format != use_24_hour_format) {
-		model->priv->use_24_hour_format = use_24_hour_format;
-		/* Get the views to redraw themselves. */
-		e_table_model_changed (E_TABLE_MODEL (model));
-	}
-}
-
diff --git a/calendar/gui/calendar-model.h b/calendar/gui/calendar-model.h
deleted file mode 100644
index ed04706090..0000000000
--- a/calendar/gui/calendar-model.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Evolution calendar - Data model for ETable
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CALENDAR_MODEL_H
-#define CALENDAR_MODEL_H
-
-#include <libgnome/gnome-defs.h>
-#include <gal/e-table/e-table-model.h>
-#include <cal-client/cal-client.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-#define TYPE_CALENDAR_MODEL            (calendar_model_get_type ())
-#define CALENDAR_MODEL(obj)            (GTK_CHECK_CAST ((obj), TYPE_CALENDAR_MODEL, CalendarModel))
-#define CALENDAR_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_CALENDAR_MODEL,	\
-					CalendarModelClass))
-#define IS_CALENDAR_MODEL(obj)         (GTK_CHECK_TYPE ((obj), TYPE_CALENDAR_MODEL))
-#define IS_CALENDAR_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_CALENDAR_MODEL))
-
-typedef struct _CalendarModel CalendarModel;
-typedef struct _CalendarModelClass CalendarModelClass;
-
-typedef struct _CalendarModelPrivate CalendarModelPrivate;
-
-struct _CalendarModel {
-	ETableModel model;
-
-	/* Private data */
-	CalendarModelPrivate *priv;
-};
-
-struct _CalendarModelClass {
-	ETableModelClass parent_class;
-};
-
-GtkType		calendar_model_get_type		  (void);
-
-CalendarModel*	calendar_model_new		  (void);
-
-CalClient*	calendar_model_get_cal_client	  (CalendarModel   *model);
-void		calendar_model_set_cal_client	  (CalendarModel   *model,
-						   CalClient	   *client,
-						   CalObjType	    type);
-
-void		calendar_model_mark_task_complete (CalendarModel   *model,
-						   gint		    row);
-void		calendar_model_delete_task	  (CalendarModel   *model,
-						   gint		    row);
-
-CalComponent*	calendar_model_get_cal_object	  (CalendarModel   *model,
-						   gint		    row);
-
-/* Whether we use 24 hour format to display the times. */
-gboolean	calendar_model_get_use_24_hour_format (CalendarModel *model);
-void		calendar_model_set_use_24_hour_format (CalendarModel *model,
-						       gboolean	      use_24_hour_format);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/calendar-summary.c b/calendar/gui/calendar-summary.c
deleted file mode 100644
index 0c05ace30a..0000000000
--- a/calendar/gui/calendar-summary.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-summary.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <bonobo.h>
-
-#include <gnome.h>
-
-#include <executive-summary/evolution-services/executive-summary-component.h>
-#include "cal-util/cal-component.h"
-#include "calendar-model.h"
-
-#include "calendar-summary.h"
-
-typedef struct {
-	ExecutiveSummaryComponent *component;
-	CalClient *client;
-} CalSummary;
-
-static char *
-generate_html_summary (CalSummary *summary)
-{
-	GList *uids, *l;
-	char *ret_html, *tmp;
-	
-	ret_html = g_strdup ("<ul>");
-	
-	uids = cal_client_get_uids (summary->client, CALOBJ_TYPE_ANY);
-	for (l = uids; l; l = l->next){
-		CalComponent *comp;
-		CalComponentText text;
-		CalClientGetStatus status;
-		char *uid;
-		char *tmp2;
-		
-		uid = l->data;
-		status = cal_client_get_object (summary->client, uid, &comp);
-		if (status != CAL_CLIENT_GET_SUCCESS)
-			continue;
-		
-		cal_component_get_summary (comp, &text);
-		
-		tmp2 = g_strdup_printf ("<li>%s</li>", text.value);
-		
-		tmp = ret_html;
-		ret_html = g_strconcat (ret_html, tmp2, NULL);
-		g_free (tmp);
-		g_free (tmp2);
-	}
-	
-	cal_obj_uid_list_free (uids);
-	
-	tmp = ret_html;
-	ret_html = g_strconcat (ret_html, "</ul>", NULL);
-	g_free (tmp);
-	
-	return ret_html;
-}
-
-static void
-cal_loaded (CalClient *client,
-	    CalClientLoadStatus status,
-	    CalSummary *summary)
-{
-	char *html;
-	
-	if (status == CAL_CLIENT_LOAD_SUCCESS) {
-		html = generate_html_summary (summary);
-		executive_summary_component_update (summary->component, html);
-		g_free (html);
-	} else {
-		g_print ("Error loading %d\n", status);
-		executive_summary_component_update (summary->component, " ");
-	}
-}
-
-char *
-create_summary_view (ExecutiveSummaryComponent *component,
-		     char **title,
-		     char **icon,
-		     void *closure)
-{
-	char *ret_html;
-	char *evoldir;
-	char *calfile;
-	CalSummary *summary;
-	gboolean result;
-	
-	evoldir = (char *) closure;
-	
-	/* strdup the title and icon */
-	*title = g_strdup ("Things to do");
-	*icon = g_strdup ("evolution-tasks.png");
-	
-	summary = g_new (CalSummary, 1);
-	summary->component = component;
-	
-	calfile = g_strdup_printf ("%s/local/Calendar/calendar.ics", evoldir);
-	g_print ("calfile: %s\n", calfile);
-	summary->client = cal_client_new ();
-	
-	result = cal_client_load_calendar (summary->client, calfile);
-	if (!result) {
-		g_warning ("%s: Could not load %s", __FUNCTION__, calfile);
-		return "";
-	}
-	
-	gtk_signal_connect (GTK_OBJECT (summary->client), "cal_loaded",
-			    GTK_SIGNAL_FUNC (cal_loaded), summary);
-	
-	return g_strdup (" ");
-}
diff --git a/calendar/gui/calendar-summary.h b/calendar/gui/calendar-summary.h
deleted file mode 100644
index 8e21262db3..0000000000
--- a/calendar/gui/calendar-summary.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* calendar-summary.c
- *
- * Authors: Iain Holmes <iain@helixcode.com>
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef CALENDAR_SUMMARY_H
-#define CALENDAR_SUMMARY_H
-
-char * create_summary_view (ExecutiveSummaryComponent *component,
-			    char **title,
-			    char **icon,
-			    void *closure);
-
-#endif
diff --git a/calendar/gui/check-filled.xpm b/calendar/gui/check-filled.xpm
deleted file mode 100644
index c0468fc25b..0000000000
--- a/calendar/gui/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/calendar/gui/component-factory.c b/calendar/gui/component-factory.c
deleted file mode 100644
index b30bae6a02..0000000000
--- a/calendar/gui/component-factory.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#include <config.h>
-#include <bonobo.h>
-#include "evolution-shell-component.h"
-#ifdef WANT_THE_EXECUTIVE_SUMMARY
-#include <executive-summary/evolution-services/executive-summary-component.h>
-#endif
-#include "component-factory.h"
-#include "control-factory.h"
-#include "calendar-config.h"
-#if WANT_THE_EXECUTIVE_SUMMARY
-#include "calendar-summary.h"
-#endif
-
-
-#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"
-#define SUMMARY_FACTORY_ID "OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"
-
-static BonoboGenericFactory *factory = NULL;
-static BonoboGenericFactory *summary_factory = NULL;
-char *evolution_dir;
-
-static const EvolutionShellComponentFolderType folder_types[] = {
-	{ "calendar", "evolution-calendar.png" },
-	{ NULL, NULL }
-};
-
-
-/* EvolutionShellComponent methods and signals.  */
-
-static EvolutionShellComponentResult
-create_view (EvolutionShellComponent *shell_component,
-	     const char *physical_uri,
-	     const char *type,
-	     BonoboControl **control_return,
-	     void *closure)
-{
-	BonoboControl *control;
-
-	if (g_strcasecmp (type, "calendar") != 0)
-		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
-
-	control = control_factory_new_control ();
-	bonobo_control_set_property (control, "folder_uri", physical_uri, NULL);
-
-	*control_return = control;
-
-	return EVOLUTION_SHELL_COMPONENT_OK;
-}
-
-static gint owner_count = 0;
-
-static void
-owner_set_cb (EvolutionShellComponent *shell_component,
-	      EvolutionShellClient *shell_client,
-	      const char *evolution_homedir,
-	      gpointer user_data)
-{
-	evolution_dir = g_strdup (evolution_homedir);
-	calendar_config_init ();
-	owner_count ++;
-}
-
-static void
-owner_unset_cb (EvolutionShellComponent *shell_component,
-		gpointer user_data)
-{
-	owner_count --;
-	if (owner_count <= 0)
-		gtk_main_quit();
-}
-
-
-/* The factory function.  */
-
-static BonoboObject *
-factory_fn (BonoboGenericFactory *factory,
-	    void *closure)
-{
-	EvolutionShellComponent *shell_component;
-
-	shell_component = evolution_shell_component_new (folder_types, create_view, NULL, NULL, NULL, NULL);
-
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
-
-	return BONOBO_OBJECT (shell_component);
-}
-
-#ifdef WANT_THE_EXECUTIVE_SUMMARY
-static BonoboObject *
-summary_fn (BonoboGenericFactory *factory, 
-	    void *closure)
-{
-	ExecutiveSummaryComponent *summary_component;
-
-	summary_component = executive_summary_component_new (NULL,
-							     create_summary_view,
-							     NULL,
-							     evolution_dir);
-	return BONOBO_OBJECT (summary_component);
-}
-#endif
-
-
-void
-component_factory_init (void)
-{
-	if (factory != NULL && factory != NULL)
-		return;
-
-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);
-
-#ifdef WANT_THE_EXECUTIVE_SUMMARY
-	summary_factory = bonobo_generic_factory_new (SUMMARY_FACTORY_ID, summary_fn, NULL);
-#endif
-	if (factory == NULL)
-		g_error ("Cannot initialize Evolution's calendar component.");
-
-#ifdef WANT_THE_EXECUTIVE_SUMMARY
-	if (summary_factory == NULL)
-		g_error ("Cannot initialize Evolution's calendar summary component.");
-#endif
-}
diff --git a/calendar/gui/component-factory.h b/calendar/gui/component-factory.h
deleted file mode 100644
index 8e5cd6605f..0000000000
--- a/calendar/gui/component-factory.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* component-factory.h
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifndef _COMPONENT_FACTORY_H_
-#define _COMPONENT_FACTORY_H_
-
-extern char *evolution_dir;
-
-void  component_factory_init  (void);
-
-#endif /* _COMPONENT_FACTORY_H_ */
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c
deleted file mode 100644
index 104eb3a4c9..0000000000
--- a/calendar/gui/control-factory.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* control-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include <bonobo.h>
-#include <bonobo/bonobo-control.h>
-#include <glade/glade.h>
-
-#include <liboaf/liboaf.h>
-
-#include <cal-util/timeutil.h>
-#include <gui/alarm.h>
-#include <gui/gnome-cal.h>
-#include <gui/calendar-commands.h>
-
-#include "control-factory.h"
-
-#define PROPERTY_CALENDAR_URI "folder_uri"
-
-#define PROPERTY_CALENDAR_URI_IDX 1
-
-#define CONTROL_FACTORY_ID   "OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"
-
-
-CORBA_Environment ev;
-CORBA_ORB orb;
-
-
-static void
-control_activate_cb (BonoboControl *control,
-		     gboolean activate,
-		     gpointer user_data)
-{
-	if (activate)
-		calendar_control_activate (control, user_data);
-	else
-		calendar_control_deactivate (control);
-}
-
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  gpointer           user_data)
-{
-	/*GnomeCalendar *gcal = user_data;*/
-
-	switch (arg_id) {
-
-	case PROPERTY_CALENDAR_URI_IDX:
-		/*
-		if (fb && fb->uri)
-			BONOBO_ARG_SET_STRING (arg, fb->uri);
-		else
-			BONOBO_ARG_SET_STRING (arg, "");
-		*/
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-	}
-}
-
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg   *arg,
-	  guint              arg_id,
-	  gpointer           user_data)
-{
-	GnomeCalendar *gcal = user_data;
-	char *filename;
-
-	switch (arg_id) {
-
-	case PROPERTY_CALENDAR_URI_IDX:
-		printf ("set_prop: '%s'\n", BONOBO_ARG_GET_STRING (arg));
-		filename = g_strdup_printf ("%s/calendar.ics",
-					    BONOBO_ARG_GET_STRING (arg));
-		calendar_set_uri (gcal, filename);
-		g_free (filename);
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-
-static void
-calendar_properties_init (GnomeCalendar *gcal, BonoboControl *control)
-{
-	BonoboPropertyBag *pbag;
-
-	pbag = bonobo_property_bag_new (get_prop, set_prop, gcal);
-
-	bonobo_property_bag_add (pbag,
-				 PROPERTY_CALENDAR_URI,
-				 PROPERTY_CALENDAR_URI_IDX,
-				 BONOBO_ARG_STRING,
-				 NULL,
-				 _("The URI that the calendar will display"),
-				 0);
-
-	bonobo_control_set_property_bag (control, pbag);
-}
-
-/* Callback factory function for calendar controls */
-static BonoboObject *
-control_factory_fn (BonoboGenericFactory *Factory, void *data)
-{
-	BonoboControl *control;
-
-	control = control_factory_new_control ();
-
-	if (control)
-		return BONOBO_OBJECT (control);
-	else
-		return NULL;
-}
-
-
-void
-control_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	puts ("XXXXXX - initializing calendar factory!!!");
-
-	factory = bonobo_generic_factory_new (CONTROL_FACTORY_ID, control_factory_fn, NULL);
-
-	if (factory == NULL)
-		g_error ("I could not register a Calendar control factory.");
-}
-
-
-BonoboControl *
-control_factory_new_control (void)
-{
-	BonoboControl *control;
-	GnomeCalendar *gcal;
-
-	gcal = new_calendar (full_name, NULL, 0);
-	gtk_widget_show (GTK_WIDGET (gcal));
-
-	control = bonobo_control_new (GTK_WIDGET (gcal));
-	if (!control) {
-		g_message ("control_factory_fn(): could not create the control!");
-		return NULL;
-	}
-
-	calendar_properties_init (gcal, control);
-
-	gtk_signal_connect (GTK_OBJECT (control), "activate",
-			    GTK_SIGNAL_FUNC (control_activate_cb), gcal);
-
-	return control;
-}
diff --git a/calendar/gui/control-factory.h b/calendar/gui/control-factory.h
deleted file mode 100644
index bacd2d3d90..0000000000
--- a/calendar/gui/control-factory.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* control-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Federico Mena Quintero
- */
-
-#ifndef _CONTROL_FACTORY_H_
-#define _CONTROL_FACTORY_H_
-
-void           control_factory_init         (void);
-BonoboControl *control_factory_new_control  (void);
-
-#endif /* _CONTROL_FACTORY_H_ */
diff --git a/calendar/gui/dayview.xpm b/calendar/gui/dayview.xpm
deleted file mode 100644
index dbabb24c5c..0000000000
--- a/calendar/gui/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/calendar/gui/dialogs/.cvsignore b/calendar/gui/dialogs/.cvsignore
deleted file mode 100644
index e995588475..0000000000
--- a/calendar/gui/dialogs/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.deps
-Makefile
-Makefile.in
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
deleted file mode 100644
index 98c8be9f97..0000000000
--- a/calendar/gui/dialogs/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-gladedir = $(datadir)/evolution/glade
-
-INCLUDES = 						\
-	-DG_LOG_DOMAIN=\"calendar-gui\"			\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
-	-I$(includedir)					\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-
-noinst_LIBRARIES = libcal-dialogs.a
-
-libcal_dialogs_a_SOURCES =	\
-	alarm-notify-dialog.c	\
-	alarm-notify-dialog.h	\
-	cal-prefs-dialog.c	\
-	cal-prefs-dialog.h	\
-	task-editor.c		\
-	task-editor.h
-
-glade_DATA =			\
-	alarm-notify.glade	\
-	cal-prefs-dialog.glade	\
-	task-editor-dialog.glade
-
-glade_messages =			\
-	alarm-notify.glade.h		\
-	cal-prefs-dialog.glade.h	\
-	task-editor-dialog.glade.h
-
-EXTRA_DIST =			\
-	$(glade_DATA)		\
-	$(glade_messages)
diff --git a/calendar/gui/dialogs/alarm-notify-dialog.c b/calendar/gui/dialogs/alarm-notify-dialog.c
deleted file mode 100644
index 7d8357599c..0000000000
--- a/calendar/gui/dialogs/alarm-notify-dialog.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include "alarm-notify-dialog.h"
-
-
-
-/* The useful contents of the alarm notify dialog */
-typedef struct {
-	GladeXML *xml;
-
-	GtkWidget *dialog;
-	GtkWidget *close;
-	GtkWidget *snooze;
-	GtkWidget *edit;
-	GtkWidget *heading;
-	GtkWidget *summary;
-	GtkWidget *snooze_time;
-
-	AlarmNotifyFunc func;
-	gpointer func_data;
-} AlarmNotify;
-
-
-
-/* Callback used when the notify dialog is destroyed */
-static void
-dialog_destroy_cb (GtkObject *object, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	gtk_object_unref (GTK_OBJECT (an->xml));
-	g_free (an);
-}
-
-/* Delete_event handler for the alarm notify dialog */
-static gint
-delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (widget);
-	return TRUE;
-}
-
-/* Callback for the close button */
-static void
-close_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_CLOSE, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the snooze button */
-static void
-snooze_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-	int snooze_time;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	snooze_time = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (an->snooze_time));
-	(* an->func) (ALARM_NOTIFY_SNOOZE, snooze_time, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/* Callback for the edit button */
-static void
-edit_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	AlarmNotify *an;
-
-	an = data;
-	g_assert (an->func != NULL);
-
-	(* an->func) (ALARM_NOTIFY_EDIT, -1, an->func_data);
-
-	gtk_widget_destroy (an->dialog);
-}
-
-/**
- * alarm_notify_dialog:
- * @trigger: Trigger time for the alarm.
- * @occur: Occurrence time for the event.
- * @comp: Calendar component object which corresponds to the alarm.
- * @func: Function to be called when a dialog action is invoked.
- * @func_data: Closure data for @func.
- * 
- * Runs the alarm notification dialog.  The specified @func will be used to
- * notify the client about result of the actions in the dialog.
- * 
- * Return value: TRUE on success, FALSE if the dialog could not be created.
- **/
-gboolean
-alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp,
-		     AlarmNotifyFunc func, gpointer func_data)
-{
-	AlarmNotify *an;
-	char buf[256];
-	struct tm tm_trigger;
-	struct tm tm_occur;
-	CalComponentText summary;
-
-	g_return_val_if_fail (trigger != -1, FALSE);
-	g_return_val_if_fail (occur != -1, FALSE);
-	g_return_val_if_fail (comp != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);
-	g_return_val_if_fail (func != NULL, FALSE);
-
-	an = g_new0 (AlarmNotify, 1);
-
-	an->func = func;
-	an->func_data = func_data;
-
-	an->xml = glade_xml_new (EVOLUTION_GLADEDIR "/alarm-notify.glade", NULL);
-	if (!an->xml) {
-		g_message ("alarm_notify_dialog(): Could not load the Glade XML file!");
-		g_free (an);
-		return FALSE;
-	}
-
-	an->dialog = glade_xml_get_widget (an->xml, "alarm-notify");
-	an->close = glade_xml_get_widget (an->xml, "close");
-	an->snooze = glade_xml_get_widget (an->xml, "snooze");
-	an->edit = glade_xml_get_widget (an->xml, "edit");
-	an->heading = glade_xml_get_widget (an->xml, "heading");
-	an->summary = glade_xml_get_widget (an->xml, "summary");
-	an->snooze_time = glade_xml_get_widget (an->xml, "snooze-time");
-
-	if (!(an->dialog && an->close && an->snooze && an->edit && an->heading && an->summary
-	      && an->snooze_time)) {
-		g_message ("alarm_notify_dialog(): Could not find all widgets in Glade file!");
-		gtk_object_unref (GTK_OBJECT (an->xml));
-		g_free (an);
-		return FALSE;
-	}
-
-	gtk_object_set_data (GTK_OBJECT (an->dialog), "alarm-notify", an);
-	gtk_signal_connect (GTK_OBJECT (an->dialog), "destroy",
-			    GTK_SIGNAL_FUNC (dialog_destroy_cb), an);
-
-	/* Title */
-
-	/* FIXME: use am_pm_flag or 24-hour time */
-
-	tm_trigger = *localtime (&trigger);
-	strftime (buf, sizeof (buf), _("Alarm on %A %b %d %Y %H:%M"), &tm_trigger);
-	gtk_window_set_title (GTK_WINDOW (an->dialog), buf);
-
-	/* Heading */
-
-	tm_occur = *localtime (&occur);
-	strftime (buf, sizeof (buf),
-		  _("Notification about your appointment on %A %b %d %Y %H:%M"),
-		  &tm_occur);
-	gtk_label_set_text (GTK_LABEL (an->heading), buf);
-
-	/* Summary */
-
-	cal_component_get_summary (comp, &summary);
-
-	if (summary.value)
-		gtk_label_set_text (GTK_LABEL (an->summary), summary.value);
-	else
-		gtk_label_set_text (GTK_LABEL (an->summary), _("No summary available."));
-
-	/* Connect actions */
-
-	gtk_signal_connect (GTK_OBJECT (an->dialog), "delete_event",
-			    GTK_SIGNAL_FUNC (delete_event_cb),
-			    an);
-			    
-	gtk_signal_connect (GTK_OBJECT (an->close), "clicked",
-			    GTK_SIGNAL_FUNC (close_clicked_cb),
-			    an);
-
-	gtk_signal_connect (GTK_OBJECT (an->snooze), "clicked",
-			    GTK_SIGNAL_FUNC (snooze_clicked_cb),
-			    an);
-
-	gtk_signal_connect (GTK_OBJECT (an->edit), "clicked",
-			    GTK_SIGNAL_FUNC (edit_clicked_cb),
-			    an);
-
-	/* Run! */
-
-	gtk_widget_show (an->dialog);
-	return TRUE;
-}
diff --git a/calendar/gui/dialogs/alarm-notify-dialog.h b/calendar/gui/dialogs/alarm-notify-dialog.h
deleted file mode 100644
index 1e56f1c586..0000000000
--- a/calendar/gui/dialogs/alarm-notify-dialog.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Evolution calendar - alarm notification dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef ALARM_NOTIFY_DIALOG_H
-#define ALARM_NOTIFY_DIALOG_H
-
-#include <time.h>
-#include <glib.h>
-#include <cal-util/cal-component.h>
-
-
-
-typedef enum {
-	ALARM_NOTIFY_CLOSE,
-	ALARM_NOTIFY_SNOOZE,
-	ALARM_NOTIFY_EDIT
-} AlarmNotifyResult;
-
-typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, int snooze_mins, gpointer data);
-
-gboolean alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp,
-			      AlarmNotifyFunc func, gpointer func_data);
-
-
-
-#endif
diff --git a/calendar/gui/dialogs/alarm-notify.glade b/calendar/gui/dialogs/alarm-notify.glade
deleted file mode 100644
index 32d7e03f8b..0000000000
--- a/calendar/gui/dialogs/alarm-notify.glade
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>Evolution Calendar</name>
-  <program_name>evolution-calendar</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <use_widget_names>False</use_widget_names>
-  <output_main_file>True</output_main_file>
-  <output_support_files>True</output_support_files>
-  <output_build_files>True</output_build_files>
-  <backup_source_files>True</backup_source_files>
-  <main_source_file>interface.c</main_source_file>
-  <main_header_file>interface.h</main_header_file>
-  <handler_source_file>callbacks.c</handler_source_file>
-  <handler_header_file>callbacks.h</handler_header_file>
-  <support_source_file>support.c</support_source_file>
-  <support_header_file>support.h</support_header_file>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>alarm-notify.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>alarm-notify</name>
-  <cxx_use_heap>True</cxx_use_heap>
-  <title></title>
-  <type>GTK_WINDOW_DIALOG</type>
-  <position>GTK_WIN_POS_CENTER</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkVBox</class>
-    <name>vbox2</name>
-    <border_width>4</border_width>
-    <cxx_use_heap>True</cxx_use_heap>
-    <homogeneous>False</homogeneous>
-    <spacing>4</spacing>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox3</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <homogeneous>False</homogeneous>
-      <spacing>8</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox5</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>heading</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>summary</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <label></label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
-	  <wrap>True</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox4</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>close</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Close</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>snooze</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Snooze</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>edit</name>
-	  <cxx_use_heap>True</cxx_use_heap>
-	  <can_focus>True</can_focus>
-	  <label>Edit appointment</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHSeparator</class>
-      <name>hseparator1</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox4</name>
-      <cxx_use_heap>True</cxx_use_heap>
-      <homogeneous>False</homogeneous>
-      <spacing>4</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label4</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<label>Snooze time (minutes)</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkSpinButton</class>
-	<name>snooze-time</name>
-	<cxx_use_heap>True</cxx_use_heap>
-	<can_focus>True</can_focus>
-	<climb_rate>1</climb_rate>
-	<digits>0</digits>
-	<numeric>False</numeric>
-	<update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	<snap>False</snap>
-	<wrap>False</wrap>
-	<value>5</value>
-	<lower>1</lower>
-	<upper>1440</upper>
-	<step>1</step>
-	<page>5</page>
-	<page_size>5</page_size>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/alarm-notify.glade.h b/calendar/gui/dialogs/alarm-notify.glade.h
deleted file mode 100644
index c7b8918e06..0000000000
--- a/calendar/gui/dialogs/alarm-notify.glade.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Close");
-gchar *s = N_("Snooze");
-gchar *s = N_("Edit appointment");
-gchar *s = N_("Snooze time (minutes)");
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
deleted file mode 100644
index 9a50db60b6..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ /dev/null
@@ -1,464 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * CalPrefsDialog - a GtkObject which handles a libglade-loaded dialog
- * to edit the calendar preference settings.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include <gal/util/e-util.h>
-#include <e-util/e-dialog-widgets.h>
-#include <widgets/misc/e-dateedit.h>
-#include "cal-prefs-dialog.h"
-#include "../calendar-config.h"
-#include "../calendar-commands.h"
-
-
-typedef struct {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	GtkWidget *dialog;
-
-	GtkWidget *working_days[7];
-	GtkWidget *week_start_day;
-	GtkWidget *start_of_day;
-	GtkWidget *end_of_day;
-	GtkWidget *use_12_hour;
-	GtkWidget *use_24_hour;
-	GtkWidget *time_divisions;
-	GtkWidget *show_end_times;
-	GtkWidget *compress_weekend;
-	GtkWidget *dnav_show_week_no;
-} CalPrefsDialogPrivate;
-
-static const int week_start_day_map[] = {
-	1, 2, 3, 4, 5, 6, 0, -1
-};
-
-static const int time_division_map[] = {
-	60, 30, 15, 10, 5, -1
-};
-
-static void cal_prefs_dialog_class_init		(CalPrefsDialogClass *class);
-static void cal_prefs_dialog_init		(CalPrefsDialog	     *prefs);
-static gboolean get_widgets			(CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_destroy		(GtkObject	     *object);
-static void cal_prefs_dialog_init_widgets	(CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_button_clicked	(GtkWidget	     *dialog,
-						 gint		      button,
-						 CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_use_24_hour_toggled(GtkWidget	     *button,
-						 CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_show_config	(CalPrefsDialog	     *prefs);
-static void cal_prefs_dialog_update_config	(CalPrefsDialog	     *prefs);
-
-GtkWidget*  cal_prefs_dialog_create_time_edit	(void);
-
-static GtkObjectClass *parent_class;
-
-E_MAKE_TYPE (cal_prefs_dialog, "CalPrefsDialog", CalPrefsDialog,
-	     cal_prefs_dialog_class_init, cal_prefs_dialog_init,
-	     GTK_TYPE_OBJECT)
-
-
-static void
-cal_prefs_dialog_class_init (CalPrefsDialogClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	object_class->destroy = cal_prefs_dialog_destroy;
-}
-
-
-static void
-cal_prefs_dialog_init (CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	priv = g_new0 (CalPrefsDialogPrivate, 1);
-	prefs->priv = priv;
-
-}
-
-
-/**
- * cal_prefs_dialog_new:
- * @Returns: a new #CalPrefsDialog.
- *
- * Creates a new #CalPrefsDialog.
- **/
-CalPrefsDialog *
-cal_prefs_dialog_new (void)
-{
-	CalPrefsDialog *prefs;
-
-	prefs = CAL_PREFS_DIALOG (gtk_type_new (cal_prefs_dialog_get_type ()));
-	return cal_prefs_dialog_construct (prefs);
-}
-
-
-/**
- * cal_prefs_dialog_construct:
- * @prefs: A #CalPrefsDialog.
- * 
- * Constructs a task editor by loading its Glade XML file.
- * 
- * Return value: The same object as @prefs, or NULL if the widgets could not be
- * created.  In the latter case, the task editor will automatically be
- * destroyed.
- **/
-CalPrefsDialog *
-cal_prefs_dialog_construct (CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	g_return_val_if_fail (IS_CAL_PREFS_DIALOG (prefs), NULL);
-
-	priv = prefs->priv;
-
-	/* Load the content widgets */
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/cal-prefs-dialog.glade", NULL);
-	if (!priv->xml) {
-		g_message ("cal_prefs_dialog_construct(): Could not load the Glade XML file!");
-		goto error;
-	}
-
-	if (!get_widgets (prefs)) {
-		g_message ("cal_prefs_dialog_construct(): Could not find all widgets in the XML file!");
-		goto error;
-	}
-
-	cal_prefs_dialog_init_widgets (prefs);
-
-	cal_prefs_dialog_show_config (prefs);
-
-	gtk_widget_show (priv->dialog);
-
-	return prefs;
-
- error:
-
-	gtk_object_unref (GTK_OBJECT (prefs));
-	return NULL;
-}
-
-
-/* Gets the widgets from the XML file and returns if they are all available.
- */
-static gboolean
-get_widgets (CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	priv = prefs->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->dialog = GW ("cal-prefs-dialog");
-
-	/* The indices must match the mktime() values. */
-	priv->working_days[0] = GW ("sun_button");
-	priv->working_days[1] = GW ("mon_button");
-	priv->working_days[2] = GW ("tue_button");
-	priv->working_days[3] = GW ("wed_button");
-	priv->working_days[4] = GW ("thu_button");
-	priv->working_days[5] = GW ("fri_button");
-	priv->working_days[6] = GW ("sat_button");
-
-	priv->week_start_day = GW ("first_day_of_week");
-	priv->start_of_day = GW ("start_of_day");
-	priv->end_of_day = GW ("end_of_day");
-	priv->use_12_hour = GW ("use_12_hour");
-	priv->use_24_hour = GW ("use_24_hour");
-	priv->time_divisions = GW ("time_divisions");
-	priv->show_end_times = GW ("show_end_times");
-	priv->compress_weekend = GW ("compress_weekend");
-	priv->dnav_show_week_no = GW ("dnav_show_week_no");
-
-#undef GW
-
-	return (priv->dialog
-		&& priv->working_days[0]
-		&& priv->working_days[1]
-		&& priv->working_days[2]
-		&& priv->working_days[3]
-		&& priv->working_days[4]
-		&& priv->working_days[5]
-		&& priv->working_days[6]
-		&& priv->week_start_day
-		&& priv->start_of_day
-		&& priv->end_of_day
-		&& priv->use_12_hour
-		&& priv->use_24_hour
-		&& priv->time_divisions
-		&& priv->show_end_times
-		&& priv->compress_weekend
-		&& priv->dnav_show_week_no);
-}
-
-
-static void
-cal_prefs_dialog_destroy (GtkObject *object)
-{
-	CalPrefsDialog *prefs;
-	CalPrefsDialogPrivate *priv;
-
-	g_return_if_fail (IS_CAL_PREFS_DIALOG (object));
-
-	prefs = CAL_PREFS_DIALOG (object);
-	priv = prefs->priv;
-
-
-	g_free (priv);
-	prefs->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-/* Called by libglade to create our custom EDateEdit widgets. */
-GtkWidget *
-cal_prefs_dialog_create_time_edit (void)
-{
-	GtkWidget *dedit;
-
-	dedit = e_date_edit_new ();
-
-	e_date_edit_set_time_popup_range (E_DATE_EDIT (dedit), 0, 24);
-	e_date_edit_set_show_date (E_DATE_EDIT (dedit), FALSE);
-
-	return dedit;
-}
-
-
-void
-cal_prefs_dialog_show		(CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	g_return_if_fail (IS_CAL_PREFS_DIALOG (prefs));
-
-	priv = prefs->priv;
-
-	/* If the dialog is already show just raise it, otherwise refresh the
-	   config settings and show it. */
-	if (GTK_WIDGET_MAPPED (priv->dialog)) {
-		gdk_window_raise (priv->dialog->window);
-	} else {
-		cal_prefs_dialog_show_config (prefs);
-		gtk_widget_show (priv->dialog);
-	}
-}
-
-
-/* Connects any necessary signal handlers. */
-static void
-cal_prefs_dialog_init_widgets	(CalPrefsDialog	*prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	priv = prefs->priv;
-
-	gtk_signal_connect (GTK_OBJECT (priv->dialog), "clicked",
-			    GTK_SIGNAL_FUNC (cal_prefs_dialog_button_clicked),
-			    prefs);
-
-	gtk_signal_connect (GTK_OBJECT (priv->use_24_hour), "toggled",
-			    GTK_SIGNAL_FUNC (cal_prefs_dialog_use_24_hour_toggled),
-			    prefs);
-}
-
-
-static void
-cal_prefs_dialog_button_clicked	(GtkWidget	*dialog,
-				 gint		 button,
-				 CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-
-	g_return_if_fail (IS_CAL_PREFS_DIALOG (prefs));
-
-	priv = prefs->priv;
-
-	/* OK & Apply buttons update the config settings. */
-	if (button == 0 || button == 1)
-		cal_prefs_dialog_update_config	(prefs);
-
-	/* OK & Close buttons close the dialog. */
-	if (button == 0 || button == 2)
-		gtk_widget_hide (priv->dialog);
-}
-
-
-static void
-cal_prefs_dialog_use_24_hour_toggled	(GtkWidget	*button,
-					 CalPrefsDialog *prefs)
-{
-	CalPrefsDialogPrivate *priv;
-	gboolean use_24_hour;
-
-	priv = prefs->priv;
-
-	g_print ("In cal_prefs_dialog_use_24_hour_toggled\n");
-
-	use_24_hour = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->use_24_hour));
-
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (priv->start_of_day),
-					    use_24_hour);
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (priv->end_of_day),
-					    use_24_hour);
-}
-
-
-/* Shows the current config settings in the dialog. */
-static void
-cal_prefs_dialog_show_config	(CalPrefsDialog	*prefs)
-{
-	CalPrefsDialogPrivate *priv;
-	CalWeekdays working_days;
-	gint mask, day, week_start_day, time_divisions;
-
-	priv = prefs->priv;
-
-	/* Working Days. */
-	working_days = calendar_config_get_working_days ();
-	mask = 1 << 0;
-	for (day = 0; day < 7; day++) {
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->working_days[day]), (working_days & mask) ? TRUE : FALSE);
-		mask <<= 1;
-	}
-
-	/* Week Start Day. */
-	week_start_day = calendar_config_get_week_start_day ();
-	e_dialog_option_menu_set (priv->week_start_day, week_start_day,
-				  week_start_day_map);
-
-	/* Start of Day. */
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->start_of_day),
-				     calendar_config_get_day_start_hour (),
-				     calendar_config_get_day_start_minute ());
-
-	/* End of Day. */
-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv->end_of_day),
-				     calendar_config_get_day_end_hour (),
-				     calendar_config_get_day_end_minute ());
-
-	/* 12/24 Hour Format. */
-	if (calendar_config_get_24_hour_format ())
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->use_24_hour), TRUE);
-	else
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->use_12_hour), TRUE);
-
-	/* Time Divisions. */
-	time_divisions = calendar_config_get_time_divisions ();
-	e_dialog_option_menu_set (priv->time_divisions, time_divisions,
-				  time_division_map);
-
-	/* Show Appointment End Times. */
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->show_end_times),
-				      calendar_config_get_show_event_end ());
-
-	/* Compress Weekend. */
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->compress_weekend), calendar_config_get_compress_weekend ());
-
-	/* Date Navigator - Show Week Numbers. */
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->dnav_show_week_no), calendar_config_get_dnav_show_week_no ());
-}
-
-
-/* Updates the config values based on the settings in the dialog. */
-static void
-cal_prefs_dialog_update_config	(CalPrefsDialog	*prefs)
-{
-	CalPrefsDialogPrivate *priv;
-	CalWeekdays working_days;
-	gint mask, day, week_start_day, time_divisions, hour, minute;
-
-	priv = prefs->priv;
-
-	/* Working Days. */
-	working_days = 0;
-	mask = 1 << 0;
-	for (day = 0; day < 7; day++) {
-		if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->working_days[day])))
-			working_days |= mask;
-		mask <<= 1;
-	}
-	calendar_config_set_working_days (working_days);
-
-	/* Week Start Day. */
-	week_start_day = e_dialog_option_menu_get (priv->week_start_day,
-						   week_start_day_map);
-	calendar_config_set_week_start_day (week_start_day);
-
-	/* Start of Day. */
-	if (e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_of_day),
-					 &hour, &minute)) {
-		calendar_config_set_day_start_hour (hour);
-		calendar_config_set_day_start_minute (minute);
-	} else {
-		/* FIXME: Show error dialog? */
-		g_warning ("Couldn't parse start of day");
-	}
-
-	/* End of Day. */
-	if (e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_of_day),
-					 &hour, &minute)) {
-		calendar_config_set_day_end_hour (hour);
-		calendar_config_set_day_end_minute (minute);
-	} else {
-		/* FIXME: Show error dialog? */
-		g_warning ("Couldn't parse end of day");
-	}
-
-	/* 12/24 Hour Format. */
-	calendar_config_set_24_hour_format (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->use_24_hour)));
-
-	/* Time Divisions. */
-	time_divisions = e_dialog_option_menu_get (priv->time_divisions,
-						   time_division_map);
-	calendar_config_set_time_divisions (time_divisions);
-
-	/* Show Appointment End Times. */
-	calendar_config_set_show_event_end (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->show_end_times)));
-
-	/* Compress Weekend. */
-	calendar_config_set_compress_weekend (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->compress_weekend)));
-
-	/* Date Navigator - Show Week Numbers. */
-	calendar_config_set_dnav_show_week_no (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->dnav_show_week_no)));
-
-	calendar_config_write ();
-	update_all_config_settings ();
-}
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade
deleted file mode 100644
index c0e225764b..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade
+++ /dev/null
@@ -1,1243 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>preferences</name>
-  <program_name>preferences</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>cal-prefs-dialog.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>cal-prefs-dialog</name>
-  <title>Calendar Preferences</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>False</allow_grow>
-  <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>True</hide_on_close>
-
-  <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
-    <child>
-      <padding>4</padding>
-      <expand>True</expand>
-      <fill>True</fill>
-    </child>
-
-    <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>hbuttonbox1</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button1</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkNotebook</class>
-      <name>notebook1</name>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox8</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame9</name>
-	  <label>Work week</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox9</name>
-	    <border_width>4</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>3</spacing>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox8</name>
-	      <homogeneous>True</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>mon_button</name>
-		<can_focus>True</can_focus>
-		<label>Mon</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>tue_button</name>
-		<can_focus>True</can_focus>
-		<label>Tue</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>wed_button</name>
-		<can_focus>True</can_focus>
-		<label>Wed</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>thu_button</name>
-		<can_focus>True</can_focus>
-		<label>Thu</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>fri_button</name>
-		<can_focus>True</can_focus>
-		<label>Fri</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>sat_button</name>
-		<can_focus>True</can_focus>
-		<label>Sat</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>sun_button</name>
-		<can_focus>True</can_focus>
-		<label>Sun</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox9</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>4</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label16</name>
-		<label>First day of week:</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkOptionMenu</class>
-		<name>first_day_of_week</name>
-		<can_focus>True</can_focus>
-		<items>Monday
-Tuesday
-Wednesday
-Thursday
-Friday
-Saturday
-Sunday
-</items>
-		<initial_choice>0</initial_choice>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox11</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>4</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label17</name>
-		<label>Start of day:</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>Custom</class>
-		<name>start_of_day</name>
-		<creation_function>cal_prefs_dialog_create_time_edit</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Tue, 10 Oct 2000 15:12:12 GMT</last_modification_time>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label18</name>
-		<label>End of day:</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>Custom</class>
-		<name>end_of_day</name>
-		<creation_function>cal_prefs_dialog_create_time_edit</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Tue, 10 Oct 2000 15:12:21 GMT</last_modification_time>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame10</name>
-	  <label>Display options</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table4</name>
-	    <border_width>4</border_width>
-	    <rows>4</rows>
-	    <columns>3</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>0</row_spacing>
-	    <column_spacing>4</column_spacing>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label19</name>
-	      <label>Time divisions:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>7.45058e-09</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label20</name>
-	      <label>Time format:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>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>GtkCheckButton</class>
-	      <name>show_end_times</name>
-	      <can_focus>True</can_focus>
-	      <label>Show appointment end times</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <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>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>compress_weekend</name>
-	      <can_focus>True</can_focus>
-	      <label>Compress weekends</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <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>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox10</name>
-	      <homogeneous>True</homogeneous>
-	      <spacing>4</spacing>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>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>
-		<class>GtkRadioButton</class>
-		<name>use_12_hour</name>
-		<can_focus>True</can_focus>
-		<label>12 hour (am/pm)</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>time_format_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>use_24_hour</name>
-		<can_focus>True</can_focus>
-		<label>24 hour</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>time_format_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment4</name>
-	      <xalign>7.45058e-09</xalign>
-	      <yalign>0.5</yalign>
-	      <xscale>0</xscale>
-	      <yscale>1</yscale>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkOptionMenu</class>
-		<name>time_divisions</name>
-		<can_focus>True</can_focus>
-		<items>60 minutes
-30 minutes
-15 minutes
-10 minutes
-05 minutes
-</items>
-		<initial_choice>0</initial_choice>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame11</name>
-	  <label>Date navigator options</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>dnav_show_week_no</name>
-	    <border_width>4</border_width>
-	    <can_focus>True</can_focus>
-	    <label>Show week numbers</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label7</name>
-	<label>Calendar</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox3</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox4</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkFrame</class>
-	    <name>frame3</name>
-	    <label>Show</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>vbox4</name>
-	      <border_width>4</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton1</name>
-		<can_focus>True</can_focus>
-		<label>Due Date</label>
-		<active>True</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton2</name>
-		<can_focus>True</can_focus>
-		<label>Time Until Due</label>
-		<active>True</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton3</name>
-		<can_focus>True</can_focus>
-		<label>Priority</label>
-		<active>True</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkFrame</class>
-	    <name>frame4</name>
-	    <label>Highlight</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>vbox5</name>
-	      <border_width>4</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton4</name>
-		<can_focus>True</can_focus>
-		<label>Overdue Items</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton5</name>
-		<can_focus>True</can_focus>
-		<label>Items Due Today</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton6</name>
-		<can_focus>True</can_focus>
-		<label>Items Not Yet Due</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame5</name>
-	  <label>Colors</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>table3</name>
-	    <border_width>4</border_width>
-	    <rows>3</rows>
-	    <columns>2</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>4</row_spacing>
-	    <column_spacing>4</column_spacing>
-
-	    <widget>
-	      <class>GnomeColorPicker</class>
-	      <name>colorpicker1</name>
-	      <can_focus>True</can_focus>
-	      <dither>True</dither>
-	      <use_alpha>False</use_alpha>
-	      <title>Pick a color</title>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GnomeColorPicker</class>
-	      <name>colorpicker2</name>
-	      <can_focus>True</can_focus>
-	      <dither>True</dither>
-	      <use_alpha>False</use_alpha>
-	      <title>Pick a color</title>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GnomeColorPicker</class>
-	      <name>colorpicker3</name>
-	      <can_focus>True</can_focus>
-	      <dither>True</dither>
-	      <use_alpha>False</use_alpha>
-	      <title>Pick a color</title>
-	      <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>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment1</name>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xscale>1</xscale>
-	      <yscale>1</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>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label8</name>
-		<label>Items Not Yet Due:</label>
-		<justify>GTK_JUSTIFY_RIGHT</justify>
-		<wrap>False</wrap>
-		<xalign>1</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment2</name>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xscale>1</xscale>
-	      <yscale>1</yscale>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label9</name>
-		<label>Items Due Today:</label>
-		<justify>GTK_JUSTIFY_RIGHT</justify>
-		<wrap>True</wrap>
-		<xalign>1</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment3</name>
-	      <xalign>1</xalign>
-	      <yalign>0.5</yalign>
-	      <xscale>1</xscale>
-	      <yscale>1</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>False</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>Overdue Items:</label>
-		<justify>GTK_JUSTIFY_RIGHT</justify>
-		<wrap>False</wrap>
-		<xalign>1</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label11</name>
-	<label>TaskPad</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox6</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame6</name>
-	  <border_width>4</border_width>
-	  <label>Defaults</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>4</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox5</name>
-	    <border_width>4</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-
-	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>checkbutton7</name>
-	      <border_width>2</border_width>
-	      <can_focus>True</can_focus>
-	      <label>Remind me of all appointments</label>
-	      <active>True</active>
-	      <draw_indicator>True</draw_indicator>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkSpinButton</class>
-	      <name>spinbutton1</name>
-	      <can_focus>True</can_focus>
-	      <climb_rate>1</climb_rate>
-	      <digits>0</digits>
-	      <numeric>False</numeric>
-	      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	      <snap>False</snap>
-	      <wrap>False</wrap>
-	      <value>1</value>
-	      <lower>0</lower>
-	      <upper>100</upper>
-	      <step>1</step>
-	      <page>10</page>
-	      <page_size>10</page_size>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label12</name>
-	      <label>minutes before they occur.</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>3</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame7</name>
-	  <border_width>4</border_width>
-	  <label>Visual Alarms</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>4</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>checkbutton8</name>
-	    <border_width>4</border_width>
-	    <can_focus>True</can_focus>
-	    <label>Beep when alarm windows appear.</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame8</name>
-	  <border_width>4</border_width>
-	  <label>Audio Alarms</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>4</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkVBox</class>
-	    <name>vbox7</name>
-	    <border_width>4</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>4</spacing>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox6</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton9</name>
-		<can_focus>True</can_focus>
-		<label>Alarms timeout after</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkSpinButton</class>
-		<name>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>5</value>
-		<lower>0</lower>
-		<upper>100</upper>
-		<step>1</step>
-		<page>10</page>
-		<page_size>10</page_size>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label13</name>
-		<label>seconds.</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkHBox</class>
-	      <name>hbox7</name>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>True</expand>
-		<fill>True</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkCheckButton</class>
-		<name>checkbutton10</name>
-		<can_focus>True</can_focus>
-		<label>Enable snoozing for</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkSpinButton</class>
-		<name>spinbutton3</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>600</value>
-		<lower>0</lower>
-		<upper>1000</upper>
-		<step>1</step>
-		<page>10</page>
-		<page_size>10</page_size>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<name>label14</name>
-		<label>seconds.</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label15</name>
-	<label>Reminders</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade.h b/calendar/gui/dialogs/cal-prefs-dialog.glade.h
deleted file mode 100644
index 0a29d11999..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("Calendar Preferences");
-gchar *s = N_("Work week");
-gchar *s = N_("Mon");
-gchar *s = N_("Tue");
-gchar *s = N_("Wed");
-gchar *s = N_("Thu");
-gchar *s = N_("Fri");
-gchar *s = N_("Sat");
-gchar *s = N_("Sun");
-gchar *s = N_("First day of week:");
-gchar *s = N_("Monday");
-gchar *s = N_("Tuesday");
-gchar *s = N_("Wednesday");
-gchar *s = N_("Thursday");
-gchar *s = N_("Friday");
-gchar *s = N_("Saturday");
-gchar *s = N_("Sunday");
-gchar *s = N_("Start of day:");
-gchar *s = N_("End of day:");
-gchar *s = N_("Display options");
-gchar *s = N_("Time divisions:");
-gchar *s = N_("Time format:");
-gchar *s = N_("Show appointment end times");
-gchar *s = N_("Compress weekends");
-gchar *s = N_("12 hour (am/pm)");
-gchar *s = N_("24 hour");
-gchar *s = N_("60 minutes");
-gchar *s = N_("30 minutes");
-gchar *s = N_("15 minutes");
-gchar *s = N_("10 minutes");
-gchar *s = N_("05 minutes");
-gchar *s = N_("Date navigator options");
-gchar *s = N_("Show week numbers");
-gchar *s = N_("Calendar");
-gchar *s = N_("Show");
-gchar *s = N_("Due Date");
-gchar *s = N_("Time Until Due");
-gchar *s = N_("Priority");
-gchar *s = N_("Highlight");
-gchar *s = N_("Overdue Items");
-gchar *s = N_("Items Due Today");
-gchar *s = N_("Items Not Yet Due");
-gchar *s = N_("Colors");
-gchar *s = N_("Pick a color");
-gchar *s = N_("Pick a color");
-gchar *s = N_("Pick a color");
-gchar *s = N_("Items Not Yet Due:");
-gchar *s = N_("Items Due Today:");
-gchar *s = N_("Overdue Items:");
-gchar *s = N_("TaskPad");
-gchar *s = N_("Defaults");
-gchar *s = N_("Remind me of all appointments");
-gchar *s = N_("minutes before they occur.");
-gchar *s = N_("Visual Alarms");
-gchar *s = N_("Beep when alarm windows appear.");
-gchar *s = N_("Audio Alarms");
-gchar *s = N_("Alarms timeout after");
-gchar *s = N_("seconds.");
-gchar *s = N_("Enable snoozing for");
-gchar *s = N_("seconds.");
-gchar *s = N_("Reminders");
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h
deleted file mode 100644
index 52f115e0ac..0000000000
--- a/calendar/gui/dialogs/cal-prefs-dialog.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * CalPrefsDialog - a GtkObject which handles a libglade-loaded dialog
- * to edit the calendar preference settings.
- */
-
-#ifndef _CAL_PREFS_DIALOG_H_
-#define _CAL_PREFS_DIALOG_H_
-
-#include <gtk/gtkobject.h>
-#include <libgnome/gnome-defs.h>
-
-BEGIN_GNOME_DECLS
-
-
-#define CAL_PREFS_DIALOG(obj)          GTK_CHECK_CAST (obj, cal_prefs_dialog_get_type (), CalPrefsDialog)
-#define CAL_PREFS_DIALOG_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, cal_prefs_dialog_get_type (), CalPrefsDialogClass)
-#define IS_CAL_PREFS_DIALOG(obj)       GTK_CHECK_TYPE (obj, cal_prefs_dialog_get_type ())
-
-
-typedef struct _CalPrefsDialog       CalPrefsDialog;
-typedef struct _CalPrefsDialogClass  CalPrefsDialogClass;
-
-struct _CalPrefsDialog
-{
-	GtkObject object;
-
-	/* Private data */
-	gpointer priv;
-};
-
-struct _CalPrefsDialogClass
-{
-	GtkObjectClass parent_class;
-};
-
-
-GtkType		cal_prefs_dialog_get_type	(void);
-CalPrefsDialog* cal_prefs_dialog_construct	(CalPrefsDialog *prefs);
-CalPrefsDialog* cal_prefs_dialog_new		(void);
-
-void		cal_prefs_dialog_show		(CalPrefsDialog *prefs);
-
-END_GNOME_DECLS
-
-#endif /* _CAL_PREFS_DIALOG_H_ */
diff --git a/calendar/gui/dialogs/task-editor-dialog.glade b/calendar/gui/dialogs/task-editor-dialog.glade
deleted file mode 100644
index bdde9ed091..0000000000
--- a/calendar/gui/dialogs/task-editor-dialog.glade
+++ /dev/null
@@ -1,706 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>task-editor-dialog</name>
-  <program_name>task-editor-dialog</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>task-editor-dialog.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeApp</class>
-  <name>task-editor-dialog</name>
-  <visible>False</visible>
-  <title>task-editor-dialog</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>notebook1</name>
-      <border_width>2</border_width>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox1</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table3</name>
-	  <rows>1</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>4</row_spacing>
-	  <column_spacing>4</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label3</name>
-	    <label>S_ummary</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>summary</default_focus_target>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>summary</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator1</name>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox4</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table1</name>
-	    <rows>2</rows>
-	    <columns>4</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>2</row_spacing>
-	    <column_spacing>4</column_spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label6</name>
-	      <label>Sta_rt Date:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label5</name>
-	      <label>_Due Date:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label9</name>
-	      <label>% Comp_lete:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <default_focus_target>percent-complete</default_focus_target>
-	      <child>
-		<left_attach>2</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkSpinButton</class>
-	      <name>percent-complete</name>
-	      <width>60</width>
-	      <can_focus>True</can_focus>
-	      <climb_rate>1</climb_rate>
-	      <digits>0</digits>
-	      <numeric>False</numeric>
-	      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	      <snap>False</snap>
-	      <wrap>False</wrap>
-	      <value>0</value>
-	      <lower>0</lower>
-	      <upper>100</upper>
-	      <step>10</step>
-	      <page>10</page>
-	      <page_size>10</page_size>
-	      <child>
-		<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>Custom</class>
-	      <name>due-date</name>
-	      <creation_function>task_editor_create_date_edit</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Sun, 10 Sep 2000 17:32:18 GMT</last_modification_time>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>start-date</name>
-	      <creation_function>task_editor_create_date_edit</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Sun, 10 Sep 2000 17:33:31 GMT</last_modification_time>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator2</name>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox3</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label7</name>
-	    <label>_Status:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>status</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>status</name>
-	    <can_focus>True</can_focus>
-	    <items>Not Started
-In Progress
-Completed
-Cancelled
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label8</name>
-	    <label>_Priority:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>priority</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>priority</name>
-	    <can_focus>True</can_focus>
-	    <items>High
-Normal
-Low
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label18</name>
-	    <label>C_lassification:</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>classification</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>classification</name>
-	    <can_focus>True</can_focus>
-	    <items>None
-Public
-Private
-Confidential
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow1</name>
-	  <height>150</height>
-	  <hscrollbar_policy>GTK_POLICY_NEVER</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>GtkText</class>
-	    <name>description</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox2</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>2</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button3</name>
-	    <can_focus>True</can_focus>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label16</name>
-	      <sensitive>False</sensitive>
-	      <label>_Contacts...</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>4</xpad>
-	      <ypad>0</ypad>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>contacts</name>
-	    <sensitive>False</sensitive>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button4</name>
-	    <can_focus>True</can_focus>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label17</name>
-	      <sensitive>False</sensitive>
-	      <label>Ca_tegories...</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>4</xpad>
-	      <ypad>0</ypad>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>categories</name>
-	    <sensitive>False</sensitive>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label1</name>
-	<label>Task</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>table4</name>
-	<border_width>4</border_width>
-	<rows>2</rows>
-	<columns>2</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>2</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label12</name>
-	  <label>Date Completed:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label14</name>
-	  <label>URL:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>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>url</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>completed-date</name>
-	  <creation_function>task_editor_create_date_edit</creation_function>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Sun, 10 Sep 2000 17:34:07 GMT</last_modification_time>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label2</name>
-	<label>Details</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/dialogs/task-editor-dialog.glade.h b/calendar/gui/dialogs/task-editor-dialog.glade.h
deleted file mode 100644
index 8ba4eea0a1..0000000000
--- a/calendar/gui/dialogs/task-editor-dialog.glade.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("task-editor-dialog");
-gchar *s = N_("S_ummary");
-gchar *s = N_("Sta_rt Date:");
-gchar *s = N_("_Due Date:");
-gchar *s = N_("% Comp_lete:");
-gchar *s = N_("_Status:");
-gchar *s = N_("Not Started");
-gchar *s = N_("In Progress");
-gchar *s = N_("Completed");
-gchar *s = N_("Cancelled");
-gchar *s = N_("_Priority:");
-gchar *s = N_("High");
-gchar *s = N_("Normal");
-gchar *s = N_("Low");
-gchar *s = N_("C_lassification:");
-gchar *s = N_("None");
-gchar *s = N_("Public");
-gchar *s = N_("Private");
-gchar *s = N_("Confidential");
-gchar *s = N_("_Contacts...");
-gchar *s = N_("Ca_tegories...");
-gchar *s = N_("Task");
-gchar *s = N_("Date Completed:");
-gchar *s = N_("URL:");
-gchar *s = N_("Details");
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
deleted file mode 100644
index d64db8ab6b..0000000000
--- a/calendar/gui/dialogs/task-editor.c
+++ /dev/null
@@ -1,1184 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * TaskEditor - a GtkObject which handles a libglade-loaded dialog to edit
- * tasks.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include <gal/util/e-util.h>
-#include <e-util/e-dialog-widgets.h>
-#include <widgets/misc/e-dateedit.h>
-#include <cal-util/timeutil.h>
-#include <cal-client/cal-client.h>
-#include "task-editor.h"
-
-
-typedef struct {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* UI handler */
-	BonoboUIComponent *uic;
-
-	/* Client to use */
-	CalClient *client;
-	
-	/* Calendar component we are editing; this is an internal copy and is
-	 * not one of the read-only objects from the parent calendar.
-	 */
-	CalComponent *comp;
-
-
-	/* This is TRUE while we are setting the widget values. We just return
-	   from any signal handlers. */
-	gboolean ignore_callbacks;
-
-	/* Widgets from the Glade file */
-
-	GtkWidget *app;
-
-	GtkWidget *summary;
-
-	GtkWidget *due_date;
-	GtkWidget *start_date;
-
-	GtkWidget *percent_complete;
-
-	GtkWidget *status;
-	GtkWidget *priority;
-	GtkWidget *classification;
-
-	GtkWidget *description;
-
-	GtkWidget *contacts;
-	GtkWidget *categories;
-
-	GtkWidget *completed_date;
-	GtkWidget *url;
-} TaskEditorPrivate;
-
-
-/* Note that these two arrays must match. */
-static const int status_map[] = {
-	ICAL_STATUS_NEEDSACTION,
-	ICAL_STATUS_INPROCESS,
-	ICAL_STATUS_COMPLETED,
-	ICAL_STATUS_CANCELLED,
-	-1
-};
-
-static const char* status_string_map[] = {
-	"NEEDS-ACTION",
-	"IN-PROCESS",
-	"COMPLETED",
-	"CANCELLED",
-	NULL
-};
-
-
-typedef enum {
-	PRIORITY_HIGH,
-	PRIORITY_NORMAL,
-	PRIORITY_LOW,
-	PRIORITY_UNDEFINED,
-} TaskEditorPriority;
-
-static const int priority_map[] = {
-	PRIORITY_HIGH,
-	PRIORITY_NORMAL,
-	PRIORITY_LOW,
-	PRIORITY_UNDEFINED,
-	-1
-};
-
-static const int classification_map[] = {
-	CAL_COMPONENT_CLASS_NONE,
-	CAL_COMPONENT_CLASS_PUBLIC,
-	CAL_COMPONENT_CLASS_PRIVATE,
-	CAL_COMPONENT_CLASS_CONFIDENTIAL,
-	-1
-};
-
-
-static void task_editor_class_init (TaskEditorClass *class);
-static void task_editor_init (TaskEditor *tedit);
-static gint app_delete_event_cb (GtkWidget *widget,
-				 GdkEvent *event,
-				 gpointer data);
-static void close_dialog (TaskEditor *tedit);
-static gboolean get_widgets (TaskEditor *tedit);
-static void init_widgets (TaskEditor *tedit);
-static void task_editor_destroy (GtkObject *object);
-static char * make_title_from_comp (CalComponent *comp);
-static void clear_widgets (TaskEditor *tedit);
-static void fill_widgets (TaskEditor *tedit);
-
-static void file_save_cb (GtkWidget *widget, gpointer data);
-static void file_save_and_close_cb (GtkWidget *widget, gpointer data);
-static void file_delete_cb (GtkWidget *widget, gpointer data);
-static void file_close_cb (GtkWidget *widget, gpointer data);
-
-static void debug_xml_cb (GtkWidget *widget, gpointer data);
-
-static void save_todo_object (TaskEditor *tedit);
-static void dialog_to_comp_object (TaskEditor *tedit);
-
-static void obj_updated_cb (CalClient *client, const char *uid, gpointer data);
-static void obj_removed_cb (CalClient *client, const char *uid, gpointer data);
-static void raise_and_focus (GtkWidget *widget);
-
-static TaskEditorPriority priority_value_to_index (int priority_value);
-static int priority_index_to_value (TaskEditorPriority priority);
-
-static int status_string_to_value	(const char *status_string);
-static const char* status_value_to_string	(int status);
-
-static void completed_date_changed	(EDateEdit	*dedit,
-					 TaskEditor	*tedit);
-static void status_changed		(GtkMenu	*menu,
-					 TaskEditor	*tedit);
-static void percent_complete_changed	(GtkAdjustment	*adj,
-					 TaskEditor	*tedit);
-
-GtkWidget * task_editor_create_date_edit (void);
-
-static GtkObjectClass *parent_class;
-
-E_MAKE_TYPE(task_editor, "TaskEditor", TaskEditor,
-	    task_editor_class_init, task_editor_init, GTK_TYPE_OBJECT)
-
-
-static void
-task_editor_class_init (TaskEditorClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	object_class->destroy = task_editor_destroy;
-}
-
-
-static void
-task_editor_init (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-
-	priv = g_new0 (TaskEditorPrivate, 1);
-	tedit->priv = priv;
-
-	priv->ignore_callbacks = FALSE;
-}
-
-
-/**
- * task_editor_new:
- * @Returns: a new #TaskEditor.
- *
- * Creates a new #TaskEditor.
- **/
-TaskEditor *
-task_editor_new (void)
-{
-	TaskEditor *tedit;
-
-	tedit = TASK_EDITOR (gtk_type_new (task_editor_get_type ()));
-	return task_editor_construct (tedit);
-}
-
-static BonoboUIVerb verbs [] = {
-
-	BONOBO_UI_UNSAFE_VERB ("FileSave", file_save_cb),
-	BONOBO_UI_UNSAFE_VERB ("FileDelete", file_delete_cb),
-	BONOBO_UI_UNSAFE_VERB ("FileClose", file_close_cb),
-	BONOBO_UI_UNSAFE_VERB ("FileSaveAndClose", file_save_and_close_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("DebugDumpXml", debug_xml_cb),
-
-	BONOBO_UI_VERB_END
-};
-
-/**
- * task_editor_construct:
- * @tedit: A #TaskEditor.
- * 
- * Constructs a task editor by loading its Glade XML file.
- * 
- * Return value: The same object as @tedit, or NULL if the widgets could not be
- * created.  In the latter case, the task editor will automatically be
- * destroyed.
- **/
-TaskEditor *
-task_editor_construct (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-	GtkWidget         *bonobo_win;
-
-	g_return_val_if_fail (tedit != NULL, NULL);
-	g_return_val_if_fail (IS_TASK_EDITOR (tedit), NULL);
-
-	priv = tedit->priv;
-
-	/* Load the content widgets */
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/task-editor-dialog.glade", NULL);
-	if (!priv->xml) {
-		g_message ("task_editor_construct(): Could not load the Glade XML file!");
-		goto error;
-	}
-
-	if (!get_widgets (tedit)) {
-		g_message ("task_editor_construct(): Could not find all widgets in the XML file!");
-		goto error;
-	}
-
-	init_widgets (tedit);
-
-	/* Construct the app */
-
-	priv->uic = bonobo_ui_component_new ("task-editor-dialog");
-	if (!priv->uic) {
-		g_message ("task_editor_construct(): Could not create the UI component");
-		goto error;
-	}
-
-	bonobo_win = bonobo_win_new ("event-editor-dialog", "Event Editor");
-
-	/* FIXME: The sucking bit */
-	{
-		GtkWidget *contents;
-
-		contents = gnome_dock_get_client_area (
-			GNOME_DOCK (GNOME_APP (priv->app)->dock));
-		if (!contents) {
-			g_message ("event_editor_construct(): Could not get contents");
-			goto error;
-		}
-		gtk_widget_ref (contents);
-		gtk_container_remove (GTK_CONTAINER (contents->parent), contents);
-		bonobo_win_set_contents (BONOBO_WIN (bonobo_win), contents);
-		gtk_widget_destroy (priv->app);
-		priv->app = GTK_WIDGET (bonobo_win);
-	}
-
-	{
-		BonoboUIContainer *container = bonobo_ui_container_new ();
-		bonobo_ui_container_set_win (container, BONOBO_WIN (priv->app));
-		bonobo_ui_component_set_container (
-			priv->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)));
-	}
-
-	bonobo_ui_component_add_verb_list_with_data (
-		priv->uic, verbs, tedit);
-
-	bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR,
-			       "evolution-task-editor-dialog.xml",
-			       "evolution-task-editor");
-
-	/* Hook to destruction of the dialog */
-	gtk_signal_connect (GTK_OBJECT (priv->app), "delete_event",
-			    GTK_SIGNAL_FUNC (app_delete_event_cb), tedit);
-
-	/* Show the dialog */
-	gtk_widget_show (priv->app);
-
-	return tedit;
-
- error:
-
-	gtk_object_unref (GTK_OBJECT (tedit));
-	return NULL;
-}
-
-
-/* Called by libglade to create our custom EDateEdit widgets. */
-GtkWidget *
-task_editor_create_date_edit (void)
-{
-	GtkWidget *dedit;
-
-	dedit = e_date_edit_new ();
-	/* FIXME: Set other options. */
-	e_date_edit_set_time_popup_range (E_DATE_EDIT (dedit), 8, 18);
-	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (dedit), TRUE);
-	return dedit;
-}
-
-
-/* Callback used when the dialog box is destroyed */
-static gint
-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	TaskEditor *tedit;
-
-	/* FIXME: need to check for a dirty object */
-
-	tedit = TASK_EDITOR (data);
-	close_dialog (tedit);
-
-	return TRUE;
-}
-
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-
-	priv = tedit->priv;
-
-	g_assert (priv->app != NULL);
-
-	gtk_object_destroy (GTK_OBJECT (tedit));
-}
-
-
-/* Gets the widgets from the XML file and returns if they are all available.
- * For the widgets whose values can be simply set with e-dialog-utils, it does
- * that as well.
- */
-static gboolean
-get_widgets (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-
-	priv = tedit->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->app = GW ("task-editor-dialog");
-
-	priv->summary = GW ("summary");
-
-	priv->due_date = GW ("due-date");
-	priv->start_date = GW ("start-date");
-
-	priv->percent_complete = GW ("percent-complete");
-
-	priv->status = GW ("status");
-	priv->priority = GW ("priority");
-	priv->classification = GW ("classification");
-
-	priv->description = GW ("description");
-
-	priv->contacts = GW ("contacts");
-	priv->categories = GW ("categories");
-
-	priv->completed_date = GW ("completed-date");
-	priv->url = GW ("url");
-
-#undef GW
-
-	return (priv->app
-		&& priv->summary
-		&& priv->due_date
-		&& priv->start_date
-		&& priv->percent_complete
-		&& priv->status
-		&& priv->priority
-		&& priv->classification
-		&& priv->description
-		&& priv->contacts
-		&& priv->categories
-		&& priv->completed_date
-		&& priv->url);
-}
-
-
-/* Hooks the widget signals */
-static void
-init_widgets (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-
-	priv = tedit->priv;
-
-	/* Connect signals. The Status, Percent Complete & Date Completed
-	   properties are closely related so whenever one changes we may need
-	   to update the other 2. */
-	gtk_signal_connect (GTK_OBJECT (priv->completed_date), "date_changed",
-			    GTK_SIGNAL_FUNC (completed_date_changed), tedit);
-	gtk_signal_connect (GTK_OBJECT (priv->completed_date), "time_changed",
-			    GTK_SIGNAL_FUNC (completed_date_changed), tedit);
-
-	gtk_signal_connect (GTK_OBJECT (GTK_OPTION_MENU (priv->status)->menu),
-			    "deactivate",
-			    GTK_SIGNAL_FUNC (status_changed), tedit);
-
-	gtk_signal_connect (GTK_OBJECT (GTK_SPIN_BUTTON (priv->percent_complete)->adjustment),
-			    "value_changed",
-			    GTK_SIGNAL_FUNC (percent_complete_changed), tedit);
-}
-
-static void
-task_editor_destroy (GtkObject *object)
-{
-	TaskEditor *tedit;
-	TaskEditorPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_TASK_EDITOR (object));
-
-	tedit = TASK_EDITOR (object);
-	priv = tedit->priv;
-
-	if (priv->uic) {
-		bonobo_object_unref (BONOBO_OBJECT (priv->uic));
-		priv->uic = NULL;
-	}
-
-	if (priv->app) {
-		gtk_widget_destroy (priv->app);
-		priv->app = NULL;
-	}
-
-	if (priv->comp) {
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-		priv->comp = NULL;
-	}
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client),
-					       tedit);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-		priv->client = NULL;
-	}
-
-	if (priv->xml) {
-		gtk_object_unref (GTK_OBJECT (priv->xml));
-		priv->xml = NULL;
-	}
-
-	g_free (priv);
-	tedit->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-void 
-task_editor_set_cal_client (TaskEditor *tedit,
-			    CalClient *client)
-{
-	TaskEditorPrivate *priv;
-
-	g_return_if_fail (tedit != NULL);
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	if (client == priv->client)
-		return;
-
-	if (client)
-		g_return_if_fail (IS_CAL_CLIENT (client));
-
-	if (client)
-		g_return_if_fail (cal_client_is_loaded (client));	
-	
-	if (client)
-		gtk_object_ref (GTK_OBJECT (client));
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client),
-					       tedit);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-	}
-
-	priv->client = client;
-
-	if (priv->client) {
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated",
-				    GTK_SIGNAL_FUNC (obj_updated_cb), tedit);
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed",
-				    GTK_SIGNAL_FUNC (obj_removed_cb), tedit);
-	}
-}
-
-
-/* Callback used when the calendar client tells us that an object changed */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	TaskEditor *tedit;
-	TaskEditorPrivate *priv;
-	CalComponent *comp;
-	CalClientGetStatus status;
-	const gchar *editing_uid;
-
-	tedit = TASK_EDITOR (data);
-
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-	
-	/* If we aren't showing the object which has been updated, return. */
-	if (!priv->comp)
-	  return;
-	cal_component_get_uid (priv->comp, &editing_uid);
-	if (strcmp (uid, editing_uid))
-	  return;
-
-
-	/* Get the task from the server. */
-	status = cal_client_get_object (priv->client, uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Everything is fine */
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);
-		return;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* The object is no longer in the server, so do nothing */
-		return;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	raise_and_focus (priv->app);
-}
-
-/* Callback used when the calendar client tells us that an object was removed */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	TaskEditor *tedit;
-	TaskEditorPrivate *priv;
-	const gchar *editing_uid;
-
-	tedit = TASK_EDITOR (data);
-
-	g_return_if_fail (tedit != NULL);
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	/* If we aren't showing the object which has been updated, return. */
-	if (!priv->comp)
-	  return;
-	cal_component_get_uid (priv->comp, &editing_uid);
-	if (strcmp (uid, editing_uid))
-	  return;
-
-
-	raise_and_focus (priv->app);
-}
-
-
-/* Brings attention to a window by raising it and giving it focus */
-static void
-raise_and_focus (GtkWidget *widget)
-{
-	g_assert (GTK_WIDGET_REALIZED (widget));
-	gdk_window_show (widget->window);
-	gtk_widget_grab_focus (widget);
-}
-
-
-/**
- * task_editor_set_todo_object:
- * @tedit: A #TaskEditor.
- * @comp: A todo object.
- * 
- * Sets the todo object that a task editor dialog will manipulate.
- **/
-void
-task_editor_set_todo_object	(TaskEditor	*tedit,
-				 CalComponent	*comp)
-{
-	TaskEditorPrivate *priv;
-	char *title;
-
-	g_return_if_fail (tedit != NULL);
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	if (priv->comp) {
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-		priv->comp = NULL;
-	}
-
-	if (comp)
-		priv->comp = cal_component_clone (comp);
-
-	title = make_title_from_comp (priv->comp);
-	gtk_window_set_title (GTK_WINDOW (priv->app), title);
-	g_free (title);
-
-	fill_widgets (tedit);
-}
-
-
-/* Creates an appropriate title for the task editor dialog */
-static char *
-make_title_from_comp (CalComponent *comp)
-{
-	const char *summary;
-	CalComponentVType type;
-	CalComponentText text;
-	
-	if (!comp)
-		return g_strdup (_("Edit Task"));
-
-	cal_component_get_summary (comp, &text);
-	if (text.value)
-		summary = text.value;
-	else
-		summary =  _("No summary");
-
-	
-	type = cal_component_get_vtype (comp);
-	switch (type) {
-	case CAL_COMPONENT_EVENT:
-		return g_strdup_printf (_("Appointment - %s"), summary);
-
-	case CAL_COMPONENT_TODO:
-		return g_strdup_printf (_("Task - %s"), summary);
-
-	case CAL_COMPONENT_JOURNAL:
-		return g_strdup_printf (_("Journal entry - %s"), summary);
-
-	default:
-		g_message ("make_title_from_comp(): Cannot handle object of type %d", type);
-		return NULL;
-	}
-}
-
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-
-	priv = tedit->priv;
-
-
-}
-
-/* Fills in the widgets with the proper values */
-static void
-fill_widgets (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-	CalComponentText text;
-	CalComponentDateTime d;
-	struct icaltimetype *completed;
-	CalComponentClassification classification;
-	GSList *l;
-	time_t t;
-	int *priority_value, *percent;
-	icalproperty_status status;
-	TaskEditorPriority priority;
-	const char *url, *status_string;
-
-	priv = tedit->priv;
-
-	clear_widgets (tedit);
-
-	if (!priv->comp)
-		return;
-
-	/* We want to ignore any signals emitted while changing fields. */
-	priv->ignore_callbacks = TRUE;
-
-
-	cal_component_get_summary (priv->comp, &text);
-	e_dialog_editable_set (priv->summary, text.value);
-
-	cal_component_get_description_list (priv->comp, &l);
-	if (l) {
-		text = *(CalComponentText *)l->data;
-		e_dialog_editable_set (priv->description, text.value);
-	} else {
-		e_dialog_editable_set (priv->description, NULL);
-	}
-	cal_component_free_text_list (l);
-	
-	/* Due Date. */
-	cal_component_get_due (priv->comp, &d);
-	if (d.value) {
-		t = icaltime_as_timet (*d.value);
-	} else {
-		t = -1;
-	}
-	e_date_edit_set_time (E_DATE_EDIT (priv->due_date), t);
-
-	/* Start Date. */
-	cal_component_get_dtstart (priv->comp, &d);
-	if (d.value) {
-		t = icaltime_as_timet (*d.value);
-	} else {
-		t = -1;
-	}
-	e_date_edit_set_time (E_DATE_EDIT (priv->start_date), t);
-
-	/* Completed Date. */
-	cal_component_get_completed (priv->comp, &completed);
-	if (completed) {
-		t = icaltime_as_timet (*completed);
-		cal_component_free_icaltimetype (completed);
-	} else {
-		t = -1;
-	}
-	e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), t);
-
-	/* Percent Complete. */
-	cal_component_get_percent (priv->comp, &percent);
-	if (percent) {
-		e_dialog_spin_set (priv->percent_complete, *percent);
-		cal_component_free_percent (percent);
-	} else {
-		/* FIXME: Could check if task is completed and set 100%. */
-		e_dialog_spin_set (priv->percent_complete, 0);
-	}
-
-	/* Status. */
-	cal_component_get_status (priv->comp, &status_string);
-	if (status_string) {
-		status = status_string_to_value (status_string);
-	} else {
-		/* Try to user the percent value. */
-		if (percent) {
-			if (*percent == 0)
-				status = ICAL_STATUS_NEEDSACTION;
-			else if (*percent == 100)
-				status = ICAL_STATUS_COMPLETED;
-			else
-				status = ICAL_STATUS_INPROCESS;
-		} else {
-			status = ICAL_STATUS_NEEDSACTION;
-		}
-	}
-	g_print ("Setting status\n");
-	e_dialog_option_menu_set (priv->status, status, status_map);
-
-	/* Priority. */
-	cal_component_get_priority (priv->comp, &priority_value);
-	if (priority_value) {
-		priority = priority_value_to_index (*priority_value);
-		cal_component_free_priority (priority_value);
-	} else {
-		priority = PRIORITY_UNDEFINED;
-	}
-	g_print ("Setting priority\n");
-	e_dialog_option_menu_set (priv->priority, priority, priority_map);
-
-
-	/* Classification. */
-	cal_component_get_classification (priv->comp, &classification);
-	g_print ("Setting classification\n");
-	e_dialog_option_menu_set (priv->classification, classification,
-				  classification_map);
-
-
-	/* URL. */
-	cal_component_get_url (priv->comp, &url);
-	e_dialog_editable_set (priv->url, url);
-
-	priv->ignore_callbacks = FALSE;
-}
-
-
-static void
-save_todo_object (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-	char *title;
-
-	priv = tedit->priv;
-
-	g_return_if_fail (priv->client != NULL);
-
-	if (!priv->comp)
-		return;
-
-	dialog_to_comp_object (tedit);
-
-	title = make_title_from_comp (priv->comp);
-	gtk_window_set_title (GTK_WINDOW (priv->app), title);
-	g_free (title);
-
-	if (!cal_client_update_object (priv->client, priv->comp))
-		g_message ("save_todo_object(): Could not update the object!");
-}
-
-
-/* Get the values of the widgets in the event editor and put them in the iCalObject */
-static void
-dialog_to_comp_object (TaskEditor *tedit)
-{
-	TaskEditorPrivate *priv;
-	CalComponent *comp;
-	CalComponentText *text;
-	CalComponentDateTime date;
-	time_t t;
-	GSList *list;
-	icalproperty_status status;
-	TaskEditorPriority priority;
-	int priority_value, percent;
-	CalComponentClassification classification;
-	char *url;
-	const char *status_string;
-	
-	priv = tedit->priv;
-	comp = priv->comp;
-
-	/* Summary. */
-	text = g_new0 (CalComponentText, 1);
-	text->value = e_dialog_editable_get (priv->summary);
-	cal_component_set_summary (comp, text);
-
-	/* Description. Note that we use the text variable again, and it is
-	   freed in cal_component_free_text_list(). */
-	list = NULL;
-	text->value  = e_dialog_editable_get (priv->description);
-	list = g_slist_prepend (list, text);
-	cal_component_set_description_list (comp, list);
-	cal_component_free_text_list (list);
-	
-
-	date.value = g_new (struct icaltimetype, 1);
-	date.tzid = NULL;
-
-	/* Due Date. */
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->due_date));
-	if (t != -1) {
-		*date.value = icaltime_from_timet (t, FALSE, FALSE);
-		cal_component_set_due (comp, &date);
-	} else {
-		cal_component_set_due (comp, NULL);
-	}
-
-	/* Start Date. */
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->start_date));
-	if (t != -1) {
-		*date.value = icaltime_from_timet (t, FALSE, FALSE);
-		cal_component_set_dtstart (comp, &date);
-	} else {
-		cal_component_set_dtstart (comp, NULL);
-	}
-
-	/* Completed Date. */
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->completed_date));
-	if (t != -1) {
-		*date.value = icaltime_from_timet (t, FALSE, FALSE);
-		cal_component_set_completed (comp, date.value);
-	} else {
-		cal_component_set_completed (comp, NULL);
-	}
-
-	g_free (date.value);
-
-	/* Percent Complete. */
-	percent = e_dialog_spin_get_int (priv->percent_complete);
-	cal_component_set_percent (comp, &percent);
-
-	/* Status. */
-	status = e_dialog_option_menu_get (priv->status, status_map);
-	status_string = status_value_to_string (status);
-	cal_component_set_status (comp, status_string);
-
-	/* Priority. */
-	priority = e_dialog_option_menu_get (priv->priority, priority_map);
-	priority_value = priority_index_to_value (priority);
-	cal_component_set_priority (comp, &priority_value);
-
-	/* Classification. */
-	classification = e_dialog_option_menu_get (priv->classification,
-						   classification_map);
-	cal_component_set_classification (comp, classification);
-
-
-	/* URL. */
-	url = e_dialog_editable_get (priv->url);
-	cal_component_set_url (comp, url);
-
-
-
-
-	cal_component_commit_sequence (comp);
-}
-
-static void
-debug_xml_cb (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *tedit = TASK_EDITOR (data);
-	TaskEditorPrivate *priv = tedit->priv;
-	
-	bonobo_win_dump (BONOBO_WIN (priv->app), "on demand");
-}
-
-/* File/Save callback */
-static void
-file_save_cb (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *tedit;
-
-	tedit = TASK_EDITOR (data);
-	save_todo_object (tedit);
-}
-
-/* File/Save and Close callback */
-static void
-file_save_and_close_cb (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *tedit;
-
-	tedit = TASK_EDITOR (data);
-	save_todo_object (tedit);
-	close_dialog (tedit);
-}
-
-/* File/Delete callback */
-static void
-file_delete_cb (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *tedit;
-	TaskEditorPrivate *priv;
-	const char *uid;
-	
-	tedit = TASK_EDITOR (data);
-
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-	
-	g_return_if_fail (priv->comp);
-
-	cal_component_get_uid (priv->comp, &uid);
-
-	/* We don't check the return value; FALSE can mean the object was not in
-	 * the server anyways.
-	 */
-	cal_client_remove_object (priv->client, uid);
-
-	close_dialog (tedit);
-}
-
-/* File/Close callback */
-static void
-file_close_cb (GtkWidget *widget, gpointer data)
-{
-	TaskEditor *tedit;
-
-	tedit = TASK_EDITOR (data);
-
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	close_dialog (tedit);
-}
-
-
-static TaskEditorPriority
-priority_value_to_index (int priority_value)
-{
-	TaskEditorPriority retval;
-
-	if (priority_value == 0)
-		retval = PRIORITY_UNDEFINED;
-	else if (priority_value <= 4)
-		retval = PRIORITY_HIGH;
-	else if (priority_value == 5)
-		retval = PRIORITY_NORMAL;
-	else 
-		retval = PRIORITY_LOW;
-
-	return retval;
-}
-
-
-static int
-priority_index_to_value (TaskEditorPriority priority)
-{
-	int retval;
-
-	switch (priority) {
-	case PRIORITY_UNDEFINED:
-		retval = 0;
-		break;
-	case PRIORITY_HIGH:
-		retval = 3;
-		break;
-	case PRIORITY_NORMAL:
-		retval = 5;
-		break;
-	case PRIORITY_LOW:
-		retval = 7;
-		break;
-	default:
-		retval = -1;
-		g_assert_not_reached ();
-		break;
-	}
-
-	return retval;
-}
-
-
-static int
-status_string_to_value	(const char *status_string)
-{
-	int i;
-
-	for (i = 0; status_map[i] != -1; i++) {
-		if (!strcmp (status_string_map[i], status_string))
-			return status_map[i];
-	}
-
-	g_warning ("Invalid todo status string");
-	return ICAL_STATUS_NEEDSACTION;
-}
-
-
-static const char*
-status_value_to_string	(int status)
-{
-	int i;
-
-	for (i = 0; status_map[i] != -1; i++) {
-		if (status_map[i] == status)
-			return status_string_map[i];
-	}
-
-	g_warning ("Invalid todo status value");
-	return NULL;
-}
-
-
-static void
-completed_date_changed	(EDateEdit	*dedit,
-			 TaskEditor	*tedit)
-{
-	TaskEditorPrivate *priv;
-	time_t t;
-
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	if (priv->ignore_callbacks)
-		return;
-
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->completed_date));
-	priv->ignore_callbacks = TRUE;
-	if (t == -1) {
-		/* If the 'Completed Date' is set to 'None', we set the
-		   status to 'Not Started' and the percent-complete to 0.
-		   The task may actually be partially-complete, but we leave
-		   it to the user to set those fields. */
-		e_dialog_option_menu_set (priv->status, ICAL_STATUS_NEEDSACTION,
-					  status_map);
-		e_dialog_spin_set (priv->percent_complete, 0);
-	} else {
-		e_dialog_option_menu_set (priv->status, ICAL_STATUS_COMPLETED,
-					  status_map);
-		e_dialog_spin_set (priv->percent_complete, 100);
-	}
-	priv->ignore_callbacks = FALSE;
-}
-
-
-static void
-status_changed		(GtkMenu	*menu,
-			 TaskEditor	*tedit)
-{
-	TaskEditorPrivate *priv;
-	icalproperty_status status;
-
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	if (priv->ignore_callbacks)
-		return;
-
-	status = e_dialog_option_menu_get (priv->status, status_map);
-	priv->ignore_callbacks = TRUE;
-	if (status == ICAL_STATUS_NEEDSACTION) {
-		e_dialog_spin_set (priv->percent_complete, 0);
-		e_date_edit_set_time (E_DATE_EDIT (priv->completed_date), -1);
-	} else if (status == ICAL_STATUS_COMPLETED) {
-		e_dialog_spin_set (priv->percent_complete, 100);
-		e_date_edit_set_time (E_DATE_EDIT (priv->completed_date),
-				      time (NULL));
-	}
-	priv->ignore_callbacks = FALSE;
-}
-
-
-static void
-percent_complete_changed	(GtkAdjustment	*adj,
-				 TaskEditor	*tedit)
-{
-	TaskEditorPrivate *priv;
-	gint percent;
-	icalproperty_status status;
-	time_t date_completed;
-
-	g_return_if_fail (IS_TASK_EDITOR (tedit));
-
-	priv = tedit->priv;
-
-	if (priv->ignore_callbacks)
-		return;
-
-	percent = e_dialog_spin_get_int (priv->percent_complete);
-	priv->ignore_callbacks = TRUE;
-
-	if (percent == 100) {
-		date_completed = time (NULL);
-		status = ICAL_STATUS_COMPLETED;
-	} else {
-		/* FIXME: Set to 'None'. */
-		date_completed = time (NULL);
-
-		if (percent == 0)
-			status = ICAL_STATUS_NEEDSACTION;
-		else
-			status = ICAL_STATUS_INPROCESS;
-	}
-
-	e_date_edit_set_time (E_DATE_EDIT (priv->completed_date),
-			      date_completed);
-	e_dialog_option_menu_set (priv->status, status, status_map);
-
-	priv->ignore_callbacks = FALSE;
-}
-
diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h
deleted file mode 100644
index a53d29c2a2..0000000000
--- a/calendar/gui/dialogs/task-editor.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _TASK_EDITOR_H_
-#define _TASK_EDITOR_H_
-
-#include <gtk/gtkobject.h>
-#include <libgnome/gnome-defs.h>
-#include <bonobo.h>
-
-BEGIN_GNOME_DECLS
-
-
-#define TASK_EDITOR(obj)          GTK_CHECK_CAST (obj, task_editor_get_type (), TaskEditor)
-#define TASK_EDITOR_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, task_editor_get_type (), TaskEditorClass)
-#define IS_TASK_EDITOR(obj)       GTK_CHECK_TYPE (obj, task_editor_get_type ())
-
-
-typedef struct _TaskEditor       TaskEditor;
-typedef struct _TaskEditorClass  TaskEditorClass;
-
-struct _TaskEditor
-{
-	GtkObject object;
-
-	/* Private data */
-	gpointer priv;
-};
-
-struct _TaskEditorClass
-{
-	GtkObjectClass parent_class;
-};
-
-
-GtkType	    task_editor_get_type	(void);
-TaskEditor* task_editor_construct	(TaskEditor	*tedit);
-TaskEditor* task_editor_new		(void);
-
-void	    task_editor_set_cal_client	(TaskEditor	*tedit,
-					 CalClient	*client);
-void	    task_editor_set_todo_object	(TaskEditor	*tedit,
-					 CalComponent	*comp);
-
-
-END_GNOME_DECLS
-
-#endif /* _TASK_EDITOR_H_ */
diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade
deleted file mode 100644
index bdde9ed091..0000000000
--- a/calendar/gui/dialogs/task-page.glade
+++ /dev/null
@@ -1,706 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>task-editor-dialog</name>
-  <program_name>task-editor-dialog</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>task-editor-dialog.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeApp</class>
-  <name>task-editor-dialog</name>
-  <visible>False</visible>
-  <title>task-editor-dialog</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>notebook1</name>
-      <border_width>2</border_width>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox1</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>4</spacing>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table3</name>
-	  <rows>1</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>4</row_spacing>
-	  <column_spacing>4</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label3</name>
-	    <label>S_ummary</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>summary</default_focus_target>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>False</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>summary</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator1</name>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox4</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table1</name>
-	    <rows>2</rows>
-	    <columns>4</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>2</row_spacing>
-	    <column_spacing>4</column_spacing>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label6</name>
-	      <label>Sta_rt Date:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label5</name>
-	      <label>_Due Date:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label9</name>
-	      <label>% Comp_lete:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <default_focus_target>percent-complete</default_focus_target>
-	      <child>
-		<left_attach>2</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkSpinButton</class>
-	      <name>percent-complete</name>
-	      <width>60</width>
-	      <can_focus>True</can_focus>
-	      <climb_rate>1</climb_rate>
-	      <digits>0</digits>
-	      <numeric>False</numeric>
-	      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	      <snap>False</snap>
-	      <wrap>False</wrap>
-	      <value>0</value>
-	      <lower>0</lower>
-	      <upper>100</upper>
-	      <step>10</step>
-	      <page>10</page>
-	      <page_size>10</page_size>
-	      <child>
-		<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>Custom</class>
-	      <name>due-date</name>
-	      <creation_function>task_editor_create_date_edit</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Sun, 10 Sep 2000 17:32:18 GMT</last_modification_time>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>start-date</name>
-	      <creation_function>task_editor_create_date_edit</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Sun, 10 Sep 2000 17:33:31 GMT</last_modification_time>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHSeparator</class>
-	  <name>hseparator2</name>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox3</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label7</name>
-	    <label>_Status:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>status</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>status</name>
-	    <can_focus>True</can_focus>
-	    <items>Not Started
-In Progress
-Completed
-Cancelled
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label8</name>
-	    <label>_Priority:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>priority</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>priority</name>
-	    <can_focus>True</can_focus>
-	    <items>High
-Normal
-Low
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label18</name>
-	    <label>C_lassification:</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>classification</default_focus_target>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>classification</name>
-	    <can_focus>True</can_focus>
-	    <items>None
-Public
-Private
-Confidential
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow1</name>
-	  <height>150</height>
-	  <hscrollbar_policy>GTK_POLICY_NEVER</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>GtkText</class>
-	    <name>description</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkHBox</class>
-	  <name>hbox2</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>2</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button3</name>
-	    <can_focus>True</can_focus>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label16</name>
-	      <sensitive>False</sensitive>
-	      <label>_Contacts...</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>4</xpad>
-	      <ypad>0</ypad>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>contacts</name>
-	    <sensitive>False</sensitive>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button4</name>
-	    <can_focus>True</can_focus>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label17</name>
-	      <sensitive>False</sensitive>
-	      <label>Ca_tegories...</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>4</xpad>
-	      <ypad>0</ypad>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>categories</name>
-	    <sensitive>False</sensitive>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label1</name>
-	<label>Task</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>table4</name>
-	<border_width>4</border_width>
-	<rows>2</rows>
-	<columns>2</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>2</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label12</name>
-	  <label>Date Completed:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label14</name>
-	  <label>URL:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>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>url</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>Custom</class>
-	  <name>completed-date</name>
-	  <creation_function>task_editor_create_date_edit</creation_function>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Sun, 10 Sep 2000 17:34:07 GMT</last_modification_time>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label2</name>
-	<label>Details</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
deleted file mode 100644
index b372a1c03b..0000000000
--- a/calendar/gui/e-calendar-table.c
+++ /dev/null
@@ -1,407 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * ECalendarTable - displays the CalComponent objects in a table (an ETable).
- * Used for calendar events and tasks.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/e-table/e-cell-checkbox.h>
-#include <gal/e-table/e-cell-toggle.h>
-#include <gal/e-table/e-cell-text.h>
-#include "e-calendar-table.h"
-#include "calendar-model.h"
-#include "dialogs/task-editor.h"
-
-/* Pixmaps. */
-#include "task.xpm"
-#include "task-recurring.xpm"
-#include "task-assigned.xpm"
-#include "task-assigned-to.xpm"
-
-#include "check-filled.xpm"
-
-
-static void e_calendar_table_class_init (ECalendarTableClass *class);
-static void e_calendar_table_init (ECalendarTable *cal_table);
-static void e_calendar_table_destroy (GtkObject *object);
-
-static void e_calendar_table_on_double_click (ETable *table,
-					      gint row,
-					      ECalendarTable *cal_table);
-static gint e_calendar_table_on_right_click (ETable *table,
-					     gint row,
-					     gint col,
-					     GdkEventButton *event,
-					     ECalendarTable *cal_table);
-static void e_calendar_table_on_open_task (GtkWidget *menuitem,
-					   gpointer	  data);
-static void e_calendar_table_on_mark_task_complete (GtkWidget *menuitem,
-						    gpointer   data);
-static void e_calendar_table_on_delete_task (GtkWidget *menuitem,
-					     gpointer   data);
-static gint e_calendar_table_on_key_press (ETable *table,
-					   gint row,
-					   gint col,
-					   GdkEventKey *event,
-					   ECalendarTable *cal_table);
-
-static void e_calendar_table_open_task (ECalendarTable *cal_table,
-					gint row);
-
-/* The icons to represent the task. */
-#define E_CALENDAR_MODEL_NUM_ICONS	4
-static char** icon_xpm_data[E_CALENDAR_MODEL_NUM_ICONS] = {
-	task_xpm, task_recurring_xpm, task_assigned_xpm, task_assigned_to_xpm
-};
-static GdkPixbuf* icon_pixbufs[E_CALENDAR_MODEL_NUM_ICONS] = { 0 };
-
-static GtkTableClass *parent_class;
-
-
-GtkType
-e_calendar_table_get_type (void)
-{
-	static GtkType e_calendar_table_type = 0;
-
-	if (!e_calendar_table_type){
-		GtkTypeInfo e_calendar_table_info = {
-			"ECalendarTable",
-			sizeof (ECalendarTable),
-			sizeof (ECalendarTableClass),
-			(GtkClassInitFunc) e_calendar_table_class_init,
-			(GtkObjectInitFunc) e_calendar_table_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		parent_class = gtk_type_class (GTK_TYPE_TABLE);
-		e_calendar_table_type = gtk_type_unique (GTK_TYPE_TABLE,
-							 &e_calendar_table_info);
-	}
-
-	return e_calendar_table_type;
-}
-
-
-static void
-e_calendar_table_class_init (ECalendarTableClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-
-	/* Method override */
-	object_class->destroy		= e_calendar_table_destroy;
-
-#if 0
-	widget_class->realize		= e_calendar_table_realize;
-	widget_class->unrealize		= e_calendar_table_unrealize;
-	widget_class->style_set		= e_calendar_table_style_set;
- 	widget_class->size_allocate	= e_calendar_table_size_allocate;
-	widget_class->focus_in_event	= e_calendar_table_focus_in;
-	widget_class->focus_out_event	= e_calendar_table_focus_out;
-	widget_class->key_press_event	= e_calendar_table_key_press;
-#endif
-}
-
-
-#define E_CALENDAR_TABLE_SPEC				\
-	"<ETableSpecification click-to-add=\"true\"> draw-grid=\"true\""	\
-        "<ETableColumn model_col= \"0\" _title=\"Categories\"            expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col= \"1\" _title=\"Classification\"        expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col= \"2\" _title=\"Completion Date\"       expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col= \"3\" _title=\"End Date\"              expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col= \"4\" _title=\"Start Date\"            expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col= \"5\" _title=\"Due Date\"              expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col= \"6\" _title=\"Geographical Position\" expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col= \"7\" _title=\"Percent complete\"      expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col= \"8\" _title=\"Priority\"              expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col= \"9\" _title=\"Summary\"               expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"summary\"  compare=\"string\"/>"  \
-        "<ETableColumn model_col=\"10\" _title=\"Transparency\"          expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col=\"11\" _title=\"URL\"                   expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col=\"12\" _title=\"Alarms\"                expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/>"  \
-        "<ETableColumn model_col=\"13\" pixbuf=\"icon\"                  expansion=\"1.0\" minimum_width=\"18\" resizable=\"false\" cell=\"icon\"     compare=\"integer\"/>" \
-        "<ETableColumn model_col=\"14\" pixbuf=\"complete\"              expansion=\"1.0\" minimum_width=\"18\" resizable=\"false\" cell=\"checkbox\" compare=\"integer\"/>" \
-	"<ETableState>" 				\
-                "<column source=\"13\"/>"               \
-                "<column source= \"9\"/>"               \
-                "<column source=\"14\"/>"               \
-        	"<grouping> </grouping>"		\
-	"</ETableState>"				\
-	"</ETableSpecification>"
-
-static void
-e_calendar_table_init (ECalendarTable *cal_table)
-{
-	GtkWidget *table;
-	ETableModel *model;
-	ECell *cell;
-	ETableExtras *extras;
-	gint i;
-	GdkPixbuf *pixbuf;
-	GdkColormap *colormap;
-	gboolean success[E_CALENDAR_TABLE_COLOR_LAST];
-	gint nfailed;
-
-	/* Allocate the colors we need. */
-
-	colormap = gtk_widget_get_colormap (GTK_WIDGET (cal_table));
-
-	cal_table->colors[E_CALENDAR_TABLE_COLOR_OVERDUE].red   = 65535;
-	cal_table->colors[E_CALENDAR_TABLE_COLOR_OVERDUE].green = 0;
-	cal_table->colors[E_CALENDAR_TABLE_COLOR_OVERDUE].blue  = 0;
-
-	nfailed = gdk_colormap_alloc_colors (colormap, cal_table->colors,
-					     E_CALENDAR_TABLE_COLOR_LAST,
-					     FALSE, TRUE, success);
-	if (nfailed)
-		g_warning ("Failed to allocate all colors");
-
-	/* Create the model */
-
-	cal_table->model = calendar_model_new ();
-	model = E_TABLE_MODEL (cal_table->model);
-
-	/* Create the header columns */
-
-	extras = e_table_extras_new();
-
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	gtk_object_set (GTK_OBJECT (cell),
-			"strikeout_column", CAL_COMPONENT_FIELD_COMPLETE,
-			"bold_column", CAL_COMPONENT_FIELD_OVERDUE,
-			"color_column", CAL_COMPONENT_FIELD_COLOR,
-			NULL);
-	e_table_extras_add_cell(extras, "summary", cell);
-
-	/* Create pixmaps */
-
-	if (!icon_pixbufs[0])
-		for (i = 0; i < E_CALENDAR_MODEL_NUM_ICONS; i++) {
-			icon_pixbufs[i] = gdk_pixbuf_new_from_xpm_data (
-				(const char **) icon_xpm_data[i]);
-		}
-
-	cell = e_cell_toggle_new (0, E_CALENDAR_MODEL_NUM_ICONS, icon_pixbufs);
-	e_table_extras_add_cell(extras, "icon", cell);
-	e_table_extras_add_pixbuf(extras, "icon", icon_pixbufs[0]);
-
-	pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) check_filled_xpm);
-	e_table_extras_add_pixbuf(extras, "complete", pixbuf);
-	gdk_pixbuf_unref(pixbuf);
-
-	/* Create the table */
-
-	table = e_table_scrolled_new (model, extras, E_CALENDAR_TABLE_SPEC, NULL);
-	gtk_object_set (GTK_OBJECT (table),
-			"click_to_add_message", "Click here to add a new Task",
-			NULL);
-	gtk_table_attach (GTK_TABLE (cal_table), table, 0, 1, 0, 1,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (table);
-
-	gtk_signal_connect (GTK_OBJECT (table), "double_click",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_double_click),
-			    cal_table);
-	gtk_signal_connect (GTK_OBJECT (table), "right_click",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_right_click),
-			    cal_table);
-	gtk_signal_connect (GTK_OBJECT (table), "key_press",
-			    GTK_SIGNAL_FUNC (e_calendar_table_on_key_press),
-			    cal_table);
-}
-
-
-/**
- * e_calendar_table_new:
- * @Returns: a new #ECalendarTable.
- *
- * Creates a new #ECalendarTable.
- **/
-GtkWidget *
-e_calendar_table_new (void)
-{
-	GtkWidget *cal_table;
-
-	cal_table = GTK_WIDGET (gtk_type_new (e_calendar_table_get_type ()));
-
-	return cal_table;
-}
-
-
-static void
-e_calendar_table_destroy (GtkObject *object)
-{
-	ECalendarTable *cal_table;
-
-	cal_table = E_CALENDAR_TABLE (object);
-
-	gtk_object_unref (GTK_OBJECT (cal_table->model));
-	cal_table->model = NULL;
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-
-void
-e_calendar_table_set_cal_client (ECalendarTable *cal_table,
-				 CalClient	*client)
-{
-	g_print ("In e_calendar_table_set_cal_client\n");
-
-	calendar_model_set_cal_client (cal_table->model, client,
-				       CALOBJ_TYPE_TODO);
-}
-
-
-static void
-e_calendar_table_on_double_click (ETable *table,
-				  gint row,
-				  ECalendarTable *cal_table)
-{
-	g_print ("In e_calendar_table_on_double_click row:%i\n", row);
-
-	e_calendar_table_open_task (cal_table, row);
-}
-
-
-static GnomeUIInfo e_calendar_table_popup_uiinfo[] = {
-	{ GNOME_APP_UI_ITEM, N_("Open..."),
-	  N_("Open the task"), e_calendar_table_on_open_task,
-	  NULL, NULL, 0, 0, 0, 0 },
-	{ GNOME_APP_UI_ITEM, N_("Mark Complete"),
-	  N_("Mark the task complete"), e_calendar_table_on_mark_task_complete,
-	  NULL, NULL, 0, 0, 0, 0 },
-	{ GNOME_APP_UI_ITEM, N_("Delete"),
-	  N_("Delete the task"), e_calendar_table_on_delete_task,
-	  NULL, NULL, 0, 0, 0, 0 },
-
-	GNOMEUIINFO_END
-};
-
-
-typedef struct _ECalendarMenuData ECalendarMenuData;
-struct _ECalendarMenuData {
-	ECalendarTable *cal_table;
-	gint row;
-};
-
-static gint
-e_calendar_table_on_right_click (ETable *table,
-				 gint row,
-				 gint col,
-				 GdkEventButton *event,
-				 ECalendarTable *cal_table)
-{
-	ECalendarMenuData menu_data;
-	GtkWidget *popup_menu;
-
-	menu_data.cal_table = cal_table;
-	menu_data.row = row;
-
-	popup_menu = gnome_popup_menu_new (e_calendar_table_popup_uiinfo);
-	gnome_popup_menu_do_popup_modal (popup_menu, NULL, NULL, event,
-					 &menu_data);
-
-	gtk_widget_destroy (popup_menu);
-
-	return TRUE;
-}
-
-
-static void
-e_calendar_table_on_open_task (GtkWidget *menuitem,
-			       gpointer	  data)
-{
-	ECalendarMenuData *menu_data = (ECalendarMenuData*) data;
-
-	e_calendar_table_open_task (menu_data->cal_table,
-				    menu_data->row);
-}
-
-
-static void
-e_calendar_table_on_mark_task_complete (GtkWidget *menuitem,
-					gpointer   data)
-{
-	ECalendarMenuData *menu_data = (ECalendarMenuData*) data;
-
-	calendar_model_mark_task_complete (menu_data->cal_table->model,
-					   menu_data->row);
-}
-
-
-static void
-e_calendar_table_on_delete_task (GtkWidget *menuitem,
-				 gpointer   data)
-{
-	ECalendarMenuData *menu_data = (ECalendarMenuData*) data;
-
-	calendar_model_delete_task (menu_data->cal_table->model,
-				    menu_data->row);
-}
-
-
-
-static gint
-e_calendar_table_on_key_press (ETable *table,
-			       gint row,
-			       gint col,
-			       GdkEventKey *event,
-			       ECalendarTable *cal_table)
-{
-	g_print ("In e_calendar_table_on_key_press\n");
-
-	if (event->keyval == GDK_Delete) {
-		g_print ("  delete key!!!\n");
-
-		calendar_model_delete_task (cal_table->model, row);
-	}
-
-	return FALSE;
-}
-
-
-static void
-e_calendar_table_open_task (ECalendarTable *cal_table,
-			    gint row)
-{
-	TaskEditor *tedit;
-	CalComponent *comp;
-
-	tedit = task_editor_new ();
-	task_editor_set_cal_client (tedit, calendar_model_get_cal_client (cal_table->model));
-
-	comp = calendar_model_get_cal_object (cal_table->model, row);
-	task_editor_set_todo_object (tedit, comp);
-}
-
-
diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
deleted file mode 100644
index 38e3eafea3..0000000000
--- a/calendar/gui/e-calendar-table.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_CALENDAR_TABLE_H_
-#define _E_CALENDAR_TABLE_H_
-
-#include <gtk/gtktable.h>
-#include "calendar-model.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * ECalendarTable - displays the iCalendar objects in a table (an ETable).
- * Used for calendar events and tasks.
- */
-
-/* These index our colors array. */
-typedef enum
-{
-	E_CALENDAR_TABLE_COLOR_OVERDUE,
-	
-	E_CALENDAR_TABLE_COLOR_LAST
-} ECalendarTableColors;
-
-
-#define E_CALENDAR_TABLE(obj)          GTK_CHECK_CAST (obj, e_calendar_table_get_type (), ECalendarTable)
-#define E_CALENDAR_TABLE_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_calendar_table_get_type (), ECalendarTableClass)
-#define E_IS_CALENDAR_TABLE(obj)       GTK_CHECK_TYPE (obj, e_calendar_table_get_type ())
-
-
-typedef struct _ECalendarTable       ECalendarTable;
-typedef struct _ECalendarTableClass  ECalendarTableClass;
-
-struct _ECalendarTable
-{
-	GtkTable table;
-
-	CalendarModel *model;
-	
-	
-	/* Colors for drawing. */
-	GdkColor colors[E_CALENDAR_TABLE_COLOR_LAST];
-};
-
-struct _ECalendarTableClass
-{
-	GtkTableClass parent_class;
-};
-
-
-GtkType	   e_calendar_table_get_type		(void);
-GtkWidget* e_calendar_table_new			(void);
-
-
-void	   e_calendar_table_set_cal_client	(ECalendarTable *cal_table,
-						 CalClient	*client);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_CALENDAR_TABLE_H_ */
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
deleted file mode 100644
index 304a07854e..0000000000
--- a/calendar/gui/e-day-view-main-item.c
+++ /dev/null
@@ -1,665 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EDayViewMainItem - canvas item which displays most of the appointment
- * data in the main Day/Work Week display.
- */
-
-#include <config.h>
-#include "e-day-view-main-item.h"
-
-static void e_day_view_main_item_class_init (EDayViewMainItemClass *class);
-static void e_day_view_main_item_init (EDayViewMainItem *dvtitem);
-
-static void e_day_view_main_item_set_arg (GtkObject *o, GtkArg *arg,
-					  guint arg_id);
-static void e_day_view_main_item_update (GnomeCanvasItem *item,
-					 double *affine,
-					 ArtSVP *clip_path, int flags);
-static void e_day_view_main_item_draw (GnomeCanvasItem *item,
-				       GdkDrawable *drawable,
-				       int x, int y,
-				       int width, int height);
-static double e_day_view_main_item_point (GnomeCanvasItem *item,
-					  double x, double y,
-					  int cx, int cy,
-					  GnomeCanvasItem **actual_item);
-static gint e_day_view_main_item_event (GnomeCanvasItem *item,
-					GdkEvent *event);
-
-static void e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem,
-							    GdkDrawable *drawable,
-							    int x,
-							    int y,
-							    int width,
-							    int height);
-static void e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem,
-						       GdkDrawable *drawable,
-						       int x, int y,
-						       int width, int height,
-						       gint day);
-static void e_day_view_main_item_draw_day_events (EDayViewMainItem *dvmitem,
-						  GdkDrawable *drawable,
-						  int x, int y,
-						  int width, int height,
-						  gint day);
-static void e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
-						 GdkDrawable *drawable,
-						 int x, int y,
-						 int width, int height,
-						 gint day, gint event_num);
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_DAY_VIEW
-};
-
-
-GtkType
-e_day_view_main_item_get_type (void)
-{
-	static GtkType e_day_view_main_item_type = 0;
-
-	if (!e_day_view_main_item_type) {
-		GtkTypeInfo e_day_view_main_item_info = {
-			"EDayViewMainItem",
-			sizeof (EDayViewMainItem),
-			sizeof (EDayViewMainItemClass),
-			(GtkClassInitFunc) e_day_view_main_item_class_init,
-			(GtkObjectInitFunc) e_day_view_main_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_day_view_main_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_day_view_main_item_info);
-	}
-
-	return e_day_view_main_item_type;
-}
-
-
-static void
-e_day_view_main_item_class_init (EDayViewMainItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EDayViewMainItem::day_view",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_DAY_VIEW);
-
-	object_class->set_arg = e_day_view_main_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_day_view_main_item_update;
-	item_class->draw        = e_day_view_main_item_draw;
-	item_class->point       = e_day_view_main_item_point;
-	item_class->event       = e_day_view_main_item_event;
-}
-
-
-static void
-e_day_view_main_item_init (EDayViewMainItem *dvtitem)
-{
-	dvtitem->day_view = NULL;
-}
-
-
-static void
-e_day_view_main_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EDayViewMainItem *dvmitem;
-
-	item = GNOME_CANVAS_ITEM (o);
-	dvmitem = E_DAY_VIEW_MAIN_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_DAY_VIEW:
-		dvmitem->day_view = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_day_view_main_item_update (GnomeCanvasItem *item,
-			    double *affine,
-			    ArtSVP *clip_path,
-			    int flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_day_view_main_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable,
-			   int x, int y, int width, int height)
-{
-	EDayViewMainItem *dvmitem;
-	EDayView *day_view;
-	GtkStyle *style;
-	GdkGC *fg_gc, *bg_gc, *light_gc, *dark_gc, *gc;
-	GdkFont *font;
-	gint row, row_y, grid_x1, grid_x2;
-	gint day, grid_y1, grid_y2;
-	gint work_day_start_row, work_day_end_row;
-	gint work_day_start_y, work_day_end_y;
-	gint day_x, day_w, work_day;
-	gint start_row, end_row, rect_x, rect_y, rect_width, rect_height;
-	struct tm *day_start;
-
-#if 0
-	g_print ("In e_day_view_main_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-	dvmitem = E_DAY_VIEW_MAIN_ITEM (canvas_item);
-	day_view = dvmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	style = GTK_WIDGET (day_view)->style;
-	font = style->font;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
-	light_gc = style->light_gc[GTK_STATE_NORMAL];
-	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-
-	/* Paint the background colors. */
-	gc = day_view->main_gc;
-	work_day_start_row = e_day_view_convert_time_to_row (day_view, day_view->work_day_start_hour, day_view->work_day_start_minute);
-	work_day_start_y = work_day_start_row * day_view->row_height - y;
-	work_day_end_row = e_day_view_convert_time_to_row (day_view, day_view->work_day_end_hour, day_view->work_day_end_minute);
-	work_day_end_y = work_day_end_row * day_view->row_height - y;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		day_start = localtime (&day_view->day_starts[day]);
-
-		work_day = day_view->working_days & (1 << day_start->tm_wday);
-
-		day_x = day_view->day_offsets[day] - x;
-		day_w = day_view->day_widths[day];
-
-		if (work_day) {
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    day_x, 0 - y,
-					    day_w, work_day_start_y - (0 - y));
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    day_x, work_day_start_y,
-					    day_w, work_day_end_y - work_day_start_y);
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    day_x, work_day_end_y,
-					    day_w, height - work_day_end_y);
-		} else {
-			gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING]);
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    day_x, 0,
-					    day_w, height);
-		}
-	}
-
-	/* Paint the selection background. */
-	if (GTK_WIDGET_HAS_FOCUS (day_view)
-	    && day_view->selection_start_day != -1
-	    && !day_view->selection_in_top_canvas) {
-		for (day = day_view->selection_start_day;
-		     day <= day_view->selection_end_day;
-		     day++) {
-			if (day == day_view->selection_start_day
-			    && day_view->selection_start_row != -1)
-				start_row = day_view->selection_start_row;
-			else
-				start_row = 0;
-			if (day == day_view->selection_end_day
-			    && day_view->selection_end_row != -1)
-				end_row = day_view->selection_end_row;
-			else
-				end_row = day_view->rows - 1;
-
-			rect_x = day_view->day_offsets[day] - x;
-			rect_width = day_view->day_widths[day];
-			rect_y = start_row * day_view->row_height - y;
-			rect_height = (end_row - start_row + 1) * day_view->row_height;
-
-			gc = style->bg_gc[GTK_STATE_SELECTED];
-			gdk_draw_rectangle (drawable, gc, TRUE,
-					    rect_x, rect_y,
-					    rect_width, rect_height);
-		}
-	}
-
-	/* Drawing the horizontal grid lines. */
-	grid_x1 = day_view->day_offsets[0] - x;
-	grid_x2 = day_view->day_offsets[day_view->days_shown] - x;
-
-	for (row = 0, row_y = 0 - y;
-	     row < day_view->rows && row_y < height;
-	     row++, row_y += day_view->row_height) {
-		if (row_y >= 0 && row_y < height)
-			gdk_draw_line (drawable, dark_gc,
-				       grid_x1, row_y, grid_x2, row_y);
-	}
-
-	/* Draw the vertical bars down the left of each column. */
-	grid_y1 = 0;
-	grid_y2 = height;
-	for (day = 0; day < day_view->days_shown; day++) {
-		grid_x1 = day_view->day_offsets[day] - x;
-
-		/* Skip if it isn't visible. */
-		if (grid_x1 >= width || grid_x1 + E_DAY_VIEW_BAR_WIDTH <= 0)
-			continue;
-
-		gdk_draw_line (drawable, fg_gc,
-			       grid_x1, grid_y1,
-			       grid_x1, grid_y2);
-		gdk_draw_line (drawable, fg_gc,
-			       grid_x1 + E_DAY_VIEW_BAR_WIDTH - 1, grid_y1,
-			       grid_x1 + E_DAY_VIEW_BAR_WIDTH - 1, grid_y2);
-		gdk_draw_rectangle (drawable, style->white_gc, TRUE,
-			       grid_x1 + 1, grid_y1,
-			       E_DAY_VIEW_BAR_WIDTH - 2, grid_y2 - grid_y1);
-
-		/* Fill in the bars when the user is busy. */
-		e_day_view_main_item_draw_events_in_vbars (dvmitem, drawable,
-							   x, y,
-							   width, height,
-							   day);
-	}
-
-	/* Fill in the vertical bars corresponding to the busy times from the
-	   long events. */
-	e_day_view_main_item_draw_long_events_in_vbars (dvmitem, drawable,
-							x, y, width, height);
-
-	/* Draw the event borders and backgrounds, and the vertical bars
-	   down the left edges. */
-	for (day = 0; day < day_view->days_shown; day++) {
-		e_day_view_main_item_draw_day_events (dvmitem, drawable,
-						      x, y, width, height,
-						      day);
-	}
-}
-
-
-static void
-e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem,
-					   GdkDrawable *drawable,
-					   int x, int y,
-					   int width, int height,
-					   gint day)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	GdkGC *gc;
-	gint grid_x, event_num, bar_y, bar_h;
-
-	day_view = dvmitem->day_view;
-
-	gc = day_view->main_gc;
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR]);
-
-	grid_x = day_view->day_offsets[day] + 1 - x;
-
-	/* Draw the busy times corresponding to the events in the day. */
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-		/* We can skip the events in the first column since they will
-		   draw over this anyway. */
-		if (event->num_columns > 0 && event->start_row_or_col == 0)
-			continue;
-
-		bar_y = event->start_minute * day_view->row_height / day_view->mins_per_row;
-		bar_h = event->end_minute * day_view->row_height / day_view->mins_per_row - bar_y;
-		bar_y -= y;
-
-		/* Skip it if it isn't visible. */
-		if (bar_y >= height || bar_y + bar_h <= 0)
-			continue;
-
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    grid_x, bar_y,
-				    E_DAY_VIEW_BAR_WIDTH - 2, bar_h);
-	}
-}
-
-
-static void
-e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem,
-						GdkDrawable *drawable,
-						int x, int y,
-						int width, int height)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	gint event_num, start_day, end_day, day, bar_y1, bar_y2, grid_x;
-	GdkGC *gc;
-
-	day_view = dvmitem->day_view;
-
-	gc = day_view->main_gc;
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR]);
-
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-
-		if (!e_day_view_find_long_event_days (day_view, event,
-						      &start_day, &end_day))
-			continue;
-
-		for (day = start_day; day <= end_day; day++) {
-			grid_x = day_view->day_offsets[day] + 1 - x;
-
-			/* Skip if it isn't visible. */
-			if (grid_x >= width
-			    || grid_x + E_DAY_VIEW_BAR_WIDTH <= 0)
-				continue;
-
-			if (event->start <= day_view->day_starts[day]) {
-				bar_y1 = 0;
-			} else {
-				bar_y1 = event->start_minute * day_view->row_height / day_view->mins_per_row - y;
-			}
-
-			if (event->end >= day_view->day_starts[day + 1]) {
-				bar_y2 = height;
-			} else {
-				bar_y2 = event->end_minute * day_view->row_height / day_view->mins_per_row - y;
-			}
-
-			if (bar_y1 < height && bar_y2 > 0 && bar_y2 > bar_y1) {
-				gdk_draw_rectangle (drawable, gc, TRUE,
-						    grid_x, bar_y1,
-						    E_DAY_VIEW_BAR_WIDTH - 2,
-						    bar_y2 - bar_y1);
-			}
-		}
-
-
-	}
-}
-
-
-static void
-e_day_view_main_item_draw_day_events (EDayViewMainItem *dvmitem,
-				      GdkDrawable *drawable,
-				      int x, int y, int width, int height,
-				      gint day)
-{
-	EDayView *day_view;
-	gint event_num;
-
-	day_view = dvmitem->day_view;
-
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		e_day_view_main_item_draw_day_event (dvmitem, drawable,
-						     x, y, width, height,
-						     day, event_num);
-	}
-}
-
-
-static void
-e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
-				     GdkDrawable *drawable,
-				     int x, int y, int width, int height,
-				     gint day, gint event_num)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	gint item_x, item_y, item_w, item_h, bar_y1, bar_y2;
-	GtkStyle *style;
-	GdkGC *gc;
-	CalComponent *comp;
-	gint num_icons, icon_x, icon_y, icon_x_inc, icon_y_inc;
-	gint max_icon_w, max_icon_h;
-	gboolean draw_reminder_icon, draw_recurrence_icon;
-
-	day_view = dvmitem->day_view;
-
-	/* If the event is currently being dragged, don't draw it. It will
-	   be drawn in the special drag items. */
-	if (day_view->drag_event_day == day
-	    && day_view->drag_event_num == event_num)
-		return;
-
-	style = GTK_WIDGET (day_view)->style;
-
-	gc = day_view->main_gc;
-	gdk_gc_set_foreground (gc, &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR]);
-
-	/* Get the position of the event. If it is not shown skip it.*/
-	if (!e_day_view_get_event_position (day_view, day, event_num,
-					    &item_x, &item_y,
-					    &item_w, &item_h))
-		return;
-
-	item_x -= x;
-	item_y -= y;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	/* Fill in the white background. Note that for events in the first
-	   column of the day, we might not want to paint over the vertical bar,
-	   since that is used for multiple events. But then you can't see
-	   where the event in the first column finishes. */
-#if 0
-	if (event->start_row_or_col == 0)
-		gdk_draw_rectangle (drawable, style->white_gc, TRUE,
-				    item_x + E_DAY_VIEW_BAR_WIDTH, item_y + 1,
-				    MAX (item_w - E_DAY_VIEW_BAR_WIDTH - 1, 0),
-				    item_h - 2);
-	else
-#endif
-		gdk_draw_rectangle (drawable, style->white_gc, TRUE,
-				    item_x + 1, item_y + 1,
-				    MAX (item_w - 2, 0), item_h - 2);
-
-	/* Draw the right edge of the vertical bar. */
-	gdk_draw_line (drawable, style->black_gc,
-		       item_x + E_DAY_VIEW_BAR_WIDTH - 1,
-		       item_y + 1,
-		       item_x + E_DAY_VIEW_BAR_WIDTH - 1,
-		       item_y + item_h - 2);
-
-	/* Draw the vertical colored bar showing when the appointment
-	   begins & ends. */
-	bar_y1 = event->start_minute * day_view->row_height / day_view->mins_per_row - y;
-	bar_y2 = event->end_minute * day_view->row_height / day_view->mins_per_row - y;
-
-	/* When an item is being resized, we fill the bar up to the new row. */
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE
-	    && day_view->resize_event_day == day
-	    && day_view->resize_event_num == event_num) {
-		if (day_view->resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE)
-			bar_y1 = item_y + 1;
-		else if (day_view->resize_drag_pos == E_DAY_VIEW_POS_BOTTOM_EDGE)
-			bar_y2 = item_y + item_h - 1;
-	}
-
-	gdk_draw_rectangle (drawable, gc, TRUE,
-			    item_x + 1, bar_y1,
-			    E_DAY_VIEW_BAR_WIDTH - 2, bar_y2 - bar_y1);
-
-	/* Draw the box around the entire event. Do this after drawing
-	   the colored bar so we don't have to worry about being 1
-	   pixel out. */
-	gdk_draw_rectangle (drawable, style->black_gc, FALSE,
-			    item_x, item_y, MAX (item_w - 1, 0), item_h - 1);
-
-#if 0
-	/* Draw the horizontal bars above and beneath the event if it
-	   is currently being edited. */
-	if (day_view->editing_event_day == day
-	    && day_view->editing_event_num == event_num) {
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    item_x,
-				    item_y - E_DAY_VIEW_BAR_HEIGHT,
-				    item_w,
-				    E_DAY_VIEW_BAR_HEIGHT);
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    item_x, item_y + item_h,
-				    item_w, E_DAY_VIEW_BAR_HEIGHT);
-	}
-#endif
-
-	/* Draw the reminder & recurrence icons, if needed. */
-	num_icons = 0;
-	draw_reminder_icon = FALSE;
-	draw_recurrence_icon = FALSE;
-	icon_x = item_x + E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_ICON_X_PAD;
-	icon_y = item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT
-		+ E_DAY_VIEW_ICON_Y_PAD;
-	comp = event->comp;
-
-#if 0
-	if (ico->dalarm.enabled || ico->malarm.enabled
-	    || ico->palarm.enabled || ico->aalarm.enabled) {
-		draw_reminder_icon = TRUE;
-		num_icons++;
-	}
-#endif
-
-	if (cal_component_has_recurrences (comp)) {
-		draw_recurrence_icon = TRUE;
-		num_icons++;
-	}
-
-	if (num_icons != 0) {
-		if (item_h >= (E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD)
-		    * num_icons) {
-			icon_x_inc = 0;
-			icon_y_inc = E_DAY_VIEW_ICON_HEIGHT
-				+ E_DAY_VIEW_ICON_Y_PAD;
-		} else {
-			icon_x_inc = E_DAY_VIEW_ICON_WIDTH
-				+ E_DAY_VIEW_ICON_X_PAD;
-			icon_y_inc = 0;
-		}
-
-		if (draw_reminder_icon) {
-			max_icon_w = item_x + item_w - icon_x
-				- E_DAY_VIEW_EVENT_BORDER_WIDTH;
-			max_icon_h = item_y + item_h - icon_y
-				- E_DAY_VIEW_EVENT_BORDER_HEIGHT;
-
-			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-			gdk_gc_set_clip_mask (gc, day_view->reminder_mask);
-			gdk_draw_pixmap (drawable, gc,
-					 day_view->reminder_icon,
-					 0, 0, icon_x, icon_y,
-					 MIN (E_DAY_VIEW_ICON_WIDTH,
-					      max_icon_w),
-					 MIN (E_DAY_VIEW_ICON_HEIGHT,
-					      max_icon_h));
-			icon_x += icon_x_inc;
-			icon_y += icon_y_inc;
-		}
-
-		if (draw_recurrence_icon) {
-			max_icon_w = item_x + item_w - icon_x
-				- E_DAY_VIEW_EVENT_BORDER_WIDTH;
-			max_icon_h = item_y + item_h - icon_y
-				- E_DAY_VIEW_EVENT_BORDER_HEIGHT;
-
-			gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-			gdk_gc_set_clip_mask (gc, day_view->recurrence_mask);
-			gdk_draw_pixmap (drawable, gc,
-					 day_view->recurrence_icon,
-					 0, 0, icon_x, icon_y,
-					 MIN (E_DAY_VIEW_ICON_WIDTH,
-					      max_icon_w),
-					 MIN (E_DAY_VIEW_ICON_HEIGHT,
-					      max_icon_h));
-		}
-		gdk_gc_set_clip_mask (gc, NULL);
-	}
-}
-
-
-/* This is supposed to return the nearest item to the point and the distance.
-   Since we are the only item we just return ourself and 0 for the distance.
-   This is needed so that we get button/motion events. */
-static double
-e_day_view_main_item_point (GnomeCanvasItem *item, double x, double y,
-			    int cx, int cy,
-			    GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
-static gint
-e_day_view_main_item_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EDayViewMainItem *dvtitem;
-
-	dvtitem = E_DAY_VIEW_MAIN_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-
-	case GDK_BUTTON_RELEASE:
-
-	case GDK_MOTION_NOTIFY:
-
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
diff --git a/calendar/gui/e-day-view-main-item.h b/calendar/gui/e-day-view-main-item.h
deleted file mode 100644
index d8305e594d..0000000000
--- a/calendar/gui/e-day-view-main-item.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_DAY_VIEW_MAIN_ITEM_H_
-#define _E_DAY_VIEW_MAIN_ITEM_H_
-
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EDayViewMainItem - canvas item which displays most of the appointment
- * data in the main Day/Work Week display.
- */
-
-#define E_DAY_VIEW_MAIN_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_day_view_main_item_get_type (), EDayViewMainItem))
-#define E_DAY_VIEW_MAIN_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_day_view_main_item_get_type ()))
-#define E_IS_DAY_VIEW_MAIN_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_day_view_main_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EDayView widget. */
-	EDayView *day_view;
-} EDayViewMainItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EDayViewMainItemClass;
-
-
-GtkType  e_day_view_main_item_get_type      (void);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_DAY_VIEW_MAIN_ITEM_H_ */
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
deleted file mode 100644
index 19d8d40317..0000000000
--- a/calendar/gui/e-day-view-time-item.c
+++ /dev/null
@@ -1,547 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EDayViewTimeItem - canvas item which displays the times down the left of
- * the EDayView.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-gui-utils.h>
-#include "e-day-view-time-item.h"
-#include "calendar-config.h"
-
-
-/* The spacing between items in the time column. GRID_X_PAD is the space down
-   either side of the column, i.e. outside the main horizontal grid lines.
-   HOUR_L_PAD & HOUR_R_PAD are the spaces on the left & right side of the
-   big hour number (this is inside the horizontal grid lines).
-   MIN_X_PAD is the spacing either side of the minute number. The smaller
-   horizontal grid lines match with this.
-   60_MIN_X_PAD is the space either side of the HH:MM display used when
-   we are displaying 60 mins per row (inside the main grid lines). */
-#define E_DVTMI_TIME_GRID_X_PAD	4
-#define E_DVTMI_HOUR_L_PAD	4
-#define E_DVTMI_HOUR_R_PAD	2
-#define E_DVTMI_MIN_X_PAD	2
-#define E_DVTMI_60_MIN_X_PAD	4
-
-
-static void e_day_view_time_item_class_init (EDayViewTimeItemClass *class);
-static void e_day_view_time_item_init (EDayViewTimeItem *dvtmitem);
-static void e_day_view_time_item_set_arg (GtkObject *o,
-					  GtkArg *arg,
-					  guint arg_id);
-
-static void e_day_view_time_item_update (GnomeCanvasItem *item,
-					 double *affine,
-					 ArtSVP *clip_path, int flags);
-static void e_day_view_time_item_draw (GnomeCanvasItem *item,
-				       GdkDrawable *drawable,
-				       int x, int y,
-				       int width, int height);
-static double e_day_view_time_item_point (GnomeCanvasItem *item,
-					  double x, double y,
-					  int cx, int cy,
-					  GnomeCanvasItem **actual_item);
-static gint e_day_view_time_item_event (GnomeCanvasItem *item,
-					GdkEvent *event);
-static void e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem,
-						  GdkEvent *event);
-static void e_day_view_time_item_on_set_divisions (GtkWidget *item,
-						   EDayViewTimeItem *dvtmitem);
-static void e_day_view_time_item_on_button_press (EDayViewTimeItem *dvtmitem,
-						  GdkEvent *event);
-static void e_day_view_time_item_on_button_release (EDayViewTimeItem *dvtmitem,
-						    GdkEvent *event);
-static void e_day_view_time_item_on_motion_notify (EDayViewTimeItem *dvtmitem,
-						   GdkEvent *event);
-static gint e_day_view_time_item_convert_position_to_row (EDayViewTimeItem *dvtmitem,
-							  gint y);
-
-
-static GnomeCanvasItemClass *parent_class;
-
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_DAY_VIEW
-};
-
-
-GtkType
-e_day_view_time_item_get_type (void)
-{
-	static GtkType e_day_view_time_item_type = 0;
-
-	if (!e_day_view_time_item_type) {
-		GtkTypeInfo e_day_view_time_item_info = {
-			"EDayViewTimeItem",
-			sizeof (EDayViewTimeItem),
-			sizeof (EDayViewTimeItemClass),
-			(GtkClassInitFunc) e_day_view_time_item_class_init,
-			(GtkObjectInitFunc) e_day_view_time_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_day_view_time_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_day_view_time_item_info);
-	}
-
-	return e_day_view_time_item_type;
-}
-
-
-static void
-e_day_view_time_item_class_init (EDayViewTimeItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EDayViewTimeItem::day_view",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_DAY_VIEW);
-
-	object_class->set_arg = e_day_view_time_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_day_view_time_item_update;
-	item_class->draw        = e_day_view_time_item_draw;
-	item_class->point       = e_day_view_time_item_point;
-	item_class->event       = e_day_view_time_item_event;
-}
-
-
-static void
-e_day_view_time_item_init (EDayViewTimeItem *dvtmitem)
-{
-	dvtmitem->dragging_selection = FALSE;
-}
-
-
-static void
-e_day_view_time_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EDayViewTimeItem *dvtmitem;
-
-	item = GNOME_CANVAS_ITEM (o);
-	dvtmitem = E_DAY_VIEW_TIME_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_DAY_VIEW:
-		dvtmitem->day_view = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_day_view_time_item_update (GnomeCanvasItem *item,
-			    double *affine,
-			    ArtSVP *clip_path,
-			    int flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/* Returns the minimum width needed for the column, by adding up all the
-   maximum widths of the strings. The string widths are all calculated in
-   the style_set handlers of EDayView and EDayViewTimeCanvas. */
-gint
-e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem)
-{
-	EDayView *day_view;
-
-	day_view = dvtmitem->day_view;
-	g_return_val_if_fail (day_view != NULL, 0);
-
-	/* Calculate the width of each time column. */
-	if (day_view->mins_per_row == 60) {
-		dvtmitem->column_width = day_view->max_small_hour_width
-			+ day_view->colon_width
-			+ day_view->max_minute_width
-			+ E_DVTMI_60_MIN_X_PAD * 2
-			+ E_DVTMI_TIME_GRID_X_PAD * 2;
-	} else {
-		dvtmitem->column_width = day_view->max_large_hour_width
-			+ day_view->max_minute_width
-			+ E_DVTMI_MIN_X_PAD * 2
-			+ E_DVTMI_HOUR_L_PAD
-			+ E_DVTMI_HOUR_R_PAD
-			+ E_DVTMI_TIME_GRID_X_PAD * 2;
-	}
-
-	return dvtmitem->column_width;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
-			   GdkDrawable	   *drawable,
-			   int		    x,
-			   int		    y,
-			   int		    width,
-			   int		    height)
-{
-	EDayView *day_view;
-	EDayViewTimeItem *dvtmitem;
-	gint time_hour_x1, time_hour_x2, time_min_x1;
-	gint hour, minute, hour_y, min_y, hour_r, min_r, start_y;
-	gint row, row_y, min_width, hour_width;
-	GtkStyle *style;
-	GdkFont *small_font, *large_font;
-	GdkGC *fg_gc, *dark_gc;
-	gchar buffer[16];
-
-	dvtmitem = E_DAY_VIEW_TIME_ITEM (canvas_item);
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	style = GTK_WIDGET (day_view)->style;
-	small_font = style->font;
-	large_font = day_view->large_font;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-
-	time_min_x1 = 0;
-	hour_r = 0;
-
-	/* Step through each row, drawing the horizontal grid lines for each
-	   day column and the times. */
-	time_hour_x1 = E_DVTMI_TIME_GRID_X_PAD - x;
-	time_hour_x2 = dvtmitem->column_width - E_DVTMI_TIME_GRID_X_PAD - x;
-	if (day_view->mins_per_row == 60) {
-		min_r = time_hour_x2 - E_DVTMI_60_MIN_X_PAD;
-	} else {
-		time_min_x1 = time_hour_x2 - E_DVTMI_MIN_X_PAD * 2
-			- day_view->max_minute_width;
-		hour_r = time_min_x1 - E_DVTMI_HOUR_R_PAD;
-		min_r = time_hour_x2 - E_DVTMI_MIN_X_PAD;
-	}
-
-	hour = day_view->first_hour_shown;
-	if (!day_view->use_24_hour_format) {
-		if (hour == 0 || hour == 12)
-			hour = 12;
-		else
-			hour %= 12;
-	}
-	hour_y = large_font->ascent + 2; /* FIXME */
-	minute = day_view->first_minute_shown;
-	min_y = small_font->ascent + 2; /* FIXME */
-	start_y = 0 - MAX (day_view->row_height, hour_y + large_font->descent);
-	for (row = 0, row_y = 0 - y;
-	     row < day_view->rows && row_y < height;
-	     row++, row_y += day_view->row_height) {
-		if (row_y > start_y) {
-			/* Draw the times down the left if needed. */
-			if (min_r <= 0)
-				continue;
-
-			if (day_view->mins_per_row == 60) {
-				gdk_draw_line (drawable, dark_gc,
-					       time_hour_x1, row_y,
-					       time_hour_x2, row_y);
-				sprintf (buffer, "%02i:%02i", hour, minute);
-				min_width = day_view->small_hour_widths[hour] + day_view->minute_widths[minute / 5] + day_view->colon_width;
-				gdk_draw_string (drawable, small_font, fg_gc,
-						 min_r - min_width,
-						 row_y + min_y, buffer);
-			} else {
-				if (minute == 0) {
-					gdk_draw_line (drawable, dark_gc,
-						       time_hour_x1, row_y,
-						       time_hour_x2, row_y);
-					sprintf (buffer, "%02i", hour);
-					hour_width = day_view->large_hour_widths[hour];
-					gdk_draw_string (drawable, large_font,
-							 fg_gc,
-							 hour_r - hour_width,
-							 row_y + hour_y,
-							 buffer);
-				} else {
-					gdk_draw_line (drawable, dark_gc,
-						       time_min_x1, row_y,
-						       time_hour_x2, row_y);
-				}
-
-				if (day_view->mins_per_row != 30
-				    || minute != 30) {
-					sprintf (buffer, "%02i", minute);
-					min_width = day_view->minute_widths[minute / 5];
-					gdk_draw_string (drawable, small_font,
-							 fg_gc,
-							 min_r - min_width,
-							 row_y + min_y,
-							 buffer);
-				}
-			}
-		}
-
-		minute += day_view->mins_per_row;
-		if (minute >= 60) {
-			hour++;
-			if (!day_view->use_24_hour_format) {
-				if (hour == 0 || hour == 12)
-					hour = 12;
-				else
-					hour %= 12;
-			}
-			minute -= 60;
-		}
-	}
-}
-
-
-static double
-e_day_view_time_item_point (GnomeCanvasItem *item, double x, double y,
-			    int cx, int cy,
-			    GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
-static gint
-e_day_view_time_item_event (GnomeCanvasItem *item,
-			    GdkEvent *event)
-{
-	EDayViewTimeItem *dvtmitem;
-
-	dvtmitem = E_DAY_VIEW_TIME_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		if (event->button.button == 1) {
-			e_day_view_time_item_on_button_press (dvtmitem, event);
-		} else if (event->button.button == 3) {
-			e_day_view_time_item_show_popup_menu (dvtmitem, event);
-			return TRUE;
-		}
-		break;
-	case GDK_BUTTON_RELEASE:
-		if (event->button.button == 1)
-			e_day_view_time_item_on_button_release (dvtmitem,
-								event);
-		break;
-
-	case GDK_MOTION_NOTIFY:
-		e_day_view_time_item_on_motion_notify (dvtmitem, event);
-		break;
-
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static void
-e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem,
-				      GdkEvent *event)
-{
-	static gint divisions[] = { 60, 30, 15, 10, 5 };
-	EDayView *day_view;
-	gint num_divisions = sizeof (divisions) / sizeof (divisions[0]);
-	GtkWidget *menu, *item;
-	gchar buffer[256];
-	GSList *group = NULL;
-	gint current_divisions, i;
-
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	current_divisions = e_day_view_get_mins_per_row (day_view);
-
-	menu = gtk_menu_new ();
-
-	/* Make sure the menu is destroyed when it disappears. */
-	e_auto_kill_popup_menu_on_hide (GTK_MENU (menu));
-
-	for (i = 0; i < num_divisions; i++) {
-		sprintf (buffer, _("%02i minute divisions"), divisions[i]);
-		item = gtk_radio_menu_item_new_with_label (group, buffer);
-		group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (item));
-		gtk_widget_show (item);
-		gtk_menu_append (GTK_MENU (menu), item);
-
-		if (current_divisions == divisions[i])
-			gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
-
-		gtk_object_set_data (GTK_OBJECT (item), "divisions",
-				     GINT_TO_POINTER (divisions[i]));
-
-		gtk_signal_connect (GTK_OBJECT (item), "toggled",
-				    e_day_view_time_item_on_set_divisions,
-				    dvtmitem);
-	}
-
-	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
-			event->button.button, event->button.time);
-}
-
-
-static void
-e_day_view_time_item_on_set_divisions (GtkWidget *item,
-				       EDayViewTimeItem *dvtmitem)
-{
-	EDayView *day_view;
-	gint divisions;
-
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	if (!GTK_CHECK_MENU_ITEM (item)->active)
-		return;
-
-	divisions = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (item),
-							  "divisions"));
-	e_day_view_set_mins_per_row (day_view, divisions);
-	calendar_config_set_time_divisions (divisions);
-}
-
-
-static void
-e_day_view_time_item_on_button_press (EDayViewTimeItem *dvtmitem,
-				      GdkEvent *event)
-{
-	EDayView *day_view;
-	GnomeCanvas *canvas;
-	gint row;
-
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	canvas = GNOME_CANVAS_ITEM (dvtmitem)->canvas;
-
-	row = e_day_view_time_item_convert_position_to_row (dvtmitem,
-							    event->button.y);
-
-	if (row == -1)
-		return;
-
-	if (!GTK_WIDGET_HAS_FOCUS (day_view))
-		gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-	if (gdk_pointer_grab (GTK_LAYOUT (canvas)->bin_window, FALSE,
-			      GDK_POINTER_MOTION_MASK
-			      | GDK_BUTTON_RELEASE_MASK,
-			      FALSE, NULL, event->button.time) == 0) {
-		e_day_view_start_selection (day_view, -1, row);
-		dvtmitem->dragging_selection = TRUE;
-	}
-}
-
-
-static void
-e_day_view_time_item_on_button_release (EDayViewTimeItem *dvtmitem,
-					GdkEvent *event)
-{
-	EDayView *day_view;
-
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	if (dvtmitem->dragging_selection) {
-		gdk_pointer_ungrab (event->button.time);
-		e_day_view_finish_selection (day_view);
-		e_day_view_stop_auto_scroll (day_view);
-	}
-
-	dvtmitem->dragging_selection = FALSE;
-}
-
-
-static void
-e_day_view_time_item_on_motion_notify (EDayViewTimeItem *dvtmitem,
-				       GdkEvent *event)
-{
-	EDayView *day_view;
-	GnomeCanvas *canvas;
-	gdouble window_y;
-	gint y, row;
-
-	if (!dvtmitem->dragging_selection)
-		return;
-
-	day_view = dvtmitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	canvas = GNOME_CANVAS_ITEM (dvtmitem)->canvas;
-
-	y = event->motion.y;
-	row = e_day_view_time_item_convert_position_to_row (dvtmitem, y);
-
-	if (row != -1) {
-		gnome_canvas_world_to_window (canvas, 0, event->motion.y,
-					      NULL, &window_y);
-		e_day_view_update_selection (day_view, -1, row);
-		e_day_view_check_auto_scroll (day_view, -1, (gint) window_y);
-	}
-}
-
-
-/* Returns the row corresponding to the y position, or -1. */
-static gint
-e_day_view_time_item_convert_position_to_row (EDayViewTimeItem *dvtmitem,
-					      gint y)
-{
-	EDayView *day_view;
-	gint row;
-
-	day_view = dvtmitem->day_view;
-	g_return_val_if_fail (day_view != NULL, -1);
-
-	if (y < 0)
-		return -1;
-
-	row = y / day_view->row_height;
-	if (row >= day_view->rows)
-		return -1;
-
-	return row;
-}
diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h
deleted file mode 100644
index 8b20fe999e..0000000000
--- a/calendar/gui/e-day-view-time-item.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_DAY_VIEW_TIME_ITEM_H_
-#define _E_DAY_VIEW_TIME_ITEM_H_
-
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EDayViewTimeItem - canvas item which displays the times down the left of
- * the EDayView.
- */
-
-#define E_DAY_VIEW_TIME_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_day_view_time_item_get_type (), EDayViewTimeItem))
-#define E_DAY_VIEW_TIME_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_day_view_time_item_get_type ()))
-#define E_IS_DAY_VIEW_TIME_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_day_view_time_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EDayView widget. */
-	EDayView *day_view;
-
-	/* The width of the time column. */
-	gint column_width;
-
-	/* TRUE if we are currently dragging the selection times. */
-	gboolean dragging_selection;
-} EDayViewTimeItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EDayViewTimeItemClass;
-
-
-GtkType  e_day_view_time_item_get_type      (void);
-
-
-gint	 e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_DAY_VIEW_TIME_ITEM_H_ */
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
deleted file mode 100644
index 6b00f34a60..0000000000
--- a/calendar/gui/e-day-view-top-item.c
+++ /dev/null
@@ -1,595 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EDayViewTopItem - displays the top part of the Day/Work Week calendar view.
- */
-
-#include <config.h>
-#include "e-day-view-top-item.h"
-
-static void e_day_view_top_item_class_init	(EDayViewTopItemClass *class);
-static void e_day_view_top_item_init		(EDayViewTopItem *dvtitem);
-
-static void e_day_view_top_item_set_arg		(GtkObject	 *o,
-						 GtkArg		 *arg,
-						 guint		  arg_id);
-static void e_day_view_top_item_update		(GnomeCanvasItem *item,
-						 double		 *affine,
-						 ArtSVP		 *clip_path,
-						 int		  flags);
-static void e_day_view_top_item_draw		(GnomeCanvasItem *item,
-						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
-static void e_day_view_top_item_draw_long_event	(EDayViewTopItem *dvtitem,
-						 gint		  event_num,
-						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
-static void e_day_view_top_item_draw_triangle	(EDayViewTopItem *dvtitem,
-						 GdkDrawable	 *drawable,
-						 gint		  x,
-						 gint		  y,
-						 gint		  w,
-						 gint		  h);
-static double e_day_view_top_item_point		(GnomeCanvasItem *item,
-						 double		  x,
-						 double		  y,
-						 int		  cx,
-						 int		  cy,
-						 GnomeCanvasItem **actual_item);
-static gint e_day_view_top_item_event		(GnomeCanvasItem *item,
-						 GdkEvent	 *event);
-
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_DAY_VIEW
-};
-
-
-GtkType
-e_day_view_top_item_get_type (void)
-{
-	static GtkType e_day_view_top_item_type = 0;
-
-	if (!e_day_view_top_item_type) {
-		GtkTypeInfo e_day_view_top_item_info = {
-			"EDayViewTopItem",
-			sizeof (EDayViewTopItem),
-			sizeof (EDayViewTopItemClass),
-			(GtkClassInitFunc) e_day_view_top_item_class_init,
-			(GtkObjectInitFunc) e_day_view_top_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_day_view_top_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_day_view_top_item_info);
-	}
-
-	return e_day_view_top_item_type;
-}
-
-
-static void
-e_day_view_top_item_class_init (EDayViewTopItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EDayViewTopItem::day_view",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_DAY_VIEW);
-
-	object_class->set_arg = e_day_view_top_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_day_view_top_item_update;
-	item_class->draw        = e_day_view_top_item_draw;
-	item_class->point       = e_day_view_top_item_point;
-	item_class->event       = e_day_view_top_item_event;
-}
-
-
-static void
-e_day_view_top_item_init (EDayViewTopItem *dvtitem)
-{
-	dvtitem->day_view = NULL;
-}
-
-
-static void
-e_day_view_top_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EDayViewTopItem *dvtitem;
-
-	item = GNOME_CANVAS_ITEM (o);
-	dvtitem = E_DAY_VIEW_TOP_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_DAY_VIEW:
-		dvtitem->day_view = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_day_view_top_item_update (GnomeCanvasItem *item,
-			    double	    *affine,
-			    ArtSVP	    *clip_path,
-			    int		     flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_day_view_top_item_draw (GnomeCanvasItem *canvas_item,
-			  GdkDrawable	  *drawable,
-			  int		   x,
-			  int		   y,
-			  int		   width,
-			  int		   height)
-{
-	EDayViewTopItem *dvtitem;
-	EDayView *day_view;
-	GtkStyle *style;
-	GdkGC *fg_gc, *bg_gc, *light_gc, *dark_gc;
-	gchar buffer[128], *format;
-	GdkRectangle clip_rect;
-	GdkFont *font;
-	gint canvas_width, canvas_height, left_edge, day, date_width, date_x;
-	gint item_height, event_num;
-	struct tm *day_start;
-
-#if 0
-	g_print ("In e_day_view_top_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-	dvtitem = E_DAY_VIEW_TOP_ITEM (canvas_item);
-	day_view = dvtitem->day_view;
-	g_return_if_fail (day_view != NULL);
-
-	style = GTK_WIDGET (day_view)->style;
-	font = style->font;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
-	light_gc = style->light_gc[GTK_STATE_NORMAL];
-	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-	canvas_width = GTK_WIDGET (canvas_item->canvas)->allocation.width;
-	canvas_height = GTK_WIDGET (canvas_item->canvas)->allocation.height;
-	left_edge = 0;
-	item_height = day_view->top_row_height - E_DAY_VIEW_TOP_CANVAS_Y_GAP;
-
-	/* Clear the entire background. */
-	gdk_draw_rectangle (drawable, dark_gc, TRUE,
-			    left_edge - x, 0,
-			    canvas_width - left_edge, height);
-
-	/* Draw the shadow around the dates. */
-	gdk_draw_line (drawable, light_gc,
-		       left_edge + 1 - x, 1 - y,
-		       canvas_width - 2 - x, 1 - y);
-	gdk_draw_line (drawable, light_gc,
-		       left_edge + 1 - x, 2 - y,
-		       left_edge + 1 - x, item_height - 1 - y);
-
-	/* Draw the background for the dates. */
-	gdk_draw_rectangle (drawable, bg_gc, TRUE,
-			    left_edge + 2 - x, 2 - y,
-			    canvas_width - left_edge - 3,
-			    item_height - 3);
-
-	/* Draw the selection background. */
-	if (GTK_WIDGET_HAS_FOCUS (day_view)
-	    && day_view->selection_start_day != -1) {
-		gint start_col, end_col, rect_x, rect_y, rect_w, rect_h;
-
-		start_col = day_view->selection_start_day;
-		end_col = day_view->selection_end_day;
-
-		if (end_col > start_col
-		    || day_view->selection_start_row == -1
-		    || day_view->selection_end_row == -1) {
-			rect_x = day_view->day_offsets[start_col];
-			rect_y = item_height;
-			rect_w = day_view->day_offsets[end_col + 1] - rect_x;
-			rect_h = canvas_height - 1 - rect_y;
-
-			gdk_draw_rectangle (drawable, style->white_gc, TRUE,
-					    rect_x - x, rect_y - y,
-					    rect_w, rect_h);
-		}
-	}
-
-	/* Draw the date. Set a clipping rectangle so we don't draw over the
-	   next day. */
-	for (day = 0; day < day_view->days_shown; day++) {
-		day_start = localtime (&day_view->day_starts[day]);
-
-		if (day_view->date_format == E_DAY_VIEW_DATE_FULL)
-			/* strftime format %A = full weekday name, %d = day of month,
-			   %B = full month name. Don't use any other specifiers. */
-			format = _("%A %d %B");
-		else if (day_view->date_format == E_DAY_VIEW_DATE_ABBREVIATED)
-			/* strftime format %a = abbreviated weekday name, %d = day of month,
-			   %b = abbreviated month name. Don't use any other specifiers. */
-			format = _("%a %d %b");
-		else if (day_view->date_format == E_DAY_VIEW_DATE_NO_WEEKDAY)
-			/* strftime format %d = day of month, %b = abbreviated month name.
-			   Don't use any other specifiers. */
-			format = _("%d %b");
-		else
-			format = "%d";
-
-		strftime (buffer, sizeof (buffer), format, day_start);
-			
-		clip_rect.x = day_view->day_offsets[day] - x;
-		clip_rect.y = 2 - y;
-		clip_rect.width = day_view->day_widths[day];
-		clip_rect.height = item_height - 2;
-		gdk_gc_set_clip_rectangle (fg_gc, &clip_rect);
-
-		date_width = gdk_string_width (font, buffer);
-		date_x = day_view->day_offsets[day] + (day_view->day_widths[day] - date_width) / 2;
-		gdk_draw_string (drawable, font, fg_gc,
-				 date_x - x, 3 + font->ascent - y, buffer);
-
-		gdk_gc_set_clip_rectangle (fg_gc, NULL);
-
-		/* Draw the lines down the left and right of the date cols. */
-		if (day != 0) {
-			gdk_draw_line (drawable, light_gc,
-				       day_view->day_offsets[day] - x,
-				       4 - y,
-				       day_view->day_offsets[day] - x,
-				       item_height - 4 - y);
-
-			gdk_draw_line (drawable, dark_gc,
-				       day_view->day_offsets[day] - 1 - x,
-				       4 - y,
-				       day_view->day_offsets[day] - 1 - x,
-				       item_height - 4 - y);
-		}
-
-		/* Draw the lines between each column. */
-		if (day != 0) {
-			gdk_draw_line (drawable, style->black_gc,
-				       day_view->day_offsets[day] - x,
-				       item_height - y,
-				       day_view->day_offsets[day] - x,
-				       canvas_height - y);
-		}
-	}
-
-	/* Draw the long events. */
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		e_day_view_top_item_draw_long_event (dvtitem, event_num,
-						     drawable,
-						     x, y, width, height);
-	}
-}
-
-
-/* This draws one event in the top canvas. */
-static void
-e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
-				     gint	      event_num,
-				     GdkDrawable     *drawable,
-				     int	      x,
-				     int	      y,
-				     int	      width,
-				     int	      height)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	GtkStyle *style;
-	GdkGC *gc, *fg_gc, *bg_gc;
-	GdkFont *font;
-	gint start_day, end_day;
-	gint item_x, item_y, item_w, item_h;
-	gint text_x, icon_x, icon_y, icon_x_inc;
-	CalComponent *comp;
-	gchar buffer[16];
-	gint hour, minute, offset, time_width, time_x, min_end_time_x;
-	gboolean draw_start_triangle, draw_end_triangle;
-	GdkRectangle clip_rect;
-
-	day_view = dvtitem->day_view;
-
-	/* If the event is currently being dragged, don't draw it. It will
-	   be drawn in the special drag items. */
-	if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->drag_event_num == event_num)
-		return;
-
-	if (!e_day_view_get_long_event_position (day_view, event_num,
-						 &start_day, &end_day,
-						 &item_x, &item_y,
-						 &item_w, &item_h))
-		return;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	style = GTK_WIDGET (day_view)->style;
-	font = style->font;
-	gc = day_view->main_gc;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
-	comp = event->comp;
-
-	/* Draw the lines across the top & bottom of the entire event. */
-	gdk_draw_line (drawable, fg_gc,
-		       item_x - x, item_y - y,
-		       item_x + item_w - 1 - x, item_y - y);
-	gdk_draw_line (drawable, fg_gc,
-		       item_x - x, item_y + item_h - 1 - y,
-		       item_x + item_w - 1 - x, item_y + item_h - 1 - y);
-
-	/* Fill it in. */
-	gdk_draw_rectangle (drawable, bg_gc, TRUE,
-			    item_x - x, item_y + 1 - y,
-			    item_w, item_h - 2);
-
-	/* When resizing we don't draw the triangles.*/
-	draw_start_triangle = TRUE;
-	draw_end_triangle = TRUE;
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE
-	    && day_view->resize_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->resize_event_num == event_num) {
-		if (day_view->resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE)
-			draw_start_triangle = FALSE;
-
-		if  (day_view->resize_drag_pos == E_DAY_VIEW_POS_RIGHT_EDGE)
-			draw_end_triangle = FALSE;
-	}
-
-	/* If the event starts before the first day shown, draw a triangle,
-	   else just draw a vertical line down the left. */
-	if (draw_start_triangle
-	    && event->start < day_view->day_starts[start_day]) {
-		e_day_view_top_item_draw_triangle (dvtitem, drawable,
-						   item_x - x, item_y - y,
-						   -E_DAY_VIEW_BAR_WIDTH,
-						   item_h);
-	} else {
-		gdk_draw_line (drawable, fg_gc,
-			       item_x - x, item_y - y,
-			       item_x - x, item_y + item_h - 1 - y);
-	}
-
-	/* Similar for the event end. */
-	if (draw_end_triangle
-	    && event->end > day_view->day_starts[end_day + 1]) {
-		e_day_view_top_item_draw_triangle (dvtitem, drawable,
-						   item_x + item_w - 1 - x,
-						   item_y - y,
-						   E_DAY_VIEW_BAR_WIDTH,
-						   item_h);
-	} else {
-		gdk_draw_line (drawable, fg_gc,
-			       item_x + item_w - 1 - x,
-			       item_y - y,
-			       item_x + item_w - 1 - x,
-			       item_y + item_h - 1 - y);
-	}
-
-	/* If we are editing the event we don't show the icons or the start
-	   & end times. */
-	if (day_view->editing_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->editing_event_num == event_num)
-		return;
-
-	/* Determine the position of the label, so we know where to place the
-	   icons. Note that since the top canvas never scrolls we don't need
-	   to take the scroll offset into account. It will always be 0. */
-	text_x = event->canvas_item->x1;
-
-	/* Draw the icons. */
-	icon_x_inc = E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD;
-	icon_x = text_x - icon_x_inc - x;
-	icon_y = item_y + 1 + E_DAY_VIEW_ICON_Y_PAD - y;
-
-	if (cal_component_has_recurrences (comp)) {
-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-		gdk_gc_set_clip_mask (gc, day_view->recurrence_mask);
-		gdk_draw_pixmap (drawable, gc,
-				 day_view->recurrence_icon,
-				 0, 0, icon_x, icon_y,
-				 E_DAY_VIEW_ICON_WIDTH,
-				 E_DAY_VIEW_ICON_HEIGHT);
-		icon_x -= icon_x_inc;
-	}
-
-#if 0
-	if (ico->dalarm.enabled || ico->malarm.enabled
-	    || ico->palarm.enabled || ico->aalarm.enabled) {
-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-		gdk_gc_set_clip_mask (gc, day_view->reminder_mask);
-		gdk_draw_pixmap (drawable, gc,
-				 day_view->reminder_icon,
-				 0, 0, icon_x, icon_y,
-				 E_DAY_VIEW_ICON_WIDTH,
-				 E_DAY_VIEW_ICON_HEIGHT);
-		icon_x -= icon_x_inc;
-	}
-	gdk_gc_set_clip_mask (gc, NULL);
-#endif
-
-	/* Draw the start & end times, if necessary.
-	   Note that GtkLabel adds 1 to the ascent so we must do that to be
-	   level with it. */
-	min_end_time_x = item_x + E_DAY_VIEW_LONG_EVENT_X_PAD - x;
-
-	if (event->start > day_view->day_starts[start_day]) {
-		offset = day_view->first_hour_shown * 60
-			+ day_view->first_minute_shown + event->start_minute;
-		hour = offset / 60;
-		minute = offset % 60;
-		sprintf (buffer, "%02i:%02i", hour, minute);
-
-		clip_rect.x = item_x - x;
-		clip_rect.y = item_y - y;
-		clip_rect.width = item_w - E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH;
-		clip_rect.height = item_h;
-		gdk_gc_set_clip_rectangle (fg_gc, &clip_rect);
-
-		gdk_draw_string (drawable, font, fg_gc,
-				 item_x + E_DAY_VIEW_LONG_EVENT_X_PAD - x,
-				 item_y + E_DAY_VIEW_LONG_EVENT_Y_PAD + font->ascent + 1 - y,
-				 buffer);
-
-		gdk_gc_set_clip_rectangle (fg_gc, NULL);
-
-		min_end_time_x += day_view->small_hour_widths[hour] + 2
-			+ day_view->max_minute_width + day_view->colon_width;
-	}
-
-	if (event->end < day_view->day_starts[end_day + 1]) {
-		offset = day_view->first_hour_shown * 60
-			+ day_view->first_minute_shown
-			+ event->end_minute;
-		hour = offset / 60;
-		minute = offset % 60;
-		time_width = day_view->small_hour_widths[hour]
-			+ day_view->max_minute_width + day_view->colon_width;
-		time_x = item_x + item_w - E_DAY_VIEW_LONG_EVENT_X_PAD - time_width - E_DAY_VIEW_LONG_EVENT_TIME_X_PAD - x;
-
-		if (time_x >= min_end_time_x) {
-			sprintf (buffer, "%02i:%02i", hour, minute);
-			gdk_draw_string (drawable, font, fg_gc,
-					 time_x,
-					 item_y + E_DAY_VIEW_LONG_EVENT_Y_PAD
-					 + font->ascent + 1 - y,
-					 buffer);
-		}
-	}
-}
-
-
-/* This draws a little triangle to indicate that an event extends past
-   the days visible on screen. */
-static void
-e_day_view_top_item_draw_triangle (EDayViewTopItem *dvtitem,
-				   GdkDrawable	   *drawable,
-				   gint		    x,
-				   gint		    y,
-				   gint		    w,
-				   gint		    h)
-{
-	EDayView *day_view;
-	GtkStyle *style;
-	GdkGC *fg_gc, *bg_gc;
-	GdkPoint points[3];
-	gint c1, c2;
-
-	day_view = dvtitem->day_view;
-
-	style = GTK_WIDGET (day_view)->style;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
-
-	points[0].x = x;
-	points[0].y = y;
-	points[1].x = x + w;
-	points[1].y = y + (h / 2) - 1;
-	points[2].x = x;
-	points[2].y = y + h - 1;
-
-	/* If the height is odd we can use the same central point for both
-	   lines. If it is even we use different end-points. */
-	c1 = c2 = y + (h / 2);
-	if (h % 2 == 0)
-		c1--;
-
-	gdk_draw_polygon (drawable, bg_gc, TRUE, points, 3);
-	gdk_draw_line (drawable, fg_gc, x, y, x + w, c1);
-	gdk_draw_line (drawable, fg_gc, x, y + h - 1, x + w, c2);
-}
-
-
-/* This is supposed to return the nearest item the the point and the distance.
-   Since we are the only item we just return ourself and 0 for the distance.
-   This is needed so that we get button/motion events. */
-static double
-e_day_view_top_item_point (GnomeCanvasItem *item, double x, double y,
-			   int cx, int cy,
-			   GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
-static gint
-e_day_view_top_item_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EDayViewTopItem *dvtitem;
-
-	dvtitem = E_DAY_VIEW_TOP_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-
-	case GDK_BUTTON_RELEASE:
-
-	case GDK_MOTION_NOTIFY:
-
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
diff --git a/calendar/gui/e-day-view-top-item.h b/calendar/gui/e-day-view-top-item.h
deleted file mode 100644
index 435ef12b58..0000000000
--- a/calendar/gui/e-day-view-top-item.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_DAY_VIEW_TOP_ITEM_H_
-#define _E_DAY_VIEW_TOP_ITEM_H_
-
-#include "e-day-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EDayViewTopItem - displays the top part of the Day/Work Week calendar view.
- */
-
-#define E_DAY_VIEW_TOP_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_day_view_top_item_get_type (), EDayViewTopItem))
-#define E_DAY_VIEW_TOP_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_day_view_top_item_get_type ()))
-#define E_IS_DAY_VIEW_TOP_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_day_view_top_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EDayView widget. */
-	EDayView *day_view;
-} EDayViewTopItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EDayViewTopItemClass;
-
-
-GtkType  e_day_view_top_item_get_type      (void);
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_DAY_VIEW_TOP_ITEM_H_ */
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
deleted file mode 100644
index f8a3002e2c..0000000000
--- a/calendar/gui/e-day-view.c
+++ /dev/null
@@ -1,6080 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EDayView - displays the Day & Work-Week views of the calendar.
- */
-
-#include <config.h>
-#include <math.h>
-#include <time.h>
-#include <gnome.h>
-#include <gdk/gdkx.h>
-#include <cal-util/timeutil.h>
-#include "e-day-view.h"
-#include "e-day-view-time-item.h"
-#include "e-day-view-top-item.h"
-#include "e-day-view-main-item.h"
-#include "calendar-commands.h"
-#include "popup-menu.h"
-#include <gal/widgets/e-canvas.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-canvas-utils.h>
-
-/* Images */
-#include "bell.xpm"
-#include "recur.xpm"
-
-/* The minimum amount of space wanted on each side of the date string. */
-#define E_DAY_VIEW_DATE_X_PAD	4
-
-#define E_DAY_VIEW_LARGE_FONT	\
-	"-adobe-utopia-regular-r-normal-*-*-240-*-*-p-*-iso8859-*"
-#define E_DAY_VIEW_LARGE_FONT_FALLBACK	\
-	"-adobe-helvetica-bold-r-normal-*-*-240-*-*-p-*-iso8859-*"
-
-/* The offset from the top/bottom of the canvas before auto-scrolling starts.*/
-#define E_DAY_VIEW_AUTO_SCROLL_OFFSET	16
-
-/* The time between each auto-scroll, in milliseconds. */
-#define E_DAY_VIEW_AUTO_SCROLL_TIMEOUT	50
-
-/* The number of timeouts we skip before we start scrolling. */
-#define E_DAY_VIEW_AUTO_SCROLL_DELAY	5
-
-/* The number of pixels the mouse has to be moved with the button down before
-   we start a drag. */
-#define E_DAY_VIEW_DRAG_START_OFFSET	4
-
-/* Drag and Drop stuff. */
-enum {
-	TARGET_CALENDAR_EVENT
-};
-static GtkTargetEntry target_table[] = {
-	{ "application/x-e-calendar-event",     0, TARGET_CALENDAR_EVENT }
-};
-static guint n_targets = sizeof(target_table) / sizeof(target_table[0]);
-
-static void e_day_view_class_init (EDayViewClass *class);
-static void e_day_view_init (EDayView *day_view);
-static void e_day_view_destroy (GtkObject *object);
-static void e_day_view_realize (GtkWidget *widget);
-static void e_day_view_unrealize (GtkWidget *widget);
-static void e_day_view_style_set (GtkWidget *widget,
-				  GtkStyle  *previous_style);
-static void e_day_view_size_allocate (GtkWidget *widget,
-				      GtkAllocation *allocation);
-static gboolean e_day_view_update_scroll_regions (EDayView *day_view);
-static gint e_day_view_focus_in (GtkWidget *widget,
-				 GdkEventFocus *event);
-static gint e_day_view_focus_out (GtkWidget *widget,
-				  GdkEventFocus *event);
-static gint e_day_view_key_press (GtkWidget *widget,
-				  GdkEventKey *event);
-static void e_day_view_cursor_key_up_shifted (EDayView *day_view,
-					      GdkEventKey *event);
-static void e_day_view_cursor_key_down_shifted (EDayView *day_view,
-						GdkEventKey *event);
-static void e_day_view_cursor_key_left_shifted (EDayView *day_view,
-						GdkEventKey *event);
-static void e_day_view_cursor_key_right_shifted (EDayView *day_view,
-						 GdkEventKey *event);
-static void e_day_view_cursor_key_up (EDayView *day_view,
-				      GdkEventKey *event);
-static void e_day_view_cursor_key_down (EDayView *day_view,
-					GdkEventKey *event);
-static void e_day_view_cursor_key_left (EDayView *day_view,
-					GdkEventKey *event);
-static void e_day_view_cursor_key_right (EDayView *day_view,
-					 GdkEventKey *event);
-static void e_day_view_ensure_rows_visible (EDayView *day_view,
-					    gint start_row,
-					    gint end_row);
-
-static gboolean e_day_view_check_if_new_event_fits (EDayView *day_view);
-
-static void e_day_view_on_canvas_realized (GtkWidget *widget,
-					   EDayView *day_view);
-
-static gboolean e_day_view_on_top_canvas_button_press (GtkWidget *widget,
-						       GdkEventButton *event,
-						       EDayView *day_view);
-static gboolean e_day_view_on_top_canvas_button_release (GtkWidget *widget,
-							 GdkEventButton *event,
-							 EDayView *day_view);
-static gboolean e_day_view_on_top_canvas_motion (GtkWidget *widget,
-						 GdkEventMotion *event,
-						 EDayView *day_view);
-
-static gboolean e_day_view_on_main_canvas_button_press (GtkWidget *widget,
-							GdkEventButton *event,
-							EDayView *day_view);
-static gboolean e_day_view_on_main_canvas_button_release (GtkWidget *widget,
-							  GdkEventButton *event,
-							  EDayView *day_view);
-
-static gboolean e_day_view_on_time_canvas_button_press (GtkWidget *widget,
-							GdkEventButton *event,
-							EDayView *day_view);
-
-static void e_day_view_update_calendar_selection_time (EDayView *day_view);
-static gboolean e_day_view_on_main_canvas_motion (GtkWidget *widget,
-						  GdkEventMotion *event,
-						  EDayView *day_view);
-static gboolean e_day_view_convert_event_coords (EDayView *day_view,
-						 GdkEvent *event,
-						 GdkWindow *window,
-						 gint *x_return,
-						 gint *y_return);
-static void e_day_view_update_long_event_resize (EDayView *day_view,
-						 gint day);
-static void e_day_view_update_resize (EDayView *day_view,
-				      gint row);
-static void e_day_view_finish_long_event_resize (EDayView *day_view);
-static void e_day_view_finish_resize (EDayView *day_view);
-static void e_day_view_abort_resize (EDayView *day_view,
-				     guint32 time);
-
-
-static gboolean e_day_view_on_long_event_button_press (EDayView		*day_view,
-						       gint		 event_num,
-						       GdkEventButton	*event,
-						       EDayViewPosition  pos,
-						       gint		 event_x,
-						       gint		 event_y);
-static gboolean e_day_view_on_event_button_press (EDayView	 *day_view,
-						  gint		  day,
-						  gint		  event_num,
-						  GdkEventButton *event,
-						  EDayViewPosition pos,
-						  gint		  event_x,
-						  gint		  event_y);
-static void e_day_view_on_long_event_click (EDayView *day_view,
-					    gint event_num,
-					    GdkEventButton  *bevent,
-					    EDayViewPosition pos,
-					    gint	     event_x,
-					    gint	     event_y);
-static void e_day_view_on_event_click (EDayView *day_view,
-				       gint day,
-				       gint event_num,
-				       GdkEventButton  *event,
-				       EDayViewPosition pos,
-				       gint		event_x,
-				       gint		event_y);
-static void e_day_view_on_event_double_click (EDayView *day_view,
-					      gint day,
-					      gint event_num);
-static void e_day_view_on_event_right_click (EDayView *day_view,
-					     GdkEventButton *bevent,
-					     gint day,
-					     gint event_num);
-
-static void e_day_view_recalc_day_starts (EDayView *day_view,
-					  time_t start_time);
-static void e_day_view_recalc_num_rows	(EDayView	*day_view);
-static void e_day_view_recalc_cell_sizes	(EDayView	*day_view);
-
-static EDayViewPosition e_day_view_convert_position_in_top_canvas (EDayView *day_view,
-								   gint x,
-								   gint y,
-								   gint *day_return,
-								   gint *event_num_return);
-static EDayViewPosition e_day_view_convert_position_in_main_canvas (EDayView *day_view,
-								    gint x,
-								    gint y,
-								    gint *day_return,
-								    gint *row_return,
-								    gint *event_num_return);
-static gboolean e_day_view_find_event_from_item (EDayView *day_view,
-						 GnomeCanvasItem *item,
-						 gint *day_return,
-						 gint *event_num_return);
-static gboolean e_day_view_find_event_from_uid (EDayView *day_view,
-						const gchar *uid,
-						gint *day_return,
-						gint *event_num_return);
-
-typedef gboolean (* EDayViewForeachEventCallback) (EDayView *day_view,
-						   gint day,
-						   gint event_num,
-						   gpointer data);
-
-static void e_day_view_foreach_event_with_uid (EDayView *day_view,
-					       const gchar *uid,
-					       EDayViewForeachEventCallback callback,
-					       gpointer data);
-
-static void e_day_view_queue_reload_events (EDayView *day_view);
-static gboolean e_day_view_reload_events_idle_cb	(gpointer data);
-static void e_day_view_reload_events (EDayView *day_view);
-static void e_day_view_free_events (EDayView *day_view);
-static void e_day_view_free_event_array (EDayView *day_view,
-					 GArray *array);
-static int e_day_view_add_event (CalComponent *comp,
-				 time_t	  start,
-				 time_t	  end,
-				 gpointer data);
-static void e_day_view_update_event_label (EDayView *day_view,
-					   gint day,
-					   gint event_num);
-static void e_day_view_update_long_event_label (EDayView *day_view,
-						gint event_num);
-
-static void e_day_view_layout_long_events (EDayView *day_view);
-static void e_day_view_layout_long_event (EDayView	   *day_view,
-					  EDayViewEvent *event,
-					  guint8	   *grid);
-static void e_day_view_reshape_long_events (EDayView *day_view);
-static void e_day_view_reshape_long_event (EDayView *day_view,
-					   gint event_num);
-static void e_day_view_layout_day_events (EDayView *day_view,
-					  gint	day);
-static void e_day_view_layout_day_event (EDayView   *day_view,
-					 gint	    day,
-					 EDayViewEvent *event,
-					 guint8	   *grid,
-					 guint16   *group_starts);
-static void e_day_view_expand_day_event (EDayView	   *day_view,
-					 gint	    day,
-					 EDayViewEvent *event,
-					 guint8	   *grid);
-static void e_day_view_recalc_cols_per_row (EDayView *day_view,
-					    gint      day,
-					    guint16  *group_starts);
-static void e_day_view_reshape_day_events (EDayView *day_view,
-					   gint day);
-static void e_day_view_reshape_day_event (EDayView *day_view,
-					  gint	day,
-					  gint	event_num);
-static void e_day_view_reshape_main_canvas_resize_bars (EDayView *day_view);
-static void e_day_view_reshape_resize_long_event_rect_item (EDayView *day_view);
-static void e_day_view_reshape_resize_rect_item (EDayView *day_view);
-
-static void e_day_view_ensure_events_sorted (EDayView *day_view);
-static gint e_day_view_event_sort_func (const void *arg1,
-					const void *arg2);
-
-static void e_day_view_start_editing_event (EDayView *day_view,
-					    gint day,
-					    gint event_num,
-					    gchar *initial_text);
-static void e_day_view_stop_editing_event (EDayView *day_view);
-static gboolean e_day_view_on_text_item_event (GnomeCanvasItem *item,
-					       GdkEvent *event,
-					       EDayView *day_view);
-static void e_day_view_on_editing_started (EDayView *day_view,
-					   GnomeCanvasItem *item);
-static void e_day_view_on_editing_stopped (EDayView *day_view,
-					   GnomeCanvasItem *item);
-
-static time_t e_day_view_convert_grid_position_to_time (EDayView *day_view,
-							gint col,
-							gint row);
-static gboolean e_day_view_convert_time_to_grid_position (EDayView *day_view,
-							  time_t time,
-							  gint *col,
-							  gint *row);
-
-static void e_day_view_start_auto_scroll (EDayView *day_view,
-					  gboolean scroll_up);
-static gboolean e_day_view_auto_scroll_handler (gpointer data);
-
-static void e_day_view_on_new_appointment (GtkWidget *widget,
-					   gpointer data);
-static void e_day_view_on_edit_appointment (GtkWidget *widget,
-					    gpointer data);
-static void e_day_view_on_delete_occurrence (GtkWidget *widget,
-					     gpointer data);
-static void e_day_view_on_delete_appointment (GtkWidget *widget,
-					      gpointer data);
-static void e_day_view_on_unrecur_appointment (GtkWidget *widget,
-					       gpointer data);
-static EDayViewEvent* e_day_view_get_popup_menu_event (EDayView *day_view);
-
-static gint e_day_view_on_top_canvas_drag_motion (GtkWidget      *widget,
-						  GdkDragContext *context,
-						  gint            x,
-						  gint            y,
-						  guint           time,
-						  EDayView	  *day_view);
-static void e_day_view_update_top_canvas_drag (EDayView *day_view,
-					       gint day);
-static void e_day_view_reshape_top_canvas_drag_item (EDayView *day_view);
-static gint e_day_view_on_main_canvas_drag_motion (GtkWidget      *widget,
-						   GdkDragContext *context,
-						   gint            x,
-						   gint            y,
-						   guint           time,
-						   EDayView	  *day_view);
-static void e_day_view_reshape_main_canvas_drag_item (EDayView *day_view);
-static void e_day_view_update_main_canvas_drag (EDayView *day_view,
-						gint row,
-						gint day);
-static void e_day_view_on_top_canvas_drag_leave (GtkWidget      *widget,
-						 GdkDragContext *context,
-						 guint           time,
-						 EDayView	     *day_view);
-static void e_day_view_on_main_canvas_drag_leave (GtkWidget      *widget,
-						  GdkDragContext *context,
-						  guint           time,
-						  EDayView	 *day_view);
-static void e_day_view_on_drag_begin (GtkWidget      *widget,
-				      GdkDragContext *context,
-				      EDayView	   *day_view);
-static void e_day_view_on_drag_end (GtkWidget      *widget,
-				    GdkDragContext *context,
-				    EDayView       *day_view);
-static void e_day_view_on_drag_data_get (GtkWidget          *widget,
-					 GdkDragContext     *context,
-					 GtkSelectionData   *selection_data,
-					 guint               info,
-					 guint               time,
-					 EDayView		*day_view);
-static void e_day_view_on_top_canvas_drag_data_received (GtkWidget	*widget,
-							 GdkDragContext *context,
-							 gint            x,
-							 gint            y,
-							 GtkSelectionData *data,
-							 guint           info,
-							 guint           time,
-							 EDayView	*day_view);
-static void e_day_view_on_main_canvas_drag_data_received (GtkWidget      *widget,
-							  GdkDragContext *context,
-							  gint            x,
-							  gint            y,
-							  GtkSelectionData *data,
-							  guint           info,
-							  guint           time,
-							  EDayView	 *day_view);
-#ifndef NO_WARNINGS
-static gboolean e_day_view_update_event_cb (EDayView *day_view,
-					    gint day,
-					    gint event_num,
-					    gpointer data);
-#endif
-static gboolean e_day_view_remove_event_cb (EDayView *day_view,
-					    gint day,
-					    gint event_num,
-					    gpointer data);
-static void e_day_view_normalize_selection (EDayView *day_view);
-
-
-static GtkTableClass *parent_class;
-
-
-GtkType
-e_day_view_get_type (void)
-{
-	static GtkType e_day_view_type = 0;
-
-	if (!e_day_view_type){
-		GtkTypeInfo e_day_view_info = {
-			"EDayView",
-			sizeof (EDayView),
-			sizeof (EDayViewClass),
-			(GtkClassInitFunc) e_day_view_class_init,
-			(GtkObjectInitFunc) e_day_view_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		parent_class = gtk_type_class (GTK_TYPE_TABLE);
-		e_day_view_type = gtk_type_unique (GTK_TYPE_TABLE,
-						   &e_day_view_info);
-	}
-
-	return e_day_view_type;
-}
-
-
-static void
-e_day_view_class_init (EDayViewClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-
-	/* Method override */
-	object_class->destroy		= e_day_view_destroy;
-
-	widget_class->realize		= e_day_view_realize;
-	widget_class->unrealize		= e_day_view_unrealize;
-	widget_class->style_set		= e_day_view_style_set;
- 	widget_class->size_allocate	= e_day_view_size_allocate;
-	widget_class->focus_in_event	= e_day_view_focus_in;
-	widget_class->focus_out_event	= e_day_view_focus_out;
-	widget_class->key_press_event	= e_day_view_key_press;
-}
-
-
-static void
-e_day_view_init (EDayView *day_view)
-{
-	gint day;
-	GnomeCanvasGroup *canvas_group;
-
-	GTK_WIDGET_SET_FLAGS (day_view, GTK_CAN_FOCUS);
-
-	day_view->calendar = NULL;
-	day_view->client = NULL;
-
-	day_view->long_events = g_array_new (FALSE, FALSE,
-					     sizeof (EDayViewEvent));
-	day_view->long_events_sorted = TRUE;
-	day_view->long_events_need_layout = FALSE;
-	day_view->long_events_need_reshape = FALSE;
-	day_view->reload_events_idle_id = 0;
-
-	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++) {
-		day_view->events[day] = g_array_new (FALSE, FALSE,
-						     sizeof (EDayViewEvent));
-		day_view->events_sorted[day] = TRUE;
-		day_view->need_layout[day] = FALSE;
-		day_view->need_reshape[day] = FALSE;
-	}
-
-	/* These indicate that the times haven't been set. */
-	day_view->lower = 0;
-	day_view->upper = 0;
-
-	/* FIXME: Initialize day_starts. */
-	day_view->work_week_view = FALSE;
-	day_view->days_shown = 1;
-
-	day_view->mins_per_row = 30;
-	day_view->date_format = E_DAY_VIEW_DATE_FULL;
-	day_view->rows_in_top_display = 0;
-
-	/* Note that these don't work yet. It would need a few fixes to the
-	   way event->start_minute and event->end_minute are used, and there
-	   may be problems with events that go outside the visible times. */
-	day_view->first_hour_shown = 0;
-	day_view->first_minute_shown = 0;
-	day_view->last_hour_shown = 24;
-	day_view->last_minute_shown = 0;
-
-	day_view->main_gc = NULL;
-	e_day_view_recalc_num_rows (day_view);
-
-	day_view->working_days = E_DAY_VIEW_MONDAY | E_DAY_VIEW_TUESDAY
-		| E_DAY_VIEW_WEDNESDAY | E_DAY_VIEW_THURSDAY
-		| E_DAY_VIEW_FRIDAY;
-
-	day_view->work_day_start_hour = 9;
-	day_view->work_day_start_minute = 0;
-	day_view->work_day_end_hour = 17;
-	day_view->work_day_end_minute = 0;
-	day_view->scroll_to_work_day = TRUE;
-
-	day_view->editing_event_day = -1;
-	day_view->editing_event_num = -1;
-
-	day_view->resize_bars_event_day = -1;
-	day_view->resize_bars_event_num = -1;
-
-	day_view->selection_start_row = -1;
-	day_view->selection_start_day = -1;
-	day_view->selection_end_row = -1;
-	day_view->selection_end_day = -1;
-	day_view->selection_is_being_dragged = FALSE;
-	day_view->selection_drag_pos = E_DAY_VIEW_DRAG_END;
-	day_view->selection_in_top_canvas = FALSE;
-
-	day_view->resize_drag_pos = E_DAY_VIEW_POS_NONE;
-
-	day_view->pressed_event_day = -1;
-
-	day_view->drag_event_day = -1;
-	day_view->drag_last_day = -1;
-
-	day_view->auto_scroll_timeout_id = 0;
-
-	/* Create the large font. */
-	day_view->large_font = gdk_font_load (E_DAY_VIEW_LARGE_FONT);
-	if (!day_view->large_font)
-		day_view->large_font = gdk_font_load (E_DAY_VIEW_LARGE_FONT_FALLBACK);
-	if (!day_view->large_font)
-		g_warning ("Couldn't load font");
-
-
-	/*
-	 * Top Canvas
-	 */
-	day_view->top_canvas = e_canvas_new ();
-	gtk_table_attach (GTK_TABLE (day_view), day_view->top_canvas,
-			  1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-	gtk_widget_show (day_view->top_canvas);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas), "button_press_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_button_press),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas), "button_release_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_button_release),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas), "motion_notify_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_motion),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas),
-				  "drag_motion",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_drag_motion),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->top_canvas),
-				  "drag_leave",
-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_drag_leave),
-				  day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->top_canvas),
-			    "drag_begin",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_begin),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->top_canvas),
-			    "drag_end",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_end),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->top_canvas),
-			    "drag_data_get",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_data_get),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->top_canvas),
-			    "drag_data_received",
-			    GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_drag_data_received),
-			    day_view);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->top_canvas)->root);
-
-	day_view->top_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_day_view_top_item_get_type (),
-				       "EDayViewTopItem::day_view", day_view,
-				       NULL);
-
-	day_view->resize_long_event_rect_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type(),
-				       NULL);
-	gnome_canvas_item_hide (day_view->resize_long_event_rect_item);
-
-	day_view->drag_long_event_rect_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_long_event_rect_item);
-
-	day_view->drag_long_event_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_text_get_type (),
-				       "anchor", GTK_ANCHOR_NW,
-				       "line_wrap", TRUE,
-				       "clip", TRUE,
-				       "max_lines", 1,
-				       "editable", TRUE,
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_long_event_item);
-
-	/*
-	 * Main Canvas
-	 */
-	day_view->main_canvas = e_canvas_new ();
-	gtk_table_attach (GTK_TABLE (day_view), day_view->main_canvas,
-			  1, 2, 1, 2,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (day_view->main_canvas);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas), "realize",
-			    GTK_SIGNAL_FUNC (e_day_view_on_canvas_realized),
-			    day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
-				  "button_press_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_button_press),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
-				  "button_release_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_button_release),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
-				  "motion_notify_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_motion),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
-				  "drag_motion",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_drag_motion),
-				  day_view);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->main_canvas),
-				  "drag_leave",
-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_drag_leave),
-				  day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas),
-			    "drag_begin",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_begin),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas),
-			    "drag_end",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_end),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas),
-			    "drag_data_get",
-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_data_get),
-			    day_view);
-	gtk_signal_connect (GTK_OBJECT (day_view->main_canvas),
-			    "drag_data_received",
-			    GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_drag_data_received),
-			    day_view);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->main_canvas)->root);
-
-	day_view->main_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_day_view_main_item_get_type (),
-				       "EDayViewMainItem::day_view", day_view,
-				       NULL);
-
-	day_view->resize_rect_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type(),
-				       NULL);
-	gnome_canvas_item_hide (day_view->resize_rect_item);
-
-	day_view->resize_bar_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type(),
-				       NULL);
-	gnome_canvas_item_hide (day_view->resize_bar_item);
-
-	day_view->main_canvas_top_resize_bar_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-
-	day_view->main_canvas_bottom_resize_bar_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-
-
-	day_view->drag_rect_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_rect_item);
-
-	day_view->drag_bar_item =
-		gnome_canvas_item_new (canvas_group,
-				       gnome_canvas_rect_get_type (),
-				       "width_pixels", 1,
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_bar_item);
-
-	day_view->drag_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_text_get_type (),
-				       "anchor", GTK_ANCHOR_NW,
-				       "line_wrap", TRUE,
-				       "clip", TRUE,
-				       "editable", TRUE,
-				       NULL);
-	gnome_canvas_item_hide (day_view->drag_item);
-
-
-	/*
-	 * Times Canvas
-	 */
-	day_view->time_canvas = e_canvas_new ();
-	gtk_layout_set_vadjustment (GTK_LAYOUT (day_view->time_canvas),
-				    GTK_LAYOUT (day_view->main_canvas)->vadjustment);
-	gtk_table_attach (GTK_TABLE (day_view), day_view->time_canvas,
-			  0, 1, 1, 2,
-			  GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (day_view->time_canvas);
-	gtk_signal_connect_after (GTK_OBJECT (day_view->time_canvas),
-				  "button_press_event",
-				  GTK_SIGNAL_FUNC (e_day_view_on_time_canvas_button_press),
-				  day_view);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->time_canvas)->root);
-
-	day_view->time_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_day_view_time_item_get_type (),
-				       "EDayViewTimeItem::day_view", day_view,
-				       NULL);
-
-
-	/*
-	 * Scrollbar.
-	 */
-	day_view->vscrollbar = gtk_vscrollbar_new (GTK_LAYOUT (day_view->main_canvas)->vadjustment);
-	gtk_table_attach (GTK_TABLE (day_view), day_view->vscrollbar,
-			  2, 3, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (day_view->vscrollbar);
-
-
-	/* Create the cursors. */
-	day_view->normal_cursor = gdk_cursor_new (GDK_TOP_LEFT_ARROW);
-	day_view->move_cursor = gdk_cursor_new (GDK_FLEUR);
-	day_view->resize_width_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
-	day_view->resize_height_cursor = gdk_cursor_new (GDK_SB_V_DOUBLE_ARROW);
-	day_view->last_cursor_set_in_top_canvas = NULL;
-	day_view->last_cursor_set_in_main_canvas = NULL;
-
-	/* Set up the drop sites. */
-	gtk_drag_dest_set (day_view->top_canvas,
-			   GTK_DEST_DEFAULT_ALL,
-			   target_table, n_targets,
-			   GDK_ACTION_COPY | GDK_ACTION_MOVE);
-	gtk_drag_dest_set (day_view->main_canvas,
-			   GTK_DEST_DEFAULT_ALL,
-			   target_table, n_targets,
-			   GDK_ACTION_COPY | GDK_ACTION_MOVE);
-}
-
-
-/* Turn off the background of the canvas windows. This reduces flicker
-   considerably when scrolling. (Why isn't it in GnomeCanvas?). */
-static void
-e_day_view_on_canvas_realized (GtkWidget *widget,
-			       EDayView *day_view)
-{
-	gdk_window_set_back_pixmap (GTK_LAYOUT (widget)->bin_window,
-				    NULL, FALSE);
-}
-
-
-/**
- * e_day_view_new:
- * @Returns: a new #EDayView.
- *
- * Creates a new #EDayView.
- **/
-GtkWidget *
-e_day_view_new (void)
-{
-	GtkWidget *day_view;
-
-	day_view = GTK_WIDGET (gtk_type_new (e_day_view_get_type ()));
-
-	return day_view;
-}
-
-
-static void
-e_day_view_destroy (GtkObject *object)
-{
-	EDayView *day_view;
-	gint day;
-
-	day_view = E_DAY_VIEW (object);
-
-	e_day_view_stop_auto_scroll (day_view);
-
-	if (day_view->reload_events_idle_id != 0) {
-		g_source_remove (day_view->reload_events_idle_id);
-		day_view->reload_events_idle_id = 0;
-	}
-
-	if (day_view->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (day_view->client), day_view);
-		gtk_object_unref (GTK_OBJECT (day_view->client));
-		day_view->client = NULL;
-	}
-
-	if (day_view->large_font)
-		gdk_font_unref (day_view->large_font);
-
-	gdk_cursor_destroy (day_view->normal_cursor);
-	gdk_cursor_destroy (day_view->move_cursor);
-	gdk_cursor_destroy (day_view->resize_width_cursor);
-	gdk_cursor_destroy (day_view->resize_height_cursor);
-
-	e_day_view_free_events (day_view);
-	g_array_free (day_view->long_events, TRUE);
-	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++)
-		g_array_free (day_view->events[day], TRUE);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-
-static void
-e_day_view_realize (GtkWidget *widget)
-{
-	EDayView *day_view;
-	GdkColormap *colormap;
-	gboolean success[E_DAY_VIEW_COLOR_LAST];
-	gint nfailed;
-
-	if (GTK_WIDGET_CLASS (parent_class)->realize)
-		(*GTK_WIDGET_CLASS (parent_class)->realize)(widget);
-
-	day_view = E_DAY_VIEW (widget);
-	day_view->main_gc = gdk_gc_new (widget->window);
-
-	colormap = gtk_widget_get_colormap (widget);
-
-	/* Allocate the colors. */
-	day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING].red   = 247 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING].green = 247 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_WORKING].blue  = 244 * 257;
-
-	day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].red   = 216 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].green = 216 * 257;
-	day_view->colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].blue  = 214 * 257;
-
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR].red   = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR].green = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR].blue  = 65535;
-
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].red   = 65535;
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].green = 65535;
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].blue  = 65535;
-
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER].red   = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER].green = 0;
-	day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER].blue  = 0;
-
-	nfailed = gdk_colormap_alloc_colors (colormap, day_view->colors,
-					     E_DAY_VIEW_COLOR_LAST, FALSE,
-					     TRUE, success);
-	if (nfailed)
-		g_warning ("Failed to allocate all colors");
-
-
-	/* Create the pixmaps. */
-	day_view->reminder_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &day_view->reminder_mask, NULL, bell_xpm);
-	day_view->recurrence_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &day_view->recurrence_mask, NULL, recur_xpm);
-
-
-
-	/* Set the canvas item colors. */
-	gnome_canvas_item_set (day_view->resize_long_event_rect_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->drag_long_event_rect_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-
-	gnome_canvas_item_set (day_view->resize_rect_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->resize_bar_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->main_canvas_top_resize_bar_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->main_canvas_bottom_resize_bar_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-
-	gnome_canvas_item_set (day_view->drag_rect_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-	gnome_canvas_item_set (day_view->drag_bar_item,
-			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_VBAR],
-			       "outline_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BORDER],
-			       NULL);
-
-
-	/* Set the fonts for the text items used when dragging. */
-	gnome_canvas_item_set (day_view->drag_long_event_item,
-			       "font_gdk", GTK_WIDGET (day_view)->style->font,
-			       NULL);
-
-	gnome_canvas_item_set (day_view->drag_item,
-			       "font_gdk", GTK_WIDGET (day_view)->style->font,
-			       NULL);
-}
-
-
-static void
-e_day_view_unrealize (GtkWidget *widget)
-{
-	EDayView *day_view;
-	GdkColormap *colormap;
-	gint i;
-
-	day_view = E_DAY_VIEW (widget);
-
-	gdk_gc_unref (day_view->main_gc);
-	day_view->main_gc = NULL;
-
-	colormap = gtk_widget_get_colormap (widget);
-	for (i = 0; i < E_DAY_VIEW_COLOR_LAST; i++)
-		gdk_colors_free (colormap, &day_view->colors[i].pixel, 1, 0);
-
-	gdk_pixmap_unref (day_view->reminder_icon);
-	day_view->reminder_icon = NULL;
-	gdk_pixmap_unref (day_view->recurrence_icon);
-	day_view->recurrence_icon = NULL;
-
-	if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-		(*GTK_WIDGET_CLASS (parent_class)->unrealize)(widget);
-}
-
-
-static void
-e_day_view_style_set (GtkWidget *widget,
-		      GtkStyle  *previous_style)
-{
-	EDayView *day_view;
-	GdkFont *font;
-	gint top_rows, top_canvas_height;
-	gint hour, max_large_hour_width;
-	gint minute, max_minute_width, i;
-	gint month, day, width;
-	gint longest_month_width, longest_abbreviated_month_width;
-	gint longest_weekday_width, longest_abbreviated_weekday_width;
-	struct tm date_tm;
-	gchar buffer[128];
-	gint times_width;
-
-	if (GTK_WIDGET_CLASS (parent_class)->style_set)
-		(*GTK_WIDGET_CLASS (parent_class)->style_set)(widget, previous_style);
-
-	day_view = E_DAY_VIEW (widget);
-	font = widget->style->font;
-
-	/* Recalculate the height of each row based on the font size. */
-	day_view->row_height = font->ascent + font->descent + E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD * 2 + 2 /* FIXME */;
-	day_view->row_height = MAX (day_view->row_height, E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD + 2);
-	GTK_LAYOUT (day_view->main_canvas)->vadjustment->step_increment = day_view->row_height;
-
-	day_view->top_row_height = font->ascent + font->descent + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT * 2 + E_DAY_VIEW_LONG_EVENT_Y_PAD * 2 + E_DAY_VIEW_TOP_CANVAS_Y_GAP;
-	day_view->top_row_height = MAX (day_view->top_row_height, E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD + 2 + E_DAY_VIEW_TOP_CANVAS_Y_GAP);
-
-	/* Set the height of the top canvas based on the row height and the
-	   number of rows needed (min 1 + 1 for the dates + 1 space for DnD).*/
-	top_rows = MAX (1, day_view->rows_in_top_display);
-	top_canvas_height = (top_rows + 2) * day_view->top_row_height;
-	gtk_widget_set_usize (day_view->top_canvas, -1, top_canvas_height);
-
-	/* Find the longest full & abbreviated month names. */
-	memset (&date_tm, 0, sizeof (date_tm));
-	date_tm.tm_year = 100;
-	date_tm.tm_mday = 1;
-	date_tm.tm_isdst = -1;
-
-	longest_month_width = 0;
-	longest_abbreviated_month_width = 0;
-	for (month = 0; month < 12; month++) {
-		date_tm.tm_mon = month;
-
-		strftime (buffer, sizeof (buffer), "%B", &date_tm);
-		width = gdk_string_width (font, buffer);
-		if (width > longest_month_width) {
-			longest_month_width = width;
-			day_view->longest_month_name = month;
-		}
-
-		strftime (buffer, sizeof (buffer), "%b", &date_tm);
-		width = gdk_string_width (font, buffer);
-		if (width > longest_abbreviated_month_width) {
-			longest_abbreviated_month_width = width;
-			day_view->longest_abbreviated_month_name = month;
-		}
-	}
-
-	/* Find the longest full & abbreviated weekday names. */
-	memset (&date_tm, 0, sizeof (date_tm));
-	date_tm.tm_year = 100;
-	date_tm.tm_mon = 0;
-	date_tm.tm_isdst = -1;
-
-	longest_weekday_width = 0;
-	longest_abbreviated_weekday_width = 0;
-	for (day = 0; day < 7; day++) {
-		date_tm.tm_mday = 2 + day;
-		date_tm.tm_wday = day;
-
-		strftime (buffer, sizeof (buffer), "%A", &date_tm);
-		width = gdk_string_width (font, buffer);
-		if (width > longest_weekday_width) {
-			longest_weekday_width = width;
-			day_view->longest_weekday_name = day;
-		}
-
-		strftime (buffer, sizeof (buffer), "%a", &date_tm);
-		width = gdk_string_width (font, buffer);
-		if (width > longest_abbreviated_weekday_width) {
-			longest_abbreviated_weekday_width = width;
-			day_view->longest_abbreviated_weekday_name = day;
-		}
-	}
-
-
-	/* Calculate the widths of all the time strings necessary. */
-	day_view->max_small_hour_width = 0;
-	max_large_hour_width = 0;
-	for (hour = 0; hour < 24; hour++) {
-		sprintf (buffer, "%02i", hour);
-		day_view->small_hour_widths[hour] = gdk_string_width (font, buffer);
-		day_view->large_hour_widths[hour] = gdk_string_width (day_view->large_font, buffer);
-		day_view->max_small_hour_width = MAX (day_view->max_small_hour_width, day_view->small_hour_widths[hour]);
-		max_large_hour_width = MAX (max_large_hour_width, day_view->large_hour_widths[hour]);
-	}
-	day_view->max_large_hour_width = max_large_hour_width;
-
-	max_minute_width = 0;
-	for (minute = 0, i = 0; minute < 60; minute += 5, i++) {
-		sprintf (buffer, "%02i", minute);
-		day_view->minute_widths[i] = gdk_string_width (font, buffer);
-		max_minute_width = MAX (max_minute_width, day_view->minute_widths[i]);
-	}
-	day_view->max_minute_width = max_minute_width;
-	day_view->colon_width = gdk_string_width (font, ":");
-
-	/* Calculate the width of the time column. */
-	times_width = e_day_view_time_item_get_column_width (E_DAY_VIEW_TIME_ITEM (day_view->time_canvas_item));
-	gtk_widget_set_usize (day_view->time_canvas, times_width, -1);
-}
-
-
-/* This recalculates the sizes of each column. */
-static void
-e_day_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
-{
-	EDayView *day_view;
-	gint day, scroll_y;
-	gboolean need_reshape;
-	gdouble old_x2, old_y2, new_x2, new_y2;
-
-#if 0
-	g_print ("In e_day_view_size_allocate\n");
-#endif
-	day_view = E_DAY_VIEW (widget);
-
-	(*GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
-
-	e_day_view_recalc_cell_sizes (day_view);
-
-	/* Set the scroll region of the top canvas to its allocated size. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (day_view->top_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = day_view->top_canvas->allocation.width - 1;
-	new_y2 = day_view->top_canvas->allocation.height - 1;
-	if (old_x2 != new_x2 || old_y2 != new_y2)
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (day_view->top_canvas),
-						0, 0, new_x2, new_y2);
-
-	need_reshape = e_day_view_update_scroll_regions (day_view);
-
-	/* Scroll to the start of the working day, if this is the initial
-	   allocation. */
-	if (day_view->scroll_to_work_day) {
-		scroll_y = e_day_view_convert_time_to_position (day_view, day_view->work_day_start_hour, day_view->work_day_start_minute);
-		gnome_canvas_scroll_to (GNOME_CANVAS (day_view->main_canvas),
-					0, scroll_y);
-		day_view->scroll_to_work_day = FALSE;
-	}
-
-	/* Flag that we need to reshape the events. Note that changes in height
-	   don't matter, since the rows are always the same height. */
-	if (need_reshape) {
-		day_view->long_events_need_reshape = TRUE;
-		for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++)
-			day_view->need_reshape[day] = TRUE;
-
-		e_day_view_check_layout (day_view);
-	}
-}
-
-
-static void
-e_day_view_recalc_cell_sizes	(EDayView	*day_view)
-{
-	/* An array of dates, one for each month in the year 2000. They must
-	   all be Sundays. */
-	static const int days[12] = { 23, 20, 19, 23, 21, 18,
-				      23, 20, 17, 22, 19, 24 };
-	gfloat width, offset;
-	gint day, max_width;
-	struct tm date_tm;
-	GdkFont *font;
-	char buffer[128];
-
-	g_return_if_fail (((GtkWidget*)day_view)->style != NULL);
-	font = GTK_WIDGET (day_view)->style->font;
-
-	/* Calculate the column sizes, using floating point so that pixels
-	   get divided evenly. Note that we use one more element than the
-	   number of columns, to make it easy to get the column widths. */
-	width = day_view->main_canvas->allocation.width;
-	width /= day_view->days_shown;
-	offset = 0;
-	for (day = 0; day <= day_view->days_shown; day++) {
-		day_view->day_offsets[day] = floor (offset + 0.5);
-		offset += width;
-	}
-
-	/* Calculate the days widths based on the offsets. */
-	for (day = 0; day < day_view->days_shown; day++) {
-		day_view->day_widths[day] = day_view->day_offsets[day + 1] - day_view->day_offsets[day];
-	}
-
-	/* Determine which date format to use, based on the column widths.
-	   We want to check the widths using the longest full or abbreviated
-	   month name and the longest full or abbreviated weekday name, as
-	   appropriate. */
-	max_width = day_view->day_widths[0];
-
-	memset (&date_tm, 0, sizeof (date_tm));
-	date_tm.tm_year = 100;
-
-	/* Try "Thursday 21 January". */
-	date_tm.tm_mon = day_view->longest_month_name;
-	date_tm.tm_mday = days[date_tm.tm_mon]
-		+ day_view->longest_weekday_name;
-	date_tm.tm_wday = day_view->longest_weekday_name;
-	date_tm.tm_isdst = -1;
-	/* strftime format %A = full weekday name, %d = day of month,
-	   %B = full month name. Don't use any other specifiers. */
-	strftime (buffer, sizeof (buffer), _("%A %d %B"), &date_tm);
-	if (gdk_string_width (font, buffer) < max_width) {
-		day_view->date_format = E_DAY_VIEW_DATE_FULL;
-		return;
-	}
-
-	/* Try "Thu 21 Jan". */
-	date_tm.tm_mon = day_view->longest_abbreviated_month_name;
-	date_tm.tm_mday = days[date_tm.tm_mon]
-		+ day_view->longest_abbreviated_weekday_name;
-	date_tm.tm_wday = day_view->longest_abbreviated_weekday_name;
-	date_tm.tm_isdst = -1;
-	/* strftime format %a = abbreviated weekday name, %d = day of month,
-	   %b = abbreviated month name. Don't use any other specifiers. */
-	strftime (buffer, sizeof (buffer), _("%a %d %b"), &date_tm);
-	if (gdk_string_width (font, buffer) < max_width) {
-		day_view->date_format = E_DAY_VIEW_DATE_ABBREVIATED;
-		return;
-	}
-
-	/* Try "23 Jan". */
-	date_tm.tm_mon = day_view->longest_abbreviated_month_name;
-	date_tm.tm_mday = 23;
-	date_tm.tm_wday = 0;
-	date_tm.tm_isdst = -1;
-	/* strftime format %d = day of month, %b = abbreviated month name.
-	   Don't use any other specifiers. */
-	strftime (buffer, sizeof (buffer), _("%d %b"), &date_tm);
-	if (gdk_string_width (font, buffer) < max_width)
-		day_view->date_format = E_DAY_VIEW_DATE_NO_WEEKDAY;
-	else
-		day_view->date_format = E_DAY_VIEW_DATE_SHORT;
-}
-
-
-static gint
-e_day_view_focus_in (GtkWidget *widget, GdkEventFocus *event)
-{
-	EDayView *day_view;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	day_view = E_DAY_VIEW (widget);
-
-	GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-
-	return FALSE;
-}
-
-
-static gint
-e_day_view_focus_out (GtkWidget *widget, GdkEventFocus *event)
-{
-	EDayView *day_view;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	day_view = E_DAY_VIEW (widget);
-
-	GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-
-	return FALSE;
-}
-
-
-void
-e_day_view_set_calendar		(EDayView	*day_view,
-				 GnomeCalendar	*calendar)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	day_view->calendar = calendar;
-
-	/* FIXME: free current events? */
-}
-
-
-/* Callback used when the calendar client finishes loading */
-static void
-cal_loaded_cb (CalClient *client, CalClientLoadStatus status, gpointer data)
-{
-	EDayView *day_view;
-
-	day_view = E_DAY_VIEW (data);
-
-	if (status != CAL_CLIENT_LOAD_SUCCESS)
-		return;
-
-	e_day_view_queue_reload_events (day_view);
-}
-
-/* Callback used when the calendar client tells us that an object changed */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	CalComponent *comp;
-	CalClientGetStatus status;
-	gint day, event_num;
-
-	g_return_if_fail (E_IS_DAY_VIEW (data));
-
-	day_view = E_DAY_VIEW (data);
-
-	/* If our time hasn't been set yet, just return. */
-	if (day_view->lower == 0 && day_view->upper == 0)
-		return;
-
-	/* Get the event from the server. */
-	status = cal_client_get_object (day_view->client, uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Everything is fine */
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);
-		return;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* The object is no longer in the server, so do nothing */
-		return;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	/* We only care about events. */
-	if (cal_component_get_vtype (comp) != CAL_COMPONENT_EVENT) {
-		gtk_object_unref (GTK_OBJECT (comp));
-		return;
-	}
-
-	/* If the event already exists and the dates didn't change, we can
-	   update the event fairly easily without changing the events arrays
-	   or computing a new layout. */
-	if (e_day_view_find_event_from_uid (day_view, uid, &day, &event_num)) {
-		if (day == E_DAY_VIEW_LONG_EVENT)
-			event = &g_array_index (day_view->long_events,
-						EDayViewEvent, event_num);
-		else
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, event_num);
-#ifndef NO_WARNINGS
-#warning "FIXME"
-#endif
-
-		/* Do this the long way every time for now */
-#if 0
-		if (ical_object_compare_dates (event->ico, ico)) {
-			g_print ("updated object's dates unchanged\n");
-			e_day_view_foreach_event_with_uid (day_view, uid, e_day_view_update_event_cb, ico);
-			ical_object_unref (ico);
-			gtk_widget_queue_draw (day_view->top_canvas);
-			gtk_widget_queue_draw (day_view->main_canvas);
-			return;
-		}
-#endif
-		/* The dates have changed, so we need to remove the
-		   old occurrrences before adding the new ones. */
-		g_print ("dates changed - removing occurrences\n");
-		e_day_view_foreach_event_with_uid (day_view, uid,
-						   e_day_view_remove_event_cb,
-						   NULL);
-	}
-
-	/* Add the occurrences of the event. */
-	cal_recur_generate_instances (comp, day_view->lower,
-				      day_view->upper,
-				      e_day_view_add_event,
-				      day_view);
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	e_day_view_check_layout (day_view);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-/* Callback used when the calendar client tells us that an object was removed */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	EDayView *day_view;
-
-	day_view = E_DAY_VIEW (data);
-
-	e_day_view_foreach_event_with_uid (day_view, uid,
-					   e_day_view_remove_event_cb, NULL);
-
-	e_day_view_check_layout (day_view);
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-/**
- * e_day_view_set_cal_client:
- * @day_view: A day view.
- * @client: A calendar client interface object.
- *
- * Sets the calendar client interface object that a day view will monitor.
- **/
-void
-e_day_view_set_cal_client	(EDayView	*day_view,
-				 CalClient	*client)
-{
-	g_return_if_fail (day_view != NULL);
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (client == day_view->client)
-		return;
-
-	if (client)
-		g_return_if_fail (IS_CAL_CLIENT (client));
-
-	if (client)
-		gtk_object_ref (GTK_OBJECT (client));
-
-	if (day_view->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (day_view->client), day_view);
-		gtk_object_unref (GTK_OBJECT (day_view->client));
-	}
-
-	day_view->client = client;
-
-	if (day_view->client) {
-		gtk_signal_connect (GTK_OBJECT (day_view->client), "cal_loaded",
-				    GTK_SIGNAL_FUNC (cal_loaded_cb), day_view);
-		gtk_signal_connect (GTK_OBJECT (day_view->client), "obj_updated",
-				    GTK_SIGNAL_FUNC (obj_updated_cb), day_view);
-		gtk_signal_connect (GTK_OBJECT (day_view->client), "obj_removed",
-				    GTK_SIGNAL_FUNC (obj_removed_cb), day_view);
-	}
-
-	e_day_view_queue_reload_events (day_view);
-}
-
-
-#ifndef NO_WARNINGS
-static gboolean
-e_day_view_update_event_cb (EDayView *day_view,
-			    gint day,
-			    gint event_num,
-			    gpointer data)
-{
-	EDayViewEvent *event;
-	CalComponent *comp;
-
-	comp = data;
-#if 0
-	g_print ("In e_day_view_update_event_cb day:%i event_num:%i\n",
-		 day, event_num);
-#endif
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-	} else {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-	}
-
-	gtk_object_unref (GTK_OBJECT (event->comp));
-	event->comp = comp;
-	gtk_object_ref (GTK_OBJECT (comp));
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		e_day_view_update_long_event_label (day_view, event_num);
-		e_day_view_reshape_long_event (day_view, event_num);
-	} else {
-		e_day_view_update_event_label (day_view, day, event_num);
-		e_day_view_reshape_day_event (day_view, day, event_num);
-	}
-	return TRUE;
-}
-#endif
-
-
-/* This calls a given function for each event instance that matches the given
-   uid. Note that it is safe for the callback to remove the event (since we
-   step backwards through the arrays). */
-static void
-e_day_view_foreach_event_with_uid (EDayView *day_view,
-				   const gchar *uid,
-				   EDayViewForeachEventCallback callback,
-				   gpointer data)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	const char *u;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		for (event_num = day_view->events[day]->len - 1;
-		     event_num >= 0;
-		     event_num--) {
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, event_num);
-
-			cal_component_get_uid (event->comp, &u);
-			if (uid && !strcmp (uid, u)) {
-				if (!(*callback) (day_view, day, event_num,
-						  data))
-					return;
-			}
-		}
-	}
-
-	for (event_num = day_view->long_events->len - 1;
-	     event_num >= 0;
-	     event_num--) {
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-
-		cal_component_get_uid (event->comp, &u);
-		if (u && !strcmp (uid, u)) {
-			if (!(*callback) (day_view, E_DAY_VIEW_LONG_EVENT,
-					  event_num, data))
-				return;
-		}
-	}
-}
-
-
-static gboolean
-e_day_view_remove_event_cb (EDayView *day_view,
-			    gint day,
-			    gint event_num,
-			    gpointer data)
-{
-	EDayViewEvent *event;
-
-#if 0
-	g_print ("In e_day_view_remove_event_cb day:%i event_num:%i\n",
-		 day, event_num);
-#endif
-
-	if (day == E_DAY_VIEW_LONG_EVENT)
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-	else
-		event = &g_array_index (day_view->events[day],
-					EDayViewEvent, event_num);
-
-	/* If we were editing this event, set editing_event_num to -1 so
-	   on_editing_stopped doesn't try to update the event. */
-	if (day_view->editing_event_day == day
-	    && day_view->editing_event_num == event_num)
-		day_view->editing_event_day = -1;
-
-	if (event->canvas_item)
-		gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-	gtk_object_unref (GTK_OBJECT (event->comp));
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		g_array_remove_index (day_view->long_events, event_num);
-		day_view->long_events_need_layout = TRUE;
-	} else {
-		g_array_remove_index (day_view->events[day], event_num);
-		day_view->need_layout[day] = TRUE;
-	}
-	return TRUE;
-}
-
-
-/* This updates the text shown for an event. If the event start or end do not
-   lie on a row boundary, the time is displayed before the summary. */
-static void
-e_day_view_update_event_label (EDayView *day_view,
-			       gint day,
-			       gint event_num)
-{
-	EDayViewEvent *event;
-	char *text;
-	gboolean free_text = FALSE, editing_event = FALSE;
-	gint offset, start_minute, end_minute;
-	CalComponentText summary;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	/* If the event isn't visible just return. */
-	if (!event->canvas_item)
-		return;
-
-	cal_component_get_summary (event->comp, &summary);
-	text = summary.value ? (char*) summary.value : "";
-
-	if (day_view->editing_event_day == day
-	    && day_view->editing_event_num == event_num)
-		editing_event = TRUE;
-
-	if (!editing_event
-	    && (event->start_minute % day_view->mins_per_row != 0
-		|| event->end_minute % day_view->mins_per_row != 0)) {
-		offset = day_view->first_hour_shown * 60
-			+ day_view->first_minute_shown;
-		start_minute = offset + event->start_minute;
-		end_minute = offset + event->end_minute;
-		text = g_strdup_printf ("%02i:%02i-%02i:%02i %s",
-					start_minute / 60,
-					start_minute % 60,
-					end_minute / 60,
-					end_minute % 60,
-					text);
-
-		free_text = TRUE;
-	}
-
-	gnome_canvas_item_set (event->canvas_item,
-			       "text", text,
-			       NULL);
-
-	if (free_text)
-		g_free (text);
-}
-
-
-static void
-e_day_view_update_long_event_label (EDayView *day_view,
-				    gint      event_num)
-{
-	EDayViewEvent *event;
-	CalComponentText summary;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	/* If the event isn't visible just return. */
-	if (!event->canvas_item)
-		return;
-
-	cal_component_get_summary (event->comp, &summary);
-	gnome_canvas_item_set (event->canvas_item,
-			       "text", summary.value ? summary.value : "",
-			       NULL);
-}
-
-
-/* Finds the day and index of the event with the given canvas item.
-   If is is a long event, -1 is returned as the day.
-   Returns TRUE if the event was found. */
-static gboolean
-e_day_view_find_event_from_item (EDayView *day_view,
-				 GnomeCanvasItem *item,
-				 gint *day_return,
-				 gint *event_num_return)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		for (event_num = 0; event_num < day_view->events[day]->len;
-		     event_num++) {
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, event_num);
-			if (event->canvas_item == item) {
-				*day_return = day;
-				*event_num_return = event_num;
-				return TRUE;
-			}
-		}
-	}
-
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-		if (event->canvas_item == item) {
-			*day_return = E_DAY_VIEW_LONG_EVENT;
-			*event_num_return = event_num;
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-
-/* Finds the day and index of the event with the given uid.
-   If is is a long event, E_DAY_VIEW_LONG_EVENT is returned as the day.
-   Returns TRUE if an event with the uid was found.
-   Note that for recurring events there may be several EDayViewEvents, one
-   for each instance, all with the same iCalObject and uid. So only use this
-   function if you know the event doesn't recur or you are just checking to
-   see if any events with the uid exist. */
-static gboolean
-e_day_view_find_event_from_uid (EDayView *day_view,
-				const gchar *uid,
-				gint *day_return,
-				gint *event_num_return)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	const char *u;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		for (event_num = 0; event_num < day_view->events[day]->len;
-		     event_num++) {
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, event_num);
-
-			cal_component_get_uid (event->comp, &u);
-			if (u && !strcmp (uid, u)) {
-				*day_return = day;
-				*event_num_return = event_num;
-				return TRUE;
-			}
-		}
-	}
-
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-
-		cal_component_get_uid (event->comp, &u);
-		if (u && !strcmp (uid, u)) {
-			*day_return = E_DAY_VIEW_LONG_EVENT;
-			*event_num_return = event_num;
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-
-/* This sets the selected time range. The EDayView will show the day or week
-   corresponding to the start time. If the start_time & end_time are not equal
-   and are both visible in the view, then the selection is set to those times,
-   otherwise it is set to 1 hour from the start of the working day. */
-void
-e_day_view_set_selected_time_range	(EDayView	*day_view,
-					 time_t		 start_time,
-					 time_t		 end_time)
-{
-	GDate date;
-	time_t lower;
-	gint start_row, start_col, end_row, end_col;
-	gboolean need_redraw = FALSE, start_in_grid, end_in_grid;
-
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	/* Calculate the first day that should be shown, based on start_time
-	   and the days_shown setting. If we are showing 1 day it is just the
-	   start of the day given by start_time, otherwise it is the previous
-	   Monday. */
-	if (!day_view->work_week_view) {
-		lower = time_day_begin (start_time);
-	} else {
-		g_date_clear (&date, 1);
-		g_date_set_time (&date, start_time);
-		g_date_subtract_days (&date, g_date_weekday (&date) - 1);
-		lower = time_from_day (g_date_year (&date),
-				       g_date_month (&date) - 1,
-				       g_date_day (&date));
-	}
-
-	/* See if we need to change the days shown. */
-	if (lower != day_view->lower) {
-		e_day_view_recalc_day_starts (day_view, lower);
-		e_day_view_queue_reload_events (day_view);
-	}
-
-	/* Set the selection. */
-	start_in_grid = e_day_view_convert_time_to_grid_position (day_view,
-								  start_time,
-								  &start_col,
-								  &start_row);
-	end_in_grid = e_day_view_convert_time_to_grid_position (day_view,
-								end_time - 60,
-								&end_col,
-								&end_row);
-
-	/* If either of the times isn't in the grid, or the selection covers
-	   an entire day, we set the selection to 1 row from the start of the
-	   working day, in the day corresponding to the start time. */
-	if (!start_in_grid || !end_in_grid
-	    || (start_row == 0 && end_row == day_view->rows - 1)) {
-		end_col = start_col;
-
-		start_row = e_day_view_convert_time_to_row (day_view, day_view->work_day_start_hour, day_view->work_day_start_minute);
-		start_row = CLAMP (start_row, 0, day_view->rows - 1);
-		end_row = start_row;
-	}
-
-	if (start_row != day_view->selection_start_row
-	    || start_col != day_view->selection_start_day) {
-		need_redraw = TRUE;
-		day_view->selection_in_top_canvas = FALSE;
-		day_view->selection_start_row = start_row;
-		day_view->selection_start_day = start_col;
-	}
-
-	if (end_row != day_view->selection_end_row
-	    || end_col != day_view->selection_end_day) {
-		need_redraw = TRUE;
-		day_view->selection_in_top_canvas = FALSE;
-		day_view->selection_end_row = end_row;
-		day_view->selection_end_day = end_col;
-	}
-
-	if (need_redraw) {
-		gtk_widget_queue_draw (day_view->top_canvas);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-/* Returns the selected time range. */
-void
-e_day_view_get_selected_time_range	(EDayView	*day_view,
-					 time_t		*start_time,
-					 time_t		*end_time)
-{
-	gint start_col, start_row, end_col, end_row;
-	time_t start, end;
-
-	start_col = day_view->selection_start_day;
-	start_row = day_view->selection_start_row;
-	end_col = day_view->selection_end_day;
-	end_row = day_view->selection_end_row;
-
-	if (start_col == -1) {
-		start_col = 0;
-		start_row = 0;
-		end_col = 0;
-		end_row = 0;
-	}
-
-	/* Check if the selection is only in the top canvas, in which case
-	   we can simply use the day_starts array. */
-	if (day_view->selection_in_top_canvas) {
-		start = day_view->day_starts[start_col];
-		end = day_view->day_starts[end_col + 1];
-	} else {
-		/* Convert the start col + row into a time. */
-		start = e_day_view_convert_grid_position_to_time (day_view, start_col, start_row);
-		end = e_day_view_convert_grid_position_to_time (day_view, end_col, end_row + 1);
-	}
-
-	if (start_time)
-		*start_time = start;
-
-	if (end_time)
-		*end_time = end;
-}
-
-
-static void
-e_day_view_recalc_day_starts (EDayView *day_view,
-			      time_t start_time)
-{
-	gint day;
-
-	day_view->day_starts[0] = start_time;
-	for (day = 1; day <= day_view->days_shown; day++) {
-		day_view->day_starts[day] = time_add_day (day_view->day_starts[day - 1], 1);
-	}
-
-	day_view->lower = start_time;
-	day_view->upper = day_view->day_starts[day_view->days_shown];
-}
-
-
-/* Whether we are displaying a work-week, in which case the display always
-   starts on the first day of the working week. */
-gboolean
-e_day_view_get_work_week_view	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), FALSE);
-
-	return day_view->work_week_view;
-}
-
-
-void
-e_day_view_set_work_week_view	(EDayView	*day_view,
-				 gboolean	 work_week_view)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (day_view->work_week_view == work_week_view)
-		return;
-
-	day_view->work_week_view = work_week_view;
-
-	/* FIXME: need to recalc the first day shown if now work-week view. */
-}
-
-
-gint
-e_day_view_get_days_shown	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), -1);
-
-	return day_view->days_shown;
-}
-
-
-void
-e_day_view_set_days_shown	(EDayView	*day_view,
-				 gint		 days_shown)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-	g_return_if_fail (days_shown >= 1);
-	g_return_if_fail (days_shown <= E_DAY_VIEW_MAX_DAYS);
-
-	if (day_view->days_shown != days_shown) {
-		day_view->days_shown = days_shown;
-		e_day_view_recalc_day_starts (day_view, day_view->lower);
-		e_day_view_recalc_cell_sizes (day_view);
-		e_day_view_queue_reload_events (day_view);
-	}
-}
-
-
-gint
-e_day_view_get_mins_per_row	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), -1);
-
-	return day_view->mins_per_row;
-}
-
-
-void
-e_day_view_set_mins_per_row	(EDayView	*day_view,
-				 gint		 mins_per_row)
-{
-	gint day;
-
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (mins_per_row != 5 && mins_per_row != 10 && mins_per_row != 15
-	    && mins_per_row != 30 && mins_per_row != 60) {
-		g_warning ("Invalid minutes per row setting");
-		return;
-	}
-
-	if (day_view->mins_per_row == mins_per_row)
-		return;
-
-	day_view->mins_per_row = mins_per_row;
-	e_day_view_recalc_num_rows (day_view);
-
-	/* If we aren't visible, we'll sort it out later. */
-	if (!GTK_WIDGET_VISIBLE (day_view))
-	    return;
-
-	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++)
-		day_view->need_layout[day] = TRUE;
-
-	/* We must layout the events before updating the scroll region, since
-	   that will result in a redraw which would crash otherwise. */
-	e_day_view_check_layout (day_view);
-	gtk_widget_queue_draw (day_view->time_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-
-	e_day_view_update_scroll_regions (day_view);
-}
-
-
-/* This specifies the working days in the week. The value is a bitwise
-   combination of day flags. Defaults to Mon-Fri. */
-EDayViewDays
-e_day_view_get_working_days	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), 0);
-
-	return day_view->working_days;
-}
-
-
-void
-e_day_view_set_working_days	(EDayView	*day_view,
-				 EDayViewDays	 days)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (day_view->working_days != days) {
-		day_view->working_days = days;
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-/* The start and end time of the working day. This only affects the background
-   colors. */
-void
-e_day_view_get_working_day		(EDayView	*day_view,
-					 gint		*start_hour,
-					 gint		*start_minute,
-					 gint		*end_hour,
-					 gint		*end_minute)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	*start_hour = day_view->work_day_start_hour;
-	*start_minute = day_view->work_day_start_minute;
-	*end_hour = day_view->work_day_end_hour;
-	*end_minute = day_view->work_day_end_minute;
-}
-
-
-void
-e_day_view_set_working_day		(EDayView	*day_view,
-					 gint		 start_hour,
-					 gint		 start_minute,
-					 gint		 end_hour,
-					 gint		 end_minute)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	day_view->work_day_start_hour = start_hour;
-	day_view->work_day_start_minute = start_minute;
-	day_view->work_day_end_hour = end_hour;
-	day_view->work_day_end_minute = end_minute;
-
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-/* Whether we use 12-hour of 24-hour format. */
-gboolean
-e_day_view_get_24_hour_format	(EDayView	*day_view)
-{
-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), FALSE);
-
-	return day_view->use_24_hour_format;
-}
-
-
-void
-e_day_view_set_24_hour_format	(EDayView	*day_view,
-				 gboolean	 use_24_hour)
-{
-	g_return_if_fail (E_IS_DAY_VIEW (day_view));
-
-	if (day_view->use_24_hour_format != use_24_hour) {
-		day_view->use_24_hour_format = use_24_hour;
-
-		/* FIXME: Eventually we need to do a re-layout. */
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-static gboolean
-e_day_view_update_scroll_regions (EDayView *day_view)
-{
-	gdouble old_x2, old_y2, new_x2, new_y2;
-	gboolean need_reshape = FALSE;
-
-	/* Set the scroll region of the time canvas to its allocated width,
-	   but with the height the same as the main canvas. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (day_view->time_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = day_view->time_canvas->allocation.width - 1;
-	new_y2 = MAX (day_view->rows * day_view->row_height,
-		      day_view->main_canvas->allocation.height) - 1;
-	if (old_x2 != new_x2 || old_y2 != new_y2)
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (day_view->time_canvas),
-						0, 0, new_x2, new_y2);
-
-	/* Set the scroll region of the main canvas to its allocated width,
-	   but with the height depending on the number of rows needed. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (day_view->main_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = day_view->main_canvas->allocation.width - 1;
-	if (old_x2 != new_x2 || old_y2 != new_y2) {
-		need_reshape = TRUE;
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (day_view->main_canvas),
-						0, 0, new_x2, new_y2);
-	}
-
-	return need_reshape;
-}
-
-
-/* This recalculates the number of rows to display, based on the time range
-   shown and the minutes per row. */
-static void
-e_day_view_recalc_num_rows	(EDayView	*day_view)
-{
-	gint hours, minutes, total_minutes;
-
-	hours = day_view->last_hour_shown - day_view->first_hour_shown;
-	/* This could be negative but it works out OK. */
-	minutes = day_view->last_minute_shown - day_view->first_minute_shown;
-	total_minutes = hours * 60 + minutes;
-	day_view->rows = total_minutes / day_view->mins_per_row;
-}
-
-
-/* Converts an hour and minute to a row in the canvas. Note that if we aren't
-   showing all 24 hours of the day, the returned row may be negative or
-   greater than day_view->rows. */
-gint
-e_day_view_convert_time_to_row	(EDayView	*day_view,
-				 gint		 hour,
-				 gint		 minute)
-{
-	gint total_minutes, start_minute, offset;
-
-	total_minutes = hour * 60 + minute;
-	start_minute = day_view->first_hour_shown * 60
-		+ day_view->first_minute_shown;
-	offset = total_minutes - start_minute;
-	if (offset < 0)
-		return -1;
-	else
-		return offset / day_view->mins_per_row;
-}
-
-
-/* Converts an hour and minute to a y coordinate in the canvas. */
-gint
-e_day_view_convert_time_to_position (EDayView	*day_view,
-				     gint	 hour,
-				     gint	 minute)
-{
-	gint total_minutes, start_minute, offset;
-
-	total_minutes = hour * 60 + minute;
-	start_minute = day_view->first_hour_shown * 60
-		+ day_view->first_minute_shown;
-	offset = total_minutes - start_minute;
-
-	return offset * day_view->row_height / day_view->mins_per_row;
-}
-
-
-static gboolean
-e_day_view_on_top_canvas_button_press (GtkWidget *widget,
-				       GdkEventButton *event,
-				       EDayView *day_view)
-{
-	gint event_x, event_y, scroll_x, scroll_y, day, event_num;
-	EDayViewPosition pos;
-
-	/* Convert the coords to the main canvas window, or return if the
-	   window is not found. */
-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) event,
-					      GTK_LAYOUT (widget)->bin_window,
-					      &event_x, &event_y))
-		return FALSE;
-
-	/* The top canvas doesn't scroll, but just in case. */
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	event_x += scroll_x;
-	event_y += scroll_y;
-
-	pos = e_day_view_convert_position_in_top_canvas (day_view,
-							 event_x, event_y,
-							 &day, &event_num);
-
-	if (pos == E_DAY_VIEW_POS_OUTSIDE)
-		return FALSE;
-
-	if (pos != E_DAY_VIEW_POS_NONE)
-		return e_day_view_on_long_event_button_press (day_view,
-							      event_num,
-							      event, pos,
-							      event_x,
-							      event_y);
-
-	e_day_view_stop_editing_event (day_view);
-
-	if (event->button == 1) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (widget)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, event->time) == 0) {
-			e_day_view_start_selection (day_view, day, -1);
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		e_day_view_on_event_right_click (day_view, event, -1, -1);
-	}
-
-	return TRUE;
-}
-
-
-static gboolean
-e_day_view_convert_event_coords (EDayView *day_view,
-				 GdkEvent *event,
-				 GdkWindow *window,
-				 gint *x_return,
-				 gint *y_return)
-{
-	gint event_x, event_y, win_x, win_y;
-	GdkWindow *event_window;;
-
-	/* Get the event window, x & y from the appropriate event struct. */
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-	case GDK_2BUTTON_PRESS:
-	case GDK_3BUTTON_PRESS:
-	case GDK_BUTTON_RELEASE:
-		event_x = event->button.x;
-		event_y = event->button.y;
-		event_window = event->button.window;
-		break;
-	case GDK_MOTION_NOTIFY:
-		event_x = event->motion.x;
-		event_y = event->motion.y;
-		event_window = event->motion.window;
-		break;
-	default:
-		/* Shouldn't get here. */
-		g_assert_not_reached ();
-		return FALSE;
-	}
-
-	while (event_window && event_window != window
-	       && event_window != GDK_ROOT_PARENT()) {
-		gdk_window_get_position (event_window, &win_x, &win_y);
-		event_x += win_x;
-		event_y += win_y;
-		event_window = gdk_window_get_parent (event_window);
-	}
-
-	*x_return = event_x;
-	*y_return = event_y;
-
-	if (event_window != window)
-		g_warning ("Couldn't find event window\n");
-
-	return (event_window == window) ? TRUE : FALSE;
-}
-
-
-static gboolean
-e_day_view_on_main_canvas_button_press (GtkWidget *widget,
-					GdkEventButton *event,
-					EDayView *day_view)
-{
-	gint event_x, event_y, scroll_x, scroll_y, row, day, event_num;
-	EDayViewPosition pos;
-
-	/* Handle scroll wheel events */
-	if (event->button == 4 || event->button == 5) {
-		GtkAdjustment *adj = GTK_LAYOUT (day_view->main_canvas)->vadjustment;
-		gfloat new_value;
-
-		new_value = adj->value + ((event->button == 4) ?
-					  -adj->page_increment / 2:
-					  adj->page_increment / 2);
-		new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-		gtk_adjustment_set_value (adj, new_value);
-
-		return TRUE;
-	}
-
-	/* Convert the coords to the main canvas window, or return if the
-	   window is not found. */
-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) event,
-					      GTK_LAYOUT (widget)->bin_window,
-					      &event_x, &event_y))
-		return FALSE;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	event_x += scroll_x;
-	event_y += scroll_y;
-
-	/* Find out where the mouse is. */
-	pos = e_day_view_convert_position_in_main_canvas (day_view,
-							  event_x, event_y,
-							  &day, &row,
-							  &event_num);
-
-	if (pos == E_DAY_VIEW_POS_OUTSIDE)
-		return FALSE;
-
-	if (pos != E_DAY_VIEW_POS_NONE)
-		return e_day_view_on_event_button_press (day_view, day,
-							 event_num, event, pos,
-							 event_x, event_y);
-
-	e_day_view_stop_editing_event (day_view);
-
-	/* Start the selection drag. */
-	if (event->button == 1) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (widget)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, event->time) == 0) {
-			e_day_view_start_selection (day_view, day, row);
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		e_day_view_on_event_right_click (day_view, event, -1, -1);
-	}
-
-	return TRUE;
-}
-
-
-static gboolean
-e_day_view_on_time_canvas_button_press (GtkWidget      *widget,
-					GdkEventButton *event,
-					EDayView       *day_view)
-{
-	/* Handle scroll wheel events */
-	if (event->button == 4 || event->button == 5) {
-		GtkAdjustment *adj = GTK_LAYOUT (day_view->main_canvas)->vadjustment;
-		gfloat new_value;
-
-		new_value = adj->value + ((event->button == 4) ?
-					  -adj->page_increment / 2:
-					  adj->page_increment / 2);
-		new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-		gtk_adjustment_set_value (adj, new_value);
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_day_view_on_long_event_button_press (EDayView		*day_view,
-				       gint		 event_num,
-				       GdkEventButton	*event,
-				       EDayViewPosition  pos,
-				       gint		 event_x,
-				       gint		 event_y)
-{
-	if (event->button == 1) {
-		if (event->type == GDK_BUTTON_PRESS) {
-			e_day_view_on_long_event_click (day_view, event_num,
-							event, pos,
-							event_x, event_y);
-			return TRUE;
-		} else if (event->type == GDK_2BUTTON_PRESS) {
-			e_day_view_on_event_double_click (day_view, -1,
-							  event_num);
-			return TRUE;
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		e_day_view_on_event_right_click (day_view, event,
-						 E_DAY_VIEW_LONG_EVENT,
-						 event_num);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-
-static gboolean
-e_day_view_on_event_button_press (EDayView	  *day_view,
-				  gint		   day,
-				  gint		   event_num,
-				  GdkEventButton  *event,
-				  EDayViewPosition pos,
-				  gint		   event_x,
-				  gint		   event_y)
-{
-	if (event->button == 1) {
-		if (event->type == GDK_BUTTON_PRESS) {
-			e_day_view_on_event_click (day_view, day, event_num,
-						   event, pos,
-						   event_x, event_y);
-			return TRUE;
-		} else if (event->type == GDK_2BUTTON_PRESS) {
-			e_day_view_on_event_double_click (day_view, day,
-							  event_num);
-			return TRUE;
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		e_day_view_on_event_right_click (day_view, event,
-						 day, event_num);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-
-static void
-e_day_view_on_long_event_click (EDayView *day_view,
-				gint event_num,
-				GdkEventButton  *bevent,
-				EDayViewPosition pos,
-				gint	     event_x,
-				gint	     event_y)
-{
-	EDayViewEvent *event;
-	gint start_day, end_day, day;
-	gint item_x, item_y, item_w, item_h;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	/* Ignore clicks on the EText while editing. */
-	if (pos == E_DAY_VIEW_POS_EVENT
-	    && E_TEXT (event->canvas_item)->editing)
-		return;
-
-	if (!(cal_component_has_recurrences (event->comp))
-	    && (pos == E_DAY_VIEW_POS_LEFT_EDGE
-		|| pos == E_DAY_VIEW_POS_RIGHT_EDGE)) {
-		if (!e_day_view_find_long_event_days (day_view, event,
-						      &start_day, &end_day))
-			return;
-
-		/* Grab the keyboard focus, so the event being edited is saved
-		   and we can use the Escape key to abort the resize. */
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (day_view->top_canvas)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, bevent->time) == 0) {
-
-			day_view->resize_event_day = E_DAY_VIEW_LONG_EVENT;
-			day_view->resize_event_num = event_num;
-			day_view->resize_drag_pos = pos;
-			day_view->resize_start_row = start_day;
-			day_view->resize_end_row = end_day;
-
-			/* Create the edit rect if necessary. */
-			e_day_view_reshape_resize_long_event_rect_item (day_view);
-
-			/* Make sure the text item is on top. */
-			gnome_canvas_item_raise_to_top (day_view->resize_long_event_rect_item);
-
-			/* Raise the event's item, above the rect as well. */
-			gnome_canvas_item_raise_to_top (event->canvas_item);
-		}
-	} else if (e_day_view_get_long_event_position (day_view, event_num,
-						       &start_day, &end_day,
-						       &item_x, &item_y,
-						       &item_w, &item_h)) {
-		/* Remember the item clicked and the mouse position,
-		   so we can start a drag if the mouse moves. */
-		day_view->pressed_event_day = E_DAY_VIEW_LONG_EVENT;
-		day_view->pressed_event_num = event_num;
-
-		day_view->drag_event_x = event_x;
-		day_view->drag_event_y = event_y;
-
-		e_day_view_convert_position_in_top_canvas (day_view,
-							   event_x, event_y,
-							   &day, NULL);
-		day_view->drag_event_offset = day - start_day;
-	}
-}
-
-
-static void
-e_day_view_on_event_click (EDayView *day_view,
-			   gint day,
-			   gint event_num,
-			   GdkEventButton  *bevent,
-			   EDayViewPosition pos,
-			   gint		  event_x,
-			   gint		  event_y)
-{
-	EDayViewEvent *event;
-	gint tmp_day, row, start_row;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	/* Ignore clicks on the EText while editing. */
-	if (pos == E_DAY_VIEW_POS_EVENT
-	    && E_TEXT (event->canvas_item)->editing)
-		return;
-
-	if (!(cal_component_has_recurrences (event->comp))
-	    && (pos == E_DAY_VIEW_POS_TOP_EDGE
-		|| pos == E_DAY_VIEW_POS_BOTTOM_EDGE)) {
-		/* Grab the keyboard focus, so the event being edited is saved
-		   and we can use the Escape key to abort the resize. */
-		if (!GTK_WIDGET_HAS_FOCUS (day_view))
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (day_view->main_canvas)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, bevent->time) == 0) {
-
-			day_view->resize_event_day = day;
-			day_view->resize_event_num = event_num;
-			day_view->resize_drag_pos = pos;
-			day_view->resize_start_row = event->start_minute / day_view->mins_per_row;
-			day_view->resize_end_row = (event->end_minute - 1) / day_view->mins_per_row;
-
-			day_view->resize_bars_event_day = day;
-			day_view->resize_bars_event_num = event_num;
-
-			/* Create the edit rect if necessary. */
-			e_day_view_reshape_resize_rect_item (day_view);
-
-			e_day_view_reshape_main_canvas_resize_bars (day_view);
-
-			/* Make sure the text item is on top. */
-			gnome_canvas_item_raise_to_top (day_view->resize_rect_item);
-			gnome_canvas_item_raise_to_top (day_view->resize_bar_item);
-
-			/* Raise the event's item, above the rect as well. */
-			gnome_canvas_item_raise_to_top (event->canvas_item);
-		}
-
-	} else {
-		/* Remember the item clicked and the mouse position,
-		   so we can start a drag if the mouse moves. */
-		day_view->pressed_event_day = day;
-		day_view->pressed_event_num = event_num;
-
-		day_view->drag_event_x = event_x;
-		day_view->drag_event_y = event_y;
-
-		e_day_view_convert_position_in_main_canvas (day_view,
-							    event_x, event_y,
-							    &tmp_day, &row,
-							    NULL);
-		start_row = event->start_minute / day_view->mins_per_row;
-		day_view->drag_event_offset = row - start_row;
-	}
-}
-
-
-static void
-e_day_view_reshape_resize_long_event_rect_item (EDayView *day_view)
-{
-	gint day, event_num, start_day, end_day;
-	gint item_x, item_y, item_w, item_h;
-	gdouble x1, y1, x2, y2;
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-
-	/* If we're not resizing an event, or the event is not shown,
-	   hide the resize bars. */
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_NONE
-	    || !e_day_view_get_long_event_position (day_view, event_num,
-						    &start_day, &end_day,
-						    &item_x, &item_y,
-						    &item_w, &item_h)) {
-		gnome_canvas_item_hide (day_view->resize_long_event_rect_item);
-		return;
-	}
-
-	x1 = item_x;
-	y1 = item_y;
-	x2 = item_x + item_w - 1;
-	y2 = item_y + item_h - 1;
-
-	gnome_canvas_item_set (day_view->resize_long_event_rect_item,
-			       "x1", x1,
-			       "y1", y1,
-			       "x2", x2,
-			       "y2", y2,
-			       NULL);
-	gnome_canvas_item_show (day_view->resize_long_event_rect_item);
-}
-
-
-static void
-e_day_view_reshape_resize_rect_item (EDayView *day_view)
-{
-	gint day, event_num;
-	gint item_x, item_y, item_w, item_h;
-	gdouble x1, y1, x2, y2;
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-
-	/* If we're not resizing an event, or the event is not shown,
-	   hide the resize bars. */
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_NONE
-	    || !e_day_view_get_event_position (day_view, day, event_num,
-					       &item_x, &item_y,
-					       &item_w, &item_h)) {
-		gnome_canvas_item_hide (day_view->resize_rect_item);
-		return;
-	}
-
-	x1 = item_x;
-	y1 = item_y;
-	x2 = item_x + item_w - 1;
-	y2 = item_y + item_h - 1;
-
-	gnome_canvas_item_set (day_view->resize_rect_item,
-			       "x1", x1 + E_DAY_VIEW_BAR_WIDTH - 1,
-			       "y1", y1,
-			       "x2", x2,
-			       "y2", y2,
-			       NULL);
-	gnome_canvas_item_show (day_view->resize_rect_item);
-
-	gnome_canvas_item_set (day_view->resize_bar_item,
-			       "x1", x1,
-			       "y1", y1,
-			       "x2", x1 + E_DAY_VIEW_BAR_WIDTH - 1,
-			       "y2", y2,
-			       NULL);
-	gnome_canvas_item_show (day_view->resize_bar_item);
-}
-
-
-static void
-e_day_view_on_event_double_click (EDayView *day_view,
-				  gint day,
-				  gint event_num)
-{
-#if 0
-	g_print ("In e_day_view_on_event_double_click\n");
-#endif
-
-}
-
-
-static void
-e_day_view_on_event_right_click (EDayView *day_view,
-				 GdkEventButton *bevent,
-				 gint day,
-				 gint event_num)
-{
-	EDayViewEvent *event;
-	int have_selection, not_being_edited, items, i;
-	struct menu_item *context_menu;
-
-	static struct menu_item main_items[] = {
-		{ N_("New appointment..."), (GtkSignalFunc) e_day_view_on_new_appointment, NULL, TRUE }
-	};
-
-	static struct menu_item child_items[] = {
-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_day_view_on_edit_appointment, NULL, TRUE },
-		{ N_("Delete this appointment"), (GtkSignalFunc) e_day_view_on_delete_appointment, NULL, TRUE },
-		{ NULL, NULL, NULL, TRUE },
-		{ N_("New appointment..."), (GtkSignalFunc) e_day_view_on_new_appointment, NULL, TRUE }
-	};
-
-	static struct menu_item recur_child_items[] = {
-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_day_view_on_edit_appointment, NULL, TRUE },
-		{ N_("Make this appointment movable"), (GtkSignalFunc) e_day_view_on_unrecur_appointment, NULL, TRUE },
-		{ N_("Delete this occurrence"), (GtkSignalFunc) e_day_view_on_delete_occurrence, NULL, TRUE },
-		{ N_("Delete all occurrences"), (GtkSignalFunc) e_day_view_on_delete_appointment, NULL, TRUE },
-		{ NULL, NULL, NULL, TRUE },
-		{ N_("New appointment..."), (GtkSignalFunc) e_day_view_on_new_appointment, NULL, TRUE }
-	};
-
-	have_selection = GTK_WIDGET_HAS_FOCUS (day_view)
-		&& day_view->selection_start_day != -1;
-
-	if (event_num == -1) {
-		items = 1;
-		context_menu = &main_items[0];
-		context_menu[0].sensitive = have_selection;
-	} else {
-		if (day == E_DAY_VIEW_LONG_EVENT)
-			event = &g_array_index (day_view->long_events,
-						EDayViewEvent, event_num);
-		else
-			event = &g_array_index (day_view->events[day],
-						EDayViewEvent, event_num);
-
-		/* This used to be set only if the event wasn't being edited
-		   in the event editor, but we can't check that at present.
-		   We could possibly set up another method of checking it. */
-		not_being_edited = TRUE;
-
-		if (cal_component_has_recurrences (event->comp)) {
-			items = 6;
-			context_menu = &recur_child_items[0];
-			context_menu[0].sensitive = not_being_edited;
-			context_menu[1].sensitive = not_being_edited;
-			context_menu[2].sensitive = not_being_edited;
-			context_menu[3].sensitive = not_being_edited;
-			context_menu[5].sensitive = have_selection;
-		} else {
-			items = 4;
-			context_menu = &child_items[0];
-			context_menu[0].sensitive = not_being_edited;
-			context_menu[1].sensitive = not_being_edited;
-			context_menu[3].sensitive = have_selection;
-		}
-	}
-
-	for (i = 0; i < items; i++)
-		context_menu[i].data = day_view;
-
-	day_view->popup_event_day = day;
-	day_view->popup_event_num = event_num;
-	popup_menu (context_menu, items, bevent);
-}
-
-
-static void
-e_day_view_on_new_appointment (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	time_t dtstart, dtend;
-	struct icaltimetype itt;
-
-	day_view = E_DAY_VIEW (data);
-
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-	e_day_view_get_selected_time_range (day_view, &dtstart, &dtend);
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	*date.value = icaltime_from_timet (dtstart, FALSE, FALSE);
-	cal_component_set_dtstart (comp, &date);
-
-	*date.value = icaltime_from_timet (dtend, FALSE, FALSE);
-	cal_component_set_dtend (comp, &date);
-
-	cal_component_commit_sequence (comp);
-
-	gnome_calendar_edit_object (day_view->calendar, comp);
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-
-static void
-e_day_view_on_edit_appointment (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-
-	day_view = E_DAY_VIEW (data);
-
-	event = e_day_view_get_popup_menu_event (day_view);
-	if (event == NULL)
-		return;
-
-	gnome_calendar_edit_object (day_view->calendar, event->comp);
-}
-
-
-static void
-e_day_view_on_delete_occurrence (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	CalComponent *comp;
-	struct icaltimetype *time;
-	GSList *list;
-
-	day_view = E_DAY_VIEW (data);
-
-	event = e_day_view_get_popup_menu_event (day_view);
-	if (event == NULL)
-		return;
-
-	/* We must duplicate the CalComponent, or we won't know it has changed
-	   when we get the "update_event" callback. */
-	comp = cal_component_clone (event->comp);
-	cal_component_get_exdate_list (comp, &list);
-	time = g_new0 (struct icaltimetype, 1);
-	*time = icaltime_from_timet (event->start, FALSE, FALSE);
-	list = g_slist_append (list, time);
-	cal_component_set_exdate_list (comp, list);
-	cal_component_free_exdate_list (list);
-
-	if (!cal_client_update_object (day_view->client, comp))
-		g_message ("e_day_view_on_delete_occurrence(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-
-static void
-e_day_view_on_delete_appointment (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	const char *uid;
-
-	day_view = E_DAY_VIEW (data);
-
-	event = e_day_view_get_popup_menu_event (day_view);
-	if (event == NULL)
-		return;
-
-	if (day_view->editing_event_day >= 0)
-		e_day_view_stop_editing_event (day_view);
-
-	cal_component_get_uid (event->comp, &uid);
-
-	/* We don't check the return value; FALSE can mean the object was not in
-	 * the server anyways.
-	 */
-	cal_client_remove_object (day_view->client, uid);
-}
-
-
-static void
-e_day_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)
-{
-	EDayView *day_view;
-	EDayViewEvent *event;
-	CalComponent *comp, *new_comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	GSList *list;
-
-	day_view = E_DAY_VIEW (data);
-
-	event = e_day_view_get_popup_menu_event (day_view);
-	if (event == NULL)
-		return;
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	/* For the recurring object, we add a exception to get rid of the
-	   instance. */
-	comp = cal_component_clone (event->comp);
-	cal_component_get_exdate_list (comp, &list);
-	*date.value = icaltime_from_timet (event->start, FALSE, FALSE);
-	list = g_slist_append (list, &date);
-	cal_component_set_exdate_list (comp, list);
-	g_slist_free (list);
-
-	/* For the unrecurred instance we duplicate the original object,
-	   create a new uid for it, get rid of the recurrence rules, and set
-	   the start & end times to the instances times. */
-	new_comp = cal_component_clone (event->comp);
-	cal_component_set_uid (new_comp, cal_component_gen_uid ());
-	cal_component_set_rdate_list (new_comp, NULL);
-	cal_component_set_rrule_list (new_comp, NULL);
-	cal_component_set_exdate_list (new_comp, NULL);
-	cal_component_set_exrule_list (new_comp, NULL);
-
-	*date.value = icaltime_from_timet (event->start, FALSE, FALSE);
-	cal_component_set_dtstart (new_comp, &date);
-	*date.value = icaltime_from_timet (event->end, FALSE, FALSE);
-	cal_component_set_dtend (new_comp, &date);
-
-	/* Now update both CalComponents. Note that we do this last since at
-	 * present the updates happen synchronously so our event may disappear.
-	 */
-	if (!cal_client_update_object (day_view->client, comp))
-		g_message ("e_day_view_on_unrecur_appointment(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	if (!cal_client_update_object (day_view->client, new_comp))
-		g_message ("e_day_view_on_unrecur_appointment(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (new_comp));
-}
-
-
-static EDayViewEvent*
-e_day_view_get_popup_menu_event (EDayView *day_view)
-{
-	if (day_view->popup_event_num == -1)
-		return NULL;
-
-	if (day_view->popup_event_day == E_DAY_VIEW_LONG_EVENT)
-		return &g_array_index (day_view->long_events,
-				       EDayViewEvent,
-				       day_view->popup_event_num);
-	else
-		return &g_array_index (day_view->events[day_view->popup_event_day],
-				       EDayViewEvent,
-				       day_view->popup_event_num);
-}
-
-
-static gboolean
-e_day_view_on_top_canvas_button_release (GtkWidget *widget,
-					 GdkEventButton *event,
-					 EDayView *day_view)
-{
-	if (day_view->selection_is_being_dragged) {
-		gdk_pointer_ungrab (event->time);
-		e_day_view_finish_selection (day_view);
-	} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-		e_day_view_finish_long_event_resize (day_view);
-		gdk_pointer_ungrab (event->time);
-	} else if (day_view->pressed_event_day != -1) {
-		e_day_view_start_editing_event (day_view,
-						day_view->pressed_event_day,
-						day_view->pressed_event_num,
-						NULL);
-	}
-
-	day_view->pressed_event_day = -1;
-
-	return FALSE;
-}
-
-
-static gboolean
-e_day_view_on_main_canvas_button_release (GtkWidget *widget,
-					  GdkEventButton *event,
-					  EDayView *day_view)
-{
-	if (day_view->selection_is_being_dragged) {
-		gdk_pointer_ungrab (event->time);
-		e_day_view_finish_selection (day_view);
-		e_day_view_stop_auto_scroll (day_view);
-	} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-		e_day_view_finish_resize (day_view);
-		gdk_pointer_ungrab (event->time);
-		e_day_view_stop_auto_scroll (day_view);
-	} else if (day_view->pressed_event_day != -1) {
-		e_day_view_start_editing_event (day_view,
-						day_view->pressed_event_day,
-						day_view->pressed_event_num,
-						NULL);
-	}
-
-	day_view->pressed_event_day = -1;
-
-	return FALSE;
-}
-
-
-static void
-e_day_view_update_calendar_selection_time (EDayView *day_view)
-{
-	time_t start, end;
-
-	e_day_view_get_selected_time_range (day_view, &start, &end);
-	gnome_calendar_set_selected_time_range (day_view->calendar,
-						start, end);
-}
-
-
-static gboolean
-e_day_view_on_top_canvas_motion (GtkWidget *widget,
-				 GdkEventMotion *mevent,
-				 EDayView *day_view)
-{
-	EDayViewEvent *event = NULL;
-	EDayViewPosition pos;
-	gint event_x, event_y, scroll_x, scroll_y, canvas_x, canvas_y;
-	gint day, event_num;
-	GdkCursor *cursor;
-
-#if 0
-	g_print ("In e_day_view_on_top_canvas_motion\n");
-#endif
-
-	/* Convert the coords to the main canvas window, or return if the
-	   window is not found. */
-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) mevent,
-					      GTK_LAYOUT (widget)->bin_window,
-					      &event_x, &event_y))
-		return FALSE;
-
-	/* The top canvas doesn't scroll, but just in case. */
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	canvas_x = event_x + scroll_x;
-	canvas_y = event_y + scroll_y;
-
-	pos = e_day_view_convert_position_in_top_canvas (day_view,
-							 canvas_x, canvas_y,
-							 &day, &event_num);
-	if (event_num != -1)
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-
-	if (day_view->selection_is_being_dragged) {
-		e_day_view_update_selection (day_view, day, -1);
-		return TRUE;
-	} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-			e_day_view_update_long_event_resize (day_view, day);
-			return TRUE;
-		}
-	} else if (day_view->pressed_event_day == E_DAY_VIEW_LONG_EVENT) {
-		GtkTargetList *target_list;
-
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					day_view->pressed_event_num);
-
-		if (!(cal_component_has_recurrences (event->comp))
-		    && (abs (canvas_x - day_view->drag_event_x) 
-			> E_DAY_VIEW_DRAG_START_OFFSET
-			|| abs (canvas_y - day_view->drag_event_y) 
-			> E_DAY_VIEW_DRAG_START_OFFSET)) {
-			day_view->drag_event_day = day_view->pressed_event_day;
-			day_view->drag_event_num = day_view->pressed_event_num;
-			day_view->pressed_event_day = -1;
-
-			/* Hide the horizontal bars. */
-			if (day_view->resize_bars_event_day != -1) {
-				day_view->resize_bars_event_day = -1;
-				day_view->resize_bars_event_num = -1;
-				gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-				gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-			}
-
-			target_list = gtk_target_list_new (target_table,
-							   n_targets);
-			gtk_drag_begin (widget, target_list,
-					GDK_ACTION_COPY | GDK_ACTION_MOVE,
-					1, (GdkEvent*)mevent);
-			gtk_target_list_unref (target_list);
-		}
-	} else {
-		cursor = day_view->normal_cursor;
-
-		/* Recurring events can't be resized. */
-		if (event && !cal_component_has_recurrences (event->comp)) {
-			switch (pos) {
-			case E_DAY_VIEW_POS_LEFT_EDGE:
-			case E_DAY_VIEW_POS_RIGHT_EDGE:
-				cursor = day_view->resize_width_cursor;
-				break;
-			default:
-				break;
-			}
-		}
-
-		/* Only set the cursor if it is different to last one set. */
-		if (day_view->last_cursor_set_in_top_canvas != cursor) {
-			day_view->last_cursor_set_in_top_canvas = cursor;
-			gdk_window_set_cursor (widget->window, cursor);
-		}
-
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_day_view_on_main_canvas_motion (GtkWidget *widget,
-				  GdkEventMotion *mevent,
-				  EDayView *day_view)
-{
-	EDayViewEvent *event = NULL;
-	EDayViewPosition pos;
-	gint event_x, event_y, scroll_x, scroll_y, canvas_x, canvas_y;
-	gint row, day, event_num;
-	GdkCursor *cursor;
-
-#if 0
-	g_print ("In e_day_view_on_main_canvas_motion\n");
-#endif
-
-	/* Convert the coords to the main canvas window, or return if the
-	   window is not found. */
-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) mevent,
-					      GTK_LAYOUT (widget)->bin_window,
-					      &event_x, &event_y))
-		return FALSE;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	canvas_x = event_x + scroll_x;
-	canvas_y = event_y + scroll_y;
-
-	pos = e_day_view_convert_position_in_main_canvas (day_view,
-							  canvas_x, canvas_y,
-							  &day, &row,
-							  &event_num);
-	if (event_num != -1)
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-	if (day_view->selection_is_being_dragged) {
-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-			e_day_view_update_selection (day_view, day, row);
-			e_day_view_check_auto_scroll (day_view,
-						      event_x, event_y);
-			return TRUE;
-		}
-	} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-			e_day_view_update_resize (day_view, row);
-			e_day_view_check_auto_scroll (day_view,
-						      event_x, event_y);
-			return TRUE;
-		}
-	} else if (day_view->pressed_event_day != -1
-		   && day_view->pressed_event_day != E_DAY_VIEW_LONG_EVENT) {
-		GtkTargetList *target_list;
-
-		event = &g_array_index (day_view->events[day_view->pressed_event_day], EDayViewEvent, day_view->pressed_event_num);
-
-		if (!cal_component_has_recurrences (event->comp)
-		    && (abs (canvas_x - day_view->drag_event_x) 
-			> E_DAY_VIEW_DRAG_START_OFFSET
-			|| abs (canvas_y - day_view->drag_event_y) 
-			> E_DAY_VIEW_DRAG_START_OFFSET)) {
-			day_view->drag_event_day = day_view->pressed_event_day;
-			day_view->drag_event_num = day_view->pressed_event_num;
-			day_view->pressed_event_day = -1;
-
-			/* Hide the horizontal bars. */
-			if (day_view->resize_bars_event_day != -1) {
-				day_view->resize_bars_event_day = -1;
-				day_view->resize_bars_event_num = -1;
-				gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-				gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-			}
-
-			target_list = gtk_target_list_new (target_table,
-							   n_targets);
-			gtk_drag_begin (widget, target_list,
-					GDK_ACTION_COPY | GDK_ACTION_MOVE,
-					1, (GdkEvent*)mevent);
-			gtk_target_list_unref (target_list);
-		}
-	} else {
-		cursor = day_view->normal_cursor;
-
-		/* Recurring events can't be resized. */
-		if (event && !cal_component_has_recurrences (event->comp)) {
-			switch (pos) {
-			case E_DAY_VIEW_POS_LEFT_EDGE:
-				cursor = day_view->move_cursor;
-				break;
-			case E_DAY_VIEW_POS_TOP_EDGE:
-			case E_DAY_VIEW_POS_BOTTOM_EDGE:
-				cursor = day_view->resize_height_cursor;
-				break;
-			default:
-				break;
-			}
-		}
-
-		/* Only set the cursor if it is different to last one set. */
-		if (day_view->last_cursor_set_in_main_canvas != cursor) {
-			day_view->last_cursor_set_in_main_canvas = cursor;
-			gdk_window_set_cursor (widget->window, cursor);
-		}
-	}
-
-	return FALSE;
-}
-
-
-/* This sets the selection to a single cell. If day is -1 then the current
-   start day is reused. If row is -1 then the selection is in the top canvas.
-*/
-void
-e_day_view_start_selection (EDayView *day_view,
-			    gint day,
-			    gint row)
-{
-	if (day == -1) {
-		day = day_view->selection_start_day;
-		if (day == -1)
-			day = 0;
-	}
-
-	day_view->selection_start_day = day;
-	day_view->selection_end_day = day;
-
-	day_view->selection_start_row = row;
-	day_view->selection_end_row = row;
-
-	day_view->selection_is_being_dragged = TRUE;
-	day_view->selection_drag_pos = E_DAY_VIEW_DRAG_END;
-	day_view->selection_in_top_canvas = (row == -1) ? TRUE : FALSE;
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-/* Updates the selection during a drag. If day is -1 the selection day is
-   unchanged. */
-void
-e_day_view_update_selection (EDayView *day_view,
-			     gint day,
-			     gint row)
-{
-	gboolean need_redraw = FALSE;
-
-#if 0
-	g_print ("Updating selection %i,%i\n", day, row);
-#endif
-
-	day_view->selection_in_top_canvas = (row == -1) ? TRUE : FALSE;
-
-	if (day == -1)
-		day = (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
-			? day_view->selection_start_day
-			: day_view->selection_end_day;
-
-	if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START) {
-		if (row != day_view->selection_start_row
-		    || day != day_view->selection_start_day) {
-			need_redraw = TRUE;
-			day_view->selection_start_row = row;
-			day_view->selection_start_day = day;
-		}
-	} else {
-		if (row != day_view->selection_end_row
-		    || day != day_view->selection_end_day) {
-			need_redraw = TRUE;
-			day_view->selection_end_row = row;
-			day_view->selection_end_day = day;
-		}
-	}
-
-	e_day_view_normalize_selection (day_view);
-
-	/* FIXME: Optimise? */
-	if (need_redraw) {
-		gtk_widget_queue_draw (day_view->top_canvas);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-static void
-e_day_view_normalize_selection (EDayView *day_view)
-{
-	gint tmp_row, tmp_day;
-
-	/* Switch the drag position if necessary. */
-	if (day_view->selection_start_day > day_view->selection_end_day
-	    || (day_view->selection_start_day == day_view->selection_end_day
-		&& day_view->selection_start_row > day_view->selection_end_row)) {
-		tmp_row = day_view->selection_start_row;
-		tmp_day = day_view->selection_start_day;
-		day_view->selection_start_day = day_view->selection_end_day;
-		day_view->selection_start_row = day_view->selection_end_row;
-		day_view->selection_end_day = tmp_day;
-		day_view->selection_end_row = tmp_row;
-		if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
-			day_view->selection_drag_pos = E_DAY_VIEW_DRAG_END;
-		else
-			day_view->selection_drag_pos = E_DAY_VIEW_DRAG_START;
-	}
-}
-
-
-void
-e_day_view_finish_selection (EDayView *day_view)
-{
-	day_view->selection_is_being_dragged = FALSE;
-	e_day_view_update_calendar_selection_time (day_view);
-}
-
-
-static void
-e_day_view_update_long_event_resize (EDayView *day_view,
-				     gint day)
-{
-	EDayViewEvent *event;
-	gint event_num;
-	gboolean need_reshape = FALSE;
-
-#if 0
-	g_print ("Updating resize Day:%i\n", day);
-#endif
-
-	event_num = day_view->resize_event_num;
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE) {
-		day = MIN (day, day_view->resize_end_row);
-		if (day != day_view->resize_start_row) {
-			need_reshape = TRUE;
-			day_view->resize_start_row = day;
-
-		}
-	} else {
-		day = MAX (day, day_view->resize_start_row);
-		if (day != day_view->resize_end_row) {
-			need_reshape = TRUE;
-			day_view->resize_end_row = day;
-		}
-	}
-
-	/* FIXME: Optimise? */
-	if (need_reshape) {
-		e_day_view_reshape_long_event (day_view, event_num);
-		e_day_view_reshape_resize_long_event_rect_item (day_view);
-		gtk_widget_queue_draw (day_view->top_canvas);
-	}
-}
-
-
-static void
-e_day_view_update_resize (EDayView *day_view,
-			  gint row)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	gboolean need_reshape = FALSE;
-
-#if 0
-	g_print ("Updating resize Row:%i\n", row);
-#endif
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE) {
-		row = MIN (row, day_view->resize_end_row);
-		if (row != day_view->resize_start_row) {
-			need_reshape = TRUE;
-			day_view->resize_start_row = row;
-
-		}
-	} else {
-		row = MAX (row, day_view->resize_start_row);
-		if (row != day_view->resize_end_row) {
-			need_reshape = TRUE;
-			day_view->resize_end_row = row;
-		}
-	}
-
-	/* FIXME: Optimise? */
-	if (need_reshape) {
-		e_day_view_reshape_day_event (day_view, day, event_num);
-		e_day_view_reshape_resize_rect_item (day_view);
-		e_day_view_reshape_main_canvas_resize_bars (day_view);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-/* This converts the resize start or end row back to a time and updates the
-   event. */
-static void
-e_day_view_finish_long_event_resize (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	gint event_num;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-
-	event_num = day_view->resize_event_num;
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	/* We use a temporary copy of the comp since we don't want to
-	   change the original comp here. Otherwise we would not detect that
-	   the event's time had changed in the "update_event" callback. */
-	comp = cal_component_clone (event->comp);
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE) {
-		dt = day_view->day_starts[day_view->resize_start_row];
-		*date.value = icaltime_from_timet (dt, FALSE, FALSE);
-		cal_component_set_dtstart (comp, &date);
-	} else {
-		dt = day_view->day_starts[day_view->resize_end_row + 1];
-		*date.value = icaltime_from_timet (dt, FALSE, FALSE);
-		cal_component_set_dtend (comp, &date);
-	}
-
-	gnome_canvas_item_hide (day_view->resize_long_event_rect_item);
-
-	day_view->resize_drag_pos = E_DAY_VIEW_POS_NONE;
-
-	if (!cal_client_update_object (day_view->client, comp))
-		g_message ("e_day_view_finish_long_event_resize(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-
-/* This converts the resize start or end row back to a time and updates the
-   event. */
-static void
-e_day_view_finish_resize (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	/* We use a temporary shallow copy of the ico since we don't want to
-	   change the original ico here. Otherwise we would not detect that
-	   the event's time had changed in the "update_event" callback. */
-	comp = cal_component_clone (event->comp);
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE) {
-		dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_start_row);
-		*date.value = icaltime_from_timet (dt, FALSE, FALSE);
-		cal_component_set_dtstart (comp, &date);
-	} else {
-		dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_end_row + 1);
-		*date.value = icaltime_from_timet (dt, FALSE, FALSE);
-		cal_component_set_dtend (comp, &date);
-	}
-
-	gnome_canvas_item_hide (day_view->resize_rect_item);
-	gnome_canvas_item_hide (day_view->resize_bar_item);
-
-	/* Hide the horizontal bars. */
-	day_view->resize_bars_event_day = -1;
-	day_view->resize_bars_event_num = -1;
-	gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-	gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-
-	day_view->resize_drag_pos = E_DAY_VIEW_POS_NONE;
-
-	if (!cal_client_update_object (day_view->client, comp))
-		g_message ("e_day_view_finish_resize(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-
-static void
-e_day_view_abort_resize (EDayView *day_view,
-			 guint32 time)
-{
-	gint day, event_num;
-
-	if (day_view->resize_drag_pos == E_DAY_VIEW_POS_NONE)
-		return;
-
-	day_view->resize_drag_pos = E_DAY_VIEW_POS_NONE;
-	gdk_pointer_ungrab (time);
-
-	day = day_view->resize_event_day;
-	event_num = day_view->resize_event_num;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		e_day_view_reshape_long_event (day_view, event_num);
-		gtk_widget_queue_draw (day_view->top_canvas);
-
-		day_view->last_cursor_set_in_top_canvas = day_view->normal_cursor;
-		gdk_window_set_cursor (day_view->top_canvas->window,
-				       day_view->normal_cursor);
-		gnome_canvas_item_hide (day_view->resize_long_event_rect_item);
-	} else {
-		e_day_view_reshape_day_event (day_view, day, event_num);
-		e_day_view_reshape_main_canvas_resize_bars (day_view);
-		gtk_widget_queue_draw (day_view->main_canvas);
-
-		day_view->last_cursor_set_in_main_canvas = day_view->normal_cursor;
-		gdk_window_set_cursor (day_view->main_canvas->window,
-				       day_view->normal_cursor);
-		gnome_canvas_item_hide (day_view->resize_rect_item);
-		gnome_canvas_item_hide (day_view->resize_bar_item);
-	}
-}
-
-
-/* This frees any events currently loaded, and queues a reload. */
-static void
-e_day_view_queue_reload_events (EDayView *day_view)
-{
-	e_day_view_free_events (day_view);
-
-	if (day_view->reload_events_idle_id == 0) {
-		/* We'll use a high idle priority here, so the events are
-		   reloaded before the canvas is updated. */
-		day_view->reload_events_idle_id = g_idle_add_full
-			(G_PRIORITY_HIGH_IDLE,
-			 e_day_view_reload_events_idle_cb, day_view, NULL);
-	}
-}
-
-
-static gboolean
-e_day_view_reload_events_idle_cb	(gpointer data)
-{
-	EDayView *day_view;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW (data), FALSE);
-
-	GDK_THREADS_ENTER ();
-
-	day_view = E_DAY_VIEW (data);
-
-	day_view->reload_events_idle_id = 0;
-
-	e_day_view_reload_events (day_view);
-
-	GDK_THREADS_LEAVE ();
-	return FALSE;
-}
-
-
-static void
-e_day_view_reload_events (EDayView *day_view)
-{
-	e_day_view_free_events (day_view);
-
-	if (!(day_view->client && cal_client_is_loaded (day_view->client)))
-		return;
-
-	/* If both lower & upper are 0, then the time range hasn't been set,
-	   so we don't try to load any events. */
-	if (day_view->calendar
-	    && (day_view->lower != 0 || day_view->upper != 0)) {
-		cal_client_generate_instances (day_view->client,
-					       CALOBJ_TYPE_EVENT,
-					       day_view->lower,
-					       day_view->upper,
-					       e_day_view_add_event,
-					       day_view);
-	}
-
-	/* We need to do this to make sure the top canvas is resized. */
-	day_view->long_events_need_layout = TRUE;
-
-	e_day_view_check_layout (day_view);
-	e_day_view_reshape_main_canvas_resize_bars (day_view);
-
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_free_events (EDayView *day_view)
-{
-	gint day;
-
-	/* Reset all our indices. */
-	day_view->editing_event_day = -1;
-	day_view->popup_event_day = -1;
-	day_view->resize_bars_event_day = -1;
-	day_view->resize_event_day = -1;
-	day_view->pressed_event_day = -1;
-	day_view->drag_event_day = -1;
-
-	e_day_view_free_event_array (day_view, day_view->long_events);
-
-	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++)
-		e_day_view_free_event_array (day_view, day_view->events[day]);
-}
-
-
-static void
-e_day_view_free_event_array (EDayView *day_view,
-			     GArray *array)
-{
-	EDayViewEvent *event;
-	gint event_num;
-
-	for (event_num = 0; event_num < array->len; event_num++) {
-		event = &g_array_index (array, EDayViewEvent, event_num);
-		if (event->canvas_item)
-			gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-		gtk_object_unref (GTK_OBJECT (event->comp));
-	}
-
-	g_array_set_size (array, 0);
-}
-
-
-/* This adds one event to the view, adding it to the appropriate array. */
-static gboolean
-e_day_view_add_event (CalComponent *comp,
-		      time_t	  start,
-		      time_t	  end,
-		      gpointer	  data)
-
-{
-	EDayView *day_view;
-	EDayViewEvent event;
-	gint day, offset;
-	struct tm start_tm, end_tm;
-
-	day_view = E_DAY_VIEW (data);
-
-	/* Check that the event times are valid. */
-	g_return_val_if_fail (start <= end, TRUE);
-	g_return_val_if_fail (start < day_view->upper, TRUE);
-	g_return_val_if_fail (end > day_view->lower, TRUE);
-
-	start_tm = *(localtime (&start));
-	end_tm = *(localtime (&end));
-
-	event.comp = comp;
-	gtk_object_ref (GTK_OBJECT (comp));
-	event.start = start;
-	event.end = end;
-	event.canvas_item = NULL;
-
-	/* Calculate the start & end minute, relative to the top of the
-	   display. */
-	offset = day_view->first_hour_shown * 60
-		+ day_view->first_minute_shown;
-	event.start_minute = start_tm.tm_hour * 60 + start_tm.tm_min - offset;
-	event.end_minute = end_tm.tm_hour * 60 + end_tm.tm_min - offset;
-
-	event.start_row_or_col = -1;
-	event.num_columns = -1;
-
-	/* Find out which array to add the event to. */
-	for (day = 0; day < day_view->days_shown; day++) {
-		if (start >= day_view->day_starts[day]
-		    && end <= day_view->day_starts[day + 1]) {
-
-			/* Special case for when the appointment ends at
-			   midnight, i.e. the start of the next day. */
-			if (end == day_view->day_starts[day + 1]) {
-
-				/* If the event last the entire day, then we
-				   skip it here so it gets added to the top
-				   canvas. */
-				if (start == day_view->day_starts[day])
-				    break;
-
-				event.end_minute = 24 * 60;
-			}
-
-			g_array_append_val (day_view->events[day], event);
-			day_view->events_sorted[day] = FALSE;
-			day_view->need_layout[day] = TRUE;
-			return TRUE;
-		}
-	}
-
-	/* The event wasn't within one day so it must be a long event,
-	   i.e. shown in the top canvas. */
-	g_array_append_val (day_view->long_events, event);
-	day_view->long_events_sorted = FALSE;
-	day_view->long_events_need_layout = TRUE;
-	return TRUE;
-}
-
-
-/* This lays out the short (less than 1 day) events in the columns.
-   Any long events are simply skipped. */
-void
-e_day_view_check_layout (EDayView *day_view)
-{
-	gint day;
-
-	/* Don't bother if we aren't visible. */
-	if (!GTK_WIDGET_VISIBLE (day_view))
-	    return;
-
-	/* Make sure the events are sorted (by start and size). */
-	e_day_view_ensure_events_sorted (day_view);
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		if (day_view->need_layout[day])
-			e_day_view_layout_day_events (day_view, day);
-
-		if (day_view->need_layout[day]
-		    || day_view->need_reshape[day]) {
-			e_day_view_reshape_day_events (day_view, day);
-
-			if (day_view->resize_bars_event_day == day)
-				e_day_view_reshape_main_canvas_resize_bars (day_view);
-		}
-
-		day_view->need_layout[day] = FALSE;
-		day_view->need_reshape[day] = FALSE;
-	}
-
-	if (day_view->long_events_need_layout)
-		e_day_view_layout_long_events (day_view);
-
-	if (day_view->long_events_need_layout
-	    || day_view->long_events_need_reshape)
-		e_day_view_reshape_long_events (day_view);
-
-	day_view->long_events_need_layout = FALSE;
-	day_view->long_events_need_reshape = FALSE;
-}
-
-
-static void
-e_day_view_layout_long_events (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	gint event_num, old_rows_in_top_display, top_canvas_height, top_rows;
-	guint8 *grid;
-
-	/* This is a temporary 2-d grid which is used to place events.
-	   Each element is 0 if the position is empty, or 1 if occupied.
-	   We allocate the maximum size possible here, assuming that each
-	   event will need its own row. */
-	grid = g_new0 (guint8,
-		       day_view->long_events->len * E_DAY_VIEW_MAX_DAYS);
-
-	/* Reset the number of rows in the top display to 0. It will be
-	   updated as events are layed out below. */
-	old_rows_in_top_display = day_view->rows_in_top_display;
-	day_view->rows_in_top_display = 0;
-
-	/* Iterate over the events, finding which days they cover, and putting
-	   them in the first free row available. */
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-		e_day_view_layout_long_event (day_view, event, grid);
-	}
-
-	/* Free the grid. */
-	g_free (grid);
-
-	/* Set the height of the top canvas based on the row height and the
-	   number of rows needed (min 1 + 1 for the dates + 1 space for DnD).*/
-	if (day_view->rows_in_top_display != old_rows_in_top_display) {
-		top_rows = MAX (1, day_view->rows_in_top_display);
-		top_canvas_height = (top_rows + 2) * day_view->top_row_height;
-		gtk_widget_set_usize (day_view->top_canvas, -1,
-				      top_canvas_height);
-	}
-}
-
-
-static void
-e_day_view_layout_long_event (EDayView	   *day_view,
-			      EDayViewEvent *event,
-			      guint8	   *grid)
-{
-	gint start_day, end_day, free_row, day, row;
-
-	event->num_columns = 0;
-
-	if (!e_day_view_find_long_event_days (day_view, event,
-					      &start_day, &end_day))
-		return;
-
-	/* Try each row until we find a free one. */
-	row = 0;
-	do {
-		free_row = row;
-		for (day = start_day; day <= end_day; day++) {
-			if (grid[row * E_DAY_VIEW_MAX_DAYS + day]) {
-				free_row = -1;
-				break;
-			}
-		}
-		row++;
-	} while (free_row == -1);
-
-	event->start_row_or_col = free_row;
-	event->num_columns = 1;
-
-	/* Mark the cells as full. */
-	for (day = start_day; day <= end_day; day++) {
-		grid[free_row * E_DAY_VIEW_MAX_DAYS + day] = 1;
-	}
-
-	/* Update the number of rows in the top canvas if necessary. */
-	day_view->rows_in_top_display = MAX (day_view->rows_in_top_display,
-					     free_row + 1);
-}
-
-
-static void
-e_day_view_reshape_long_events (EDayView *day_view)
-{
-	EDayViewEvent *event;
-	gint event_num;
-
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-
-		if (event->num_columns == 0) {
-			if (event->canvas_item) {
-				gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-				event->canvas_item = NULL;
-			}
-		} else {
-			e_day_view_reshape_long_event (day_view, event_num);
-		}
-	}
-}
-
-
-static void
-e_day_view_reshape_long_event (EDayView *day_view,
-			       gint	 event_num)
-{
-	EDayViewEvent *event;
-	GdkFont *font;
-	gint start_day, end_day, item_x, item_y, item_w, item_h;
-	gint text_x, text_w, num_icons, icons_width, width, time_width;
-	CalComponent *comp;
-	gint min_text_x, max_text_w, text_width, line_len;
-	gchar *text, *end_of_line;
-	gboolean show_icons = TRUE, use_max_width = FALSE;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	if (!e_day_view_get_long_event_position (day_view, event_num,
-						 &start_day, &end_day,
-						 &item_x, &item_y,
-						 &item_w, &item_h)) {
-		if (event->canvas_item) {
-			gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-			event->canvas_item = NULL;
-		}
-		return;
-	}
-
-	/* Take off the border and padding. */
-	item_x += E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD;
-	item_w -= (E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD) * 2;
-	item_y += E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD;
-	item_h -= (E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD) * 2;
-
-	/* We don't show the icons while resizing, since we'd have to
-	   draw them on top of the resize rect. Nor when editing. */
-	num_icons = 0;
-	comp = event->comp;
-	font = GTK_WIDGET (day_view)->style->font;
-
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE
-	    && day_view->resize_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->resize_event_num == event_num)
-		show_icons = FALSE;
-
-	if (day_view->editing_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->editing_event_num == event_num) {
-		show_icons = FALSE;
-		use_max_width = TRUE;
-	}
-
-#if 0
-	if (show_icons) {
-		if (ico->dalarm.enabled || ico->malarm.enabled
-		    || ico->palarm.enabled || ico->aalarm.enabled)
-			num_icons++;
-		if (ico->recur)
-			num_icons++;
-	}
-#endif
-
-	if (!event->canvas_item) {
-		event->canvas_item =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->top_canvas)->root),
-					       e_text_get_type (),
-					       "font_gdk", GTK_WIDGET (day_view)->style->font,
-					       "anchor", GTK_ANCHOR_NW,
-					       "clip", TRUE,
-					       "max_lines", 1,
-					       "editable", TRUE,
-					       "use_ellipsis", TRUE,
-					       NULL);
-		gtk_signal_connect (GTK_OBJECT (event->canvas_item), "event",
-				    GTK_SIGNAL_FUNC (e_day_view_on_text_item_event),
-				    day_view);
-		e_day_view_update_long_event_label (day_view, event_num);
-	}
-
-	/* Calculate its position. We first calculate the ideal position which
-	   is centered with the icons. We then make sure we haven't gone off
-	   the left edge of the available space. Finally we make sure we don't
-	   go off the right edge. */
-	icons_width = (E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD)
-		* num_icons;
-	time_width = day_view->max_small_hour_width + day_view->colon_width
-		+ day_view->max_minute_width;
-
-	if (use_max_width) {
-		text_x = item_x;
-		text_w = item_w;
-	} else {
-		/* Get the requested size of the label. */
-		gtk_object_get (GTK_OBJECT (event->canvas_item),
-				"text", &text,
-				NULL);
-		text_width = 0;
-		if (text) {
-			end_of_line = strchr (text, '\n');
-			if (end_of_line)
-				line_len = end_of_line - text;
-			else
-				line_len = strlen (text);
-			text_width = gdk_text_width (font, text, line_len);
-			g_free (text);
-		}
-
-		width = text_width + icons_width;
-		text_x = item_x + (item_w - width) / 2;
-
-		min_text_x = item_x;
-		if (event->start > day_view->day_starts[start_day])
-			min_text_x += time_width + E_DAY_VIEW_LONG_EVENT_TIME_X_PAD;
-
-		text_x = MAX (text_x, min_text_x);
-
-		max_text_w = item_x + item_w - text_x;
-		if (event->end < day_view->day_starts[end_day + 1])
-			max_text_w -= time_width + E_DAY_VIEW_LONG_EVENT_TIME_X_PAD;
-
-		text_w = MIN (width, max_text_w);
-
-		/* Now take out the space for the icons. */
-		text_x += icons_width;
-		text_w -= icons_width;
-	}
-
-	text_w = MAX (text_w, 0);
-	gnome_canvas_item_set (event->canvas_item,
-			       "clip_width", (gdouble) text_w,
-			       "clip_height", (gdouble) item_h,
-			       NULL);
-	e_canvas_item_move_absolute(event->canvas_item,
-				    text_x, item_y);
-}
-
-
-/* Find the start and end days for the event. */
-gboolean
-e_day_view_find_long_event_days (EDayView	*day_view,
-				 EDayViewEvent	*event,
-				 gint		*start_day_return,
-				 gint		*end_day_return)
-{
-	gint day, start_day, end_day;
-
-	start_day = -1;
-	end_day = -1;
-
-	for (day = 0; day < day_view->days_shown; day++) {
-		if (start_day == -1
-		    && event->start < day_view->day_starts[day + 1])
-			start_day = day;
-		if (event->end > day_view->day_starts[day])
-			end_day = day;
-	}
-
-	/* Sanity check. */
-	if (start_day < 0 || start_day >= day_view->days_shown
-	    || end_day < 0 || end_day >= day_view->days_shown
-	    || end_day < start_day) {
-		g_warning ("Invalid date range for event");
-		return FALSE;
-	}
-
-	*start_day_return = start_day;
-	*end_day_return = end_day;
-
-	return TRUE;
-}
-
-
-static void
-e_day_view_layout_day_events (EDayView *day_view,
-			      gint	day)
-{
-	EDayViewEvent *event;
-	gint row, event_num;
-	guint8 *grid;
-
-	/* This is a temporary array which keeps track of rows which are
-	   connected. When an appointment spans multiple rows then the number
-	   of columns in each of these rows must be the same (i.e. the maximum
-	   of all of them). Each element in the array corresponds to one row
-	   and contains the index of the first row in the group of connected
-	   rows. */
-	guint16 group_starts[12 * 24];
-
-	/* Reset the cols_per_row array, and initialize the connected rows. */
-	for (row = 0; row < day_view->rows; row++) {
-		day_view->cols_per_row[day][row] = 0;
-		group_starts[row] = row;
-	}
-
-	/* This is a temporary 2-d grid which is used to place events.
-	   Each element is 0 if the position is empty, or 1 if occupied. */
-	grid = g_new0 (guint8, day_view->rows * E_DAY_VIEW_MAX_COLUMNS);
-
-
-	/* Iterate over the events, finding which rows they cover, and putting
-	   them in the first free column available. Increment the number of
-	   events in each of the rows it covers, and make sure they are all
-	   in one group. */
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-		e_day_view_layout_day_event (day_view, day, event,
-					     grid, group_starts);
-	}
-
-	/* Recalculate the number of columns needed in each row. */
-	e_day_view_recalc_cols_per_row (day_view, day, group_starts);
-
-	/* Iterate over the events again, trying to expand events horizontally
-	   if there is enough space. */
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-		e_day_view_expand_day_event (day_view, day, event, grid);
-	}
-
-	/* Free the grid. */
-	g_free (grid);
-}
-
-
-/* Finds the first free position to place the event in.
-   Increments the number of events in each of the rows it covers, and makes
-   sure they are all in one group. */
-static void
-e_day_view_layout_day_event (EDayView	   *day_view,
-			     gint	    day,
-			     EDayViewEvent *event,
-			     guint8	   *grid,
-			     guint16	   *group_starts)
-{
-	gint start_row, end_row, free_col, col, row, group_start;
-
-	start_row = event->start_minute / day_view->mins_per_row;
-	end_row = (event->end_minute - 1) / day_view->mins_per_row;
-
-	event->num_columns = 0;
-
-	/* If the event can't currently be seen, just return. */
-	if (start_row >= day_view->rows || end_row < 0)
-		return;
-
-	/* Make sure we don't go outside the visible times. */
-	start_row = CLAMP (start_row, 0, day_view->rows - 1);
-	end_row = CLAMP (end_row, 0, day_view->rows - 1);
-
-	/* Try each column until we find a free one. */
-	for (col = 0; col < E_DAY_VIEW_MAX_COLUMNS; col++) {
-		free_col = col;
-		for (row = start_row; row <= end_row; row++) {
-			if (grid[row * E_DAY_VIEW_MAX_COLUMNS + col]) {
-				free_col = -1;
-				break;
-			}
-		}
-
-		if (free_col != -1)
-			break;
-	}
-
-	/* If we can't find space for the event, just return. */
-	if (free_col == -1)
-		return;
-
-	/* The event is assigned 1 col initially, but may be expanded later. */
-	event->start_row_or_col = free_col;
-	event->num_columns = 1;
-
-	/* Determine the start index of the group. */
-	group_start = group_starts[start_row];
-
-	/* Increment number of events in each of the rows the event covers.
-	   We use the cols_per_row array for this. It will be sorted out after
-	   all the events have been layed out. Also make sure all the rows that
-	   the event covers are in one group. */
-	for (row = start_row; row <= end_row; row++) {
-		grid[row * E_DAY_VIEW_MAX_COLUMNS + free_col] = 1;
-		day_view->cols_per_row[day][row]++;
-		group_starts[row] = group_start;
-	}
-
-	/* If any following rows should be in the same group, add them. */
-	for (row = end_row + 1; row < day_view->rows; row++) {
-		if (group_starts[row] > end_row)
-			break;
-		group_starts[row] = group_start;
-	}
-}
-
-
-/* For each group of rows, find the max number of events in all the
-   rows, and set the number of cols in each of the rows to that. */
-static void
-e_day_view_recalc_cols_per_row (EDayView *day_view,
-				gint	  day,
-				guint16  *group_starts)
-{
-	gint start_row = 0, row, next_start_row, max_events;
-
-	while (start_row < day_view->rows) {
-
-		max_events = 0;
-		for (row = start_row; row < day_view->rows && group_starts[row] == start_row; row++)
-			max_events = MAX (max_events, day_view->cols_per_row[day][row]);
-
-		next_start_row = row;
-
-		for (row = start_row; row < next_start_row; row++)
-			day_view->cols_per_row[day][row] = max_events;
-
-		start_row = next_start_row;
-	}
-}
-
-
-/* Expands the event horizontally to fill any free space. */
-static void
-e_day_view_expand_day_event (EDayView	   *day_view,
-			     gint	    day,
-			     EDayViewEvent *event,
-			     guint8	   *grid)
-{
-	gint start_row, end_row, col, row;
-	gboolean clashed;
-
-	start_row = event->start_minute / day_view->mins_per_row;
-	end_row = (event->end_minute - 1) / day_view->mins_per_row;
-
-	/* Try each column until we find a free one. */
-	clashed = FALSE;
-	for (col = event->start_row_or_col + 1; col < day_view->cols_per_row[day][start_row]; col++) {
-		for (row = start_row; row <= end_row; row++) {
-			if (grid[row * E_DAY_VIEW_MAX_COLUMNS + col]) {
-				clashed = TRUE;
-				break;
-			}
-		}
-
-		if (clashed)
-			break;
-
-		event->num_columns++;
-	}
-}
-
-
-/* This creates or updates the sizes of the canvas items for one day of the
-   main canvas. */
-static void
-e_day_view_reshape_day_events (EDayView *day_view,
-			       gint	 day)
-{
-	gint event_num;
-
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		e_day_view_reshape_day_event (day_view, day, event_num);
-	}
-}
-
-
-static void
-e_day_view_reshape_day_event (EDayView *day_view,
-			      gint	day,
-			      gint	event_num)
-{
-	EDayViewEvent *event;
-	gint item_x, item_y, item_w, item_h;
-	gint num_icons, icons_offset;
-	CalComponent *comp;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-	comp = event->comp;
-
-	if (!e_day_view_get_event_position (day_view, day, event_num,
-					    &item_x, &item_y,
-					    &item_w, &item_h)) {
-		if (event->canvas_item) {
-			gtk_object_destroy (GTK_OBJECT (event->canvas_item));
-			event->canvas_item = NULL;
-		}
-	} else {
-		/* Skip the border and padding. */
-		item_x += E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD;
-		item_w -= E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD * 2;
-		item_y += E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD;
-		item_h -= (E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD) * 2;
-
-		/* We don't show the icons while resizing, since we'd have to
-		   draw them on top of the resize rect. */
-		num_icons = 0;
-		if (day_view->resize_drag_pos == E_DAY_VIEW_POS_NONE
-		    || day_view->resize_event_day != day
-		    || day_view->resize_event_num != event_num) {
-#if 0
-			if (ico->dalarm.enabled || ico->malarm.enabled
-			    || ico->palarm.enabled || ico->aalarm.enabled)
-				num_icons++;
-#endif
-			if (cal_component_has_recurrences (comp))
-				num_icons++;
-		}
-
-		if (num_icons > 0) {
-			if (item_h >= (E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD) * num_icons)
-				icons_offset = E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD * 2;
-			else
-				icons_offset = (E_DAY_VIEW_ICON_WIDTH + E_DAY_VIEW_ICON_X_PAD) * num_icons + E_DAY_VIEW_ICON_X_PAD;
-			item_x += icons_offset;
-			item_w -= icons_offset;
-		}
-
-		if (!event->canvas_item) {
-			event->canvas_item =
-				gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view->main_canvas)->root),
-						       e_text_get_type (),
-						       "font_gdk", GTK_WIDGET (day_view)->style->font,
-						       "anchor", GTK_ANCHOR_NW,
-						       "line_wrap", TRUE,
-						       "editable", TRUE,
-						       "clip", TRUE,
-						       "use_ellipsis", TRUE,
-						       NULL);
-			gtk_signal_connect (GTK_OBJECT (event->canvas_item),
-					    "event",
-					    GTK_SIGNAL_FUNC (e_day_view_on_text_item_event),
-					    day_view);
-			e_day_view_update_event_label (day_view, day,
-						       event_num);
-		}
-
-		item_w = MAX (item_w, 0);
-		gnome_canvas_item_set (event->canvas_item,
-				       "clip_width", (gdouble) item_w,
-				       "clip_height", (gdouble) item_h,
-				       NULL);
-		e_canvas_item_move_absolute(event->canvas_item,
-					    item_x, item_y);
-	}
-}
-
-
-/* This creates or resizes the horizontal bars used to resize events in the
-   main canvas. */
-static void
-e_day_view_reshape_main_canvas_resize_bars (EDayView *day_view)
-{
-	gint day, event_num;
-	gint item_x, item_y, item_w, item_h;
-	gdouble x, y, w, h;
-
-	day = day_view->resize_bars_event_day;
-	event_num = day_view->resize_bars_event_num;
-
-	/* If we're not editing an event, or the event is not shown,
-	   hide the resize bars. */
-	if (day != -1 && day == day_view->drag_event_day
-	    && event_num == day_view->drag_event_num) {
-		gtk_object_get (GTK_OBJECT (day_view->drag_rect_item),
-				"x1", &x,
-				"y1", &y,
-				"x2", &w,
-				"y2", &h,
-				NULL);
-		w -= x;
-		x++;
-		h -= y;
-	} else if (day != -1
-		   && e_day_view_get_event_position (day_view, day, event_num,
-						     &item_x, &item_y,
-						     &item_w, &item_h)) {
-		x = item_x + E_DAY_VIEW_BAR_WIDTH;
-		y = item_y;
-		w = item_w - E_DAY_VIEW_BAR_WIDTH;
-		h = item_h;
-	} else {
-		gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-		gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-		return;
-	}
-
-	gnome_canvas_item_set (day_view->main_canvas_top_resize_bar_item,
-			       "x1", x - E_DAY_VIEW_BAR_WIDTH,
-			       "y1", y - E_DAY_VIEW_BAR_HEIGHT,
-			       "x2", x + w - 1,
-			       "y2", y - 1,
-			       NULL);
-	gnome_canvas_item_show (day_view->main_canvas_top_resize_bar_item);
-
-	gnome_canvas_item_set (day_view->main_canvas_bottom_resize_bar_item,
-			       "x1", x - E_DAY_VIEW_BAR_WIDTH,
-			       "y1", y + h,
-			       "x2", x + w - 1,
-			       "y2", y + h + E_DAY_VIEW_BAR_HEIGHT - 1,
-			       NULL);
-	gnome_canvas_item_show (day_view->main_canvas_bottom_resize_bar_item);
-}
-
-
-static void
-e_day_view_ensure_events_sorted (EDayView *day_view)
-{
-	gint day;
-
-	/* Sort the long events. */
-	if (!day_view->long_events_sorted) {
-		qsort (day_view->long_events->data,
-		       day_view->long_events->len,
-		       sizeof (EDayViewEvent),
-		       e_day_view_event_sort_func);
-		day_view->long_events_sorted = TRUE;
-	}
-
-	/* Sort the events for each day. */
-	for (day = 0; day < day_view->days_shown; day++) {
-		if (!day_view->events_sorted[day]) {
-			qsort (day_view->events[day]->data,
-			       day_view->events[day]->len,
-			       sizeof (EDayViewEvent),
-			       e_day_view_event_sort_func);
-			day_view->events_sorted[day] = TRUE;
-		}
-	}
-}
-
-
-static gint
-e_day_view_event_sort_func (const void *arg1,
-			    const void *arg2)
-{
-	EDayViewEvent *event1, *event2;
-
-	event1 = (EDayViewEvent*) arg1;
-	event2 = (EDayViewEvent*) arg2;
-
-	if (event1->start < event2->start)
-		return -1;
-	if (event1->start > event2->start)
-		return 1;
-
-	if (event1->end > event2->end)
-		return -1;
-	if (event1->end < event2->end)
-		return 1;
-
-	return 0;
-}
-
-
-static gint
-e_day_view_key_press (GtkWidget *widget, GdkEventKey *event)
-{
-	EDayView *day_view;
-	CalComponent *comp;
-	gint day, event_num;
-	gchar *initial_text;
-	guint keyval;
-	gboolean stop_emission;
-	time_t dtstart, dtend;
-	CalComponentDateTime dt;
-	struct icaltimetype itt;
-	const char *uid;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	day_view = E_DAY_VIEW (widget);
-	keyval = event->keyval;
-
-	/* The Escape key aborts a resize operation. */
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-		if (keyval == GDK_Escape) {
-			e_day_view_abort_resize (day_view, event->time);
-		}
-		return FALSE;
-	}
-
-	/* Handle the cursor keys for moving & extending the selection. */
-	stop_emission = TRUE;
-	if (event->state & GDK_SHIFT_MASK) {
-		switch (keyval) {
-		case GDK_Up:
-			e_day_view_cursor_key_up_shifted (day_view, event);
-			break;
-		case GDK_Down:
-			e_day_view_cursor_key_down_shifted (day_view, event);
-			break;
-		case GDK_Left:
-			e_day_view_cursor_key_left_shifted (day_view, event);
-			break;
-		case GDK_Right:
-			e_day_view_cursor_key_right_shifted (day_view, event);
-			break;
-		default:
-			stop_emission = FALSE;
-			break;
-		}
-	} else {
-		switch (keyval) {
-		case GDK_Up:
-			e_day_view_cursor_key_up (day_view, event);
-			break;
-		case GDK_Down:
-			e_day_view_cursor_key_down (day_view, event);
-			break;
-		case GDK_Left:
-			e_day_view_cursor_key_left (day_view, event);
-			break;
-		case GDK_Right:
-			e_day_view_cursor_key_right (day_view, event);
-			break;
-		default:
-			stop_emission = FALSE;
-			break;
-		}
-	}
-	if (stop_emission)
-		return TRUE;
-
-	if (day_view->selection_start_day == -1)
-		return FALSE;
-
-	/* Check if there is room for a new event to be typed in. If there
-	   isn't we don't want to add an event as we will then add a new
-	   event for every key press. */
-	if (!e_day_view_check_if_new_event_fits (day_view)) {
-		return FALSE;
-	}
-
-	/* We only want to start an edit with a return key or a simple
-	   character. */
-	if (keyval == GDK_Return) {
-		initial_text = NULL;
-	} else if ((keyval < 0x20)
-		   || (keyval > 0xFF)
-		   || (event->length == 0)
-		   || (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))) {
-		return FALSE;
-	} else {
-		initial_text = event->string;
-	}
-
-	/* Add a new event covering the selected range */
-
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-
-	e_day_view_get_selected_time_range (day_view, &dtstart, &dtend);
-
-	dt.value = &itt;
-	dt.tzid = NULL;
-
-	*dt.value = icaltime_from_timet (dtstart, FALSE, FALSE);
-	cal_component_set_dtstart (comp, &dt);
-
-	*dt.value = icaltime_from_timet (dtend, FALSE, FALSE);
-	cal_component_set_dtend (comp, &dt);
-
-	/* We add the event locally and start editing it. When we get the
-	   "update_event" callback from the server, we basically ignore it.
-	   If we were to wait for the "update_event" callback it wouldn't be
-	   as responsive and we may lose a few keystrokes. */
-	e_day_view_add_event (comp, dtstart, dtend, day_view);
-	e_day_view_check_layout (day_view);
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-
-	cal_component_get_uid (comp, &uid);
-	if (e_day_view_find_event_from_uid (day_view, uid, &day, &event_num)) {
-		e_day_view_start_editing_event (day_view, day, event_num,
-						initial_text);
-	} else {
-		g_warning ("Couldn't find event to start editing.\n");
-	}
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	return TRUE;
-}
-
-
-static void
-e_day_view_cursor_key_up_shifted (EDayView *day_view, GdkEventKey *event)
-{
-	gint *row;
-
-	if (day_view->selection_in_top_canvas)
-		return;
-
-	if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
-		row = &day_view->selection_start_row;
-	else
-		row = &day_view->selection_end_row;
-
-	if (*row == 0)
-		return;
-
-	*row = *row - 1;
-
-	e_day_view_ensure_rows_visible (day_view, *row, *row);
-
-	e_day_view_normalize_selection (day_view);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_cursor_key_down_shifted (EDayView *day_view, GdkEventKey *event)
-{
-	gint *row;
-
-	if (day_view->selection_in_top_canvas)
-		return;
-
-	if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
-		row = &day_view->selection_start_row;
-	else
-		row = &day_view->selection_end_row;
-
-	if (*row >= day_view->rows - 1)
-		return;
-
-	*row = *row + 1;
-
-	e_day_view_ensure_rows_visible (day_view, *row, *row);
-
-	e_day_view_normalize_selection (day_view);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_cursor_key_left_shifted (EDayView *day_view, GdkEventKey *event)
-{
-	gint *day;
-
-	if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
-		day = &day_view->selection_start_day;
-	else
-		day = &day_view->selection_end_day;
-
-	if (*day == 0)
-		return;
-
-	*day = *day - 1;
-
-	e_day_view_normalize_selection (day_view);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_cursor_key_right_shifted (EDayView *day_view, GdkEventKey *event)
-{
-	gint *day;
-
-	if (day_view->selection_drag_pos == E_DAY_VIEW_DRAG_START)
-		day = &day_view->selection_start_day;
-	else
-		day = &day_view->selection_end_day;
-
-	if (*day >= day_view->days_shown - 1)
-		return;
-
-	*day = *day + 1;
-
-	e_day_view_normalize_selection (day_view);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_cursor_key_up (EDayView *day_view, GdkEventKey *event)
-{
-	if (day_view->selection_start_day == -1) {
-		day_view->selection_start_day = 0;
-		day_view->selection_start_row = 0;
-	}
-	day_view->selection_end_day = day_view->selection_start_day;
-
-	if (day_view->selection_in_top_canvas) {
-		return;
-	} else if (day_view->selection_start_row == 0) {
-		day_view->selection_in_top_canvas = TRUE;
-		day_view->selection_start_row = -1;
-	} else {
-		day_view->selection_start_row--;
-	}
-	day_view->selection_end_row = day_view->selection_start_row;
-
-	if (!day_view->selection_in_top_canvas)
-		e_day_view_ensure_rows_visible (day_view,
-						day_view->selection_start_row,
-						day_view->selection_end_row);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_cursor_key_down (EDayView *day_view, GdkEventKey *event)
-{
-	if (day_view->selection_start_day == -1) {
-		day_view->selection_start_day = 0;
-		day_view->selection_start_row = 0;
-	}
-	day_view->selection_end_day = day_view->selection_start_day;
-
-	if (day_view->selection_in_top_canvas) {
-		day_view->selection_in_top_canvas = FALSE;
-		day_view->selection_start_row = 0;
-	} else if (day_view->selection_start_row >= day_view->rows - 1) {
-		return;
-	} else {
-		day_view->selection_start_row++;
-	}
-	day_view->selection_end_row = day_view->selection_start_row;
-
-	if (!day_view->selection_in_top_canvas)
-		e_day_view_ensure_rows_visible (day_view,
-						day_view->selection_start_row,
-						day_view->selection_end_row);
-
-	e_day_view_update_calendar_selection_time (day_view);
-
-	/* FIXME: Optimise? */
-	gtk_widget_queue_draw (day_view->top_canvas);
-	gtk_widget_queue_draw (day_view->main_canvas);
-}
-
-
-static void
-e_day_view_cursor_key_left (EDayView *day_view, GdkEventKey *event)
-{
-	if (day_view->selection_start_day == 0) {
-		gnome_calendar_previous (day_view->calendar);
-	} else {
-		day_view->selection_start_day--;
-		day_view->selection_end_day--;
-
-		e_day_view_update_calendar_selection_time (day_view);
-
-		/* FIXME: Optimise? */
-		gtk_widget_queue_draw (day_view->top_canvas);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-static void
-e_day_view_cursor_key_right (EDayView *day_view, GdkEventKey *event)
-{
-	if (day_view->selection_end_day == day_view->days_shown - 1) {
-		gnome_calendar_next (day_view->calendar);
-	} else {
-		day_view->selection_start_day++;
-		day_view->selection_end_day++;
-
-		e_day_view_update_calendar_selection_time (day_view);
-
-		/* FIXME: Optimise? */
-		gtk_widget_queue_draw (day_view->top_canvas);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-}
-
-
-static gboolean
-e_day_view_check_if_new_event_fits (EDayView *day_view)
-{
-	gint day, start_row, end_row, row;
-
-	day = day_view->selection_start_day;
-	start_row = day_view->selection_start_row;
-	end_row = day_view->selection_end_row;
-
-	/* Long events always fit, since we keep adding rows to the top
-	   canvas. */
-	if (day != day_view->selection_end_day)
-		return TRUE;
-	if (start_row == 0 && end_row == day_view->rows)
-		return TRUE;
-
-	/* If any of the rows already have E_DAY_VIEW_MAX_COLUMNS columns,
-	   return FALSE. */
-	for (row = start_row; row <= end_row; row++) {
-		if (day_view->cols_per_row[day][row] >= E_DAY_VIEW_MAX_COLUMNS)
-			return FALSE;
-	}
-
-	return TRUE;
-}
-
-
-static void
-e_day_view_ensure_rows_visible (EDayView *day_view,
-				gint start_row,
-				gint end_row)
-{
-	GtkAdjustment *adj;
-	gfloat value, min_value, max_value;
-
-	adj = GTK_LAYOUT (day_view->main_canvas)->vadjustment;
-
-	value = adj->value;
-
-	min_value = (end_row + 1) * day_view->row_height - adj->page_size;
-	if (value < min_value)
-		value = min_value;
-
-	max_value = start_row * day_view->row_height;
-	if (value > max_value)
-		value = max_value;
-
-	if (value != adj->value) {
-		adj->value = value;
-		gtk_adjustment_value_changed (adj);
-	}
-}
-
-
-static void
-e_day_view_start_editing_event (EDayView *day_view,
-				gint	  day,
-				gint	  event_num,
-				gchar    *initial_text)
-{
-	EDayViewEvent *event;
-	ETextEventProcessor *event_processor = NULL;
-	ETextEventProcessorCommand command;
-
-#if 0
-	g_print ("In e_day_view_start_editing_event\n");
-#endif
-
-	/* If we are already editing the event, just return. */
-	if (day == day_view->editing_event_day
-	    && event_num == day_view->editing_event_num)
-		return;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-	} else {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-	}
-
-	/* If the event is not shown, don't try to edit it. */
-	if (!event->canvas_item)
-		return;
-
-	/* We must grab the focus before setting the initial text, since
-	   grabbing the focus will result in a call to
-	   e_day_view_on_editing_started(), which will reset the text to get
-	   rid of the start and end times. */
-	e_canvas_item_grab_focus (event->canvas_item);
-
-	if (initial_text) {
-		gnome_canvas_item_set (event->canvas_item,
-				       "text", initial_text,
-				       NULL);
-	}
-
-	/* Try to move the cursor to the end of the text. */
-	gtk_object_get (GTK_OBJECT (event->canvas_item),
-			"event_processor", &event_processor,
-			NULL);
-	if (event_processor) {
-		command.action = E_TEP_MOVE;
-		command.position = E_TEP_END_OF_BUFFER;
-		gtk_signal_emit_by_name (GTK_OBJECT (event_processor),
-					 "command", &command);
-	}
-}
-
-
-/* This stops the current edit. If accept is TRUE the event summary is update,
-   else the edit is cancelled. */
-static void
-e_day_view_stop_editing_event (EDayView *day_view)
-{
-	GtkWidget *toplevel;
-
-	/* Check we are editing an event. */
-	if (day_view->editing_event_day == -1)
-		return;
-
-	/* Set focus to the toplevel so the item loses focus. */
-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (day_view));
-	if (toplevel && GTK_IS_WINDOW (toplevel))
-		gtk_window_set_focus (GTK_WINDOW (toplevel), NULL);
-}
-
-
-static gboolean
-e_day_view_on_text_item_event (GnomeCanvasItem *item,
-			       GdkEvent *event,
-			       EDayView *day_view)
-{
-	switch (event->type) {
-	case GDK_KEY_PRESS:
-		if (event && event->key.keyval == GDK_Return) {
-			/* We set the keyboard focus to the EDayView, so the
-			   EText item loses it and stops the edit. */
-			gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
-			/* Stop the signal last or we will also stop any
-			   other events getting to the EText item. */
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-			return TRUE;
-		}
-		break;
-	case GDK_BUTTON_PRESS:
-	case GDK_BUTTON_RELEASE:
-		/* Only let the EText handle the event while editing. */
-		if (!E_TEXT (item)->editing)
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-		break;
-	case GDK_FOCUS_CHANGE:
-		if (event->focus_change.in)
-			e_day_view_on_editing_started (day_view, item);
-		else
-			e_day_view_on_editing_stopped (day_view, item);
-
-		return FALSE;
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static void
-e_day_view_on_editing_started (EDayView *day_view,
-			       GnomeCanvasItem *item)
-{
-	gint day, event_num;
-
-	if (!e_day_view_find_event_from_item (day_view, item,
-					      &day, &event_num))
-		return;
-
-#if 0
-	g_print ("In e_day_view_on_editing_started Day:%i Event:%i\n",
-		 day, event_num);
-#endif
-
-	/* FIXME: This is a temporary workaround for a bug which seems to stop
-	   us getting focus_out signals. It is not a complete fix since if we
-	   don't get focus_out signals we don't save the appointment text so
-	   this may be lost. */
-	if (day_view->editing_event_day == day
-	    && day_view->editing_event_num == event_num)
-		return;
-
-	day_view->editing_event_day = day;
-	day_view->editing_event_num = event_num;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		e_day_view_reshape_long_event (day_view, event_num);
-	} else {
-		day_view->resize_bars_event_day = day;
-		day_view->resize_bars_event_num = event_num;
-		e_day_view_update_event_label (day_view, day, event_num);
-		e_day_view_reshape_main_canvas_resize_bars (day_view);
-	}
-}
-
-
-static void
-e_day_view_on_editing_stopped (EDayView *day_view,
-			       GnomeCanvasItem *item)
-{
-	gint day, event_num;
-	gboolean editing_long_event = FALSE;
-	EDayViewEvent *event;
-	gchar *text = NULL;
-	CalComponentText summary;
-
-	/* Note: the item we are passed here isn't reliable, so we just stop
-	   the edit of whatever item was being edited. We also receive this
-	   event twice for some reason. */
-	day = day_view->editing_event_day;
-	event_num = day_view->editing_event_num;
-
-#if 0
-	g_print ("In e_day_view_on_editing_stopped Day:%i Event:%i\n",
-		 day, event_num);
-#endif
-
-	/* If no item is being edited, just return. */
-	if (day == -1)
-		return;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		editing_long_event = TRUE;
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-	} else {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-		/* Hide the horizontal bars. */
-		gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-		gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-	}
-
-	/* Reset the edit fields. */
-	day_view->editing_event_day = -1;
-	day_view->editing_event_num = -1;
-
-	day_view->resize_bars_event_day = -1;
-	day_view->resize_bars_event_num = -1;
-
-	gtk_object_get (GTK_OBJECT (event->canvas_item),
-			"text", &text,
-			NULL);
-
-	/* Only update the summary if necessary. */
-	cal_component_get_summary (event->comp, &summary);
-	if (text && summary.value && !strcmp (text, summary.value)) {
-		g_free (text);
-
-		if (day == E_DAY_VIEW_LONG_EVENT)
-			e_day_view_reshape_long_event (day_view, event_num);
-		return;
-	}
-
-	if (text) {
-		summary.value = text;
-		summary.altrep = NULL;
-		cal_component_set_summary (event->comp, &summary);
-
-		g_free (text);
-	} else
-		cal_component_set_summary (event->comp, NULL);
-
-	if (!cal_client_update_object (day_view->client, event->comp))
-		g_message ("e_day_view_on_editing_stopped(): Could not update the object!");
-}
-
-
-/* FIXME: It is possible that we may produce an invalid time due to daylight
-   saving times (i.e. when clocks go forward there is a range of time which
-   is not valid). I don't know the best way to handle daylight saving time. */
-static time_t
-e_day_view_convert_grid_position_to_time (EDayView *day_view,
-					  gint col,
-					  gint row)
-{
-	struct tm *tmp_tm;
-	time_t val;
-	gint minutes;
-
-	/* Calulate the number of minutes since the start of the day. */
-	minutes = day_view->first_hour_shown * 60
-		+ day_view->first_minute_shown
-		+ row * day_view->mins_per_row;
-
-	/* A special case for midnight, where we can use the start of the
-	   next day. */
-	if (minutes == 60 * 24)
-		return day_view->day_starts[col + 1];
-
-	/* We convert the start of the day to a struct tm, then set the
-	   hour and minute, then convert it back to a time_t. */
-	tmp_tm = localtime (&day_view->day_starts[col]);
-
-	tmp_tm->tm_hour = minutes / 60;
-	tmp_tm->tm_min = minutes % 60;
-	tmp_tm->tm_isdst = -1;
-
-	val = mktime (tmp_tm);
-	return val;
-}
-
-
-static gboolean
-e_day_view_convert_time_to_grid_position (EDayView *day_view,
-					  time_t time,
-					  gint *col,
-					  gint *row)
-{
-	struct tm *tmp_tm;
-	gint day, minutes;
-
-	*col = *row = 0;
-
-	if (time < day_view->lower || time >= day_view->upper)
-		return FALSE;
-
-	/* We can find the column easily using the day_starts array. */
-	for (day = 1; day <= day_view->days_shown; day++) {
-		if (time < day_view->day_starts[day]) {
-			*col = day - 1;
-			break;
-		}
-	}
-
-	/* To find the row we need to convert the time to a struct tm,
-	   calculate the offset in minutes from the top of the display and
-	   divide it by the mins per row setting. */
-	tmp_tm = localtime (&time);
-	minutes = tmp_tm->tm_hour * 60 + tmp_tm->tm_min;
-	minutes -= day_view->first_hour_shown * 60
-		+ day_view->first_minute_shown;
-
-	*row = minutes / day_view->mins_per_row;
-
-	if (*row < 0 || *row >= day_view->rows)
-		return FALSE;
-
-	return TRUE;
-}
-
-
-/* This starts or stops auto-scrolling when dragging a selection or resizing
-   an event. */
-void
-e_day_view_check_auto_scroll (EDayView *day_view,
-			      gint event_x,
-			      gint event_y)
-{
-	day_view->last_mouse_x = event_x;
-	day_view->last_mouse_y = event_y;
-
-	if (event_y < E_DAY_VIEW_AUTO_SCROLL_OFFSET)
-		e_day_view_start_auto_scroll (day_view, TRUE);
-	else if (event_y >= day_view->main_canvas->allocation.height
-		 - E_DAY_VIEW_AUTO_SCROLL_OFFSET)
-		e_day_view_start_auto_scroll (day_view, FALSE);
-	else
-		e_day_view_stop_auto_scroll (day_view);
-}
-
-
-static void
-e_day_view_start_auto_scroll (EDayView *day_view,
-			      gboolean scroll_up)
-{
-	if (day_view->auto_scroll_timeout_id == 0) {
-		day_view->auto_scroll_timeout_id = g_timeout_add (E_DAY_VIEW_AUTO_SCROLL_TIMEOUT, e_day_view_auto_scroll_handler, day_view);
-		day_view->auto_scroll_delay = E_DAY_VIEW_AUTO_SCROLL_DELAY;
-	}
-	day_view->auto_scroll_up = scroll_up;
-}
-
-
-void
-e_day_view_stop_auto_scroll (EDayView *day_view)
-{
-	if (day_view->auto_scroll_timeout_id != 0) {
-		gtk_timeout_remove (day_view->auto_scroll_timeout_id);
-		day_view->auto_scroll_timeout_id = 0;
-	}
-}
-
-
-static gboolean
-e_day_view_auto_scroll_handler (gpointer data)
-{
-	EDayView *day_view;
-	EDayViewPosition pos;
-	gint scroll_x, scroll_y, new_scroll_y, canvas_x, canvas_y, row, day;
-	GtkAdjustment *adj;
-
-	g_return_val_if_fail (E_IS_DAY_VIEW (data), FALSE);
-
-	day_view = E_DAY_VIEW (data);
-
-	GDK_THREADS_ENTER ();
-
-	if (day_view->auto_scroll_delay > 0) {
-		day_view->auto_scroll_delay--;
-		GDK_THREADS_LEAVE ();
-		return TRUE;
-	}
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (day_view->main_canvas),
-					 &scroll_x, &scroll_y);
-
-	adj = GTK_LAYOUT (day_view->main_canvas)->vadjustment;
-
-	if (day_view->auto_scroll_up)
-		new_scroll_y = MAX (scroll_y - adj->step_increment, 0);
-	else
-		new_scroll_y = MIN (scroll_y + adj->step_increment,
-				    adj->upper - adj->page_size);
-
-	if (new_scroll_y != scroll_y) {
-		/* NOTE: This reduces flicker, but only works if we don't use
-		   canvas items which have X windows. */
-		gtk_layout_freeze (GTK_LAYOUT (day_view->main_canvas));
-
-		gnome_canvas_scroll_to (GNOME_CANVAS (day_view->main_canvas),
-					scroll_x, new_scroll_y);
-
-		gtk_layout_thaw (GTK_LAYOUT (day_view->main_canvas));
-	}
-
-	canvas_x = day_view->last_mouse_x + scroll_x;
-	canvas_y = day_view->last_mouse_y + new_scroll_y;
-
-	/* The last_mouse_x position is set to -1 when we are selecting using
-	   the time column. In this case we set canvas_x to 0 and we ignore
-	   the resulting day. */
-	if (day_view->last_mouse_x == -1)
-		canvas_x = 0;
-
-	/* Update the selection/resize/drag if necessary. */
-	pos = e_day_view_convert_position_in_main_canvas (day_view,
-							  canvas_x, canvas_y,
-							  &day, &row, NULL);
-
-	if (day_view->last_mouse_x == -1)
-		day = -1;
-
-	if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-		if (day_view->selection_is_being_dragged) {
-			e_day_view_update_selection (day_view, day, row);
-		} else if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE) {
-			e_day_view_update_resize (day_view, row);
-		} else if (day_view->drag_item->object.flags
-			   & GNOME_CANVAS_ITEM_VISIBLE) {
-			e_day_view_update_main_canvas_drag (day_view, row,
-							    day);
-		}
-	}
-
-	GDK_THREADS_LEAVE ();
-	return TRUE;
-}
-
-
-gboolean
-e_day_view_get_event_position (EDayView *day_view,
-			       gint day,
-			       gint event_num,
-			       gint *item_x,
-			       gint *item_y,
-			       gint *item_w,
-			       gint *item_h)
-{
-	EDayViewEvent *event;
-	gint start_row, end_row, cols_in_row, start_col, num_columns;
-
-	event = &g_array_index (day_view->events[day], EDayViewEvent,
-				event_num);
-
-	/* If the event is flagged as not displayed, return FALSE. */
-	if (event->num_columns == 0)
-		return FALSE;
-
-	start_row = event->start_minute / day_view->mins_per_row;
-	end_row = (event->end_minute - 1) / day_view->mins_per_row;
-	cols_in_row = day_view->cols_per_row[day][start_row];
-	start_col = event->start_row_or_col;
-	num_columns = event->num_columns;
-
-	if (cols_in_row == 0)
-		return FALSE;
-
-	/* If the event is being resize, use the resize position. */
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE
-	    && day_view->resize_event_day == day
-	    && day_view->resize_event_num == event_num) {
-		if (day_view->resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE)
-			start_row = day_view->resize_start_row;
-		else if (day_view->resize_drag_pos == E_DAY_VIEW_POS_BOTTOM_EDGE)
-			end_row = day_view->resize_end_row;
-	}
-
-
-	*item_x = day_view->day_offsets[day]
-		+ day_view->day_widths[day] * start_col / cols_in_row;
-	*item_w = day_view->day_widths[day] * num_columns / cols_in_row
-		- E_DAY_VIEW_GAP_WIDTH;
-	*item_w = MAX (*item_w, 0);
-	*item_y = start_row * day_view->row_height;
-#if 0
-	*item_h = (end_row - start_row + 1) * day_view->row_height;
-#else
-	/* This makes the event end on the grid line of the next row,
-	   which maybe looks nicer if you have 2 events on consecutive rows. */
-	*item_h = (end_row - start_row + 1) * day_view->row_height + 1;
-#endif
-	return TRUE;
-}
-
-
-gboolean
-e_day_view_get_long_event_position	(EDayView	*day_view,
-					 gint		 event_num,
-					 gint		*start_day,
-					 gint		*end_day,
-					 gint		*item_x,
-					 gint		*item_y,
-					 gint		*item_w,
-					 gint		*item_h)
-{
-	EDayViewEvent *event;
-
-	event = &g_array_index (day_view->long_events, EDayViewEvent,
-				event_num);
-
-	/* If the event is flagged as not displayed, return FALSE. */
-	if (event->num_columns == 0)
-		return FALSE;
-
-	if (!e_day_view_find_long_event_days (day_view, event,
-					      start_day, end_day))
-		return FALSE;
-
-	/* If the event is being resize, use the resize position. */
-	if (day_view->resize_drag_pos != E_DAY_VIEW_POS_NONE
-	    && day_view->resize_event_day == E_DAY_VIEW_LONG_EVENT
-	    && day_view->resize_event_num == event_num) {
-		if (day_view->resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE)
-			*start_day = day_view->resize_start_row;
-		else if (day_view->resize_drag_pos == E_DAY_VIEW_POS_RIGHT_EDGE)
-			*end_day = day_view->resize_end_row;
-	}
-
-	*item_x = day_view->day_offsets[*start_day] + E_DAY_VIEW_BAR_WIDTH;
-	*item_w = day_view->day_offsets[*end_day + 1] - *item_x
-		- E_DAY_VIEW_GAP_WIDTH;
-	*item_w = MAX (*item_w, 0);
-	*item_y = (event->start_row_or_col + 1) * day_view->top_row_height;
-	*item_h = day_view->top_row_height - E_DAY_VIEW_TOP_CANVAS_Y_GAP;
-	return TRUE;
-}
-
-
-/* Converts a position within the entire top canvas to a day & event and
-   a place within the event if appropriate. If event_num_return is NULL, it
-   simply returns the grid position without trying to find the event. */
-static EDayViewPosition
-e_day_view_convert_position_in_top_canvas (EDayView *day_view,
-					   gint x,
-					   gint y,
-					   gint *day_return,
-					   gint *event_num_return)
-{
-	EDayViewEvent *event;
-	gint day, row, col;
-	gint event_num, start_day, end_day, item_x, item_y, item_w, item_h;
-
-	*day_return = -1;
-	if (event_num_return)
-		*event_num_return = -1;
-
-	if (x < 0 || y < 0)
-		return E_DAY_VIEW_POS_OUTSIDE;
-
-	row = y / day_view->top_row_height - 1;
-
-	day = -1;
-	for (col = 1; col <= day_view->days_shown; col++) {
-		if (x < day_view->day_offsets[col]) {
-			day = col - 1;
-			break;
-		}
-	}
-	if (day == -1)
-		return E_DAY_VIEW_POS_OUTSIDE;
-
-	*day_return = day;
-
-	/* If only the grid position is wanted, return. */
-	if (event_num_return == NULL)
-		return E_DAY_VIEW_POS_NONE;
-
-	for (event_num = 0; event_num < day_view->long_events->len;
-	     event_num++) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-
-		if (event->start_row_or_col != row)
-			continue;
-
-		if (!e_day_view_get_long_event_position (day_view, event_num,
-							 &start_day, &end_day,
-							 &item_x, &item_y,
-							 &item_w, &item_h))
-			continue;
-
-		if (x < item_x)
-			continue;
-
-		if (x >= item_x + item_w)
-			continue;
-
-		*event_num_return = event_num;
-
-		if (x < item_x + E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH
-		    + E_DAY_VIEW_LONG_EVENT_X_PAD)
-			return E_DAY_VIEW_POS_LEFT_EDGE;
-
-		if (x >= item_x + item_w - E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH
-		    - E_DAY_VIEW_LONG_EVENT_X_PAD)
-			return E_DAY_VIEW_POS_RIGHT_EDGE;
-
-		return E_DAY_VIEW_POS_EVENT;
-	}
-
-	return E_DAY_VIEW_POS_NONE;
-}
-
-
-/* Converts a position within the entire main canvas to a day, row, event and
-   a place within the event if appropriate. If event_num_return is NULL, it
-   simply returns the grid position without trying to find the event. */
-static EDayViewPosition
-e_day_view_convert_position_in_main_canvas (EDayView *day_view,
-					    gint x,
-					    gint y,
-					    gint *day_return,
-					    gint *row_return,
-					    gint *event_num_return)
-{
-	gint day, row, col, event_num;
-	gint item_x, item_y, item_w, item_h;
-
-	*day_return = -1;
-	*row_return = -1;
-	if (event_num_return)
-		*event_num_return = -1;
-
-	/* Check the position is inside the canvas, and determine the day
-	   and row. */
-	if (x < 0 || y < 0)
-		return E_DAY_VIEW_POS_OUTSIDE;
-
-	row = y / day_view->row_height;
-	if (row >= day_view->rows)
-		return E_DAY_VIEW_POS_OUTSIDE;
-
-	day = -1;
-	for (col = 1; col <= day_view->days_shown; col++) {
-		if (x < day_view->day_offsets[col]) {
-			day = col - 1;
-			break;
-		}
-	}
-	if (day == -1)
-		return E_DAY_VIEW_POS_OUTSIDE;
-
-	*day_return = day;
-	*row_return = row;
-
-	/* If only the grid position is wanted, return. */
-	if (event_num_return == NULL)
-		return E_DAY_VIEW_POS_NONE;
-
-	/* Check the selected item first, since the horizontal resizing bars
-	   may be above other events. */
-	if (day_view->resize_bars_event_day == day) {
-		if (e_day_view_get_event_position (day_view, day,
-						   day_view->resize_bars_event_num,
-						   &item_x, &item_y,
-						   &item_w, &item_h)) {
-			if (x >= item_x && x < item_x + item_w) {
-				*event_num_return = day_view->resize_bars_event_num;
-				if (y >= item_y - E_DAY_VIEW_BAR_HEIGHT
-				    && y < item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT)
-					return E_DAY_VIEW_POS_TOP_EDGE;
-				if (y >= item_y + item_h - E_DAY_VIEW_EVENT_BORDER_HEIGHT
-				    && y < item_y + item_h + E_DAY_VIEW_BAR_HEIGHT)
-					return E_DAY_VIEW_POS_BOTTOM_EDGE;
-			}
-		}
-	}
-
-	/* Try to find the event at the found position. */
-	*event_num_return = -1;
-	for (event_num = 0; event_num < day_view->events[day]->len;
-	     event_num++) {
-		if (!e_day_view_get_event_position (day_view, day, event_num,
-						    &item_x, &item_y,
-						    &item_w, &item_h))
-			continue;
-
-		if (x < item_x || x >= item_x + item_w
-		    || y < item_y || y >= item_y + item_h)
-			continue;
-
-		*event_num_return = event_num;
-
-		if (x < item_x + E_DAY_VIEW_BAR_WIDTH)
-			return E_DAY_VIEW_POS_LEFT_EDGE;
-
-		if (y < item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT
-		    + E_DAY_VIEW_EVENT_Y_PAD)
-			return E_DAY_VIEW_POS_TOP_EDGE;
-
-		if (y >= item_y + item_h - E_DAY_VIEW_EVENT_BORDER_HEIGHT
-		    - E_DAY_VIEW_EVENT_Y_PAD)
-			return E_DAY_VIEW_POS_BOTTOM_EDGE;
-
-		return E_DAY_VIEW_POS_EVENT;
-	}
-
-	return E_DAY_VIEW_POS_NONE;
-}
-
-
-static gint
-e_day_view_on_top_canvas_drag_motion (GtkWidget      *widget,
-				      GdkDragContext *context,
-				      gint            x,
-				      gint            y,
-				      guint           time,
-				      EDayView	     *day_view)
-{
-	gint scroll_x, scroll_y;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	day_view->drag_event_x = x + scroll_x;
-	day_view->drag_event_y = y + scroll_y;
-
-	e_day_view_reshape_top_canvas_drag_item (day_view);
-
-	return TRUE;
-}
-
-
-static void
-e_day_view_reshape_top_canvas_drag_item (EDayView *day_view)
-{
-	EDayViewPosition pos;
-	gint x, y, day;
-
-	/* Calculate the day & start row of the event being dragged, using
-	   the current mouse position. */
-	x = day_view->drag_event_x;
-	y = day_view->drag_event_y;
-	pos = e_day_view_convert_position_in_top_canvas (day_view, x, y,
-							 &day, NULL);
-	/* This shouldn't really happen in a drag. */
-	if (pos == E_DAY_VIEW_POS_OUTSIDE)
-		return;
-
-	if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT)
-		day -= day_view->drag_event_offset;
-	day = MAX (day, 0);
-
-	e_day_view_update_top_canvas_drag (day_view, day);
-}
-
-
-static void
-e_day_view_update_top_canvas_drag (EDayView *day_view,
-				   gint day)
-{
-	EDayViewEvent *event = NULL;
-	gint row, num_days, start_day, end_day;
-	gdouble item_x, item_y, item_w, item_h;
-	GdkFont *font;
-	gchar *text;
-
-
-	/* Calculate the event's position. If the event is in the same
-	   position we started in, we use the same columns. */
-	row = day_view->rows_in_top_display + 1;
-	num_days = 1;
-
-	if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					day_view->drag_event_num);
-		row = event->start_row_or_col + 1;
-
-		if (!e_day_view_find_long_event_days (day_view, event,
-						      &start_day, &end_day))
-			return;
-
-		num_days = end_day - start_day + 1;
-
-		/* Make sure we don't go off the screen. */
-		day = MIN (day, day_view->days_shown - num_days);
-
-	} else if (day_view->drag_event_day != -1) {
-		event = &g_array_index (day_view->events[day_view->drag_event_day],
-					EDayViewEvent,
-					day_view->drag_event_num);
-	}
-
-	/* If the position hasn't changed, just return. */
-	if (day_view->drag_last_day == day
-	    && (day_view->drag_long_event_item->object.flags
-		& GNOME_CANVAS_ITEM_VISIBLE))
-		return;
-
-	day_view->drag_last_day = day;
-
-
-	item_x = day_view->day_offsets[day] + E_DAY_VIEW_BAR_WIDTH;
-	item_w = day_view->day_offsets[day + num_days] - item_x
-		- E_DAY_VIEW_GAP_WIDTH;
-	item_y = row * day_view->top_row_height;
-	item_h = day_view->top_row_height - E_DAY_VIEW_TOP_CANVAS_Y_GAP;
-
-
-	/* Set the positions of the event & associated items. */
-	gnome_canvas_item_set (day_view->drag_long_event_rect_item,
-			       "x1", item_x,
-			       "y1", item_y,
-			       "x2", item_x + item_w - 1,
-			       "y2", item_y + item_h - 1,
-			       NULL);
-
-	font = GTK_WIDGET (day_view)->style->font;
-	gnome_canvas_item_set (day_view->drag_long_event_item,
-			       "font_gdk", font,
-			       "clip_width", item_w - (E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD) * 2,
-			       "clip_height", item_h - (E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD) * 2,
-			       NULL);
-	e_canvas_item_move_absolute (day_view->drag_long_event_item,
-				     item_x + E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD,
-				     item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD);
-
-	if (!(day_view->drag_long_event_rect_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
-		gnome_canvas_item_raise_to_top (day_view->drag_long_event_rect_item);
-		gnome_canvas_item_show (day_view->drag_long_event_rect_item);
-	}
-
-	/* Set the text, if necessary. We don't want to set the text every
-	   time it moves, so we check if it is currently invisible and only
-	   set the text then. */
-	if (!(day_view->drag_long_event_item->object.flags
-	      & GNOME_CANVAS_ITEM_VISIBLE)) {
-		CalComponentText summary;
-
-		cal_component_get_summary (event->comp, &summary);
-		if (event) {
-			cal_component_get_summary (event->comp, &summary);
-			text = g_strdup (summary.value);
-		} else {
-			text = NULL;
-		}
-
-		gnome_canvas_item_set (day_view->drag_long_event_item,
-				       "text", text ? text : "",
-				       NULL);
-		gnome_canvas_item_raise_to_top (day_view->drag_long_event_item);
-		gnome_canvas_item_show (day_view->drag_long_event_item);
-
-		g_free (text);
-	}
-}
-
-
-static gint
-e_day_view_on_main_canvas_drag_motion (GtkWidget      *widget,
-				       GdkDragContext *context,
-				       gint            x,
-				       gint            y,
-				       guint           time,
-				       EDayView	      *day_view)
-{
-	gint scroll_x, scroll_y;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	day_view->drag_event_x = x + scroll_x;
-	day_view->drag_event_y = y + scroll_y;
-
-	e_day_view_reshape_main_canvas_drag_item (day_view);
-	e_day_view_reshape_main_canvas_resize_bars (day_view);
-
-	e_day_view_check_auto_scroll (day_view, x, y);
-
-	return TRUE;
-}
-
-
-static void
-e_day_view_reshape_main_canvas_drag_item (EDayView *day_view)
-{
-	EDayViewPosition pos;
-	gint x, y, day, row;
-
-	/* Calculate the day & start row of the event being dragged, using
-	   the current mouse position. */
-	x = day_view->drag_event_x;
-	y = day_view->drag_event_y;
-	pos = e_day_view_convert_position_in_main_canvas (day_view, x, y,
-							  &day, &row, NULL);
-	/* This shouldn't really happen in a drag. */
-	if (pos == E_DAY_VIEW_POS_OUTSIDE)
-		return;
-
-	if (day_view->drag_event_day != -1
-	    && day_view->drag_event_day != E_DAY_VIEW_LONG_EVENT)
-		row -= day_view->drag_event_offset;
-	row = MAX (row, 0);
-
-	e_day_view_update_main_canvas_drag (day_view, row, day);
-}
-
-
-static void
-e_day_view_update_main_canvas_drag (EDayView *day_view,
-				    gint row,
-				    gint day)
-{
-	EDayViewEvent *event = NULL;
-	gint cols_in_row, start_col, num_columns, num_rows, start_row, end_row;
-	gdouble item_x, item_y, item_w, item_h;
-	GdkFont *font;
-	gchar *text;
-
-	/* If the position hasn't changed, just return. */
-	if (day_view->drag_last_day == day
-	    && day_view->drag_last_row == row
-	    && (day_view->drag_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE))
-		return;
-
-	day_view->drag_last_day = day;
-	day_view->drag_last_row = row;
-
-	/* Calculate the event's position. If the event is in the same
-	   position we started in, we use the same columns. */
-	cols_in_row = 1;
-	start_row = 0;
-	start_col = 0;
-	num_columns = 1;
-	num_rows = 1;
-
-	if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					day_view->drag_event_num);
-	} else if (day_view->drag_event_day != -1) {
-		event = &g_array_index (day_view->events[day_view->drag_event_day],
-					EDayViewEvent,
-					day_view->drag_event_num);
-		start_row = event->start_minute / day_view->mins_per_row;
-		end_row = (event->end_minute - 1) / day_view->mins_per_row;
-		num_rows = end_row - start_row + 1;
-	}
-
-	if (day_view->drag_event_day == day && start_row == row) {
-		cols_in_row = day_view->cols_per_row[day][row];
-		start_col = event->start_row_or_col;
-		num_columns = event->num_columns;
-	}
-
-	item_x = day_view->day_offsets[day]
-		+ day_view->day_widths[day] * start_col / cols_in_row;
-	item_w = day_view->day_widths[day] * num_columns / cols_in_row
-		- E_DAY_VIEW_GAP_WIDTH;
-	item_y = row * day_view->row_height;
-	item_h = num_rows * day_view->row_height;
-
-	/* Set the positions of the event & associated items. */
-	gnome_canvas_item_set (day_view->drag_rect_item,
-			       "x1", item_x + E_DAY_VIEW_BAR_WIDTH - 1,
-			       "y1", item_y,
-			       "x2", item_x + item_w - 1,
-			       "y2", item_y + item_h - 1,
-			       NULL);
-
-	gnome_canvas_item_set (day_view->drag_bar_item,
-			       "x1", item_x,
-			       "y1", item_y,
-			       "x2", item_x + E_DAY_VIEW_BAR_WIDTH - 1,
-			       "y2", item_y + item_h - 1,
-			       NULL);
-
-	font = GTK_WIDGET (day_view)->style->font;
-	gnome_canvas_item_set (day_view->drag_item,
-			       "font_gdk", font,
-			       "clip_width", item_w - E_DAY_VIEW_BAR_WIDTH - E_DAY_VIEW_EVENT_X_PAD * 2,
-			       "clip_height", item_h - (E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD) * 2,
-			       NULL);
-	e_canvas_item_move_absolute (day_view->drag_item,
-				     item_x + E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD,
-				     item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD);
-
-	if (!(day_view->drag_bar_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
-		gnome_canvas_item_raise_to_top (day_view->drag_bar_item);
-		gnome_canvas_item_show (day_view->drag_bar_item);
-	}
-
-	if (!(day_view->drag_rect_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
-		gnome_canvas_item_raise_to_top (day_view->drag_rect_item);
-		gnome_canvas_item_show (day_view->drag_rect_item);
-	}
-
-	/* Set the text, if necessary. We don't want to set the text every
-	   time it moves, so we check if it is currently invisible and only
-	   set the text then. */
-	if (!(day_view->drag_item->object.flags & GNOME_CANVAS_ITEM_VISIBLE)) {
-		CalComponentText summary;
-
-		if (event) {
-			cal_component_get_summary (event->comp, &summary);
-			text = g_strdup (summary.value);
-		} else {
-			text = NULL;
-		}
-
-		gnome_canvas_item_set (day_view->drag_item,
-				       "text", text ? text : "",
-				       NULL);
-		gnome_canvas_item_raise_to_top (day_view->drag_item);
-		gnome_canvas_item_show (day_view->drag_item);
-
-		g_free (text);
-	}
-}
-
-
-static void
-e_day_view_on_top_canvas_drag_leave (GtkWidget      *widget,
-				     GdkDragContext *context,
-				     guint           time,
-				     EDayView	     *day_view)
-{
-	day_view->drag_last_day = -1;
-
-	gnome_canvas_item_hide (day_view->drag_long_event_rect_item);
-	gnome_canvas_item_hide (day_view->drag_long_event_item);
-}
-
-
-static void
-e_day_view_on_main_canvas_drag_leave (GtkWidget      *widget,
-				      GdkDragContext *context,
-				      guint           time,
-				      EDayView	     *day_view)
-{
-	day_view->drag_last_day = -1;
-
-	e_day_view_stop_auto_scroll (day_view);
-
-	gnome_canvas_item_hide (day_view->drag_rect_item);
-	gnome_canvas_item_hide (day_view->drag_bar_item);
-	gnome_canvas_item_hide (day_view->drag_item);
-
-	/* Hide the resize bars if they are being used in the drag. */
-	if (day_view->drag_event_day == day_view->resize_bars_event_day
-	    && day_view->drag_event_num == day_view->resize_bars_event_num) {
-		gnome_canvas_item_hide (day_view->main_canvas_top_resize_bar_item);
-		gnome_canvas_item_hide (day_view->main_canvas_bottom_resize_bar_item);
-	}
-}
-
-
-static void
-e_day_view_on_drag_begin (GtkWidget      *widget,
-			  GdkDragContext *context,
-			  EDayView	 *day_view)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-
-	day = day_view->drag_event_day;
-	event_num = day_view->drag_event_num;
-
-	/* These should both be set. */
-	g_return_if_fail (day != -1);
-	g_return_if_fail (event_num != -1);
-
-	if (day == E_DAY_VIEW_LONG_EVENT)
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-	else
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-
-	/* Hide the text item, since it will be shown in the special drag
-	   items. */
-	gnome_canvas_item_hide (event->canvas_item);
-}
-
-
-static void
-e_day_view_on_drag_end (GtkWidget      *widget,
-			GdkDragContext *context,
-			EDayView       *day_view)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-
-	day = day_view->drag_event_day;
-	event_num = day_view->drag_event_num;
-
-	/* If the calendar has already been updated in drag_data_received()
-	   we just return. */
-	if (day == -1 || event_num == -1)
-		return;
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-		gtk_widget_queue_draw (day_view->top_canvas);
-	} else {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-		gtk_widget_queue_draw (day_view->main_canvas);
-	}
-
-	/* Show the text item again. */
-	gnome_canvas_item_show (event->canvas_item);
-
-	day_view->drag_event_day = -1;
-	day_view->drag_event_num = -1;
-}
-
-
-static void
-e_day_view_on_drag_data_get (GtkWidget          *widget,
-			     GdkDragContext     *context,
-			     GtkSelectionData   *selection_data,
-			     guint               info,
-			     guint               time,
-			     EDayView		*day_view)
-{
-	EDayViewEvent *event;
-	gint day, event_num;
-	const char *event_uid;
-
-	day = day_view->drag_event_day;
-	event_num = day_view->drag_event_num;
-
-	/* These should both be set. */
-	g_return_if_fail (day != -1);
-	g_return_if_fail (event_num != -1);
-
-	if (day == E_DAY_VIEW_LONG_EVENT)
-		event = &g_array_index (day_view->long_events,
-					EDayViewEvent, event_num);
-	else
-		event = &g_array_index (day_view->events[day],
-					EDayViewEvent, event_num);
-
-
-	cal_component_get_uid (event->comp, &event_uid);
-
-	g_return_if_fail (event_uid != NULL);
-
-	if (info == TARGET_CALENDAR_EVENT) {
-		gtk_selection_data_set (selection_data,	selection_data->target,
-					8, event_uid, strlen (event_uid));
-	}
-}
-
-
-static void
-e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
-					      GdkDragContext     *context,
-					      gint                x,
-					      gint                y,
-					      GtkSelectionData   *data,
-					      guint               info,
-					      guint               time,
-					      EDayView	         *day_view)
-{
-	EDayViewEvent *event=NULL;
-	EDayViewPosition pos;
-	gint day, start_day, end_day, num_days;
-	gint start_offset, end_offset;
-	gchar *event_uid;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-
-	if ((data->length >= 0) && (data->format == 8)) {
-		pos = e_day_view_convert_position_in_top_canvas (day_view,
-								 x, y, &day,
-								 NULL);
-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-			const char *uid;
-			num_days = 1;
-			start_offset = 0;
-			end_offset = -1;
-
-			if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
-				event = &g_array_index (day_view->long_events, EDayViewEvent,
-							day_view->drag_event_num);
-				day -= day_view->drag_event_offset;
-				day = MAX (day, 0);
-
-				e_day_view_find_long_event_days (day_view,
-								 event,
-								 &start_day,
-								 &end_day);
-				num_days = end_day - start_day + 1;
-				/* Make sure we don't go off the screen. */
-				day = MIN (day, day_view->days_shown - num_days);
-
-				start_offset = event->start_minute;
-				end_offset = event->end_minute;
-			} else if (day_view->drag_event_day != -1) {
-				event = &g_array_index (day_view->events[day_view->drag_event_day],
-							EDayViewEvent,
-							day_view->drag_event_num);
-			}
-
-			event_uid = data->data;
-
-			cal_component_get_uid (event->comp, &uid);
-
-			if (!event_uid || !uid || strcmp (event_uid, uid))
-				g_warning ("Unexpected event UID");
-
-			/* We use a temporary shallow of the comp since we
-			   don't want to change the original comp here.
-			   Otherwise we would not detect that the event's time
-			   had changed in the "update_event" callback. */
-
-			comp = cal_component_clone (event->comp);
-
-			date.value = &itt;
-			date.tzid = NULL;
-
-			dt = day_view->day_starts[day] + start_offset * 60;
-			*date.value = icaltime_from_timet (dt, FALSE, FALSE);
-			cal_component_set_dtstart (comp, &date);
-			if (end_offset == -1 || end_offset == 0)
-				dt = day_view->day_starts[day + num_days];
-			else
-				dt = day_view->day_starts[day + num_days - 1] + end_offset * 60;
-			*date.value = icaltime_from_timet (dt, FALSE, FALSE);
-			cal_component_set_dtend (comp, &date);
-
-			gtk_drag_finish (context, TRUE, TRUE, time);
-
-			/* Reset this since it will be invalid. */
-			day_view->drag_event_day = -1;
-
-			/* Show the text item again, just in case it hasn't
-			   moved. If we don't do this it may not appear. */
-			if (event->canvas_item)
-				gnome_canvas_item_show (event->canvas_item);
-
-			if (!cal_client_update_object (day_view->client, comp))
-				g_message ("e_day_view_on_top_canvas_drag_data_received(): Could "
-					   "not update the object!");
-
-			gtk_object_unref (GTK_OBJECT (comp));
-
-			return;
-		}
-	}
-
-	gtk_drag_finish (context, FALSE, FALSE, time);
-}
-
-
-static void
-e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
-					       GdkDragContext     *context,
-					       gint                x,
-					       gint                y,
-					       GtkSelectionData   *data,
-					       guint               info,
-					       guint               time,
-					       EDayView		  *day_view)
-{
-	EDayViewEvent *event = NULL;
-	EDayViewPosition pos;
-	gint day, row, start_row, end_row, num_rows, scroll_x, scroll_y;
-	gint start_offset, end_offset;
-	gchar *event_uid;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-
-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),
-					 &scroll_x, &scroll_y);
-	x += scroll_x;
-	y += scroll_y;
-
-	if ((data->length >= 0) && (data->format == 8)) {
-		pos = e_day_view_convert_position_in_main_canvas (day_view,
-								  x, y, &day,
-								  &row, NULL);
-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {
-			const char *uid;
-			num_rows = 1;
-			start_offset = 0;
-			end_offset = 0;
-
-			if (day_view->drag_event_day == E_DAY_VIEW_LONG_EVENT) {
-				event = &g_array_index (day_view->long_events, EDayViewEvent,
-							day_view->drag_event_num);
-			} else if (day_view->drag_event_day != -1) {
-				event = &g_array_index (day_view->events[day_view->drag_event_day],
-							EDayViewEvent,
-							day_view->drag_event_num);
-				row -= day_view->drag_event_offset;
-
-				/* Calculate time offset from start row. */
-				start_row = event->start_minute / day_view->mins_per_row;
-				end_row = (event->end_minute - 1) / day_view->mins_per_row;
-				num_rows = end_row - start_row + 1;
-
-				start_offset = event->start_minute % day_view->mins_per_row;
-				end_offset = event->end_minute % day_view->mins_per_row;
-				if (end_offset != 0)
-					end_offset = day_view->mins_per_row - end_offset;
-			}
-
-			event_uid = data->data;
-
-			cal_component_get_uid (event->comp, &uid);
-			if (!event_uid || !uid || strcmp (event_uid, uid))
-				g_warning ("Unexpected event UID");
-
-			/* We use a temporary shallow copy of comp since we
-			   don't want to change the original comp here.
-			   Otherwise we would not detect that the event's time
-			   had changed in the "update_event" callback. */
-			comp = cal_component_clone (event->comp);
-
-			date.value = &itt;
-			date.tzid = NULL;
-
-			dt = e_day_view_convert_grid_position_to_time (day_view, day, row) + start_offset * 60;
-			*date.value = icaltime_from_timet (dt, FALSE, FALSE);
-			cal_component_set_dtstart (comp, &date);
-			dt = e_day_view_convert_grid_position_to_time (day_view, day, row + num_rows) - end_offset * 60;
-			*date.value = icaltime_from_timet (dt, FALSE, FALSE);
-			cal_component_set_dtend (comp, &date);
-
-			gtk_drag_finish (context, TRUE, TRUE, time);
-
-			/* Reset this since it will be invalid. */
-			day_view->drag_event_day = -1;
-
-			/* Show the text item again, just in case it hasn't
-			   moved. If we don't do this it may not appear. */
-			if (event->canvas_item)
-				gnome_canvas_item_show (event->canvas_item);
-
-			if (!cal_client_update_object (day_view->client, comp))
-				g_message ("e_day_view_on_main_canvas_drag_data_received(): "
-					   "Could not update the object!");
-
-			gtk_object_unref (GTK_OBJECT (comp));
-
-			return;
-		}
-	}
-
-	gtk_drag_finish (context, FALSE, FALSE, time);
-}
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
deleted file mode 100644
index bf72d47f46..0000000000
--- a/calendar/gui/e-day-view.h
+++ /dev/null
@@ -1,565 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_DAY_VIEW_H_
-#define _E_DAY_VIEW_H_
-
-#include <time.h>
-#include <gtk/gtktable.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#include "gnome-cal.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EDayView - displays the Day & Work-Week views of the calendar.
- */
-
-/* The maximum number of days shown. We use the week view for anything more
-   than about 9 days. */
-#define E_DAY_VIEW_MAX_DAYS		10
-
-/* This is used as a special code to signify a long event instead of the day
-   of a normal event. */
-#define E_DAY_VIEW_LONG_EVENT		E_DAY_VIEW_MAX_DAYS
-
-/* The maximum number of columns of appointments within a day. */
-#define E_DAY_VIEW_MAX_COLUMNS		6
-
-/* The width of the gap between appointments. This should be at least
-   E_DAY_VIEW_BAR_WIDTH, since in the top canvas we use this space to draw
-   the triangle to represent continuing events. */
-#define E_DAY_VIEW_GAP_WIDTH		7
-
-/* The width of the bars down the left of each column and appointment.
-   This includes the borders on each side of it. */
-#define E_DAY_VIEW_BAR_WIDTH		7
-
-/* The height of the horizontal bar above & beneath the selected event.
-   This includes the borders on the top and bottom. */
-#define E_DAY_VIEW_BAR_HEIGHT		6
-
-/* The size of the reminder & recurrence icons, and padding around them. */
-#define E_DAY_VIEW_ICON_WIDTH		16
-#define E_DAY_VIEW_ICON_HEIGHT		16
-#define E_DAY_VIEW_ICON_X_PAD		0
-#define E_DAY_VIEW_ICON_Y_PAD		0
-
-/* The size of the border around the event. */
-#define E_DAY_VIEW_EVENT_BORDER_WIDTH	1
-#define E_DAY_VIEW_EVENT_BORDER_HEIGHT	1
-
-/* The padding on each side of the event text. */
-#define E_DAY_VIEW_EVENT_X_PAD		2
-#define E_DAY_VIEW_EVENT_Y_PAD		1
-
-/* The padding on each side of the event text for events in the top canvas. */
-#define E_DAY_VIEW_LONG_EVENT_X_PAD	2
-#define E_DAY_VIEW_LONG_EVENT_Y_PAD	2
-
-/* The size of the border around the long events in the top canvas. */
-#define E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH	1
-#define E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT	1
-
-/* The space between the time and the icon/text in the top canvas. */
-#define E_DAY_VIEW_LONG_EVENT_TIME_X_PAD	2
-
-/* The gap between rows in the top canvas. */
-#define E_DAY_VIEW_TOP_CANVAS_Y_GAP	2
-
-
-/* These are used to get/set the working days in the week. The bit-flags are
-   combined together. The bits must be from 0 (Sun) to 6 (Sat) to match the
-   day values used by localtime etc. */
-typedef enum
-{
-	E_DAY_VIEW_SUNDAY	= 1 << 0,
-	E_DAY_VIEW_MONDAY	= 1 << 1,
-	E_DAY_VIEW_TUESDAY	= 1 << 2,
-	E_DAY_VIEW_WEDNESDAY	= 1 << 3,
-	E_DAY_VIEW_THURSDAY	= 1 << 4,
-	E_DAY_VIEW_FRIDAY	= 1 << 5,
-	E_DAY_VIEW_SATURDAY	= 1 << 6
-} EDayViewDays;
-
-
-/* These are used to specify the type of an appointment. They match those
-   used in EMeetingTimeSelector. */
-typedef enum
-{
-	E_DAY_VIEW_BUSY_TENTATIVE	= 0,
-	E_DAY_VIEW_BUSY_OUT_OF_OFFICE	= 1,
-	E_DAY_VIEW_BUSY_BUSY		= 2,
-
-	E_DAY_VIEW_BUSY_LAST		= 3
-} EDayViewBusyType;
-
-/* This is used to specify the format used when displaying the dates.
-   The full format is like 'Thursday 12 September'. The abbreviated format is
-   like 'Thu 12 Sep'. The no weekday format is like '12 Sep'. The short format
-   is like '12'. The actual format used is determined in
-   e_day_view_recalc_cell_sizes(), once we know the font being used. */
-typedef enum
-{
-	E_DAY_VIEW_DATE_FULL,
-	E_DAY_VIEW_DATE_ABBREVIATED,
-	E_DAY_VIEW_DATE_NO_WEEKDAY,
-	E_DAY_VIEW_DATE_SHORT
-} EDayViewDateFormat;
-
-/* These index our colors array. */
-typedef enum
-{
-	E_DAY_VIEW_COLOR_BG_WORKING,
-	E_DAY_VIEW_COLOR_BG_NOT_WORKING,
-	E_DAY_VIEW_COLOR_EVENT_VBAR,
-
-	E_DAY_VIEW_COLOR_EVENT_BACKGROUND,
-	E_DAY_VIEW_COLOR_EVENT_BORDER,
-	
-	E_DAY_VIEW_COLOR_LAST
-} EDayViewColors;
-
-/* These specify which part of the selection we are dragging, if any. */
-typedef enum
-{
-	E_DAY_VIEW_DRAG_START,
-	E_DAY_VIEW_DRAG_END
-} EDayViewDragPosition;
-
-/* Specifies the position of the mouse. */
-typedef enum
-{
-	E_DAY_VIEW_POS_OUTSIDE,
-	E_DAY_VIEW_POS_NONE,
-	E_DAY_VIEW_POS_EVENT,
-	E_DAY_VIEW_POS_LEFT_EDGE,
-	E_DAY_VIEW_POS_RIGHT_EDGE,
-	E_DAY_VIEW_POS_TOP_EDGE,
-	E_DAY_VIEW_POS_BOTTOM_EDGE
-} EDayViewPosition;
-
-typedef struct _EDayViewEvent EDayViewEvent;
-struct _EDayViewEvent {
-	CalComponent *comp;
-	time_t start;
-	time_t end;
-	guint8 start_row_or_col;/* The start column for normal events, or the
-				   start row for long events. */
-	guint8 num_columns;	/* 0 indicates not displayed. For long events
-				   this is just 1 if the event is shown. */
-	guint16 start_minute;	/* Offsets from the start of the display. */
-	guint16 end_minute;
-	GnomeCanvasItem *canvas_item;
-};
-
-
-#define E_DAY_VIEW(obj)          GTK_CHECK_CAST (obj, e_day_view_get_type (), EDayView)
-#define E_DAY_VIEW_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_day_view_get_type (), EDayViewClass)
-#define E_IS_DAY_VIEW(obj)       GTK_CHECK_TYPE (obj, e_day_view_get_type ())
-
-
-typedef struct _EDayView       EDayView;
-typedef struct _EDayViewClass  EDayViewClass;
-
-struct _EDayView
-{
-	GtkTable table;
-
-	/* The top canvas where the dates and long appointments are shown. */
-	GtkWidget *top_canvas;
-	GnomeCanvasItem *top_canvas_item;
-
-	/* The main canvas where the rest of the appointments are shown. */
-	GtkWidget *main_canvas;
-	GnomeCanvasItem *main_canvas_item;
-
-	/* The canvas displaying the times of the day. */
-	GtkWidget *time_canvas;
-	GnomeCanvasItem *time_canvas_item;
-
-	GtkWidget *vscrollbar;
-
-	/* The calendar we are associated with. */
-	GnomeCalendar *calendar;
-
-	/* Calendar client object we are monitoring */
-	CalClient *client;
-
-	/* The start and end of the day shown. */
-	time_t lower;
-	time_t upper;
-
-	/* Whether we are showing the work-week view. */
-	gboolean work_week_view;
-
-	/* The number of days we are showing. Usually 1 or 5, but can be up
-	   to E_DAY_VIEW_MAX_DAYS, e.g. when the user selects a range of
-	   days in the mini calendar. */
-	gint days_shown;
-
-	/* The start of each day & an extra element to hold the last time. */
-	time_t day_starts[E_DAY_VIEW_MAX_DAYS + 1];
-
-
-	/* An array of EDayViewEvent elements for the top view and each day. */
-	GArray *long_events;
-	GArray *events[E_DAY_VIEW_MAX_DAYS];
-
-	/* These are set to FALSE whenever an event in the corresponding array
-	   is changed. Any function that needs the events sorted calls
-	   e_day_view_ensure_events_sorted(). */
-	gboolean long_events_sorted;
-	gboolean events_sorted[E_DAY_VIEW_MAX_DAYS];
-
-	/* This is TRUE if we need to relayout the events before drawing. */
-	gboolean long_events_need_layout;
-	gboolean need_layout[E_DAY_VIEW_MAX_DAYS];
-
-	/* This is TRUE if we need to reshape the canvas items, but a full
-	   layout is not necessary. */
-	gboolean long_events_need_reshape;
-	gboolean need_reshape[E_DAY_VIEW_MAX_DAYS];
-
-	/* The id of our idle function to reload all events. */
-	gint reload_events_idle_id;
-
-	/* The number of minutes per row. 5, 10, 15, 30 or 60. */
-	gint mins_per_row;
-
-	/* The number of rows needed, depending on the times shown and the
-	   minutes per row. */
-	gint rows;
-
-	/* The height of each row. */
-	gint row_height;
-
-	/* The number of rows in the top display. */
-	gint rows_in_top_display;
-
-	/* The height of each row in the top canvas. */
-	gint top_row_height;
-
-	/* The first and last times shown in the display. The last time isn't
-	   included in the range. Default is 0:00-24:00 */
-	gint first_hour_shown;
-	gint first_minute_shown;
-	gint last_hour_shown;
-	gint last_minute_shown;
-
-	/* Bitwise combination of working days. Defaults to Mon-Fri. */
-	EDayViewDays working_days;
-
-	/* The start and end of the work day, rounded to the nearest row. */
-	gint work_day_start_hour;
-	gint work_day_start_minute;
-	gint work_day_end_hour;
-	gint work_day_end_minute;
-
-	/* Whether we use 12-hour of 24-hour format. */
-	gboolean use_24_hour_format;
-
-	/* This is set to TRUE when the widget is created, so it scrolls to
-	   the start of the working day when first shown. */
-	gboolean scroll_to_work_day;
-
-	/* This is the width & offset of each of the day columns in the
-	   display. */
-	gint day_widths[E_DAY_VIEW_MAX_DAYS];
-	gint day_offsets[E_DAY_VIEW_MAX_DAYS + 1];
-
-	/* An array holding the number of columns in each row, in each day. */
-	guint8 cols_per_row[E_DAY_VIEW_MAX_DAYS][12 * 24];
-
-	/* Sizes of the various time strings. */
-	gint large_hour_widths[24];
-	gint small_hour_widths[24];
-	gint minute_widths[12];		/* intervals of 5 minutes. */
-	gint max_small_hour_width;
-	gint max_large_hour_width;
-	gint max_minute_width;
-	gint colon_width;
-
-	/* This specifies how we are displaying the dates at the top. */
-	EDayViewDateFormat date_format;
-
-	/* These are the longest month & weekday names in the current font.
-	   Months are 0 to 11. Weekdays are 0 (Sun) to 6 (Sat). */
-	gint longest_month_name;
-	gint longest_abbreviated_month_name;
-	gint longest_weekday_name;
-	gint longest_abbreviated_weekday_name;
-
-	/* The large font use to display the hours. I don't think we need a
-	   fontset since we only display numbers. */
-	GdkFont *large_font;
-
-	/* The GC used for painting in different colors. */
-	GdkGC *main_gc;
-
-	/* The icons. */
-	GdkPixmap *reminder_icon;
-	GdkBitmap *reminder_mask;
-	GdkPixmap *recurrence_icon;
-	GdkBitmap *recurrence_mask;
-
-	/* Colors for drawing. */
-	GdkColor colors[E_DAY_VIEW_COLOR_LAST];
-
-	/* The normal & resizing cursors. */
-	GdkCursor *normal_cursor;
-	GdkCursor *move_cursor;
-	GdkCursor *resize_width_cursor;
-	GdkCursor *resize_height_cursor;
-
-	/* This remembers the last cursor set on the window. */
-	GdkCursor *last_cursor_set_in_top_canvas;
-	GdkCursor *last_cursor_set_in_main_canvas;
-
-	/*
-	 * Editing, Selection & Dragging data
-	 */
-
-	/* The horizontal bars to resize events in the main canvas. */
-	GnomeCanvasItem *main_canvas_top_resize_bar_item;
-	GnomeCanvasItem *main_canvas_bottom_resize_bar_item;
-
-	/* The event currently being edited. The day is -1 if no event is
-	 being edited, or E_DAY_VIEW_LONG_EVENT if a long event is edited. */
-	gint editing_event_day;
-	gint editing_event_num;
-
-	/* This is a GnomeCanvasRect which is placed around an item while it
-	   is being resized, so we can raise it above all other EText items. */
-	GnomeCanvasItem *resize_long_event_rect_item;
-	GnomeCanvasItem *resize_rect_item;
-	GnomeCanvasItem *resize_bar_item;
-
-	/* The event for which a popup menu is being displayed, as above. */
-	gint popup_event_day;
-	gint popup_event_num;
-
-	/* The currently selected region. If selection_start_day is -1 there is
-	   no current selection. If start_row or end_row is -1 then the
-	   selection is in the top canvas. */
-	gint selection_start_day;
-	gint selection_end_day;
-	gint selection_start_row;
-	gint selection_end_row;
-
-	/* This is TRUE if the selection is currently being dragged using the
-	   mouse. */
-	gboolean selection_is_being_dragged;
-
-	/* This specifies which end of the selection is being dragged. */
-	EDayViewDragPosition selection_drag_pos;
-
-	/* This is TRUE if the selection is in the top canvas only (i.e. if the
-	   last motion event was in the top canvas). */
-	gboolean selection_in_top_canvas;
-
-	/* The last mouse position, relative to the main canvas window.
-	   Used when auto-scrolling to update the selection. */
-	gint last_mouse_x;
-	gint last_mouse_y;
-
-	/* Auto-scroll info for when selecting an area or dragging an item. */
-	gint auto_scroll_timeout_id;
-	gint auto_scroll_delay;
-	gboolean auto_scroll_up;
-
-	/* These are used for the resize bars. */
-	gint resize_bars_event_day;
-	gint resize_bars_event_num;
-
-	/* These are used when resizing events. */
-	gint resize_event_day;
-	gint resize_event_num;
-	EDayViewPosition resize_drag_pos;
-	gint resize_start_row;
-	gint resize_end_row;
-
-	/* This is the event the mouse button was pressed on. If the button
-	   is released we start editing it, but if the mouse is dragged we set
-	   this to -1. */
-	gint pressed_event_day;
-	gint pressed_event_num;
-
-	/* These are used when dragging events. If drag_event_day is not -1 we
-	   know that we are dragging one of the EDayView events around. */
-	gint drag_event_day;
-	gint drag_event_num;
-
-	/* The last mouse position when dragging, in the entire canvas. */
-	gint drag_event_x;
-	gint drag_event_y;
-
-	/* The offset of the mouse from the top of the event, in rows.
-	   In the top canvas this is the offset from the left, in days. */
-	gint drag_event_offset;
-
-	/* The last day & row dragged to, so we know when we need to update
-	   the dragged event's position. */
-	gint drag_last_day;
-	gint drag_last_row;
-
-	/* This is a GnomeCanvasRect which is placed around an item while it
-	   is being resized, so we can raise it above all other EText items. */
-	GnomeCanvasItem *drag_long_event_rect_item;
-	GnomeCanvasItem *drag_long_event_item;
-	GnomeCanvasItem *drag_rect_item;
-	GnomeCanvasItem *drag_bar_item;
-	GnomeCanvasItem *drag_item;
-};
-
-struct _EDayViewClass
-{
-	GtkTableClass parent_class;
-};
-
-
-GtkType	   e_day_view_get_type			(void);
-GtkWidget* e_day_view_new			(void);
-
-void       e_day_view_set_calendar		(EDayView	*day_view,
-						 GnomeCalendar	*calendar);
-
-void       e_day_view_set_cal_client		(EDayView	*day_view,
-						 CalClient	*client);
-
-/* This sets the selected time range. The EDayView will show the day or week
-   corresponding to the start time. If the start_time & end_time are not equal
-   and are both visible in the view, then the selection is set to those times,
-   otherwise it is set to 1 hour from the start of the working day. */
-void       e_day_view_set_selected_time_range	(EDayView	*day_view,
-						 time_t		 start_time,
-						 time_t		 end_time);
-
-/* Returns the selected time range. */
-void       e_day_view_get_selected_time_range	(EDayView	*day_view,
-						 time_t		*start_time,
-						 time_t		*end_time);
-
-/* This is called when one event has been added or updated. */
-void       e_day_view_update_event		(EDayView	*day_view,
-						 const gchar	*uid);
-
-/* This removes all the events associated with the given uid. Note that for
-   recurring events there may be more than one. If any events are found and
-   removed we need to layout the events again. */
-void	   e_day_view_remove_event		(EDayView	*day_view,
-						 const gchar	*uid);
-
-/* Whether we are displaying a work-week, in which case the display always
-   starts on the first day of the working week. */
-gboolean   e_day_view_get_work_week_view	(EDayView	*day_view);
-void	   e_day_view_set_work_week_view	(EDayView	*day_view,
-						 gboolean	 work_week_view);
-
-/* The number of days shown in the EDayView, from 1 to 7. This is normally
-   either 1 or 5 (for the Work-Week view). */
-gint	   e_day_view_get_days_shown		(EDayView	*day_view);
-void	   e_day_view_set_days_shown		(EDayView	*day_view,
-						 gint		 days_shown);
-
-/* This specifies how many minutes are represented by one row in the display.
-   It can be 60, 30, 15, 10 or 5. The default is 30. */
-gint	   e_day_view_get_mins_per_row		(EDayView	*day_view);
-void	   e_day_view_set_mins_per_row		(EDayView	*day_view,
-						 gint		 mins_per_row);
-
-/* This specifies the working days in the week. The value is a bitwise
-   combination of day flags. Defaults to Mon-Fri. */
-EDayViewDays e_day_view_get_working_days	(EDayView	*day_view);
-void	   e_day_view_set_working_days		(EDayView	*day_view,
-						 EDayViewDays	 days);
-
-/* The start and end time of the working day. This only affects the background
-   colors. */
-void	   e_day_view_get_working_day		(EDayView	*day_view,
-						 gint		*start_hour,
-						 gint		*start_minute,
-						 gint		*end_hour,
-						 gint		*end_minute);
-void	   e_day_view_set_working_day		(EDayView	*day_view,
-						 gint		 start_hour,
-						 gint		 start_minute,
-						 gint		 end_hour,
-						 gint		 end_minute);
-
-/* Whether we use 12-hour of 24-hour format. */
-gboolean   e_day_view_get_24_hour_format	(EDayView	*day_view);
-void	   e_day_view_set_24_hour_format	(EDayView	*day_view,
-						 gboolean	 use_24_hour);
-
-/*
- * Internal functions called by the associated canvas items.
- */
-void	   e_day_view_check_layout		(EDayView	*day_view);
-gint	   e_day_view_convert_time_to_row	(EDayView	*day_view,
-						 gint		 hour,
-						 gint		 minute);
-gint	   e_day_view_convert_time_to_position	(EDayView	*day_view,
-						 gint		 hour,
-						 gint		 minute);
-gboolean   e_day_view_get_event_position	(EDayView	*day_view,
-						 gint		 day,
-						 gint		 event_num,
-						 gint		*item_x,
-						 gint		*item_y,
-						 gint		*item_w,
-						 gint		*item_h);
-gboolean   e_day_view_get_long_event_position	(EDayView	*day_view,
-						 gint		 event_num,
-						 gint		*start_day,
-						 gint		*end_day,
-						 gint		*item_x,
-						 gint		*item_y,
-						 gint		*item_w,
-						 gint		*item_h);
-gboolean   e_day_view_find_long_event_days	(EDayView	*day_view,
-						 EDayViewEvent	*event,
-						 gint		*start_day,
-						 gint		*end_day);
-
-void	   e_day_view_start_selection		(EDayView	*day_view,
-						 gint		 day,
-						 gint		 row);
-void	   e_day_view_update_selection		(EDayView	*day_view,
-						 gint		 day,
-						 gint		 row);
-void	   e_day_view_finish_selection		(EDayView	*day_view);
-
-void	   e_day_view_check_auto_scroll		(EDayView	*day_view,
-						 gint		 event_x,
-						 gint		 event_y);
-void	   e_day_view_stop_auto_scroll		(EDayView	*day_view);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_DAY_VIEW_H_ */
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
deleted file mode 100644
index 28071be091..0000000000
--- a/calendar/gui/e-itip-control.c
+++ /dev/null
@@ -1,450 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * e-itip-control.c
- *
- * Authors:
- *    Jesse Pavel <jpavel@helixcode.com>
- *
- * Copyright 2000, Helix Code, Inc.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <bonobo.h>
-#include <glade/glade.h>
-#include <icaltypes.h>
-#include <ical.h>
-#include <time.h>
-
-#include "e-itip-control.h"
-#include <cal-util/cal-component.h>
-#include <cal-client/cal-client.h>
-
-
-#define DEFAULT_WIDTH 500
-#define DEFAULT_HEIGHT 400
-
-extern gchar *evolution_dir;
-
-typedef struct _EItipControlPrivate EItipControlPrivate;
-
-struct _EItipControlPrivate {
-	GladeXML *xml;
-	GtkWidget *main_frame;
-	GtkWidget *text_box;
-	GtkWidget *organizer_entry, *dtstart_label, *dtend_label;
-	GtkWidget *summary_entry, *description_box;
-	GtkWidget *add_button;
-	GtkWidget *loading_window;
-	GtkWidget *loading_progress;
-
-	icalcomponent *main_comp, *comp;
-	CalComponent *cal_comp;
-};
-
-
-#if 0
-static icalparameter *
-get_icalparam_by_type (icalproperty *prop, icalparameter_kind kind)
-{
-	icalparameter *param;
-
-	for (param = icalproperty_get_first_parameter (prop, ICAL_ANY_PARAMETER);
-	     param != NULL && icalparameter_isa (param) != kind;
-	     param = icalproperty_get_next_parameter (prop, ICAL_ANY_PARAMETER) );
-
-	return param;
-}
-#endif
-
-static void
-itip_control_destroy_cb (GtkObject *object,
-		    gpointer data)
-{
-	EItipControlPrivate *priv = data;
-
-	gtk_object_unref (GTK_OBJECT (priv->xml));
-	if (priv->main_comp != NULL) {
-		icalcomponent_free (priv->main_comp);
-	}
-
-	if (priv->cal_comp != NULL) {
-		gtk_object_unref (GTK_OBJECT (priv->cal_comp));
-	}
-	g_free (priv);
-}
-	
-static void
-itip_control_size_request_cb (GtkWidget *widget, GtkRequisition *requisition)
-{
-	requisition->width = DEFAULT_WIDTH;
-	requisition->height = DEFAULT_HEIGHT;
-}
-
-static void
-cal_loaded_cb (GtkObject *object, CalClientGetStatus status, gpointer data)
-{
-	CalClient *client = CAL_CLIENT (object);
-	EItipControlPrivate *priv = data;
-
-	gtk_widget_hide (priv->loading_progress);
-
-	if (status == CAL_CLIENT_GET_SUCCESS) {
-		if (cal_client_update_object (client, priv->cal_comp) == FALSE) {
-			GtkWidget *dialog;
-	
-			dialog = gnome_warning_dialog("I couldn't update your calendar file!\n");
-			gnome_dialog_run (GNOME_DIALOG(dialog));
-		}
-		else {
-			/* We have success. */
-			GtkWidget *dialog;
-	
-			dialog = gnome_ok_dialog("Component successfully added.");
-			gnome_dialog_run (GNOME_DIALOG(dialog));
-		}
-	}
-	else {
-		GtkWidget *dialog;
-
-		dialog = gnome_ok_dialog("There was an error loading the calendar file.");
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-	}
-
-	gtk_object_unref (GTK_OBJECT (client));
-	return;
-}
-
-static void
-add_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EItipControlPrivate *priv = data;
-	gchar cal_uri[255];
-	CalClient *client;
-
-	sprintf (cal_uri, "%s/local/Calendar/calendar.ics", evolution_dir);
-	
-	client = cal_client_new ();
-	if (cal_client_load_calendar (client, cal_uri) == FALSE) {
-		GtkWidget *dialog;
-
-		dialog = gnome_warning_dialog("I couldn't open your calendar file!\n");
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-		gtk_object_unref (GTK_OBJECT (client));
-	
-		return;
-	}
-
-	gtk_signal_connect (GTK_OBJECT (client), "cal_loaded",
-	    	   	    GTK_SIGNAL_FUNC (cal_loaded_cb), priv);
-	
-	gtk_progress_bar_update (GTK_PROGRESS_BAR (priv->loading_progress), 0.5);
-	gtk_widget_show (priv->loading_progress);
-
-	return;
-}
-
-
-/*
- * Bonobo::PersistStream
- *
- * These two functions implement the Bonobo::PersistStream load and
- * save methods which allow data to be loaded into and out of the
- * BonoboObject.
- */
-
-static char *
-stream_read (Bonobo_Stream stream)
-{
-	Bonobo_Stream_iobuf *buffer;
-	CORBA_Environment    ev;
-	gchar *data = NULL;
-	gint length = 0;
-
-	CORBA_exception_init (&ev);
-	do {
-#define READ_CHUNK_SIZE 65536
-		Bonobo_Stream_read (stream, READ_CHUNK_SIZE,
-				    &buffer, &ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION) {
-			CORBA_exception_free (&ev);
-			return NULL;
-		}
-
-		if (buffer->_length <= 0)
-			break;
-
-		data = g_realloc (data,
-				  length + buffer->_length);
-
-		memcpy (data + length,
-			buffer->_buffer, buffer->_length);
-
-		length += buffer->_length;
-
-		CORBA_free (buffer);
-	} while (1);
-
-	CORBA_free (buffer);
-	CORBA_exception_free (&ev);
-
-	if (data == NULL)
-	  data = g_strdup("");
-
-	return data;
-} /* stream_read */
-
-/*
- * This function implements the Bonobo::PersistStream:load method.
- */
-static void
-pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,
-	      Bonobo_Persist_ContentType type, void *data,
-	      CORBA_Environment *ev)
-{
-	EItipControlPrivate *priv = data;
-	gchar *vcalendar;
-	gint pos, length, length2;
-
-	if (type && g_strcasecmp (type, "text/calendar") != 0 &&	    
-	    g_strcasecmp (type, "text/x-calendar") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	if ((vcalendar = stream_read (stream)) == NULL) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_FileNotFound, NULL);
-		return;
-	}
-
-	/* Do something with the data, here. */
-	pos = 0;
-	length = strlen (vcalendar);
-	length2 = strlen (gtk_editable_get_chars (GTK_EDITABLE (priv->text_box), 0, -1));
-	
-
-	if (length2 > 0) 
-		gtk_editable_delete_text (GTK_EDITABLE (priv->text_box), 0, length2);
-
-	gtk_editable_insert_text (GTK_EDITABLE (priv->text_box),
-				  vcalendar,
-				  length,
-				  &pos);
-
-	priv->main_comp = icalparser_parse_string (vcalendar);
-	if (priv->main_comp == NULL) {
-		g_printerr ("e-itip-control.c: the iCalendar data was invalid!\n");
-		return;
-	}
-
-	priv->comp = icalcomponent_get_first_component (priv->main_comp,
-							ICAL_ANY_COMPONENT);
-	if (priv->comp == NULL) {
-		g_printerr ("e-itip-control.c: I could not extract a proper component from\n"
-			    "     the vCalendar data.\n");
-		icalcomponent_free (priv->main_comp);
-		return;
-	}
-
-	priv->cal_comp = cal_component_new ();
-	if (cal_component_set_icalcomponent (priv->cal_comp, priv->comp) == FALSE) {
-		g_printerr ("e-itip-control.c: I couldn't create a CalComponent from the iTip data.\n");
-		gtk_object_unref (GTK_OBJECT (priv->cal_comp));
-	}
-
-	/* Okay, good then; now I will pick apart the component to get
-	 all the things I'll show in my control. */
-	{
-		icalproperty *prop;
-		gchar *new_text;
-		gchar *organizer, *description, *summary;
-		struct icaltimetype dtstart, dtend;
-		time_t tstart, tend;
-
-		prop = icalcomponent_get_first_property (priv->comp, ICAL_ORGANIZER_PROPERTY);
-		if (prop) {
-			organizer = icalproperty_get_organizer (prop);
-		
-			/* Here I strip off the "MAILTO:" if it is present. */
-			new_text = strchr (organizer, ':');
-			if (new_text != NULL)
-				new_text++;
-			else
-				new_text = organizer;
-
-			gtk_entry_set_text (GTK_ENTRY (priv->organizer_entry), new_text);
-		}
-
-		prop = icalcomponent_get_first_property (priv->comp, ICAL_SUMMARY_PROPERTY);
-		if (prop) {
-			summary = icalproperty_get_summary (prop);
-			gtk_entry_set_text (GTK_ENTRY (priv->summary_entry), summary);
-		}
-
-		prop = icalcomponent_get_first_property (priv->comp, ICAL_DESCRIPTION_PROPERTY);
-		if (prop) {
-			description = icalproperty_get_summary (prop);
-	
-			pos = 0;
-			length = strlen (description);
-			length2 = strlen (gtk_editable_get_chars 
-						(GTK_EDITABLE (priv->description_box), 0, -1));
-		
-			if (length2 > 0)
-				gtk_editable_delete_text (GTK_EDITABLE (priv->description_box), 0, length2);
-		
-			gtk_editable_insert_text (GTK_EDITABLE (priv->description_box),
-						  description,
-						  length,
-						  &pos);
-		}
-
-		prop = icalcomponent_get_first_property (priv->comp, ICAL_DTSTART_PROPERTY);
-		dtstart = icalproperty_get_dtstart (prop);
-		prop = icalcomponent_get_first_property (priv->comp, ICAL_DTEND_PROPERTY);
-		dtend = icalproperty_get_dtend (prop);
-
-		tstart = icaltime_as_timet (dtstart);
-		tend = icaltime_as_timet (dtend);
-
-		gtk_label_set_text (GTK_LABEL (priv->dtstart_label), ctime (&tstart));
-		gtk_label_set_text (GTK_LABEL (priv->dtend_label), ctime (&tend));
-	}
-	
-	pos = 0;
-	length = strlen (vcalendar);
-	length2 = strlen (gtk_editable_get_chars (GTK_EDITABLE (priv->text_box), 0, -1));
-	
-
-	if (length2 > 0) 
-		gtk_editable_delete_text (GTK_EDITABLE (priv->text_box), 0, length2);
-
-	gtk_editable_insert_text (GTK_EDITABLE (priv->text_box),
-				  vcalendar,
-				  length,
-				  &pos);
-
-
-	g_free (vcalendar);
-
-} /* 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)
-{
-	EItipControlPrivate *priv = data;
-	gchar                *vcalendar;
-	int                  length;
-
-	if (type && g_strcasecmp (type, "text/calendar") != 0 &&	    
-	    g_strcasecmp (type, "text/x-calendar") != 0) {	    
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Persist_WrongDataType, NULL);
-		return;
-	}
-
-	/* Put something into vcalendar here. */
-	length = gtk_text_get_length (GTK_TEXT (priv->text_box));
-	vcalendar = gtk_editable_get_chars (GTK_EDITABLE (priv->text_box), 0, -1);
-
-	bonobo_stream_client_write (stream, vcalendar, length, ev);
-	g_free (vcalendar);
-} /* pstream_save */
-
-static CORBA_long
-pstream_get_max_size (BonoboPersistStream *ps, void *data,
-		      CORBA_Environment *ev)
-{
-	EItipControlPrivate *priv = data;
-	gint length;
-  
-	length = gtk_text_get_length (GTK_TEXT (priv->text_box));
-
-	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/calendar", "text/x-calendar");
-}
-
-static BonoboObject *
-e_itip_control_factory (BonoboGenericFactory *Factory, void *closure)
-{
-	BonoboControl      *control;
-	BonoboPersistStream *stream;
-	EItipControlPrivate *priv;
-
-	priv = g_new0 (EItipControlPrivate, 1);
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/" "e-itip-control.glade", "main_frame");
-
-	/* Create the control. */
-	priv->main_frame = glade_xml_get_widget (priv->xml, "main_frame");
-	priv->text_box = glade_xml_get_widget (priv->xml, "text_box");
-	priv->organizer_entry = glade_xml_get_widget (priv->xml, "organizer_entry");
-	priv->dtstart_label = glade_xml_get_widget (priv->xml, "dtstart_label");
-	priv->dtend_label = glade_xml_get_widget (priv->xml, "dtend_label");
-	priv->summary_entry = glade_xml_get_widget (priv->xml, "summary_entry");
-	priv->description_box = glade_xml_get_widget (priv->xml, "description_box");
-	priv->add_button = glade_xml_get_widget (priv->xml, "add_button");
-	priv->loading_progress = glade_xml_get_widget (priv->xml, "loading_progress");
-	priv->loading_window = glade_xml_get_widget (priv->xml, "loading_window");
-
-	gtk_text_set_editable (GTK_TEXT (priv->text_box), FALSE);
-	
-	gtk_signal_connect (GTK_OBJECT (priv->main_frame), "destroy",
-			    GTK_SIGNAL_FUNC (itip_control_destroy_cb), priv);
-	gtk_signal_connect (GTK_OBJECT (priv->main_frame), "size_request",
-			    GTK_SIGNAL_FUNC (itip_control_size_request_cb), priv);
-	gtk_signal_connect (GTK_OBJECT (priv->add_button), "clicked",
-			    GTK_SIGNAL_FUNC (add_button_clicked_cb), priv);
-
-	gtk_widget_show (priv->text_box);
-	gtk_widget_show (priv->main_frame);
-
-	control = bonobo_control_new (priv->main_frame);
-
-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,
-					    pstream_get_max_size,
-					    pstream_get_content_types,
-					    priv);
-
-	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_itip_control_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	factory =
-		bonobo_generic_factory_new (
-		        "OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a",
-			e_itip_control_factory, NULL);
-
-	if (factory == NULL)
-		g_error ("I could not register an iTip control factory.");
-}
-
diff --git a/calendar/gui/e-itip-control.glade b/calendar/gui/e-itip-control.glade
deleted file mode 100644
index 8a683f72aa..0000000000
--- a/calendar/gui/e-itip-control.glade
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-itip-control</name>
-  <program_name>e-itip-control</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>window1</name>
-  <visible>False</visible>
-  <title>window1</title>
-  <type>GTK_WINDOW_TOPLEVEL</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkFrame</class>
-    <name>main_frame</name>
-    <border_width>4</border_width>
-    <label>Test iTip control</label>
-    <label_xalign>0.11</label_xalign>
-    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-
-    <widget>
-      <class>GtkScrolledWindow</class>
-      <name>scrolledwindow1</name>
-      <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy>
-      <vscrollbar_policy>GTK_POLICY_NEVER</vscrollbar_policy>
-      <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-      <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-
-      <widget>
-	<class>GtkViewport</class>
-	<name>viewport1</name>
-	<shadow_type>GTK_SHADOW_IN</shadow_type>
-
-	<widget>
-	  <class>GtkVBox</class>
-	  <name>vbox1</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table1</name>
-	    <rows>4</rows>
-	    <columns>2</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>0</row_spacing>
-	    <column_spacing>9</column_spacing>
-	    <child>
-	      <padding>6</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <name>organizer_entry</name>
-	      <can_focus>True</can_focus>
-	      <editable>False</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text></text>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <name>summary_entry</name>
-	      <can_focus>True</can_focus>
-	      <editable>True</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text></text>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>2</top_attach>
-		<bottom_attach>3</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkScrolledWindow</class>
-	      <name>scrolledwindow2</name>
-	      <hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
-	      <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
-	      <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
-	      <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkText</class>
-		<name>description_box</name>
-		<can_focus>True</can_focus>
-		<editable>False</editable>
-		<text></text>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label7</name>
-	      <label>Date:</label>
-	      <justify>GTK_JUSTIFY_RIGHT</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</xalign>
-	      <yalign>0</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label6</name>
-	      <label>Organizer:</label>
-	      <justify>GTK_JUSTIFY_RIGHT</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</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>GtkLabel</class>
-	      <name>label8</name>
-	      <label>Summary:</label>
-	      <justify>GTK_JUSTIFY_RIGHT</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</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>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label9</name>
-	      <label>Description:</label>
-	      <justify>GTK_JUSTIFY_RIGHT</justify>
-	      <wrap>False</wrap>
-	      <xalign>1</xalign>
-	      <yalign>0</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>3</top_attach>
-		<bottom_attach>4</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkAlignment</class>
-	      <name>alignment1</name>
-	      <xalign>0</xalign>
-	      <yalign>0</yalign>
-	      <xscale>1</xscale>
-	      <yscale>1</yscale>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>True</yfill>
-	      </child>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>hbox1</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>dtstart_label</name>
-		  <label>date-start</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label3</name>
-		  <label>--to--</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0</yalign>
-		  <xpad>19</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>dtend_label</name>
-		  <label>date-end</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkHButtonBox</class>
-	    <name>hbuttonbox1</name>
-	    <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
-	    <spacing>30</spacing>
-	    <child_min_width>85</child_min_width>
-	    <child_min_height>27</child_min_height>
-	    <child_ipad_x>7</child_ipad_x>
-	    <child_ipad_y>0</child_ipad_y>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>add_button</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label>Add to Calendar</label>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkText</class>
-	    <name>text_box</name>
-	    <can_focus>True</can_focus>
-	    <editable>False</editable>
-	    <text></text>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>loading_window</name>
-  <visible>False</visible>
-  <title>Loading Calendar</title>
-  <type>GTK_WINDOW_DIALOG</type>
-  <position>GTK_WIN_POS_CENTER</position>
-  <modal>False</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkFrame</class>
-    <name>frame1</name>
-    <border_width>4</border_width>
-    <label></label>
-    <label_xalign>0</label_xalign>
-    <shadow_type>GTK_SHADOW_ETCHED_OUT</shadow_type>
-
-    <widget>
-      <class>GtkVBox</class>
-      <name>vbox2</name>
-      <border_width>7</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>1</spacing>
-
-      <widget>
-	<class>GtkHBox</class>
-	<name>hbox2</name>
-	<border_width>6</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>9</spacing>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label10</name>
-	  <label>Loading calendar...</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkProgressBar</class>
-	  <name>progressbar1</name>
-	  <value>0</value>
-	  <lower>0</lower>
-	  <upper>100</upper>
-	  <bar_style>GTK_PROGRESS_CONTINUOUS</bar_style>
-	  <orientation>GTK_PROGRESS_LEFT_TO_RIGHT</orientation>
-	  <activity_mode>False</activity_mode>
-	  <show_text>False</show_text>
-	  <format>%P %%</format>
-	  <text_xalign>0.5</text_xalign>
-	  <text_yalign>0.5</text_yalign>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/e-itip-control.h b/calendar/gui/e-itip-control.h
deleted file mode 100644
index 467f0578ef..0000000000
--- a/calendar/gui/e-itip-control.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __E_ITIP_CONTROL_H__
-#define __E_ITIP_CONTROL_H__
-
-#include <bonobo/bonobo-control.h>
-
-void             e_itip_control_factory_init (void);
-
-#endif /* __E_ITIP_CONTROL_H__ */
diff --git a/calendar/gui/e-meeting-dialog.glade b/calendar/gui/e-meeting-dialog.glade
deleted file mode 100644
index 5f52030d71..0000000000
--- a/calendar/gui/e-meeting-dialog.glade
+++ /dev/null
@@ -1,464 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>e-meeting-dialog</name>
-  <program_name>e-meeting-dialog</program_name>
-  <directory></directory>
-  <source_directory>src</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-</project>
-
-<widget>
-  <class>GtkWindow</class>
-  <name>meeting_window</name>
-  <width>486</width>
-  <height>330</height>
-  <visible>False</visible>
-  <title>Meeting Invitations</title>
-  <type>GTK_WINDOW_DIALOG</type>
-  <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
-  <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
-
-  <widget>
-    <class>GtkVBox</class>
-    <name>vbox1</name>
-    <homogeneous>False</homogeneous>
-    <spacing>0</spacing>
-
-    <widget>
-      <class>GtkToolbar</class>
-      <name>toolbar1</name>
-      <orientation>GTK_ORIENTATION_HORIZONTAL</orientation>
-      <type>GTK_TOOLBAR_BOTH</type>
-      <space_size>5</space_size>
-      <space_style>GTK_TOOLBAR_SPACE_LINE</space_style>
-      <relief>GTK_RELIEF_NORMAL</relief>
-      <tooltips>True</tooltips>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-      </child>
-
-      <widget>
-	<class>GtkButton</class>
-	<child_name>Toolbar:button</child_name>
-	<name>send_button</name>
-	<label>Send
-Updates</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_MAIL_SND</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkVSeparator</class>
-	<name>vseparator1</name>
-	<width>13</width>
-	<height>58</height>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<child_name>Toolbar:button</child_name>
-	<name>button4</name>
-	<label>Cancel
-Meeting</label>
-	<stock_pixmap>GNOME_STOCK_PIXMAP_CLOSE</stock_pixmap>
-      </widget>
-
-      <widget>
-	<class>GtkVSeparator</class>
-	<name>vseparator2</name>
-	<width>12</width>
-	<height>58</height>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox3</name>
-      <border_width>3</border_width>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>4</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label3</name>
-	<label>Organizer: </label>
-	<justify>GTK_JUSTIFY_RIGHT</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>3</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>1</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>organizer_entry</name>
-	<width>252</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>False</expand>
-	  <fill>True</fill>
-	</child>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkHBox</class>
-      <name>hbox1</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>False</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label1</name>
-	<label>Attendees: </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>4</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkHButtonBox</class>
-	<name>hbuttonbox3</name>
-	<layout_style>GTK_BUTTONBOX_START</layout_style>
-	<spacing>0</spacing>
-	<child_min_width>83</child_min_width>
-	<child_min_height>29</child_min_height>
-	<child_ipad_x>8</child_ipad_x>
-	<child_ipad_y>1</child_ipad_y>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>True</fill>
-	</child>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>add_button</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>Add</label>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>delete_button</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>Delete</label>
-	</widget>
-
-	<widget>
-	  <class>GtkButton</class>
-	  <name>edit_button</name>
-	  <can_default>True</can_default>
-	  <can_focus>True</can_focus>
-	  <label>Edit</label>
-	</widget>
-      </widget>
-    </widget>
-
-    <widget>
-      <class>GtkScrolledWindow</class>
-      <name>scrolledwindow1</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>attendee_list</name>
-	<can_focus>True</can_focus>
-	<columns>4</columns>
-	<column_widths>145,141,60,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>label8</name>
-	  <label>Attendee</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>label5</name>
-	  <label>Role</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>label6</name>
-	  <label>RSVP</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>label7</name>
-	  <label>Status</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0.5</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	</widget>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-<widget>
-  <class>GnomeDialog</class>
-  <name>edit_dialog</name>
-  <width>344</width>
-  <height>152</height>
-  <visible>False</visible>
-  <title>Attendee</title>
-  <type>GTK_WINDOW_DIALOG</type>
-  <position>GTK_WIN_POS_MOUSE</position>
-  <modal>True</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_SPREAD</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>GtkHBox</class>
-      <name>hbox2</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label2</name>
-	<label>Attendee address</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>6</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkEntry</class>
-	<name>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>GtkHBox</class>
-      <name>hbox4</name>
-      <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
-
-      <widget>
-	<class>GtkLabel</class>
-	<name>label9</name>
-	<label>Role</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>5</xpad>
-	<ypad>0</ypad>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkCombo</class>
-	<name>role_combo</name>
-	<width>160</width>
-	<value_in_list>False</value_in_list>
-	<ok_if_empty>True</ok_if_empty>
-	<case_sensitive>False</case_sensitive>
-	<use_arrows>True</use_arrows>
-	<use_arrows_always>False</use_arrows_always>
-	<items>Chair
-Required Participant
-Optional Participant
-Non-Participant
-Other
-
-
-</items>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <child_name>GtkCombo:entry</child_name>
-	  <name>role_entry</name>
-	  <can_focus>True</can_focus>
-	  <editable>False</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text>Required Participant</text>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkCheckButton</class>
-	<name>rsvp_check</name>
-	<can_focus>True</can_focus>
-	<label>RSVP</label>
-	<active>True</active>
-	<draw_indicator>True</draw_indicator>
-	<child>
-	  <padding>0</padding>
-	  <expand>True</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/e-meeting-edit.c b/calendar/gui/e-meeting-edit.c
deleted file mode 100644
index 6ae266174d..0000000000
--- a/calendar/gui/e-meeting-edit.c
+++ /dev/null
@@ -1,663 +0,0 @@
-/* Evolution calendar - Meeting editor dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Jesse Pavel <jpavel@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include <icaltypes.h>
-#include <ical.h>
-#include "e-meeting-edit.h"
-
-#define E_MEETING_GLADE_XML "e-meeting-dialog.glade"
-
-
-typedef struct _EMeetingEditorPrivate EMeetingEditorPrivate;
-
-struct _EMeetingEditorPrivate {
-	/* These are the widgets to be used in the GUI. */
-	GladeXML *xml;
-	GtkWidget *meeting_window;
-	GtkWidget *attendee_list;
-	GtkWidget *address_entry;
-	GtkWidget *edit_dialog;
-	GtkWidget *organizer_entry;
-	GtkWidget *role_entry;
-	GtkWidget *rsvp_check;
-	
-	gint changed_signal_id;
-
-	/* Various pieces of information. */
-	gint selected_row;
-	CalComponent *comp;
-	CalClient *client;
-	icalcomponent *icalcomp, *vevent;
-
-	gint numentries;  /* How many attendees are there? */
-	gboolean dirty;  /* Has anything changed? */
-}; 
-
-#define NUM_COLUMNS 4  /* The number of columns in our attendee list. */
-
-enum column_names {ADDRESS_COL, ROLE_COL, RSVP_COL, STATUS_COL};
-
-static gchar *partstat_values[] = {
-	"Needs action",
-	"Accepted",
-	"Declined",
-	"Tentative",
-	"Delegated",
-	"Completed",
-	"In Progress",
-	"Unknown"
-};
-
-static gchar *role_values[] = {
-	"Chair",
-	"Required Participant",
-	"Optional Participant",
-	"Non-Participant",
-	"Other"
-};
-
-
-/* Note that I have to iterate and check myself because
-   ical_property_get_xxx_parameter doesn't take into account the
-   kind of parameter for which you wish to search! */
-static icalparameter *
-get_icalparam_by_type (icalproperty *prop, icalparameter_kind kind)
-{
-	icalparameter *param;
-
-	for (param = icalproperty_get_first_parameter (prop, ICAL_ANY_PARAMETER);
-	     param != NULL && icalparameter_isa (param) != kind;
-	     param = icalproperty_get_next_parameter (prop, ICAL_ANY_PARAMETER) );
-
-	return param;
-}
-
-
-static gboolean
-window_delete_cb (GtkWidget *widget,
-		  GdkEvent *event,
-		  gpointer data)
-{	
-	EMeetingEditorPrivate *priv;
-	gchar *text;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	if (priv->dirty == TRUE) {
-		/* FIXME: notify the event editor that our data has changed. 
-			For now, I'll just display a dialog box. */
-		{
-			GtkWidget *dialog;
-			icalproperty *prop;
-			icalvalue *value;
-
-			/* Save the organizer into the iCAL object. */
-        		prop = icalcomponent_get_first_property (priv->vevent, ICAL_ORGANIZER_PROPERTY);
-
-			text = gtk_entry_get_text (GTK_ENTRY (priv->organizer_entry));
-			if (strlen (text) > 0) {
-				gchar buffer[200];
-				g_snprintf (buffer, 190, "MAILTO:%s", text);
-				
-				if (prop == NULL) {
-					/* We need to add an ORGANIZER property. */
-					prop = icalproperty_new (ICAL_ORGANIZER_PROPERTY);
-					icalcomponent_add_property (priv->vevent, prop);
-				}
-				value = icalvalue_new_text (buffer);
-				icalproperty_set_value (prop, value);
-			}
-		
-			dialog = gnome_warning_dialog_parented ("Note that the meeting has changed,\n"
-								"and you should save this event.",
-								GTK_WINDOW (priv->meeting_window));
-			gnome_dialog_run (GNOME_DIALOG(dialog));
-		}
-	}
-
-	gtk_entry_set_text (GTK_ENTRY (priv->organizer_entry), "");
-
-	return (FALSE);
-}
-
-static void 
-window_destroy_cb (GtkWidget *widget,
-		   gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	gtk_main_quit ();
-	return;
-}
-
-/* put_property_in_list() synchronizes the display of row `rownum'
-   in our attendee list to the values of `prop'. If rownum < 0,
-   then put_property_in_list() will append a new row. 
-   If the property doesn't contain certain parameters that we deem
-   necessary, it will add them. */
-static void
-put_property_in_list (icalproperty *prop, gint rownum, gpointer data)
-{
-	gchar *row_text[NUM_COLUMNS];
-	gchar *text, *new_text;
-	icalparameter *param;
-	icalvalue *value;
-	gint enumval;
-	gint cntr;
-
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-	
-	value = icalproperty_get_value (prop);
-
-	if (value != NULL) {
-		text = strdup (icalvalue_as_ical_string (value));
-	
-		/* Here I strip off the "MAILTO:" if it is present. */
-		new_text = strchr (text, ':');
-		if (new_text != NULL)
-			new_text++;
-		else
-			new_text = text;
-	
-		row_text[ADDRESS_COL] = g_strdup (new_text);
-		g_free (text);
-	}
-
-	param = get_icalparam_by_type (prop, ICAL_ROLE_PARAMETER);
-	if (param == NULL) {
-		param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT);
-		icalproperty_add_parameter (prop, param);
-	}
-		
-	enumval = icalparameter_get_role (param);
-	if (enumval < 0 || enumval > 4)
-		enumval = 4;
-	
-	row_text[ROLE_COL] = role_values [enumval];
-
-	param = get_icalparam_by_type (prop, ICAL_RSVP_PARAMETER);
-	if (param == NULL) {
-		param = icalparameter_new_rsvp (TRUE);
-		icalproperty_add_parameter (prop, param);
-	}
-
-	if (icalparameter_get_rsvp (param))
-		row_text[RSVP_COL] = "Y";
-	else
-		row_text[RSVP_COL] = "N";
-
-	param = get_icalparam_by_type (prop, ICAL_PARTSTAT_PARAMETER);
-	if (param == NULL) {
-		param = icalparameter_new_partstat (ICAL_PARTSTAT_NEEDSACTION);
-		icalproperty_add_parameter (prop, param);
-	}
-
-	enumval = icalparameter_get_partstat (param);
-	if (enumval < 0 || enumval > 7) {
-		enumval = 7;
-	}
-
-	row_text[STATUS_COL] = partstat_values [enumval];
-
-	if (rownum < 0) {
-		gtk_clist_append (GTK_CLIST (priv->attendee_list), row_text);
-		gtk_clist_set_row_data (GTK_CLIST (priv->attendee_list), priv->numentries, prop);
-		priv->numentries++;
-	}
-	else {
-		for (cntr = 0; cntr < NUM_COLUMNS; cntr++) {
-			gtk_clist_set_text (GTK_CLIST (priv->attendee_list), 
-					    rownum,
-					    cntr,
-					    row_text[cntr]);
-		}
-	}
-
-	g_free (row_text[ADDRESS_COL]);
-}
-
-	
-
-/* edit_attendee() performs the GUI manipulation and interaction for
-   editing `prop' and returns TRUE if the user indicated that he wants
-   to save the new property information.
-
-   Note that it is necessary that the property have parameters of the types
-   RSVP, PARTSTAT, and ROLE already when passed into this function. */
-static gboolean
-edit_attendee (icalproperty *prop, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-	gint button_num;
-	gchar *new_text, *text;
-	icalparameter *param;
-	icalvalue *value;
-	gchar buffer[200];
-	gint cntr;
-	gint enumval;
-	gboolean retval;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	g_return_val_if_fail (prop != NULL, FALSE);
-
-	if (priv->edit_dialog == NULL || priv->address_entry == NULL) {
-		priv->edit_dialog = glade_xml_get_widget (priv->xml, "edit_dialog");
-		priv->address_entry = glade_xml_get_widget (priv->xml, "address_entry");
-
-		gnome_dialog_set_close (GNOME_DIALOG (priv->edit_dialog), TRUE);
-		gnome_dialog_editable_enters (GNOME_DIALOG (priv->edit_dialog), 
-					      GTK_EDITABLE (priv->address_entry));
-		gnome_dialog_close_hides (GNOME_DIALOG (priv->edit_dialog), TRUE);
-		gnome_dialog_set_default (GNOME_DIALOG (priv->edit_dialog), 0);
-	}
-
-	g_return_val_if_fail (priv->edit_dialog != NULL, FALSE);
-	g_return_val_if_fail (priv->address_entry != NULL, FALSE);
-
-	gtk_widget_realize (priv->edit_dialog);
-	
-	value = icalproperty_get_value (prop);
-
-	if (value != NULL) {
-		text = strdup (icalvalue_as_ical_string (value));
-	
-		/* Here I strip off the "MAILTO:" if it is present. */
-		new_text = strchr (text, ':');
-		if (new_text != NULL)
-			new_text++;
-		else
-			new_text = text;
-	
-		gtk_entry_set_text (GTK_ENTRY (priv->address_entry), new_text);
-		g_free (text);
-	}
-	else {
-		gtk_entry_set_text (GTK_ENTRY (priv->address_entry), "");
-	}
-				
-
-	param = get_icalparam_by_type (prop, ICAL_ROLE_PARAMETER);
-	enumval = icalparameter_get_role (param);
-	if (enumval < 0 || enumval > 4)
-		enumval = 4;
-	
-	text = role_values [enumval];
-	gtk_entry_set_text (GTK_ENTRY (priv->role_entry), text);
-
-	param = get_icalparam_by_type (prop, ICAL_RSVP_PARAMETER);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->rsvp_check),
-					icalparameter_get_rsvp (param));
-
-	gtk_widget_show (priv->edit_dialog);
-
-	button_num = gnome_dialog_run (GNOME_DIALOG (priv->edit_dialog));
-
-	if (button_num == 0) {
-		/* The user pressed the OK button. */
-		new_text = gtk_entry_get_text (GTK_ENTRY (priv->address_entry));
-
-		g_snprintf (buffer, 190, "MAILTO:%s", new_text);
-		value = icalvalue_new_text (buffer);
-		icalproperty_set_value (prop, value);
-
-		/* Take care of the ROLE. */
-		icalproperty_remove_parameter (prop, ICAL_ROLE_PARAMETER);
-
-		param = NULL;
-		text = gtk_entry_get_text (GTK_ENTRY(priv->role_entry));
-
-		for (cntr = 0; cntr < 5; cntr++) {
-			if (strncmp (text, role_values[cntr], 3) == 0) {
-				param = icalparameter_new_role (cntr);
-				break;
-			}
-		}
-
-		if (param == NULL) {
-			g_print ("e-meeting-edit.c: edit_attendee() the ROLE param was null.\n");
-			/* Use this as a default case, if none of the others match. */
-			param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT);
-		}
-
-		icalproperty_add_parameter (prop, param);
-
-		/* Now the RSVP. */
-		icalproperty_remove_parameter (prop, ICAL_RSVP_PARAMETER);
-
-		param = icalparameter_new_rsvp 
-				(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->rsvp_check)));
-		icalproperty_add_parameter (prop, param);
-
-		retval = TRUE;
-	}
-	else  /* The user didn't say OK. */
-		retval = FALSE;
-	
-	return retval;
-}
-
-
-static void 
-add_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-	icalproperty *prop;
-	icalparameter *param;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	prop = icalproperty_new (ICAL_ATTENDEE_PROPERTY);
-	param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT); 
-	icalproperty_add_parameter (prop, param);
-	param = icalparameter_new_rsvp (TRUE); 
-	icalproperty_add_parameter (prop, param);
-	param = icalparameter_new_partstat (ICAL_PARTSTAT_NEEDSACTION);
-	icalproperty_add_parameter (prop, param);
-
-	if (edit_attendee (prop, data) == TRUE) {
-		/* Let's add this property to our component and to the CList. */
-		icalcomponent_add_property (priv->vevent, prop);
-
-		/* The -1 indicates that we should add a new row. */
-		put_property_in_list (prop, -1, data);
-
-		priv->dirty = TRUE;
-	}
-	else {
-		icalproperty_free (prop);
-	}
-}	
-
-static void 
-delete_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	if (priv->selected_row < 0) {
-		GtkWidget *dialog;
-
-		dialog = gnome_warning_dialog_parented ("You must select an entry to delete.",
-							GTK_WINDOW (priv->meeting_window));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-	}
-	else {
-		/* Delete the associated property from the iCAL object. */
-		icalproperty *prop;
-
-		prop = (icalproperty *)gtk_clist_get_row_data (GTK_CLIST (priv->attendee_list),
-							       priv->selected_row);
-		icalcomponent_remove_property (priv->vevent, prop);
-		icalproperty_free (prop);
-
-		gtk_clist_remove (GTK_CLIST (priv->attendee_list), priv->selected_row);
-		priv->selected_row = -1;
-		priv->numentries--;
-		priv->dirty = TRUE;
-	}
-}
-
-static void 
-edit_button_clicked_cb (GtkWidget *widget, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	
-	if (priv->selected_row < 0) {
-		GtkWidget *dialog;
-
-		dialog = gnome_warning_dialog_parented ("You must select an entry to edit.",
-							GTK_WINDOW (priv->meeting_window));
-		gnome_dialog_run (GNOME_DIALOG(dialog));
-		return;
-	}
-	else {
-		icalproperty *prop, *new_prop;
-		icalparameter *param, *new_param;
-		icalvalue *value, *new_value;
-		
-		prop = (icalproperty *)gtk_clist_get_row_data (GTK_CLIST (priv->attendee_list),
-							       priv->selected_row);
-
-		g_assert (prop != NULL);
-
-		new_prop = icalproperty_new_clone (prop);
-
-		if (edit_attendee (new_prop, data)) {
-			/* The user hit Okay. */
-			/*We need to synchronize the old property with the newly edited one.*/
-			value = icalvalue_new_clone (icalproperty_get_value (new_prop));
-			icalproperty_set_value (prop, value);
-
-			icalproperty_remove_parameter (prop, ICAL_ROLE_PARAMETER);
-			icalproperty_remove_parameter (prop, ICAL_RSVP_PARAMETER);
-
-			param = get_icalparam_by_type (prop, ICAL_ROLE_PARAMETER);
-			if (param != NULL)
-				g_print ("e-meeting-edit.c: param should be NULL, but it isn't.\n");
-
-			icalproperty_remove_parameter (prop, ICAL_PARTSTAT_PARAMETER);
-
-			param = icalparameter_new_clone (get_icalparam_by_type (new_prop, ICAL_ROLE_PARAMETER));
-			g_assert (param != NULL);
-			icalproperty_add_parameter (prop, param);
-			param = icalparameter_new_clone (get_icalparam_by_type (new_prop, ICAL_RSVP_PARAMETER));
-			g_assert (param != NULL);
-			icalproperty_add_parameter (prop, param);
-			param = icalparameter_new_clone (get_icalparam_by_type (new_prop, ICAL_PARTSTAT_PARAMETER));
-			g_assert (param != NULL);
-			icalproperty_add_parameter (prop, param);
-			
-			put_property_in_list (prop, priv->selected_row, data);
-			priv->dirty = TRUE;
-
-		}
-		icalproperty_free (new_prop);
-	}
-}
-
-
-
-static void 
-list_row_select_cb  (GtkWidget *widget,
-                     gint row,
-                     gint column,
-                     GdkEventButton *event,
-                     gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-	
-	priv->selected_row = row;
-}
-
-static void
-organizer_changed_cb (GtkWidget *widget, gpointer data)
-{
-	EMeetingEditorPrivate *priv;
-
-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)->priv;
-
-	gtk_signal_disconnect (GTK_OBJECT (priv->organizer_entry), priv->changed_signal_id);
-
-	priv->dirty = TRUE;
-}
-
-
-/* ------------------------------------------------------------ */
-/* --------------------- Exported Functions ------------------- */
-/* ------------------------------------------------------------ */
-
-EMeetingEditor * 
-e_meeting_editor_new (CalComponent *comp, CalClient *client)
-{
-	EMeetingEditor *object;
-	EMeetingEditorPrivate *priv;
-
-	object = (EMeetingEditor *)g_new(EMeetingEditor, 1);
-	
-	priv = (EMeetingEditorPrivate *) g_new0(EMeetingEditorPrivate, 1);
-	priv->selected_row = -1;
-	priv->comp = comp;
-	priv->client = client;
-	priv->icalcomp = cal_component_get_icalcomponent (comp);
-	
-	object->priv = priv;
-
-	return object;	
-}
-
-void
-e_meeting_editor_free (EMeetingEditor *editor)
-{
-	if (editor == NULL)
-		return;
-		
-	if (editor->priv != NULL)
-		g_free (editor->priv);
-	
-	g_free (editor);
-}
-	
-
-
-void 
-e_meeting_edit (EMeetingEditor *editor)
-{
-	EMeetingEditorPrivate *priv;
-	GtkWidget *add_button, *delete_button, *edit_button;
-	icalproperty *prop;
-	icalvalue *value;
-	gchar *text;
-
-
-	g_return_if_fail (editor != NULL);
-
-	priv = (EMeetingEditorPrivate *)editor->priv;
-
-	g_return_if_fail (priv != NULL);
-
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/" E_MEETING_GLADE_XML, NULL);
-	
-	priv->meeting_window =  glade_xml_get_widget (priv->xml, "meeting_window");
-	priv->attendee_list = glade_xml_get_widget (priv->xml, "attendee_list");
-	priv->role_entry = glade_xml_get_widget (priv->xml, "role_entry");
-	priv->rsvp_check = glade_xml_get_widget (priv->xml, "rsvp_check");
-
-	gtk_clist_set_column_justification (GTK_CLIST (priv->attendee_list), ROLE_COL, GTK_JUSTIFY_CENTER);
-	gtk_clist_set_column_justification (GTK_CLIST (priv->attendee_list), RSVP_COL, GTK_JUSTIFY_CENTER);
-	gtk_clist_set_column_justification (GTK_CLIST (priv->attendee_list), STATUS_COL, GTK_JUSTIFY_CENTER);
-
-        gtk_signal_connect (GTK_OBJECT (priv->meeting_window), "delete_event",
-                            GTK_SIGNAL_FUNC (window_delete_cb), editor);
-
-	gtk_signal_connect_after (GTK_OBJECT (priv->meeting_window), "delete_event",
-				  GTK_SIGNAL_FUNC (window_destroy_cb), editor);
-
-        gtk_signal_connect (GTK_OBJECT (priv->meeting_window), "destroy_event",
-                            GTK_SIGNAL_FUNC (window_destroy_cb), editor);
-
-	gtk_signal_connect (GTK_OBJECT (priv->attendee_list), "select_row",
-			    GTK_SIGNAL_FUNC (list_row_select_cb), editor);
-
-	add_button = glade_xml_get_widget (priv->xml, "add_button");
-	delete_button = glade_xml_get_widget (priv->xml, "delete_button");
-	edit_button = glade_xml_get_widget (priv->xml, "edit_button");
-
-	gtk_signal_connect (GTK_OBJECT (add_button), "clicked",
-			    GTK_SIGNAL_FUNC (add_button_clicked_cb), editor);
-	
-	gtk_signal_connect (GTK_OBJECT (delete_button), "clicked",
-			    GTK_SIGNAL_FUNC (delete_button_clicked_cb), editor);
-
-	gtk_signal_connect (GTK_OBJECT (edit_button), "clicked",
-			    GTK_SIGNAL_FUNC (edit_button_clicked_cb), editor);
-
-	priv->organizer_entry = glade_xml_get_widget (priv->xml, "organizer_entry");
-
-	if (icalcomponent_isa (priv->icalcomp) != ICAL_VEVENT_COMPONENT)
-		priv->vevent = icalcomponent_get_first_component(priv->icalcomp,ICAL_VEVENT_COMPONENT);
-	else
-		priv->vevent = priv->icalcomp;
-
-	g_assert (priv->vevent != NULL);
-
-	/* Let's extract the organizer, if there is one. */
-        prop = icalcomponent_get_first_property (priv->vevent, ICAL_ORGANIZER_PROPERTY);
-
-	if (prop != NULL) {
-		gchar *buffer;
-
-	        value = icalproperty_get_value (prop);
-		buffer = g_strdup (icalvalue_as_ical_string (value));
-	        if (buffer != NULL) {
-			/* Strip off the MAILTO:, if it is present. */
-	        	text = strchr (buffer, ':');
-			if (text == NULL)
-				text = buffer;
-			else
-				text++;
-				
-			gtk_entry_set_text (GTK_ENTRY (priv->organizer_entry), text);
-			g_free (buffer);
-		}
-		
-	}
-
-	priv->changed_signal_id = gtk_signal_connect (GTK_OBJECT (priv->organizer_entry), "changed",
-						      GTK_SIGNAL_FUNC (organizer_changed_cb), editor);
-
-
-	/* Let's go through the iCAL object, and create a list entry
-	   for each ATTENDEE property. */
-        for (prop = icalcomponent_get_first_property (priv->vevent, ICAL_ATTENDEE_PROPERTY);
-             prop != NULL;
-             prop = icalcomponent_get_next_property (priv->vevent, ICAL_ATTENDEE_PROPERTY))
-	{
-		put_property_in_list (prop, -1, editor);
-	}
-	
-
-	gtk_widget_show (priv->meeting_window);
-
-	gtk_main ();
-
-	if (priv->meeting_window != NULL)
-		gtk_widget_destroy (priv->meeting_window);
-
-	if (priv->edit_dialog != NULL)
-		gtk_widget_destroy (priv->edit_dialog);
-
-	gtk_object_unref (GTK_OBJECT (priv->xml));
-}
diff --git a/calendar/gui/e-meeting-edit.h b/calendar/gui/e-meeting-edit.h
deleted file mode 100644
index 783a9c6b34..0000000000
--- a/calendar/gui/e-meeting-edit.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Evolution calendar - Meeting editor dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Jesse Pavel <jpavel@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __E_MEETING_EDIT_H__
-#define __E_MEETING_EDIT_H__
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include <cal-util/cal-component.h>
-#include <cal-client/cal-client.h>
-
-typedef struct _EMeetingEditor EMeetingEditor;
-
-struct _EMeetingEditor {
-	gpointer priv;
-};
-
-
-EMeetingEditor * e_meeting_editor_new (CalComponent *comp, CalClient *client);
-void e_meeting_edit (EMeetingEditor *editor);
-void e_meeting_editor_free (EMeetingEditor *editor);
-
-
-#endif /*  __E_MEETING_EDIT_H__  */
-
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
deleted file mode 100644
index 8f221bd17f..0000000000
--- a/calendar/gui/e-week-view-event-item.c
+++ /dev/null
@@ -1,757 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EWeekViewEventItem - displays the background, times and icons for an event
- * in the week/month views. A separate EText canvas item is used to display &
- * edit the text.
- */
-
-#include <config.h>
-#include <gal/e-text/e-text.h>
-#include "e-week-view-event-item.h"
-
-static void e_week_view_event_item_class_init	(EWeekViewEventItemClass *class);
-static void e_week_view_event_item_init		(EWeekViewEventItem *wveitem);
-
-static void e_week_view_event_item_set_arg	(GtkObject	 *o,
-						 GtkArg		 *arg,
-						 guint		  arg_id);
-static void e_week_view_event_item_update	(GnomeCanvasItem *item,
-						 double		 *affine,
-						 ArtSVP		 *clip_path,
-						 int		  flags);
-static void e_week_view_event_item_draw		(GnomeCanvasItem *item,
-						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
-static void e_week_view_event_item_draw_icons	(EWeekViewEventItem *wveitem,
-						 GdkDrawable        *drawable,
-						 gint		     icon_x,
-						 gint		     icon_y,
-						 gint		     x2,
-						 gboolean	     right_align);
-static void e_week_view_event_item_draw_triangle (EWeekViewEventItem *wveitem,
-						  GdkDrawable	     *drawable,
-						  gint		      x,
-						  gint		      y,
-						  gint		      w,
-						  gint		      h);
-static double e_week_view_event_item_point	(GnomeCanvasItem *item,
-						 double		  x,
-						 double		  y,
-						 int		  cx,
-						 int		  cy,
-						 GnomeCanvasItem **actual_item);
-static gint e_week_view_event_item_event	(GnomeCanvasItem *item,
-						 GdkEvent	 *event);
-static gboolean e_week_view_event_item_button_press (EWeekViewEventItem *wveitem,
-						     GdkEvent		*event);
-static gboolean e_week_view_event_item_button_release (EWeekViewEventItem *wveitem,
-						       GdkEvent		  *event);
-static EWeekViewPosition e_week_view_event_item_get_position (EWeekViewEventItem *wveitem,
-							      gdouble x,
-							      gdouble y);
-
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_EVENT_NUM,
-	ARG_SPAN_NUM
-};
-
-
-GtkType
-e_week_view_event_item_get_type (void)
-{
-	static GtkType e_week_view_event_item_type = 0;
-
-	if (!e_week_view_event_item_type) {
-		GtkTypeInfo e_week_view_event_item_info = {
-			"EWeekViewEventItem",
-			sizeof (EWeekViewEventItem),
-			sizeof (EWeekViewEventItemClass),
-			(GtkClassInitFunc) e_week_view_event_item_class_init,
-			(GtkObjectInitFunc) e_week_view_event_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_week_view_event_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_week_view_event_item_info);
-	}
-
-	return e_week_view_event_item_type;
-}
-
-
-static void
-e_week_view_event_item_class_init (EWeekViewEventItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EWeekViewEventItem::event_num",
-				 GTK_TYPE_INT, GTK_ARG_WRITABLE,
-				 ARG_EVENT_NUM);
-	gtk_object_add_arg_type ("EWeekViewEventItem::span_num",
-				 GTK_TYPE_INT, GTK_ARG_WRITABLE,
-				 ARG_SPAN_NUM);
-
-	object_class->set_arg = e_week_view_event_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_week_view_event_item_update;
-	item_class->draw        = e_week_view_event_item_draw;
-	item_class->point       = e_week_view_event_item_point;
-	item_class->event       = e_week_view_event_item_event;
-}
-
-
-static void
-e_week_view_event_item_init (EWeekViewEventItem *wveitem)
-{
-	wveitem->event_num = -1;
-	wveitem->span_num = -1;
-}
-
-
-static void
-e_week_view_event_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EWeekViewEventItem *wveitem;
-	gboolean needs_update = FALSE;
-
-	item = GNOME_CANVAS_ITEM (o);
-	wveitem = E_WEEK_VIEW_EVENT_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_EVENT_NUM:
-		wveitem->event_num = GTK_VALUE_INT (*arg);
-		needs_update = TRUE;
-		break;
-	case ARG_SPAN_NUM:
-		wveitem->span_num = GTK_VALUE_INT (*arg);
-		needs_update = TRUE;
-		break;
-	}
-
-	if (needs_update)
-		gnome_canvas_item_request_update (item);
-}
-
-
-static void
-e_week_view_event_item_update (GnomeCanvasItem *item,
-			       double	       *affine,
-			       ArtSVP	       *clip_path,
-			       int	        flags)
-{
-	EWeekViewEventItem *wveitem;
-	EWeekView *week_view;
-	gint span_x, span_y, span_w;
-
-#if 0
-	g_print ("In e_week_view_event_item_update\n");
-#endif
-
-	wveitem = E_WEEK_VIEW_EVENT_ITEM (item);
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = 0;
-	item->y2 = 0;
-
-	if (wveitem->event_num != -1 && wveitem->span_num != -1) {
-		if (e_week_view_get_span_position (week_view,
-						   wveitem->event_num,
-						   wveitem->span_num,
-						   &span_x, &span_y,
-						   &span_w)) {
-#if 0
-			g_print ("  Event:%i Span:%i %i,%i W:%i\n",
-				 wveitem->event_num, wveitem->span_num,
-				 span_x, span_y, span_w);
-#endif
-			item->x1 = span_x;
-			item->y1 = span_y;
-			item->x2 = span_x + span_w - 1;
-			item->y2 = span_y + week_view->row_height - 1;
-		}
-	}
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_week_view_event_item_draw (GnomeCanvasItem  *canvas_item,
-			     GdkDrawable      *drawable,
-			     int	       x,
-			     int	       y,
-			     int	       width,
-			     int	       height)
-{
-	EWeekViewEventItem *wveitem;
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	GtkStyle *style;
-	GdkGC *fg_gc, *gc;
-	GdkFont *font;
-	gint x1, y1, x2, y2, time_x, time_y, time_y_small_min;
-	gint icon_x, icon_y, time_width, min_end_time_x;
-	gint rect_x, rect_w, rect_x2;
-	gboolean one_day_event, editing_span = FALSE;
-	gint start_minute, end_minute;
-	gchar buffer[128];
-	gboolean draw_start_triangle = FALSE, draw_end_triangle = FALSE;
-	GdkRectangle clip_rect;
-
-#if 0
-	g_print ("In e_week_view_event_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-
-	wveitem = E_WEEK_VIEW_EVENT_ITEM (canvas_item);
-	week_view = E_WEEK_VIEW (GTK_WIDGET (canvas_item->canvas)->parent);
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (wveitem->event_num == -1 || wveitem->span_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				wveitem->event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + wveitem->span_num);
-
-	style = GTK_WIDGET (week_view)->style;
-	font = style->font;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	gc = week_view->main_gc;
-
-	x1 = canvas_item->x1 - x;
-	y1 = canvas_item->y1 - y;
-	x2 = canvas_item->x2 - x;
-	y2 = canvas_item->y2 - y;
-
-	if (x1 == x2 || y1 == y2)
-		return;
-
-	icon_y = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT + E_WEEK_VIEW_ICON_Y_PAD;
-	start_minute = event->start_minute;
-	end_minute = event->end_minute;
-	time_y_small_min = 0;
-	icon_x = 0;
-
-	time_y = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT
-		+ E_WEEK_VIEW_EVENT_TEXT_Y_PAD + font->ascent;
-
-	if (week_view->small_font)
-		time_y_small_min = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT
-			+ E_WEEK_VIEW_EVENT_TEXT_Y_PAD
-			+ week_view->small_font->ascent;
-
-	if (week_view->use_small_font && week_view->small_font)
-		time_width = week_view->digit_width * 2
-			+ week_view->small_digit_width * 2;
-	else
-		time_width = week_view->digit_width * 4
-			+ week_view->colon_width;
-
-	one_day_event = e_week_view_is_one_day_event (week_view,
-						      wveitem->event_num);
-	if (one_day_event) {
-		time_x = x1 + E_WEEK_VIEW_EVENT_L_PAD;
-
-		/* Convert the time into a string. We use different parts of
-		   the string for the different time formats. Notice that the
-		   string is always 11 characters long. */
-		sprintf (buffer, "%02i:%02i %02i:%02i",
-			 start_minute / 60, start_minute % 60,
-			 end_minute / 60, end_minute % 60);
-
-		/* Draw the start and end times, as required. */
-		switch (week_view->time_format) {
-		case E_WEEK_VIEW_TIME_BOTH_SMALL_MIN:
-			gdk_draw_text (drawable, font, fg_gc,
-				       time_x, time_y, buffer, 2);
-			gdk_draw_text (drawable, week_view->small_font, fg_gc,
-				       time_x + week_view->digit_width * 2,
-				       time_y_small_min, buffer + 3, 2);
-			gdk_draw_text (drawable, font, fg_gc,
-				       time_x + week_view->digit_width * 4 - 2,
-				       time_y, buffer + 6, 2);
-			gdk_draw_text (drawable, week_view->small_font, fg_gc,
-				       time_x + week_view->digit_width * 6 - 2,
-				       time_y_small_min, buffer + 9, 2);
-
-			icon_x = x1 + time_width * 2 + week_view->space_width
-				+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;
-			break;
-		case E_WEEK_VIEW_TIME_START_SMALL_MIN:
-			gdk_draw_text (drawable, font, fg_gc,
-				       time_x, time_y, buffer, 2);
-			gdk_draw_text (drawable, week_view->small_font, fg_gc,
-				       time_x + week_view->digit_width * 2,
-				       time_y_small_min, buffer + 3, 2);
-
-			icon_x = x1 + time_width
-				+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;
-			break;
-		case E_WEEK_VIEW_TIME_BOTH:
-			gdk_draw_text (drawable, font, fg_gc,
-				       time_x, time_y, buffer, 11);
-			icon_x = x1 + time_width * 2 + week_view->space_width
-				+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;
-			break;
-		case E_WEEK_VIEW_TIME_START:
-			gdk_draw_text (drawable, font, fg_gc,
-				       time_x, time_y, buffer, 5);
-			icon_x = x1 + time_width
-				+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;
-			break;
-		case E_WEEK_VIEW_TIME_NONE:
-			icon_x = x1 + E_WEEK_VIEW_EVENT_L_PAD;
-			break;
-		}
-
-		/* Draw the icons. */
-		e_week_view_event_item_draw_icons (wveitem, drawable,
-						   icon_x, icon_y,
-						   x2, FALSE);
-
-	} else {
-		rect_x = x1 + E_WEEK_VIEW_EVENT_L_PAD;
-		rect_w = x2 - x1 - E_WEEK_VIEW_EVENT_L_PAD
-			- E_WEEK_VIEW_EVENT_R_PAD + 1;
-
-		/* Draw the triangles at the start & end, if needed. */
-		if (event->start < week_view->day_starts[span->start_day]) {
-			draw_start_triangle = TRUE;
-			rect_x += 2;
-			rect_w -= 2;
-		}
-
-		if (event->end > week_view->day_starts[span->start_day
-						      + span->num_days]) {
-			draw_end_triangle = TRUE;
-			rect_w -= 2;
-		}
-
-		gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND]);
-		gdk_draw_rectangle (drawable, gc, TRUE,
-				    rect_x, y1 + 1, rect_w, y2 - y1 - 1);
-
-		gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER]);
-		rect_x2 = rect_x + rect_w - 1;
-		gdk_draw_line (drawable, gc, rect_x,  y1, rect_x2, y1);
-		gdk_draw_line (drawable, gc, rect_x,  y2, rect_x2, y2);
-
-		if (draw_start_triangle) {
-			e_week_view_event_item_draw_triangle (wveitem, drawable, x1 + E_WEEK_VIEW_EVENT_L_PAD + 2, y1, -3, y2 - y1 + 1);
-		} else {
-			gdk_draw_line (drawable, gc, rect_x,  y1, rect_x, y2);
-		}
-
-		if (draw_end_triangle) {
-			e_week_view_event_item_draw_triangle (wveitem, drawable, x2 - E_WEEK_VIEW_EVENT_R_PAD - 2, y1, 3, y2 - y1 + 1);
-		} else {
-			gdk_draw_line (drawable, gc, rect_x2, y1, rect_x2, y2);
-		}
-
-		if (span->text_item && E_TEXT (span->text_item)->editing)
-			editing_span = TRUE;
-
-		/* Draw the start & end times, if necessary. */
-		min_end_time_x = x1 + E_WEEK_VIEW_EVENT_L_PAD
-			+ E_WEEK_VIEW_EVENT_BORDER_WIDTH
-			+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;
-		if (!editing_span
-		    && event->start > week_view->day_starts[span->start_day]) {
-			sprintf (buffer, "%02i:%02i",
-				 start_minute / 60, start_minute % 60);
-			time_x = x1 + E_WEEK_VIEW_EVENT_L_PAD
-				+ E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;
-
-			clip_rect.x = x1;
-			clip_rect.y = y1;
-			clip_rect.width = x2 - x1 - E_WEEK_VIEW_EVENT_R_PAD
-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH + 1;
-			clip_rect.height = y2 - y1 + 1;
-			gdk_gc_set_clip_rectangle (fg_gc, &clip_rect);
-
-			if (week_view->use_small_font
-			    && week_view->small_font) {
-				gdk_draw_text (drawable, font, fg_gc,
-					       time_x, time_y, buffer, 2);
-				gdk_draw_text (drawable, week_view->small_font,
-					       fg_gc,
-					       time_x + week_view->digit_width * 2,
-					       time_y_small_min,
-					       buffer + 3, 2);
-			} else {
-				gdk_draw_text (drawable, font, fg_gc,
-					       time_x, time_y, buffer, 5);
-			}
-
-			gdk_gc_set_clip_rectangle (fg_gc, NULL);
-
-			min_end_time_x += time_width + 2;
-		}
-
-		if (!editing_span
-		    && event->end < week_view->day_starts[span->start_day
-							 + span->num_days]) {
-			sprintf (buffer, "%02i:%02i",
-				 end_minute / 60, end_minute % 60);
-			time_x = x2 - E_WEEK_VIEW_EVENT_R_PAD
-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				- E_WEEK_VIEW_EVENT_TEXT_X_PAD - 1
-				- time_width;
-
-			if (time_x >= min_end_time_x) {
-				if (week_view->use_small_font
-				    && week_view->small_font) {
-					gdk_draw_text (drawable, font, fg_gc,
-						       time_x, time_y,
-						       buffer, 2);
-					gdk_draw_text (drawable,
-						       week_view->small_font,
-						       fg_gc,
-						       time_x + week_view->digit_width * 2,
-						       time_y_small_min,
-						       buffer + 3, 2);
-				} else {
-					gdk_draw_text (drawable, font, fg_gc,
-						       time_x, time_y,
-						       buffer, 5);
-				}
-			}
-		}
-
-		/* Draw the icons. */
-		if (span->text_item) {
-			icon_x = span->text_item->x1 - x;
-			e_week_view_event_item_draw_icons (wveitem, drawable,
-							   icon_x, icon_y,
-							   x2, TRUE);
-		}
-	}
-}
-
-
-static void
-e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem,
-				   GdkDrawable        *drawable,
-				   gint		       icon_x,
-				   gint		       icon_y,
-				   gint		       x2,
-				   gboolean	       right_align)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	CalComponent *comp;
-	GdkGC *gc;
-	gint num_icons = 0, icon_x_inc;
-	gboolean draw_reminder_icon = FALSE, draw_recurrence_icon = FALSE;
-
-	week_view = E_WEEK_VIEW (GTK_WIDGET (GNOME_CANVAS_ITEM (wveitem)->canvas)->parent);
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				wveitem->event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + wveitem->span_num);
-	comp = event->comp;
-
-	gc = week_view->main_gc;
-
-#if 0
-	if (ico->dalarm.enabled || ico->malarm.enabled
-	    || ico->palarm.enabled || ico->aalarm.enabled) {
-		draw_reminder_icon = TRUE;
-		num_icons++;
-	}
-#endif
-
-	if (cal_component_has_recurrences (comp)) {
-		draw_recurrence_icon = TRUE;
-		num_icons++;
-	}
-
-	icon_x_inc = E_WEEK_VIEW_ICON_WIDTH + E_WEEK_VIEW_ICON_X_PAD;
-
-	if (right_align)
-		icon_x -= icon_x_inc * num_icons;
-
-	if (draw_reminder_icon && icon_x + E_WEEK_VIEW_ICON_WIDTH <= x2) {
-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-		gdk_gc_set_clip_mask (gc, week_view->reminder_mask);
-		gdk_draw_pixmap (drawable, gc,
-				 week_view->reminder_icon,
-				 0, 0, icon_x, icon_y,
-				 E_WEEK_VIEW_ICON_WIDTH,
-				 E_WEEK_VIEW_ICON_HEIGHT);
-		icon_x += icon_x_inc;
-	}
-
-	if (draw_recurrence_icon && icon_x + E_WEEK_VIEW_ICON_WIDTH <= x2) {
-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);
-		gdk_gc_set_clip_mask (gc, week_view->recurrence_mask);
-		gdk_draw_pixmap (drawable, gc,
-				 week_view->recurrence_icon,
-				 0, 0, icon_x, icon_y,
-				 E_WEEK_VIEW_ICON_WIDTH,
-				 E_WEEK_VIEW_ICON_HEIGHT);
-		icon_x += icon_x_inc;
-	}
-
-	gdk_gc_set_clip_mask (gc, NULL);
-}
-
-
-/* This draws a little triangle to indicate that an event extends past
-   the days visible on screen. */
-static void
-e_week_view_event_item_draw_triangle (EWeekViewEventItem *wveitem,
-				      GdkDrawable	 *drawable,
-				      gint		  x,
-				      gint		  y,
-				      gint		  w,
-				      gint		  h)
-{
-	EWeekView *week_view;
-	GdkGC *gc;
-	GdkPoint points[3];
-	gint c1, c2;
-
-	week_view = E_WEEK_VIEW (GTK_WIDGET (GNOME_CANVAS_ITEM (wveitem)->canvas)->parent);
-
-	gc = week_view->main_gc;
-
-	points[0].x = x;
-	points[0].y = y;
-	points[1].x = x + w;
-	points[1].y = y + (h / 2) - 1;
-	points[2].x = x;
-	points[2].y = y + h - 1;
-
-	gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND]);
-	gdk_draw_polygon (drawable, gc, TRUE, points, 3);
-
-	gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER]);
-
-	/* If the height is odd we can use the same central point for both
-	   lines. If it is even we use different end-points. */
-	c1 = c2 = y + (h / 2);
-	if (h % 2 == 0)
-		c1--;
-
-	gdk_draw_line (drawable, gc, x, y, x + w, c1);
-	gdk_draw_line (drawable, gc, x, y + h - 1, x + w, c2);
-}
-
-
-/* This is supposed to return the nearest item the the point and the distance.
-   Since we are the only item we just return ourself and 0 for the distance.
-   This is needed so that we get button/motion events. */
-static double
-e_week_view_event_item_point (GnomeCanvasItem *item, double x, double y,
-			      int cx, int cy,
-			      GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
-static gint
-e_week_view_event_item_event (GnomeCanvasItem *item, GdkEvent *event)
-{
-	EWeekViewEventItem *wveitem;
-
-	wveitem = E_WEEK_VIEW_EVENT_ITEM (item);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		return e_week_view_event_item_button_press (wveitem, event);
-	case GDK_BUTTON_RELEASE:
-		return e_week_view_event_item_button_release (wveitem, event);
-	case GDK_MOTION_NOTIFY:
-		break;
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_week_view_event_item_button_press (EWeekViewEventItem *wveitem,
-				     GdkEvent		*bevent)
-{
-	EWeekView *week_view;
-	EWeekViewPosition pos;
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	GnomeCanvasItem *item;
-
-	item = GNOME_CANVAS_ITEM (wveitem);
-
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				wveitem->event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + wveitem->span_num);
-
-#if 0
-	g_print ("In e_week_view_event_item_button_press\n");
-#endif
-
-	pos = e_week_view_event_item_get_position (wveitem, bevent->button.x,
-						   bevent->button.y);
-	if (pos == E_WEEK_VIEW_POS_NONE)
-		return FALSE;
-
-	week_view->pressed_event_num = wveitem->event_num;
-	week_view->pressed_span_num = wveitem->span_num;
-
-	if (bevent->button.button == 1) {
-		/* Ignore clicks on the event while editing. */
-		if (E_TEXT (span->text_item)->editing)
-			return FALSE;
-
-		/* Remember the item clicked and the mouse position,
-		   so we can start a drag if the mouse moves. */
-		week_view->drag_event_x = bevent->button.x;
-		week_view->drag_event_y = bevent->button.y;
-
-		/* FIXME: Remember the day offset from the start of the event.
-		 */
-	} else if (bevent->button.button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (week_view))
-			gtk_widget_grab_focus (GTK_WIDGET (week_view));
-		e_week_view_show_popup_menu (week_view,
-					     (GdkEventButton*) bevent,
-					     wveitem->event_num);
-		gtk_signal_emit_stop_by_name (GTK_OBJECT (item->canvas),
-					      "button_press_event");
-	}
-
-	return TRUE;
-}
-
-
-static gboolean
-e_week_view_event_item_button_release (EWeekViewEventItem *wveitem,
-				       GdkEvent		  *event)
-{
-	EWeekView *week_view;
-	GnomeCanvasItem *item;
-
-	item = GNOME_CANVAS_ITEM (wveitem);
-
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-#if 0
-	g_print ("In e_week_view_event_item_button_release\n");
-#endif
-
-	if (week_view->pressed_event_num != -1
-	    && week_view->pressed_event_num == wveitem->event_num
-	    && week_view->pressed_span_num == wveitem->span_num) {
-		e_week_view_start_editing_event (week_view,
-						 wveitem->event_num,
-						 wveitem->span_num,
-						 NULL);
-		week_view->pressed_event_num = -1;
-		return TRUE;
-	}
-
-	week_view->pressed_event_num = -1;
-
-	return FALSE;
-}
-
-
-static EWeekViewPosition
-e_week_view_event_item_get_position (EWeekViewEventItem *wveitem,
-				     gdouble x,
-				     gdouble y)
-{
-	EWeekView *week_view;
-	GnomeCanvasItem *item;
-
-	item = GNOME_CANVAS_ITEM (wveitem);
-
-	week_view = E_WEEK_VIEW (GTK_WIDGET (item->canvas)->parent);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), E_WEEK_VIEW_POS_NONE);
-
-#if 0
-	g_print ("In e_week_view_event_item_get_position item: %g,%g %g,%g point: %g,%g\n", item->x1, item->y1, item->x2, item->y2, x, y);
-#endif
-
-	if (x < item->x1 + E_WEEK_VIEW_EVENT_L_PAD
-	    || x >= item->x2 - E_WEEK_VIEW_EVENT_R_PAD)
-		return E_WEEK_VIEW_POS_NONE;
-
-	/* Support left/right edge for long events only. */
-	if (!e_week_view_is_one_day_event (week_view, wveitem->event_num)) {
-		if (x < item->x1 + E_WEEK_VIEW_EVENT_L_PAD
-		    + E_WEEK_VIEW_EVENT_BORDER_WIDTH
-		    + E_WEEK_VIEW_EVENT_TEXT_X_PAD)
-			return E_WEEK_VIEW_POS_LEFT_EDGE;
-
-		if (x >= item->x2 - E_WEEK_VIEW_EVENT_R_PAD
-		    - E_WEEK_VIEW_EVENT_BORDER_WIDTH
-		    - E_WEEK_VIEW_EVENT_TEXT_X_PAD)
-			return E_WEEK_VIEW_POS_RIGHT_EDGE;
-	}
-
-	return E_WEEK_VIEW_POS_EVENT;
-}
diff --git a/calendar/gui/e-week-view-event-item.h b/calendar/gui/e-week-view-event-item.h
deleted file mode 100644
index cfe58699b0..0000000000
--- a/calendar/gui/e-week-view-event-item.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_WEEK_VIEW_EVENT_ITEM_H_
-#define _E_WEEK_VIEW_EVENT_ITEM_H_
-
-#include "e-week-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EWeekViewEventItem - displays the background, times and icons for an event
- * in the week/month views. A separate EText canvas item is used to display &
- * edit the text.
- */
-
-#define E_WEEK_VIEW_EVENT_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_week_view_event_item_get_type (), EWeekViewEventItem))
-#define E_WEEK_VIEW_EVENT_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_week_view_event_item_get_type ()))
-#define E_IS_WEEK_VIEW_EVENT_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_week_view_event_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The event index in the EWeekView events array. */
-	gint event_num;
-
-	/* The span index within the event. */
-	gint span_num;
-} EWeekViewEventItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EWeekViewEventItemClass;
-
-
-GtkType  e_week_view_event_item_get_type      (void);
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_WEEK_VIEW_EVENT_ITEM_H_ */
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
deleted file mode 100644
index 10990324ff..0000000000
--- a/calendar/gui/e-week-view-main-item.c
+++ /dev/null
@@ -1,388 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EWeekViewMainItem - displays the background grid and dates for the Week and
- * Month calendar views.
- */
-
-#include <config.h>
-#include "e-week-view-main-item.h"
-
-static void e_week_view_main_item_class_init	(EWeekViewMainItemClass *class);
-static void e_week_view_main_item_init		(EWeekViewMainItem *wvmitem);
-
-static void e_week_view_main_item_set_arg	(GtkObject	 *o,
-						 GtkArg		 *arg,
-						 guint		  arg_id);
-static void e_week_view_main_item_update	(GnomeCanvasItem *item,
-						 double		 *affine,
-						 ArtSVP		 *clip_path,
-						 int		  flags);
-static void e_week_view_main_item_draw		(GnomeCanvasItem *item,
-						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
-static void e_week_view_main_item_draw_day	(EWeekViewMainItem *wvmitem,
-						 gint		   day,
-						 GDate		  *date,
-						 GdkDrawable       *drawable,
-						 gint		   x,
-						 gint		   y,
-						 gint		   width,
-						 gint		   height);
-static double e_week_view_main_item_point	(GnomeCanvasItem *item,
-						 double		  x,
-						 double		  y,
-						 int		  cx,
-						 int		  cy,
-						 GnomeCanvasItem **actual_item);
-
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_WEEK_VIEW
-};
-
-
-GtkType
-e_week_view_main_item_get_type (void)
-{
-	static GtkType e_week_view_main_item_type = 0;
-
-	if (!e_week_view_main_item_type) {
-		GtkTypeInfo e_week_view_main_item_info = {
-			"EWeekViewMainItem",
-			sizeof (EWeekViewMainItem),
-			sizeof (EWeekViewMainItemClass),
-			(GtkClassInitFunc) e_week_view_main_item_class_init,
-			(GtkObjectInitFunc) e_week_view_main_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_week_view_main_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_week_view_main_item_info);
-	}
-
-	return e_week_view_main_item_type;
-}
-
-
-static void
-e_week_view_main_item_class_init (EWeekViewMainItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EWeekViewMainItem::week_view",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_WEEK_VIEW);
-
-	object_class->set_arg = e_week_view_main_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_week_view_main_item_update;
-	item_class->draw        = e_week_view_main_item_draw;
-	item_class->point       = e_week_view_main_item_point;
-}
-
-
-static void
-e_week_view_main_item_init (EWeekViewMainItem *wvmitem)
-{
-	wvmitem->week_view = NULL;
-}
-
-
-static void
-e_week_view_main_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EWeekViewMainItem *wvmitem;
-
-	item = GNOME_CANVAS_ITEM (o);
-	wvmitem = E_WEEK_VIEW_MAIN_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_WEEK_VIEW:
-		wvmitem->week_view = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_week_view_main_item_update (GnomeCanvasItem *item,
-			      double	      *affine,
-			      ArtSVP	      *clip_path,
-			      int	       flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_week_view_main_item_draw (GnomeCanvasItem  *canvas_item,
-			    GdkDrawable      *drawable,
-			    int		      x,
-			    int		      y,
-			    int		      width,
-			    int		      height)
-{
-	EWeekViewMainItem *wvmitem;
-	EWeekView *week_view;
-	GDate date;
-	gint num_days, day, day_x, day_y, day_w, day_h;
-
-#if 0
-	g_print ("In e_week_view_main_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-
-	wvmitem = E_WEEK_VIEW_MAIN_ITEM (canvas_item);
-	week_view = wvmitem->week_view;
-	g_return_if_fail (week_view != NULL);
-
-	/* Step through each of the days. */
-	date = week_view->first_day_shown;
-
-	/* If no date has been set, we just use Dec 1999/January 2000. */
-	if (!g_date_valid (&date))
-		g_date_set_dmy (&date, 27, 12, 1999);
-
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	for (day = 0; day < num_days; day++) {
-		e_week_view_get_day_position (week_view, day,
-					      &day_x, &day_y,
-					      &day_w, &day_h);
-		/* Skip any days which are outside the area. */
-		if (day_x < x + width && day_x + day_w >= x
-		    && day_y < y + height && day_y + day_h >= y) {
-			e_week_view_main_item_draw_day (wvmitem, day, &date,
-							drawable,
-							day_x - x, day_y - y,
-							day_w, day_h);
-		}
-		g_date_add_days (&date, 1);
-	}
-}
-
-
-static void
-e_week_view_main_item_draw_day (EWeekViewMainItem *wvmitem,
-				gint		   day,
-				GDate		  *date,
-				GdkDrawable       *drawable,
-				gint		   x,
-				gint		   y,
-				gint		   width,
-				gint		   height)
-{
-	EWeekView *week_view;
-	GtkStyle *style;
-	GdkGC *fg_gc, *bg_gc, *light_gc, *dark_gc, *gc, *date_gc;
-	GdkGC *selected_fg_gc, *selected_bg_gc;
-	GdkFont *font;
-	gint right_edge, bottom_edge, date_width, date_x, line_y;
-	gboolean show_day_name, show_month_name, selected;
-	gchar buffer[128], *format_string;
-	gint month, day_of_month, max_width;
-	GdkColor *bg_color;
-
-#if 0
-	g_print ("Drawing Day:%i at %i,%i\n", day, x, y);
-#endif
-	week_view = wvmitem->week_view;
-	style = GTK_WIDGET (week_view)->style;
-	font = style->font;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_PRELIGHT];
-	light_gc = style->light_gc[GTK_STATE_NORMAL];
-	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-	selected_fg_gc = style->fg_gc[GTK_STATE_SELECTED];
-	selected_bg_gc = style->bg_gc[GTK_STATE_SELECTED];
-	gc = week_view->main_gc;
-
-	g_return_if_fail (gc != NULL);
-
-	month = g_date_month (date);
-	day_of_month = g_date_day (date);
-	line_y = y + E_WEEK_VIEW_DATE_T_PAD + font->ascent
-		+ font->descent	+ E_WEEK_VIEW_DATE_LINE_T_PAD;
-
-	/* Draw the background of the day. In the month view odd months are
-	   one color and even months another, so you can easily see when each
-	   month starts (defaults are white for odd - January, March, ... and
-	   light gray for even). In the week view the background is always the
-	   same color, the color used for the odd months in the month view. */
-	if (week_view->multi_week_view && (month % 2 == 0))
-		bg_color = &week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS];
-	else
-		bg_color = &week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS];
-
-	gdk_gc_set_foreground (gc, bg_color);
-	gdk_draw_rectangle (drawable, gc, TRUE, x, y, width, height);
-
-	/* Draw the lines on the right and bottom of the cell. The canvas is
-	   sized so that the lines on the right & bottom edges will be off the
-	   edge of the canvas, so we don't have to worry about them. */
-	right_edge = x + width - 1;
-	bottom_edge = y + height - 1;
-
-	gdk_draw_line (drawable, fg_gc,
-		       right_edge, y, right_edge, bottom_edge);
-	gdk_draw_line (drawable, fg_gc,
-		       x, bottom_edge, right_edge, bottom_edge);
-
-	/* If the day is selected, draw the blue background. */
-	selected = TRUE;
-	if (!GTK_WIDGET_HAS_FOCUS (week_view)
-	    || week_view->selection_start_day == -1
-	    || week_view->selection_start_day > day
-	    || week_view->selection_end_day < day)
-		selected = FALSE;
-	if (selected) {
-		if (week_view->multi_week_view)
-			gdk_draw_rectangle (drawable, selected_bg_gc, TRUE,
-					    x + 2, y + 1,
-					    width - 5,
-					    E_WEEK_VIEW_DATE_T_PAD - 1
-					    + font->ascent + font->descent);
-		else
-			gdk_draw_rectangle (drawable, selected_bg_gc, TRUE,
-					    x + 2, y + 1,
-					    width - 5, line_y - y);
-	}
-
-	/* Display the date in the top of the cell.
-	   In the week view, display the long format "10 January" in all cells,
-	   or abbreviate it to "10 Jan" or "10" if that doesn't fit.
-	   In the month view, only use the long format for the first cell and
-	   the 1st of each month, otherwise use "10". */
-	show_day_name = FALSE;
-	show_month_name = FALSE;
-	if (!week_view->multi_week_view) {
-		show_day_name = TRUE;
-		show_month_name = TRUE;
-	} else if (day == 0 || day_of_month == 1) {
-		show_month_name = TRUE;
-	}
-
-	/* Now find the longest form of the date that will fit. */
-	max_width = width - 4;
-	format_string = NULL;
-	if (show_day_name) {
-		if (week_view->max_day_width + week_view->digit_width * 2
-		    + week_view->space_width * 2
-		    + week_view->month_widths[month - 1] < max_width)
-			/* strftime format %A = full weekday name, %d = day of
-			   month, %B = full month name. You can change the
-			   order but don't change the specifiers or add
-			   anything. */
-			format_string = _("%A %d %B");
-		else if (week_view->max_abbr_day_width
-			 + week_view->digit_width * 2
-			 + week_view->space_width * 2
-			 + week_view->abbr_month_widths[month - 1] < max_width)
-			/* strftime format %a = abbreviated weekday name,
-			   %d = day of month, %b = abbreviated month name.
-			   You can change the order but don't change the
-			   specifiers or add anything. */
-			format_string = _("%a %d %b");
-	}
-	if (!format_string && show_month_name) {
-		if (week_view->digit_width * 2 + week_view->space_width
-		    + week_view->month_widths[month - 1] < max_width)
-			/* strftime format %d = day of month, %B = full
-			   month name. You can change the order but don't
-			   change the specifiers or add anything. */
-			format_string = _("%d %B");
-		else if (week_view->digit_width * 2 + week_view->space_width
-		    + week_view->abbr_month_widths[month - 1] < max_width)
-			/* strftime format %d = day of month, %b = abbreviated
-			   month name. You can change the order but don't
-			   change the specifiers or add anything. */
-			format_string = _("%d %b");
-	}
-
-	g_date_strftime (buffer, sizeof (buffer),
-			 format_string ? format_string : "%d", date);
-	date_width = gdk_string_width (font, buffer);
-	date_x = x + width - date_width - E_WEEK_VIEW_DATE_R_PAD;
-	date_x = MAX (date_x, x + 1);
-
-	if (selected)
-		date_gc = selected_fg_gc;
-	else
-		date_gc = fg_gc;
-	gdk_draw_string (drawable, font, date_gc,
-			 date_x, y + E_WEEK_VIEW_DATE_T_PAD + font->ascent,
-			 buffer);
-
-	/* Draw the line under the date. */
-	if (!week_view->multi_week_view) {
-		gdk_draw_line (drawable, fg_gc,
-			       x + E_WEEK_VIEW_DATE_LINE_L_PAD, line_y,
-			       right_edge, line_y);
-	}
-}
-
-
-
-
-/* This is supposed to return the nearest item the the point and the distance.
-   Since we are the only item we just return ourself and 0 for the distance.
-   This is needed so that we get button/motion events. */
-static double
-e_week_view_main_item_point (GnomeCanvasItem *item, double x, double y,
-			     int cx, int cy,
-			     GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
diff --git a/calendar/gui/e-week-view-main-item.h b/calendar/gui/e-week-view-main-item.h
deleted file mode 100644
index f75dcb0ec9..0000000000
--- a/calendar/gui/e-week-view-main-item.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_WEEK_VIEW_MAIN_ITEM_H_
-#define _E_WEEK_VIEW_MAIN_ITEM_H_
-
-#include "e-week-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EWeekViewMainItem - displays the background grid and dates for the Week and
- * Month calendar views.
- */
-
-#define E_WEEK_VIEW_MAIN_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_week_view_main_item_get_type (), EWeekViewMainItem))
-#define E_WEEK_VIEW_MAIN_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_week_view_main_item_get_type ()))
-#define E_IS_WEEK_VIEW_MAIN_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_week_view_main_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EWeekView widget. */
-	EWeekView *week_view;
-} EWeekViewMainItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EWeekViewMainItemClass;
-
-
-GtkType  e_week_view_main_item_get_type      (void);
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_WEEK_VIEW_MAIN_ITEM_H_ */
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
deleted file mode 100644
index 14f47e4bcf..0000000000
--- a/calendar/gui/e-week-view-titles-item.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EWeekViewTitlesItem - displays the 'Monday', 'Tuesday' etc. at the top of
- * the Month calendar view.
- */
-
-#include <config.h>
-#include "e-week-view-titles-item.h"
-
-static void e_week_view_titles_item_class_init	(EWeekViewTitlesItemClass *class);
-static void e_week_view_titles_item_init	(EWeekViewTitlesItem *wvtitem);
-
-static void e_week_view_titles_item_set_arg	(GtkObject	 *o,
-						 GtkArg		 *arg,
-						 guint		  arg_id);
-static void e_week_view_titles_item_update	(GnomeCanvasItem *item,
-						 double		 *affine,
-						 ArtSVP		 *clip_path,
-						 int		  flags);
-static void e_week_view_titles_item_draw	(GnomeCanvasItem *item,
-						 GdkDrawable	 *drawable,
-						 int		  x,
-						 int		  y,
-						 int		  width,
-						 int		  height);
-static double e_week_view_titles_item_point	(GnomeCanvasItem *item,
-						 double		  x,
-						 double		  y,
-						 int		  cx,
-						 int		  cy,
-						 GnomeCanvasItem **actual_item);
-
-
-static GnomeCanvasItemClass *parent_class;
-
-/* The arguments we take */
-enum {
-	ARG_0,
-	ARG_WEEK_VIEW
-};
-
-
-GtkType
-e_week_view_titles_item_get_type (void)
-{
-	static GtkType e_week_view_titles_item_type = 0;
-
-	if (!e_week_view_titles_item_type) {
-		GtkTypeInfo e_week_view_titles_item_info = {
-			"EWeekViewTitlesItem",
-			sizeof (EWeekViewTitlesItem),
-			sizeof (EWeekViewTitlesItemClass),
-			(GtkClassInitFunc) e_week_view_titles_item_class_init,
-			(GtkObjectInitFunc) e_week_view_titles_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		e_week_view_titles_item_type = gtk_type_unique (gnome_canvas_item_get_type (), &e_week_view_titles_item_info);
-	}
-
-	return e_week_view_titles_item_type;
-}
-
-
-static void
-e_week_view_titles_item_class_init (EWeekViewTitlesItemClass *class)
-{
-	GtkObjectClass  *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	parent_class = gtk_type_class (gnome_canvas_item_get_type());
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	gtk_object_add_arg_type ("EWeekViewTitlesItem::week_view",
-				 GTK_TYPE_POINTER, GTK_ARG_WRITABLE,
-				 ARG_WEEK_VIEW);
-
-	object_class->set_arg = e_week_view_titles_item_set_arg;
-
-	/* GnomeCanvasItem method overrides */
-	item_class->update      = e_week_view_titles_item_update;
-	item_class->draw        = e_week_view_titles_item_draw;
-	item_class->point       = e_week_view_titles_item_point;
-}
-
-
-static void
-e_week_view_titles_item_init (EWeekViewTitlesItem *wvtitem)
-{
-	wvtitem->week_view = NULL;
-}
-
-
-static void
-e_week_view_titles_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
-{
-	GnomeCanvasItem *item;
-	EWeekViewTitlesItem *wvtitem;
-
-	item = GNOME_CANVAS_ITEM (o);
-	wvtitem = E_WEEK_VIEW_TITLES_ITEM (o);
-	
-	switch (arg_id){
-	case ARG_WEEK_VIEW:
-		wvtitem->week_view = GTK_VALUE_POINTER (*arg);
-		break;
-	}
-}
-
-
-static void
-e_week_view_titles_item_update (GnomeCanvasItem *item,
-				double	    *affine,
-				ArtSVP	    *clip_path,
-				int		     flags)
-{
-	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->update)
-		(* GNOME_CANVAS_ITEM_CLASS (parent_class)->update) (item, affine, clip_path, flags);
-
-	/* The item covers the entire canvas area. */
-	item->x1 = 0;
-	item->y1 = 0;
-	item->x2 = INT_MAX;
-	item->y2 = INT_MAX;
-}
-
-
-/*
- * DRAWING ROUTINES - functions to paint the canvas item.
- */
-
-static void
-e_week_view_titles_item_draw (GnomeCanvasItem  *canvas_item,
-			      GdkDrawable      *drawable,
-			      int		x,
-			      int		y,
-			      int		width,
-			      int		height)
-{
-	EWeekViewTitlesItem *wvtitem;
-	EWeekView *week_view;
-	GtkStyle *style;
-	GdkGC *fg_gc, *bg_gc, *light_gc, *dark_gc;
-	GdkFont *font;
-	gint canvas_width, canvas_height, col_width, col, date_width, date_x;
-	gchar buffer[128], *date_format;
-	GDate date;
-	GdkRectangle clip_rect;
-	gboolean long_format;
-
-#if 0
-	g_print ("In e_week_view_titles_item_draw %i,%i %ix%i\n",
-		 x, y, width, height);
-#endif
-
-	wvtitem = E_WEEK_VIEW_TITLES_ITEM (canvas_item);
-	week_view = wvtitem->week_view;
-	g_return_if_fail (week_view != NULL);
-
-	style = GTK_WIDGET (week_view)->style;
-	font = style->font;
-	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
-	light_gc = style->light_gc[GTK_STATE_NORMAL];
-	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-	canvas_width = GTK_WIDGET (canvas_item->canvas)->allocation.width;
-	canvas_height = GTK_WIDGET (canvas_item->canvas)->allocation.height;
-
-	/* Draw the shadow around the dates. */
-	gdk_draw_line (drawable, light_gc,
-		       1 - x, 1 - y,
-		       canvas_width - 2 - x, 1 - y);
-	gdk_draw_line (drawable, light_gc,
-		       1 - x, 2 - y,
-		       1 - x, canvas_height - 1 - y);
-
-	gdk_draw_rectangle (drawable, dark_gc, FALSE,
-			    0 - x, 0 - y,
-			    canvas_width - 1, canvas_height);
-
-	/* Determine the format to use. */
-	col_width = canvas_width / week_view->columns;
-	if (col_width > week_view->max_day_width + 2) {
-	  date_format = "%A";
-	  long_format = TRUE;
-	} else {
-	  date_format = "%a";
-	  long_format = FALSE;
-	}
-
-	/* Shift right one pixel to account for the shadow around the main
-	   canvas. */
-	x--;
-
-	/* Draw the date. Set a clipping rectangle so we don't draw over the
-	   next day. */
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, 27, 3, 2000);	/* Must be a Monday. */
-	for (col = 0; col < week_view->columns; col++) {
-		if (col == 5 && week_view->compress_weekend) {
-			g_date_strftime (buffer, 128, "%a/", &date);
-			g_date_add_days (&date, 1);
-			g_date_strftime (buffer + strlen (buffer), 100,
-					 "%a", &date);
-		} else {
-			g_date_strftime (buffer, 128, date_format, &date);
-		}
-
-		clip_rect.x = week_view->col_offsets[col] - x;
-		clip_rect.y = 2 - y;
-		clip_rect.width = week_view->col_widths[col];
-		clip_rect.height = canvas_height - 2;
-		gdk_gc_set_clip_rectangle (fg_gc, &clip_rect);
-
-		if (col == 5 && week_view->compress_weekend)
-			date_width = week_view->abbr_day_widths[5]
-				+ week_view->slash_width
-				+ week_view->abbr_day_widths[6];
-		else if (long_format)
-			date_width = week_view->day_widths[col];
-		else
-			date_width = week_view->abbr_day_widths[col];
-
-		date_x = week_view->col_offsets[col]
-			+ (week_view->col_widths[col] - date_width) / 2;
-		date_x = MAX (date_x, week_view->col_offsets[col]);
-		gdk_draw_string (drawable, font, fg_gc,
-				 date_x - x, 3 + font->ascent - y, buffer);
-
-		gdk_gc_set_clip_rectangle (fg_gc, NULL);
-
-		/* Draw the lines down the left and right of the date cols. */
-		if (col != 0) {
-			gdk_draw_line (drawable, light_gc,
-				       week_view->col_offsets[col] - x,
-				       4 - y,
-				       week_view->col_offsets[col] - x,
-				       canvas_height - 4 - y);
-
-			gdk_draw_line (drawable, dark_gc,
-				       week_view->col_offsets[col] - 1 - x,
-				       4 - y,
-				       week_view->col_offsets[col] - 1 - x,
-				       canvas_height - 4 - y);
-		}
-
-		/* Draw the lines between each column. */
-		if (col != 0) {
-			gdk_draw_line (drawable, style->black_gc,
-				       week_view->col_offsets[col] - x,
-				       canvas_height - y,
-				       week_view->col_offsets[col] - x,
-				       canvas_height - y);
-		}
-
-		g_date_add_days (&date, 1);
-	}
-}
-
-
-/* This is supposed to return the nearest item the the point and the distance.
-   Since we are the only item we just return ourself and 0 for the distance.
-   This is needed so that we get button/motion events. */
-static double
-e_week_view_titles_item_point (GnomeCanvasItem *item, double x, double y,
-			       int cx, int cy,
-			       GnomeCanvasItem **actual_item)
-{
-	*actual_item = item;
-	return 0.0;
-}
-
-
diff --git a/calendar/gui/e-week-view-titles-item.h b/calendar/gui/e-week-view-titles-item.h
deleted file mode 100644
index 7ce1ccd386..0000000000
--- a/calendar/gui/e-week-view-titles-item.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_WEEK_VIEW_TITLES_ITEM_H_
-#define _E_WEEK_VIEW_TITLES_ITEM_H_
-
-#include "e-week-view.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EWeekViewTitlesItem - displays the 'Monday', 'Tuesday' etc. at the top of
- * the Month calendar view.
- */
-
-#define E_WEEK_VIEW_TITLES_ITEM(obj)     (GTK_CHECK_CAST((obj), \
-        e_week_view_titles_item_get_type (), EWeekViewTitlesItem))
-#define E_WEEK_VIEW_TITLES_ITEM_CLASS(k) (GTK_CHECK_CLASS_CAST ((k),\
-	e_week_view_titles_item_get_type ()))
-#define E_IS_WEEK_VIEW_TITLES_ITEM(o)    (GTK_CHECK_TYPE((o), \
-	e_week_view_titles_item_get_type ()))
-
-typedef struct {
-	GnomeCanvasItem canvas_item;
-
-	/* The parent EWeekView widget. */
-	EWeekView *week_view;
-} EWeekViewTitlesItem;
-
-typedef struct {
-	GnomeCanvasItemClass parent_class;
-
-} EWeekViewTitlesItemClass;
-
-
-GtkType  e_week_view_titles_item_get_type      (void);
-
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_WEEK_VIEW_TITLES_ITEM_H_ */
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
deleted file mode 100644
index ab38f92c1a..0000000000
--- a/calendar/gui/e-week-view.c
+++ /dev/null
@@ -1,3185 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-/*
- * EWeekView - displays the Week & Month views of the calendar.
- */
-
-#include <config.h>
-#include <math.h>
-#include <gnome.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include "calendar-commands.h"
-#include "e-week-view.h"
-#include "e-week-view-event-item.h"
-#include "e-week-view-main-item.h"
-#include "e-week-view-titles-item.h"
-#include <cal-util/timeutil.h>
-#include "popup-menu.h"
-#include <gal/widgets/e-canvas.h>
-#include <gal/e-text/e-text.h>
-#include <gal/widgets/e-canvas-utils.h>
-
-/* Images */
-#include "bell.xpm"
-#include "recur.xpm"
-
-#include "jump.xpm"
-
-#define E_WEEK_VIEW_SMALL_FONT	\
-	"-adobe-utopia-regular-r-normal-*-*-100-*-*-p-*-iso8859-*"
-#define E_WEEK_VIEW_SMALL_FONT_FALLBACK	\
-	"-adobe-helvetica-medium-r-normal-*-*-80-*-*-p-*-iso8859-*"
-
-/* We use a 7-bit field to store row numbers in EWeekViewEventSpan, so the
-   maximum number or rows we can allow is 127. It is very unlikely to be
-   reached anyway. */
-#define E_WEEK_VIEW_MAX_ROWS_PER_CELL	127
-
-#define E_WEEK_VIEW_JUMP_BUTTON_WIDTH	16
-#define E_WEEK_VIEW_JUMP_BUTTON_HEIGHT	8
-
-#define E_WEEK_VIEW_JUMP_BUTTON_X_PAD	3
-#define E_WEEK_VIEW_JUMP_BUTTON_Y_PAD	3
-
-static void e_week_view_class_init (EWeekViewClass *class);
-static void e_week_view_init (EWeekView *week_view);
-static void e_week_view_destroy (GtkObject *object);
-static void e_week_view_realize (GtkWidget *widget);
-static void e_week_view_unrealize (GtkWidget *widget);
-static void e_week_view_style_set (GtkWidget *widget,
-				   GtkStyle  *previous_style);
-static void e_week_view_size_allocate (GtkWidget *widget,
-				       GtkAllocation *allocation);
-static void e_week_view_recalc_cell_sizes (EWeekView *week_view);
-static gint e_week_view_focus_in (GtkWidget *widget,
-				  GdkEventFocus *event);
-static gint e_week_view_focus_out (GtkWidget *widget,
-				   GdkEventFocus *event);
-static gint e_week_view_expose_event (GtkWidget *widget,
-				      GdkEventExpose *event);
-static void e_week_view_draw (GtkWidget    *widget,
-			      GdkRectangle *area);
-static void e_week_view_draw_shadow (EWeekView *week_view);
-
-static gboolean e_week_view_on_button_press (GtkWidget *widget,
-					     GdkEventButton *event,
-					     EWeekView *week_view);
-static gboolean e_week_view_on_button_release (GtkWidget *widget,
-					       GdkEventButton *event,
-					       EWeekView *week_view);
-static gboolean e_week_view_on_motion (GtkWidget *widget,
-				       GdkEventMotion *event,
-				       EWeekView *week_view);
-static gint e_week_view_convert_position_to_day (EWeekView *week_view,
-						 gint x,
-						 gint y);
-static void e_week_view_update_selection (EWeekView *week_view,
-					  gint day);
-
-static void e_week_view_queue_reload_events (EWeekView *week_view);
-static gboolean e_week_view_reload_events_idle_cb	(gpointer data);
-static void e_week_view_reload_events (EWeekView *week_view);
-static void e_week_view_free_events (EWeekView *week_view);
-static gboolean e_week_view_add_event (CalComponent *comp,
-				       time_t	  start,
-				       time_t	  end,
-				       gpointer	  data);
-static void e_week_view_check_layout (EWeekView *week_view);
-static void e_week_view_layout_events (EWeekView *week_view);
-static void e_week_view_layout_event (EWeekView	   *week_view,
-				      EWeekViewEvent   *event,
-				      guint8	   *grid,
-				      GArray	   *spans);
-static void e_week_view_ensure_events_sorted (EWeekView *week_view);
-static gint e_week_view_event_sort_func (const void *arg1,
-					 const void *arg2);
-static void e_week_view_reshape_events (EWeekView *week_view);
-static void e_week_view_reshape_event_span (EWeekView *week_view,
-					    gint event_num,
-					    gint span_num);
-static gint e_week_view_find_day (EWeekView *week_view,
-				  time_t time_to_find,
-				  gboolean include_midnight_in_prev_day);
-static gint e_week_view_find_span_end (EWeekView *week_view,
-				       gint day);
-static void e_week_view_recalc_day_starts (EWeekView *week_view,
-					   time_t lower);
-static void e_week_view_on_adjustment_changed (GtkAdjustment *adjustment,
-					       EWeekView *week_view);
-static void e_week_view_on_editing_started (EWeekView *week_view,
-					    GnomeCanvasItem *item);
-static void e_week_view_on_editing_stopped (EWeekView *week_view,
-					    GnomeCanvasItem *item);
-static gboolean e_week_view_find_event_from_item (EWeekView	  *week_view,
-						  GnomeCanvasItem *item,
-						  gint		  *event_num,
-						  gint		  *span_num);
-static gboolean e_week_view_find_event_from_uid (EWeekView	  *week_view,
-						 const gchar	  *uid,
-						 gint		  *event_num_return);
-typedef gboolean (* EWeekViewForeachEventCallback) (EWeekView *week_view,
-						    gint event_num,
-						    gpointer data);
-
-static void e_week_view_foreach_event_with_uid (EWeekView *week_view,
-						const gchar *uid,
-						EWeekViewForeachEventCallback callback,
-						gpointer data);
-static gboolean e_week_view_on_text_item_event (GnomeCanvasItem *item,
-						GdkEvent *event,
-						EWeekView *week_view);
-static gboolean e_week_view_on_jump_button_event (GnomeCanvasItem *item,
-						  GdkEvent *event,
-						  EWeekView *week_view);
-static gint e_week_view_key_press (GtkWidget *widget, GdkEventKey *event);
-static void e_week_view_on_new_appointment (GtkWidget *widget,
-					    gpointer data);
-static void e_week_view_on_edit_appointment (GtkWidget *widget,
-					     gpointer data);
-static void e_week_view_on_delete_occurrence (GtkWidget *widget,
-					      gpointer data);
-static void e_week_view_on_delete_appointment (GtkWidget *widget,
-					       gpointer data);
-static void e_week_view_on_unrecur_appointment (GtkWidget *widget,
-						gpointer data);
-
-#ifndef NO_WARNINGS
-static gboolean e_week_view_update_event_cb (EWeekView *week_view,
-					     gint event_num,
-					     gpointer data);
-#endif
-static gboolean e_week_view_remove_event_cb (EWeekView *week_view,
-					     gint event_num,
-					     gpointer data);
-
-static GtkTableClass *parent_class;
-
-
-GtkType
-e_week_view_get_type (void)
-{
-	static GtkType e_week_view_type = 0;
-
-	if (!e_week_view_type){
-		GtkTypeInfo e_week_view_info = {
-			"EWeekView",
-			sizeof (EWeekView),
-			sizeof (EWeekViewClass),
-			(GtkClassInitFunc) e_week_view_class_init,
-			(GtkObjectInitFunc) e_week_view_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		parent_class = gtk_type_class (GTK_TYPE_TABLE);
-		e_week_view_type = gtk_type_unique (GTK_TYPE_TABLE,
-						    &e_week_view_info);
-	}
-
-	return e_week_view_type;
-}
-
-
-static void
-e_week_view_class_init (EWeekViewClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-
-	/* Method override */
-	object_class->destroy		= e_week_view_destroy;
-
-	widget_class->realize		= e_week_view_realize;
-	widget_class->unrealize		= e_week_view_unrealize;
-	widget_class->style_set		= e_week_view_style_set;
- 	widget_class->size_allocate	= e_week_view_size_allocate;
-	widget_class->focus_in_event	= e_week_view_focus_in;
-	widget_class->focus_out_event	= e_week_view_focus_out;
-	widget_class->key_press_event	= e_week_view_key_press;
-	widget_class->expose_event	= e_week_view_expose_event;
-	widget_class->draw		= e_week_view_draw;
-}
-
-
-static void
-e_week_view_init (EWeekView *week_view)
-{
-	GnomeCanvasGroup *canvas_group;
-	GtkObject *adjustment;
-	GdkPixbuf *pixbuf;
-	gint i;
-
-	GTK_WIDGET_SET_FLAGS (week_view, GTK_CAN_FOCUS);
-
-	week_view->calendar = NULL;
-	week_view->client = NULL;
-
-	week_view->events = g_array_new (FALSE, FALSE,
-					 sizeof (EWeekViewEvent));
-	week_view->events_sorted = TRUE;
-	week_view->events_need_layout = FALSE;
-	week_view->events_need_reshape = FALSE;
-	week_view->reload_events_idle_id = 0;
-
-	week_view->spans = NULL;
-
-	week_view->multi_week_view = FALSE;
-	week_view->weeks_shown = 6;
-	week_view->rows = 6;
-	week_view->columns = 2;
-	week_view->compress_weekend = TRUE;
-
-	g_date_clear (&week_view->base_date, 1);
-	g_date_clear (&week_view->first_day_shown, 1);
-
-	week_view->row_height = 10;
-	week_view->rows_per_cell = 1;
-
-	week_view->selection_start_day = -1;
-	week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_NONE;
-
-	week_view->pressed_event_num = -1;
-	week_view->editing_event_num = -1;
-
-	week_view->main_gc = NULL;
-
-	/* Create the small font. */
-	week_view->use_small_font = TRUE;
-	week_view->small_font = gdk_font_load (E_WEEK_VIEW_SMALL_FONT);
-	if (!week_view->small_font)
-		week_view->small_font = gdk_font_load (E_WEEK_VIEW_SMALL_FONT_FALLBACK);
-	if (!week_view->small_font)
-		g_warning ("Couldn't load font");
-
-
-	/*
-	 * Titles Canvas. Note that we don't show it is only shown in the
-	 * Month view.
-	 */
-	week_view->titles_canvas = e_canvas_new ();
-	gtk_table_attach (GTK_TABLE (week_view), week_view->titles_canvas,
-			  1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view->titles_canvas)->root);
-
-	week_view->titles_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_week_view_titles_item_get_type (),
-				       "EWeekViewTitlesItem::week_view", week_view,
-				       NULL);
-
-	/*
-	 * Main Canvas
-	 */
-	week_view->main_canvas = e_canvas_new ();
-	gtk_table_attach (GTK_TABLE (week_view), week_view->main_canvas,
-			  1, 2, 1, 2,
-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 1, 1);
-	gtk_widget_show (week_view->main_canvas);
-
-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view->main_canvas)->root);
-
-	week_view->main_canvas_item =
-		gnome_canvas_item_new (canvas_group,
-				       e_week_view_main_item_get_type (),
-				       "EWeekViewMainItem::week_view", week_view,
-				       NULL);
-
-	gtk_signal_connect_after (GTK_OBJECT (week_view->main_canvas),
-				  "button_press_event",
-				  GTK_SIGNAL_FUNC (e_week_view_on_button_press),
-				  week_view);
-	gtk_signal_connect_after (GTK_OBJECT (week_view->main_canvas),
-				  "button_release_event",
-				  GTK_SIGNAL_FUNC (e_week_view_on_button_release),
-				  week_view);
-	gtk_signal_connect_after (GTK_OBJECT (week_view->main_canvas),
-				  "motion_notify_event",
-				  GTK_SIGNAL_FUNC (e_week_view_on_motion),
-				  week_view);
-
-	/* Create the buttons to jump to each days. */
-	pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**) jump_xpm);
-
-	for (i = 0; i < E_WEEK_VIEW_MAX_WEEKS * 7; i++) {
-		week_view->jump_buttons[i] = gnome_canvas_item_new
-			(canvas_group,
-			 gnome_canvas_pixbuf_get_type (),
-			 "GnomeCanvasPixbuf::pixbuf", pixbuf,
-			 NULL);
-
-		gtk_signal_connect (GTK_OBJECT (week_view->jump_buttons[i]),
-				    "event",
-				    GTK_SIGNAL_FUNC (e_week_view_on_jump_button_event),
-				    week_view);
-	}
-
-
-	/*
-	 * Scrollbar.
-	 */
-	adjustment = gtk_adjustment_new (0, -52, 52, 1, 1, 1);
-	gtk_signal_connect (adjustment, "value_changed",
-			    GTK_SIGNAL_FUNC (e_week_view_on_adjustment_changed),
-			    week_view);
-
-	week_view->vscrollbar = gtk_vscrollbar_new (GTK_ADJUSTMENT (adjustment));
-	gtk_table_attach (GTK_TABLE (week_view), week_view->vscrollbar,
-			  2, 3, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0);
-	gtk_widget_show (week_view->vscrollbar);
-
-
-	/* Create the cursors. */
-	week_view->normal_cursor = gdk_cursor_new (GDK_TOP_LEFT_ARROW);
-	week_view->move_cursor = gdk_cursor_new (GDK_FLEUR);
-	week_view->resize_width_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
-	week_view->last_cursor_set = NULL;
-}
-
-
-/**
- * e_week_view_new:
- * @Returns: a new #EWeekView.
- *
- * Creates a new #EWeekView.
- **/
-GtkWidget *
-e_week_view_new (void)
-{
-	GtkWidget *week_view;
-
-	week_view = GTK_WIDGET (gtk_type_new (e_week_view_get_type ()));
-
-	return week_view;
-}
-
-
-static void
-e_week_view_destroy (GtkObject *object)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (object);
-
-	e_week_view_free_events (week_view);
-
-	if (week_view->reload_events_idle_id != 0) {
-		g_source_remove (week_view->reload_events_idle_id);
-		week_view->reload_events_idle_id = 0;
-	}
-
-	if (week_view->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (week_view->client), week_view);
-		gtk_object_unref (GTK_OBJECT (week_view->client));
-		week_view->client = NULL;
-	}
-
-	if (week_view->small_font)
-		gdk_font_unref (week_view->small_font);
-
-	gdk_cursor_destroy (week_view->normal_cursor);
-	gdk_cursor_destroy (week_view->move_cursor);
-	gdk_cursor_destroy (week_view->resize_width_cursor);
-
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-
-static void
-e_week_view_realize (GtkWidget *widget)
-{
-	EWeekView *week_view;
-	GdkColormap *colormap;
-	gboolean success[E_WEEK_VIEW_COLOR_LAST];
-	gint nfailed;
-
-	if (GTK_WIDGET_CLASS (parent_class)->realize)
-		(*GTK_WIDGET_CLASS (parent_class)->realize)(widget);
-
-	week_view = E_WEEK_VIEW (widget);
-	week_view->main_gc = gdk_gc_new (widget->window);
-
-	colormap = gtk_widget_get_colormap (widget);
-
-	/* Allocate the colors. */
-	week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].red   = 0xeded;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].green = 0xeded;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].blue  = 0xeded;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS].red   = 65535;
-	week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS].green = 65535;
-	week_view->colors[E_WEEK_VIEW_COLOR_ODD_MONTHS].blue  = 65535;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].red   = 0xd6d6;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].green = 0xd6d6;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].blue  = 0xd6d6;
-
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER].red   = 0;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER].green = 0;
-	week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER].blue  = 0;
-
-	nfailed = gdk_colormap_alloc_colors (colormap, week_view->colors,
-					     E_WEEK_VIEW_COLOR_LAST, FALSE,
-					     TRUE, success);
-	if (nfailed)
-		g_warning ("Failed to allocate all colors");
-
-
-	/* Create the pixmaps. */
-	week_view->reminder_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &week_view->reminder_mask, NULL, bell_xpm);
-	week_view->recurrence_icon = gdk_pixmap_colormap_create_from_xpm_d (NULL, colormap, &week_view->recurrence_mask, NULL, recur_xpm);
-}
-
-
-static void
-e_week_view_unrealize (GtkWidget *widget)
-{
-	EWeekView *week_view;
-	GdkColormap *colormap;
-	gint i;
-
-	week_view = E_WEEK_VIEW (widget);
-
-	gdk_gc_unref (week_view->main_gc);
-	week_view->main_gc = NULL;
-
-	colormap = gtk_widget_get_colormap (widget);
-	for (i = 0; i < E_WEEK_VIEW_COLOR_LAST; i++)
-		gdk_colors_free (colormap, &week_view->colors[i].pixel, 1, 0);
-
-	gdk_pixmap_unref (week_view->reminder_icon);
-	week_view->reminder_icon = NULL;
-	gdk_pixmap_unref (week_view->recurrence_icon);
-	week_view->recurrence_icon = NULL;
-
-	if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-		(*GTK_WIDGET_CLASS (parent_class)->unrealize)(widget);
-}
-
-
-static void
-e_week_view_style_set (GtkWidget *widget,
-		      GtkStyle  *previous_style)
-{
-	EWeekView *week_view;
-	GdkFont *font;
-	gint day, day_width, max_day_width, max_abbr_day_width;
-	gint month, month_width, max_month_width, max_abbr_month_width;
-	GDate date;
-	gchar buffer[128];
-
-	if (GTK_WIDGET_CLASS (parent_class)->style_set)
-		(*GTK_WIDGET_CLASS (parent_class)->style_set)(widget, previous_style);
-
-	week_view = E_WEEK_VIEW (widget);
-	font = widget->style->font;
-
-	/* Recalculate the height of each row based on the font size. */
-	week_view->row_height = font->ascent + font->descent + E_WEEK_VIEW_EVENT_BORDER_HEIGHT * 2 + E_WEEK_VIEW_EVENT_TEXT_Y_PAD * 2;
-	week_view->row_height = MAX (week_view->row_height, E_WEEK_VIEW_ICON_HEIGHT + E_WEEK_VIEW_ICON_Y_PAD + E_WEEK_VIEW_EVENT_BORDER_HEIGHT * 2);
-
-	/* Set the height of the top canvas. */
-	gtk_widget_set_usize (week_view->titles_canvas, -1,
-			      font->ascent + font->descent + 5);
-
-	/* Save the sizes of various strings in the font, so we can quickly
-	   decide which date formats to use. */
-	g_date_clear (&date, 1);
-	g_date_set_dmy (&date, 27, 3, 2000);	/* Must be a Monday. */
-
-	max_day_width = 0;
-	max_abbr_day_width = 0;
-	for (day = 0; day < 7; day++) {
-		g_date_strftime (buffer, 128, "%A", &date);
-		day_width = gdk_string_width (font, buffer);
-		week_view->day_widths[day] = day_width;
-		max_day_width = MAX (max_day_width, day_width);
-
-		g_date_strftime (buffer, 128, "%a", &date);
-		day_width = gdk_string_width (font, buffer);
-		week_view->abbr_day_widths[day] = day_width;
-		max_abbr_day_width = MAX (max_abbr_day_width, day_width);
-
-		g_date_add_days (&date, 1);
-	}
-
-	max_month_width = 0;
-	max_abbr_month_width = 0;
-	for (month = 0; month < 12; month++) {
-		g_date_set_month (&date, month + 1);
-
-		g_date_strftime (buffer, 128, "%B", &date);
-		month_width = gdk_string_width (font, buffer);
-		week_view->month_widths[month] = month_width;
-		max_month_width = MAX (max_month_width, month_width);
-
-		g_date_strftime (buffer, 128, "%b", &date);
-		month_width = gdk_string_width (font, buffer);
-		week_view->abbr_month_widths[month] = month_width;
-		max_abbr_month_width = MAX (max_abbr_month_width, month_width);
-	}
-
-	week_view->space_width = gdk_string_width (font, " ");
-	week_view->colon_width = gdk_string_width (font, ":");
-	week_view->slash_width = gdk_string_width (font, "/");
-	week_view->digit_width = gdk_string_width (font, "5");
-	if (week_view->small_font)
-		week_view->small_digit_width = gdk_string_width (week_view->small_font, "5");
-	week_view->max_day_width = max_day_width;
-	week_view->max_abbr_day_width = max_abbr_day_width;
-	week_view->max_month_width = max_month_width;
-	week_view->max_abbr_month_width = max_abbr_month_width;
-}
-
-
-/* This recalculates the sizes of each column. */
-static void
-e_week_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
-{
-	EWeekView *week_view;
-	gdouble old_x2, old_y2, new_x2, new_y2;
-
-	week_view = E_WEEK_VIEW (widget);
-
-	(*GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
-
-	e_week_view_recalc_cell_sizes (week_view);
-
-	/* Set the scroll region of the top canvas to its allocated size. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (week_view->titles_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = week_view->titles_canvas->allocation.width - 1;
-	new_y2 = week_view->titles_canvas->allocation.height - 1;
-	if (old_x2 != new_x2 || old_y2 != new_y2)
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (week_view->titles_canvas),
-						0, 0, new_x2, new_y2);
-
-
-	/* Set the scroll region of the main canvas to its allocated width,
-	   but with the height depending on the number of rows needed. */
-	gnome_canvas_get_scroll_region (GNOME_CANVAS (week_view->main_canvas),
-					NULL, NULL, &old_x2, &old_y2);
-	new_x2 = week_view->main_canvas->allocation.width - 1;
-	new_y2 = week_view->main_canvas->allocation.height - 1;
-	if (old_x2 != new_x2 || old_y2 != new_y2)
-		gnome_canvas_set_scroll_region (GNOME_CANVAS (week_view->main_canvas),
-						0, 0, new_x2, new_y2);
-
-	/* Flag that we need to reshape the events. */
-	if (old_x2 != new_x2 || old_y2 != new_y2) {
-		week_view->events_need_reshape = TRUE;
-		e_week_view_check_layout (week_view);
-	}
-}
-
-
-static void
-e_week_view_recalc_cell_sizes (EWeekView *week_view)
-{
-	gfloat canvas_width, canvas_height, offset;
-	gint row, col;
-	GtkWidget *widget;
-	GdkFont *font;
-	gint width, height, time_width;
-
-	if (week_view->multi_week_view) {
-		week_view->rows = week_view->weeks_shown * 2;
-		week_view->columns = week_view->compress_weekend ? 6 : 7;
-	} else {
-		week_view->rows = 6;
-		week_view->columns = 2;
-	}
-
-	/* Calculate the column sizes, using floating point so that pixels
-	   get divided evenly. Note that we use one more element than the
-	   number of columns, to make it easy to get the column widths.
-	   We also add one to the width so that the right border of the last
-	   column is off the edge of the displayed area. */
-	canvas_width = week_view->main_canvas->allocation.width + 1;
-	canvas_width /= week_view->columns;
-	offset = 0;
-	for (col = 0; col <= week_view->columns; col++) {
-		week_view->col_offsets[col] = floor (offset + 0.5);
-		offset += canvas_width;
-	}
-
-	/* Calculate the cell widths based on the offsets. */
-	for (col = 0; col < week_view->columns; col++) {
-		week_view->col_widths[col] = week_view->col_offsets[col + 1]
-			- week_view->col_offsets[col];
-	}
-
-	/* Now do the same for the row heights. */
-	canvas_height = week_view->main_canvas->allocation.height + 1;
-	canvas_height /= week_view->rows;
-	offset = 0;
-	for (row = 0; row <= week_view->rows; row++) {
-		week_view->row_offsets[row] = floor (offset + 0.5);
-		offset += canvas_height;
-	}
-
-	/* Calculate the cell heights based on the offsets. */
-	for (row = 0; row < week_view->rows; row++) {
-		week_view->row_heights[row] = week_view->row_offsets[row + 1]
-			- week_view->row_offsets[row];
-	}
-
-
-	/* If the font hasn't been set yet just return. */
-	widget = GTK_WIDGET (week_view);
-	if (!widget->style || ! widget->style->font)
-		return;
-
-	font = widget->style->font;
-
-	/* Calculate the number of rows of events in each cell, for the large
-	   cells and the compressed weekend cells. */
-	if (week_view->multi_week_view) {
-		week_view->events_y_offset = E_WEEK_VIEW_DATE_T_PAD
-			+ font->ascent + font->descent
-			+ E_WEEK_VIEW_DATE_B_PAD;
-	} else {
-		week_view->events_y_offset = E_WEEK_VIEW_DATE_T_PAD
-			+ font->ascent + font->descent
-			+ E_WEEK_VIEW_DATE_LINE_T_PAD + 1
-			+ E_WEEK_VIEW_DATE_LINE_B_PAD;
-	}
-
-	height = week_view->row_heights[0];
-	week_view->rows_per_cell = (height * 2 - week_view->events_y_offset)
-		/ (week_view->row_height + E_WEEK_VIEW_EVENT_Y_SPACING);
-	week_view->rows_per_cell = MIN (week_view->rows_per_cell,
-					E_WEEK_VIEW_MAX_ROWS_PER_CELL);
-
-	week_view->rows_per_compressed_cell =
-		(height - week_view->events_y_offset)
-		/ (week_view->row_height + E_WEEK_VIEW_EVENT_Y_SPACING);
-	week_view->rows_per_compressed_cell = MIN (week_view->rows_per_compressed_cell,
-						   E_WEEK_VIEW_MAX_ROWS_PER_CELL);
-
-	/* Determine which time format to use, based on the width of the cells.
-	   We only allow the time to take up about half of the width. */
-	width = week_view->col_widths[0];
-
-	week_view->time_format = E_WEEK_VIEW_TIME_NONE;
-	if (week_view->use_small_font && week_view->small_font) {
-		time_width = week_view->digit_width * 2
-			+ week_view->small_digit_width * 2;
-		if (width / 2 > time_width * 2 + week_view->space_width)
-			week_view->time_format = E_WEEK_VIEW_TIME_BOTH_SMALL_MIN;
-		else if (width / 2 > time_width)
-			week_view->time_format = E_WEEK_VIEW_TIME_START_SMALL_MIN;
-	} else {
-		time_width = week_view->digit_width * 4
-			+ week_view->colon_width;
-		if (width / 2 > time_width * 2 + week_view->space_width)
-			week_view->time_format = E_WEEK_VIEW_TIME_BOTH;
-		else if (width / 2 > time_width)
-			week_view->time_format = E_WEEK_VIEW_TIME_START;
-	}
-}
-
-
-static gint
-e_week_view_focus_in (GtkWidget *widget, GdkEventFocus *event)
-{
-	EWeekView *week_view;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	week_view = E_WEEK_VIEW (widget);
-
-	GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-
-	return FALSE;
-}
-
-
-static gint
-e_week_view_focus_out (GtkWidget *widget, GdkEventFocus *event)
-{
-	EWeekView *week_view;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	week_view = E_WEEK_VIEW (widget);
-
-	GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-
-	return FALSE;
-}
-
-
-/* This draws a shadow around the top display and main display. */
-static gint
-e_week_view_expose_event (GtkWidget *widget,
-			  GdkEventExpose *event)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (widget);
-
-	e_week_view_draw_shadow (week_view);
-
-	if (GTK_WIDGET_CLASS (parent_class)->expose_event)
-		(*GTK_WIDGET_CLASS (parent_class)->expose_event)(widget, event);
-
-	return FALSE;
-}
-
-
-static void
-e_week_view_draw (GtkWidget    *widget,
-		  GdkRectangle *area)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (widget);
-
-	e_week_view_draw_shadow (week_view);
-
-	if (GTK_WIDGET_CLASS (parent_class)->draw)
-		(*GTK_WIDGET_CLASS (parent_class)->draw)(widget, area);
-}
-
-
-static void
-e_week_view_draw_shadow (EWeekView *week_view)
-{
-	gint x1, y1, x2, y2;
-	GtkStyle *style;
-	GdkGC *light_gc, *dark_gc;
-	GdkWindow *window;
-
-	/* Draw the shadow around the graphical displays. */
-	x1 = week_view->main_canvas->allocation.x - 1;
-	y1 = week_view->main_canvas->allocation.y - 1;
-	x2 = x1 + week_view->main_canvas->allocation.width + 2;
-	y2 = y1 + week_view->main_canvas->allocation.height + 2;
-
-	style = GTK_WIDGET (week_view)->style;
-	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
-	light_gc = style->light_gc[GTK_STATE_NORMAL];
-
-	window = GTK_WIDGET (week_view)->window;
-	gdk_draw_line (window, dark_gc, x1, y1, x1, y2);
-	gdk_draw_line (window, dark_gc, x1, y1, x2, y1);
-	gdk_draw_line (window, light_gc, x2, y1, x2, y2);
-	gdk_draw_line (window, light_gc, x1, y2, x2, y2);
-}
-
-
-void
-e_week_view_set_calendar	(EWeekView	*week_view,
-				 GnomeCalendar	*calendar)
-{
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	week_view->calendar = calendar;
-
-	/* FIXME: free current events? */
-}
-
-
-/* Callback used when the calendar client finishes loading */
-static void
-cal_loaded_cb (CalClient *client, CalClientLoadStatus status, gpointer data)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (data);
-
-	if (status != CAL_CLIENT_LOAD_SUCCESS)
-		return;
-
-	e_week_view_queue_reload_events (week_view);
-}
-
-/* Callback used when the calendar client tells us that an object changed */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	gint event_num, num_days;
-	CalComponent *comp;
-	CalClientGetStatus status;
-
-	week_view = E_WEEK_VIEW (data);
-
-	/* If we don't have a valid date set yet, just return. */
-	if (!g_date_valid (&week_view->first_day_shown))
-		return;
-
-	/* Get the event from the server. */
-	status = cal_client_get_object (week_view->client, uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Everything is fine */
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);
-		return;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* The object is no longer in the server, so do nothing */
-		return;
-	}
-
-	/* We only care about events. */
-	if (cal_component_get_vtype (comp) != CAL_COMPONENT_EVENT) {
-		gtk_object_unref (GTK_OBJECT (comp));
-		return;
-	}
-
-	/* If the event already exists and the dates didn't change, we can
-	   update the event fairly easily without changing the events arrays
-	   or computing a new layout. */
-	if (e_week_view_find_event_from_uid (week_view, uid, &event_num)) {
-#ifndef NO_WARNINGS
-#warning "FIXME"
-#endif
-
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-
-		/* Do this the long way every time for now */
-#if 0
-		if (ical_object_compare_dates (event->ico, ico)) {
-			e_week_view_foreach_event_with_uid (week_view, uid, e_week_view_update_event_cb, comp);
-			gtk_object_unref (GTK_OBJECT (comp));
-			gtk_widget_queue_draw (week_view->main_canvas);
-			return;
-		}
-#endif
-		/* The dates have changed, so we need to remove the
-		   old occurrrences before adding the new ones. */
-		e_week_view_foreach_event_with_uid (week_view, uid,
-						    e_week_view_remove_event_cb,
-						    NULL);
-	}
-
-	/* Add the occurrences of the event. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-
-	cal_recur_generate_instances (comp,
-				      week_view->day_starts[0],
-				      week_view->day_starts[num_days],
-				      e_week_view_add_event,
-				      week_view);
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	e_week_view_check_layout (week_view);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-/* Callback used when the calendar client tells us that an object was removed */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	EWeekView *week_view;
-
-	week_view = E_WEEK_VIEW (data);
-
-	e_week_view_foreach_event_with_uid (week_view, uid,
-					    e_week_view_remove_event_cb, NULL);
-
-	e_week_view_check_layout (week_view);
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-/**
- * e_week_view_set_cal_client:
- * @week_view: A week view.
- * @client: A calendar client interface object.
- *
- * Sets the calendar client interface object that a week view will monitor.
- **/
-void
-e_week_view_set_cal_client	(EWeekView	*week_view,
-				 CalClient	*client)
-{
-	g_return_if_fail (week_view != NULL);
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (client == week_view->client)
-		return;
-
-	if (client)
-		g_return_if_fail (IS_CAL_CLIENT (client));
-
-	if (client)
-		gtk_object_ref (GTK_OBJECT (client));
-
-	if (week_view->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (week_view->client), week_view);
-		gtk_object_unref (GTK_OBJECT (week_view->client));
-	}
-
-	week_view->client = client;
-
-	if (week_view->client) {
-		gtk_signal_connect (GTK_OBJECT (week_view->client), "cal_loaded",
-				    GTK_SIGNAL_FUNC (cal_loaded_cb), week_view);
-		gtk_signal_connect (GTK_OBJECT (week_view->client), "obj_updated",
-				    GTK_SIGNAL_FUNC (obj_updated_cb), week_view);
-		gtk_signal_connect (GTK_OBJECT (week_view->client), "obj_removed",
-				    GTK_SIGNAL_FUNC (obj_removed_cb), week_view);
-	}
-
-	e_week_view_queue_reload_events (week_view);
-}
-
-
-/* This sets the selected time range. The EWeekView will show the corresponding
-   month and the days between start_time and end_time will be selected.
-   To select a single day, use the same value for start_time & end_time. */
-void
-e_week_view_set_selected_time_range	(EWeekView	*week_view,
-					 time_t		 start_time,
-					 time_t		 end_time)
-{
-	GDate date, base_date, end_date;
-	gint day_offset, num_days;
-	gboolean update_adjustment_value = FALSE;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	g_date_clear (&date, 1);
-	g_date_set_time (&date, start_time);
-
-	if (week_view->multi_week_view) {
-		/* Find the number of days since the start of the month. */
-		day_offset = g_date_day (&date) - 1;
-
-		/* Find the 1st Monday at or before the start of the month. */
-		base_date = date;
-		g_date_set_day (&base_date, 1);
-		day_offset += g_date_weekday (&base_date) - 1;
-	} else {
-		/* Find the 1st Monday at or before the given day. */
-		day_offset = g_date_weekday (&date) - 1;
-	}
-
-	/* Calculate the base date, i.e. the first day shown when the
-	   scrollbar adjustment value is 0. */
-	base_date = date;
-	g_date_subtract_days (&base_date, day_offset);
-
-	/* See if we need to update the base date. */
-	if (!g_date_valid (&week_view->base_date)
-	    || g_date_compare (&week_view->base_date, &base_date)) {
-		week_view->base_date = base_date;
-		update_adjustment_value = TRUE;
-	}
-
-	/* See if we need to update the first day shown. */
-	if (!g_date_valid (&week_view->first_day_shown)
-	    || g_date_compare (&week_view->first_day_shown, &base_date)) {
-		week_view->first_day_shown = base_date;
-		start_time = time_add_day (start_time, -day_offset);
-		start_time = time_day_begin (start_time);
-		e_week_view_recalc_day_starts (week_view, start_time);
-		e_week_view_queue_reload_events (week_view);
-	}
-
-	/* Set the selection to the given days. */
-	week_view->selection_start_day = g_date_julian (&date)
-		- g_date_julian (&base_date);
-	if (end_time == start_time
-	    || end_time <= time_add_day (start_time, 1))
-		week_view->selection_end_day = week_view->selection_start_day;
-	else {
-		g_date_clear (&end_date, 1);
-		g_date_set_time (&end_date, end_time - 60);
-		week_view->selection_end_day = g_date_julian (&end_date)
-			- g_date_julian (&base_date);
-	}
-
-	/* Make sure the selection is valid. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	num_days--;
-	week_view->selection_start_day = CLAMP (week_view->selection_start_day,
-						0, num_days);
-	week_view->selection_end_day = CLAMP (week_view->selection_end_day,
-					      week_view->selection_start_day,
-					      num_days);
-
-	/* Reset the adjustment value to 0 if the base address has changed.
-	   Note that we do this after updating first_day_shown so that our
-	   signal handler will not try to reload the events. */
-	if (update_adjustment_value)
-		gtk_adjustment_set_value (GTK_RANGE (week_view->vscrollbar)->adjustment, 0);
-
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-/* Returns the selected time range. */
-void
-e_week_view_get_selected_time_range	(EWeekView	*week_view,
-					 time_t		*start_time,
-					 time_t		*end_time)
-{
-	gint start_day, end_day;
-
-	start_day = week_view->selection_start_day;
-	end_day = week_view->selection_end_day;
-
-	if (start_day == -1) {
-		start_day = 0;
-		end_day = 0;
-	}
-
-	if (start_time)
-		*start_time = week_view->day_starts[start_day];
-
-	if (end_time)
-		*end_time = week_view->day_starts[end_day + 1];
-}
-
-
-/* Note that the returned date may be invalid if no date has been set yet. */
-void
-e_week_view_get_first_day_shown		(EWeekView	*week_view,
-					 GDate		*date)
-{
-	*date = week_view->first_day_shown;
-}
-
-
-/* This sets the first day shown in the view. It will be rounded down to the
-   nearest week. */
-void
-e_week_view_set_first_day_shown		(EWeekView	*week_view,
-					 GDate		*date)
-{
-	GDate base_date;
-	gint day_offset, num_days;
-	gboolean update_adjustment_value = FALSE;
-	guint32 old_selection_start_julian = 0, old_selection_end_julian = 0;
-	struct tm start_tm;
-	time_t start_time;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	/* Calculate the old selection range. */
-	if (week_view->selection_start_day != -1) {
-		old_selection_start_julian =
-			g_date_julian (&week_view->base_date)
-			+ week_view->selection_start_day;
-		old_selection_end_julian =
-			g_date_julian (&week_view->base_date)
-			+ week_view->selection_end_day;
-	}
-
-	/* Find the 1st Monday at or before the given day. */
-	day_offset = g_date_weekday (date) - 1;
-
-	/* Calculate the base date, i.e. the first day shown when the
-	   scrollbar adjustment value is 0. */
-	base_date = *date;
-	g_date_subtract_days (&base_date, day_offset);
-
-	/* See if we need to update the base date. */
-	if (!g_date_valid (&week_view->base_date)
-	    || g_date_compare (&week_view->base_date, &base_date)) {
-		week_view->base_date = base_date;
-		update_adjustment_value = TRUE;
-	}
-
-	/* See if we need to update the first day shown. */
-	if (!g_date_valid (&week_view->first_day_shown)
-	    || g_date_compare (&week_view->first_day_shown, &base_date)) {
-		week_view->first_day_shown = base_date;
-		g_date_to_struct_tm (&base_date, &start_tm);
-		start_time = mktime (&start_tm);
-		e_week_view_recalc_day_starts (week_view, start_time);
-		e_week_view_queue_reload_events (week_view);
-	}
-
-	/* Try to keep the previous selection, but if it is no longer shown
-	   just select the first day. */
-	if (week_view->selection_start_day != -1) {
-		week_view->selection_start_day = old_selection_start_julian
-			- g_date_julian (&base_date);
-		week_view->selection_end_day = old_selection_end_julian
-			- g_date_julian (&base_date);
-
-		/* Make sure the selection is valid. */
-		num_days = week_view->multi_week_view
-			? week_view->weeks_shown * 7 : 7;
-		num_days--;
-		week_view->selection_start_day =
-			CLAMP (week_view->selection_start_day, 0, num_days);
-		week_view->selection_end_day =
-			CLAMP (week_view->selection_end_day,
-			       week_view->selection_start_day,
-			       num_days);
-	}
-
-	/* Reset the adjustment value to 0 if the base address has changed.
-	   Note that we do this after updating first_day_shown so that our
-	   signal handler will not try to reload the events. */
-	if (update_adjustment_value)
-		gtk_adjustment_set_value (GTK_RANGE (week_view->vscrollbar)->adjustment, 0);
-
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-/* Recalculates the time_t corresponding to the start of each day. */
-static void
-e_week_view_recalc_day_starts (EWeekView *week_view,
-			       time_t lower)
-{
-	gint num_days, day;
-	time_t tmp_time;
-
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-
-	tmp_time = lower;
-	week_view->day_starts[0] = tmp_time;
-	for (day = 1; day <= num_days; day++) {
-		tmp_time = time_add_day (tmp_time, 1);
-		week_view->day_starts[day] = tmp_time;
-	}
-}
-
-
-gboolean
-e_week_view_get_multi_week_view	(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-	return week_view->multi_week_view;
-}
-
-
-void
-e_week_view_set_multi_week_view	(EWeekView	*week_view,
-				 gboolean	 multi_week_view)
-{
-	GtkAdjustment *adjustment;
-	gint page_increment, page_size;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (week_view->multi_week_view == multi_week_view)
-		return;
-
-	week_view->multi_week_view = multi_week_view;
-
-	if (multi_week_view) {
-		gtk_widget_show (week_view->titles_canvas);
-		page_increment = 4;
-		page_size = 5;
-	} else {
-		gtk_widget_hide (week_view->titles_canvas);
-		page_increment = page_size = 1;
-	}
-
-	adjustment = GTK_RANGE (week_view->vscrollbar)->adjustment;
-	adjustment->page_increment = page_increment;
-	adjustment->page_size = page_size;
-	gtk_adjustment_changed (adjustment);
-
-	/* FIXME: Need to change start date and adjustment value? */
-
-	e_week_view_recalc_day_starts (week_view, week_view->day_starts[0]);
-	e_week_view_recalc_cell_sizes (week_view);
-	e_week_view_queue_reload_events (week_view);
-}
-
-
-gint
-e_week_view_get_weeks_shown	(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), 1);
-
-	return week_view->weeks_shown;
-}
-
-
-void
-e_week_view_set_weeks_shown	(EWeekView	*week_view,
-				 gint		 weeks_shown)
-{
-	GtkAdjustment *adjustment;
-	gint page_increment, page_size;
-
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	weeks_shown = MIN (weeks_shown, E_WEEK_VIEW_MAX_WEEKS);
-
-	if (week_view->weeks_shown == weeks_shown)
-		return;
-
-	week_view->weeks_shown = weeks_shown;
-
-	if (week_view->multi_week_view) {
-		page_increment = 4;
-		page_size = 5;
-
-		adjustment = GTK_RANGE (week_view->vscrollbar)->adjustment;
-		adjustment->page_increment = page_increment;
-		adjustment->page_size = page_size;
-		gtk_adjustment_changed (adjustment);
-
-		/* FIXME: Need to change start date and adjustment value? */
-		e_week_view_recalc_day_starts (week_view,
-					       week_view->day_starts[0]);
-		e_week_view_recalc_cell_sizes (week_view);
-		e_week_view_queue_reload_events (week_view);
-	}
-}
-
-
-gboolean
-e_week_view_get_compress_weekend	(EWeekView	*week_view)
-{
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-
-	return week_view->compress_weekend;
-}
-
-
-void
-e_week_view_set_compress_weekend	(EWeekView	*week_view,
-					 gboolean	 compress)
-{
-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));
-
-	if (week_view->compress_weekend == compress)
-		return;
-
-	week_view->compress_weekend = compress;
-
-	/* The option only affects the month view. */
-	if (!week_view->multi_week_view)
-		return;
-
-	e_week_view_recalc_cell_sizes (week_view);
-	week_view->events_need_reshape = TRUE;
-	e_week_view_check_layout (week_view);
-}
-
-
-#ifndef NO_WARNINGS
-static gboolean
-e_week_view_update_event_cb (EWeekView *week_view,
-			     gint event_num,
-			     gpointer data)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint span_num;
-	gchar *text;
-	CalComponent *comp;
-
-	comp = data;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-
-	gtk_object_unref (GTK_OBJECT (event->comp));
-	event->comp = comp;
-	gtk_object_ref (GTK_OBJECT (comp));
-
-	for (span_num = 0; span_num < event->num_spans; span_num++) {
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       event->spans_index + span_num);
-
-		if (span->text_item) {
-			CalComponentText t;
-
-			cal_component_get_summary (event->comp, &t);
-			text = (char*) t.value;
-			gnome_canvas_item_set (span->text_item,
-					       "text", text ? text : "",
-					       NULL);
-
-			e_week_view_reshape_event_span (week_view, event_num,
-							span_num);
-		}
-	}
-
-	return TRUE;
-}
-#endif
-
-
-/* This calls a given function for each event instance that matches the given
-   uid. Note that it is safe for the callback to remove the event (since we
-   step backwards through the arrays). */
-static void
-e_week_view_foreach_event_with_uid (EWeekView *week_view,
-				    const gchar *uid,
-				    EWeekViewForeachEventCallback callback,
-				    gpointer data)
-{
-	EWeekViewEvent *event;
-	gint event_num;
-
-	for (event_num = week_view->events->len - 1;
-	     event_num >= 0;
-	     event_num--) {
-		const char *u;
-
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-
-		cal_component_get_uid (event->comp, &u);
-		if (u && !strcmp (uid, u)) {
-			if (!(*callback) (week_view, event_num, data))
-				return;
-		}
-	}
-}
-
-
-static gboolean
-e_week_view_remove_event_cb (EWeekView *week_view,
-			     gint event_num,
-			     gpointer data)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint span_num;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-
-	/* If we were editing this event, set editing_event_num to -1 so
-	   on_editing_stopped doesn't try to update the event. */
-	if (week_view->editing_event_num == event_num)
-		week_view->editing_event_num = -1;
-
-	/* We leave the span elements in the array, but set the canvas item
-	   pointers to NULL. */
-	for (span_num = 0; span_num < event->num_spans; span_num++) {
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       event->spans_index + span_num);
-
-		if (span->text_item) {
-			gtk_object_destroy (GTK_OBJECT (span->text_item));
-			span->text_item = NULL;
-		}
-		if (span->background_item) {
-			gtk_object_destroy (GTK_OBJECT (span->background_item));
-			span->background_item = NULL;
-		}
-	}
-
-	gtk_object_unref (GTK_OBJECT (event->comp));
-
-	g_array_remove_index (week_view->events, event_num);
-	week_view->events_need_layout = TRUE;
-
-	return TRUE;
-}
-
-
-void
-e_week_view_get_day_position	(EWeekView	*week_view,
-				 gint		 day,
-				 gint		*day_x,
-				 gint		*day_y,
-				 gint		*day_w,
-				 gint		*day_h)
-{
-	gint week, day_of_week, row;
-
-	*day_x = *day_y = *day_w = *day_h = 0;
-	g_return_if_fail (day >= 0);
-
-	if (week_view->multi_week_view) {
-		g_return_if_fail (day < week_view->weeks_shown * 7);
-
-		week = day / 7;
-		day_of_week = day % 7;
-		if (week_view->compress_weekend && day_of_week >= 5) {
-			/* In the compressed view Saturday is above Sunday and
-			   both have just one row as opposed to 2 for all the
-			   other days. */
-			if (day_of_week == 5) {
-				*day_y = week_view->row_offsets[week * 2];
-				*day_h = week_view->row_heights[week * 2];
-			} else {
-				*day_y = week_view->row_offsets[week * 2 + 1];
-				*day_h = week_view->row_heights[week * 2 + 1];
-			}
-			/* Both Saturday and Sunday are in the 6th column. */
-			*day_x = week_view->col_offsets[5];
-			*day_w = week_view->col_widths[5];
-		} else {
-			*day_y = week_view->row_offsets[week * 2];
-			*day_h = week_view->row_heights[week * 2]
-				+ week_view->row_heights[week * 2 + 1];
-			*day_x = week_view->col_offsets[day_of_week];
-			*day_w = week_view->col_widths[day_of_week];
-		}
-	} else {
-		g_return_if_fail (day < 7);
-
-		/* The week view has Mon, Tue & Wed down the left column and
-		   Thu, Fri & Sat/Sun down the right. */
-		if (day < 3) {
-			*day_x = week_view->col_offsets[0];
-			*day_w = week_view->col_widths[0];
-		} else {
-			*day_x = week_view->col_offsets[1];
-			*day_w = week_view->col_widths[1];
-		}
-
-		if (day < 5) {
-			row = (day % 3) * 2;
-			*day_y = week_view->row_offsets[row];
-			*day_h = week_view->row_heights[row]
-				+ week_view->row_heights[row + 1];
-		} else {
-			/* Saturday & Sunday. */
-			*day_y = week_view->row_offsets[day - 1];
-			*day_h = week_view->row_heights[day - 1];
-		}
-	}
-}
-
-
-/* Returns the bounding box for a span of an event. Usually this can easily
-   be determined by the start & end days and row of the span, which are set in
-   e_week_view_layout_event(). Though we need a special case for the weekends
-   when they are compressed, since the span may not fit. */
-gboolean
-e_week_view_get_span_position	(EWeekView	*week_view,
-				 gint		 event_num,
-				 gint		 span_num,
-				 gint		*span_x,
-				 gint		*span_y,
-				 gint		*span_w)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint end_day_of_week, num_days;
-	gint start_x, start_y, start_w, start_h;
-	gint end_x, end_y, end_w, end_h;
-
-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);
-	g_return_val_if_fail (event_num < week_view->events->len, FALSE);
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-
-	g_return_val_if_fail (span_num < event->num_spans, FALSE);
-
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + span_num);
-
-	if (span->row >= week_view->rows_per_cell)
-		return FALSE;
-
-	end_day_of_week = (span->start_day + span->num_days - 1) % 7;
-	num_days = span->num_days;
-	/* Check if the row will not be visible in compressed cells. */
-	if (span->row >= week_view->rows_per_compressed_cell) {
-		if (week_view->multi_week_view) {
-			if (week_view->compress_weekend) {
-				/* If it ends on a Saturday and is 1 day long
-				   we skip it, else we shorten it. If it ends
-				   on a Sunday it must be 1 day long and we
-				   skip it. */
-				if (end_day_of_week == 5) {	   /* Sat */
-					if (num_days == 1) {
-						return FALSE;
-					} else {
-						num_days--;
-					}
-				} else if (end_day_of_week == 6) { /* Sun */
-					return FALSE;
-				}
-			}
-		} else {
-			/* All spans are 1 day long in the week view, so we
-			   just skip it. */
-			if (end_day_of_week > 4)
-				return FALSE;
-		}
-	}
-
-	e_week_view_get_day_position (week_view, span->start_day,
-				      &start_x, &start_y, &start_w, &start_h);
-	*span_y = start_y + week_view->events_y_offset
-		+ span->row * (week_view->row_height
-			       + E_WEEK_VIEW_EVENT_Y_SPACING);
-	if (num_days == 1) {
-		*span_x = start_x;
-		*span_w = start_w;
-	} else {
-		e_week_view_get_day_position (week_view,
-					      span->start_day + num_days - 1,
-					      &end_x, &end_y, &end_w, &end_h);
-		*span_x = start_x;
-		*span_w = end_x - start_x + end_w;
-	}
-
-	return TRUE;
-}
-
-
-
-static gboolean
-e_week_view_on_button_press (GtkWidget *widget,
-			     GdkEventButton *event,
-			     EWeekView *week_view)
-{
-	gint x, y, day;
-
-#if 0
-	g_print ("In e_week_view_on_button_press\n");
-#endif
-
-	/* Handle scroll wheel events */
-	if (event->button == 4 || event->button == 5) {
-		GtkAdjustment *adj = GTK_RANGE (week_view->vscrollbar)->adjustment;
-		gfloat new_value;
-
-		new_value = adj->value + ((event->button == 4) ?
-					  -adj->page_increment:
-					  adj->page_increment);
-		new_value = CLAMP (new_value, adj->lower, adj->upper - adj->page_size);
-		gtk_adjustment_set_value (adj, new_value);
-
-		return TRUE;
-	}
-
-	/* If an event is pressed just return. */
-	if (week_view->pressed_event_num != -1)
-		return FALSE;
-
-	/* Convert the mouse position to a week & day. */
-	x = event->x;
-	y = event->y;
-	day = e_week_view_convert_position_to_day (week_view, x, y);
-	if (day == -1)
-		return FALSE;
-
-	/* Start the selection drag. */
-	if (event->button == 1) {
-		if (!GTK_WIDGET_HAS_FOCUS (week_view))
-			gtk_widget_grab_focus (GTK_WIDGET (week_view));
-
-		if (gdk_pointer_grab (GTK_LAYOUT (widget)->bin_window, FALSE,
-				      GDK_POINTER_MOTION_MASK
-				      | GDK_BUTTON_RELEASE_MASK,
-				      FALSE, NULL, event->time) == 0) {
-			week_view->selection_start_day = day;
-			week_view->selection_end_day = day;
-			week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_END;
-
-			/* FIXME: Optimise? */
-			gtk_widget_queue_draw (week_view->main_canvas);
-		}
-	} else if (event->button == 3) {
-		if (!GTK_WIDGET_HAS_FOCUS (week_view))
-			gtk_widget_grab_focus (GTK_WIDGET (week_view));
-		e_week_view_show_popup_menu (week_view, event, -1);
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_week_view_on_button_release (GtkWidget *widget,
-			       GdkEventButton *event,
-			       EWeekView *week_view)
-{
-	time_t start, end;
-
-#if 0
-	g_print ("In e_week_view_on_button_release\n");
-#endif
-
-	if (week_view->selection_drag_pos != E_WEEK_VIEW_DRAG_NONE) {
-		week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_NONE;
-		gdk_pointer_ungrab (event->time);
-		start = week_view->day_starts[week_view->selection_start_day];
-		end = week_view->day_starts[week_view->selection_end_day + 1];
-		gnome_calendar_set_selected_time_range (week_view->calendar,
-							start, end);
-	}
-
-	return FALSE;
-}
-
-
-static gboolean
-e_week_view_on_motion (GtkWidget *widget,
-		       GdkEventMotion *mevent,
-		       EWeekView *week_view)
-{
-	gint x, y, day;
-
-#if 0
-	g_print ("In e_week_view_on_motion\n");
-#endif
-
-	/* Convert the mouse position to a week & day. */
-	x = mevent->x;
-	y = mevent->y;
-	day = e_week_view_convert_position_to_day (week_view, x, y);
-	if (day == -1)
-		return FALSE;
-
-	if (week_view->selection_drag_pos != E_WEEK_VIEW_DRAG_NONE) {
-		e_week_view_update_selection (week_view, day);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-
-/* Converts a position in the canvas window to a day offset from the first
-   day displayed. Returns -1 if the position is outside the grid. */
-static gint
-e_week_view_convert_position_to_day (EWeekView *week_view,
-				     gint x,
-				     gint y)
-{
-	gint col, row, grid_x = -1, grid_y = -1, week, day;
-
-	/* First we convert it to a grid position. */
-	for (col = 0; col <= week_view->columns; col++) {
-		if (x < week_view->col_offsets[col]) {
-			grid_x = col - 1;
-			break;
-		}
-	}
-
-	for (row = 0; row <= week_view->rows; row++) {
-		if (y < week_view->row_offsets[row]) {
-			grid_y = row - 1;
-			break;
-		}
-	}
-
-	/* If the mouse is outside the grid return FALSE. */
-	if (grid_x == -1 || grid_y == -1)
-		return -1;
-
-	/* Now convert the grid position to a week and day. */
-	if (week_view->multi_week_view) {
-		week = grid_y / 2;
-		if (week_view->compress_weekend && grid_x == 5
-		    && grid_y % 2 == 1)
-			day = 6;
-		else
-			day = grid_x;
-	} else {
-		week = 0;
-		if (grid_x == 0)
-			day = grid_y / 2;
-		else if (grid_y == 5)
-			day = 6;
-		else
-			day = grid_y / 2 + 3;
-	}
-
-	return week * 7 + day;
-}
-
-
-static void
-e_week_view_update_selection (EWeekView *week_view,
-			      gint day)
-{
-	gint tmp_day;
-	gboolean need_redraw = FALSE;
-
-#if 0
-	g_print ("Updating selection %i,%i\n", week, day);
-#endif
-
-	if (week_view->selection_drag_pos == E_WEEK_VIEW_DRAG_START) {
-		if (day != week_view->selection_start_day) {
-			need_redraw = TRUE;
-			week_view->selection_start_day = day;
-		}
-	} else {
-		if (day != week_view->selection_end_day) {
-			need_redraw = TRUE;
-			week_view->selection_end_day = day;
-		}
-	}
-
-	/* Switch the drag position if necessary. */
-	if (week_view->selection_start_day > week_view->selection_end_day) {
-		tmp_day = week_view->selection_start_day;
-		week_view->selection_start_day = week_view->selection_end_day;
-		week_view->selection_end_day = tmp_day;
-		if (week_view->selection_drag_pos == E_WEEK_VIEW_DRAG_START)
-			week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_END;
-		else
-			week_view->selection_drag_pos = E_WEEK_VIEW_DRAG_START;
-	}
-
-	/* FIXME: Optimise? */
-	if (need_redraw) {
-		gtk_widget_queue_draw (week_view->main_canvas);
-	}
-}
-
-
-/* This frees any events currently loaded, and queues a reload. */
-static void
-e_week_view_queue_reload_events (EWeekView *week_view)
-{
-	e_week_view_free_events (week_view);
-
-	if (week_view->reload_events_idle_id == 0) {
-		/* We'll use a low priority here, so the user can scroll
-		   the view quickly. */
-		week_view->reload_events_idle_id = g_idle_add_full
-			(G_PRIORITY_LOW,
-			 e_week_view_reload_events_idle_cb, week_view, NULL);
-	}
-}
-
-
-static gboolean
-e_week_view_reload_events_idle_cb	(gpointer data)
-{
-	EWeekView *week_view;
-
-	g_return_val_if_fail (E_IS_WEEK_VIEW (data), FALSE);
-
-	GDK_THREADS_ENTER ();
-
-	week_view = E_WEEK_VIEW (data);
-
-	week_view->reload_events_idle_id = 0;
-
-	e_week_view_reload_events (week_view);
-
-	GDK_THREADS_LEAVE ();
-	return FALSE;
-}
-
-
-static void
-e_week_view_reload_events (EWeekView *week_view)
-{
-	gint num_days;
-
-	e_week_view_free_events (week_view);
-
-	if (!(week_view->client && cal_client_is_loaded (week_view->client)))
-		return;
-
-	if (week_view->calendar
-	    && g_date_valid (&week_view->first_day_shown)) {
-		num_days = week_view->multi_week_view
-			? week_view->weeks_shown * 7 : 7;
-
-		cal_client_generate_instances (week_view->client,
-					       CALOBJ_TYPE_EVENT,
-					       week_view->day_starts[0],
-					       week_view->day_starts[num_days],
-					       e_week_view_add_event,
-					       week_view);
-	}
-
-	week_view->events_need_reshape = TRUE;
-	e_week_view_check_layout (week_view);
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-static void
-e_week_view_free_events (EWeekView *week_view)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint event_num, span_num, num_days, day;
-
-	/* Reset all our indices. */
-	week_view->pressed_event_num = -1;
-	week_view->pressed_span_num = -1;
-	week_view->editing_event_num = -1;
-	week_view->editing_span_num = -1;
-	week_view->popup_event_num = -1;
-
-	for (event_num = 0; event_num < week_view->events->len; event_num++) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-		gtk_object_unref (GTK_OBJECT (event->comp));
-	}
-
-	g_array_set_size (week_view->events, 0);
-
-	/* Destroy all the old canvas items. */
-	if (week_view->spans) {
-		for (span_num = 0; span_num < week_view->spans->len;
-		     span_num++) {
-			span = &g_array_index (week_view->spans,
-					       EWeekViewEventSpan, span_num);
-			if (span->background_item)
-				gtk_object_destroy (GTK_OBJECT (span->background_item));
-			if (span->text_item)
-				gtk_object_destroy (GTK_OBJECT (span->text_item));
-		}
-		g_array_free (week_view->spans, TRUE);
-		week_view->spans = NULL;
-	}
-
-	/* Clear the number of rows used per day. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	for (day = 0; day <= num_days; day++) {
-		week_view->rows_per_day[day] = 0;
-	}
-}
-
-
-/* This adds one event to the view, adding it to the appropriate array. */
-static gboolean
-e_week_view_add_event (CalComponent *comp,
-		       time_t	  start,
-		       time_t	  end,
-		       gpointer	  data)
-
-{
-	EWeekView *week_view;
-	EWeekViewEvent event;
-	gint num_days;
-	struct tm start_tm, end_tm;
-
-	week_view = E_WEEK_VIEW (data);
-
-	/* Check that the event times are valid. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-
-#if 0
-	g_print ("View start:%li end:%li  Event start:%li end:%li\n",
-		 week_view->day_starts[0], week_view->day_starts[num_days],
-		 start, end);
-#endif
-
-	g_return_val_if_fail (start <= end, TRUE);
-	g_return_val_if_fail (start < week_view->day_starts[num_days], TRUE);
-	g_return_val_if_fail (end > week_view->day_starts[0], TRUE);
-
-	start_tm = *(localtime (&start));
-	end_tm = *(localtime (&end));
-
-	event.comp = comp;
-	gtk_object_ref (GTK_OBJECT (event.comp));
-	event.start = start;
-	event.end = end;
-	event.spans_index = 0;
-	event.num_spans = 0;
-
-	event.start_minute = start_tm.tm_hour * 60 + start_tm.tm_min;
-	event.end_minute = end_tm.tm_hour * 60 + end_tm.tm_min;
-	if (event.end_minute == 0 && start != end)
-		event.end_minute = 24 * 60;
-
-	g_array_append_val (week_view->events, event);
-	week_view->events_sorted = FALSE;
-	week_view->events_need_layout = TRUE;
-
-	return TRUE;
-}
-
-
-/* This lays out the events, or reshapes them, as necessary. */
-static void
-e_week_view_check_layout (EWeekView *week_view)
-{
-	/* Don't bother if we aren't visible. */
-	if (!GTK_WIDGET_VISIBLE (week_view))
-	    return;
-
-	/* Make sure the events are sorted (by start and size). */
-	e_week_view_ensure_events_sorted (week_view);
-
-	if (week_view->events_need_layout)
-		e_week_view_layout_events (week_view);
-
-	if (week_view->events_need_layout || week_view->events_need_reshape)
-		e_week_view_reshape_events (week_view);
-
-	week_view->events_need_layout = FALSE;
-	week_view->events_need_reshape = FALSE;
-}
-
-
-static void
-e_week_view_layout_events (EWeekView *week_view)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint num_days, day, event_num, span_num;
-	guint8 *grid;
-	GArray *spans, *old_spans;
-
-	/* This is a temporary 2-d grid which is used to place events.
-	   Each element is 0 if the position is empty, or 1 if occupied.
-	   We allocate the maximum size possible here, assuming that each
-	   event will need its own row. */
-	grid = g_new0 (guint8, E_WEEK_VIEW_MAX_ROWS_PER_CELL * 7
-		       * E_WEEK_VIEW_MAX_WEEKS);
-
-	/* We create a new array of spans, which will replace the old one. */
-	spans = g_array_new (FALSE, FALSE, sizeof (EWeekViewEventSpan));
-
-	/* Clear the number of rows used per day. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	for (day = 0; day <= num_days; day++) {
-		week_view->rows_per_day[day] = 0;
-	}
-
-	/* Iterate over the events, finding which weeks they cover, and putting
-	   them in the first free row available. */
-	for (event_num = 0; event_num < week_view->events->len; event_num++) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-		e_week_view_layout_event (week_view, event, grid, spans);
-	}
-
-	/* Free the grid. */
-	g_free (grid);
-
-	/* Replace the spans array. */
-	old_spans = week_view->spans;
-	week_view->spans = spans;
-
-	/* Destroy the old spans array, destroying any unused canvas items. */
-	if (old_spans) {
-		for (span_num = 0; span_num < old_spans->len; span_num++) {
-			span = &g_array_index (old_spans, EWeekViewEventSpan,
-					       span_num);
-			if (span->background_item)
-				gtk_object_destroy (GTK_OBJECT (span->background_item));
-			if (span->text_item)
-				gtk_object_destroy (GTK_OBJECT (span->text_item));
-		}
-		g_array_free (old_spans, TRUE);
-	}
-}
-
-
-static void
-e_week_view_layout_event (EWeekView	   *week_view,
-			  EWeekViewEvent   *event,
-			  guint8	   *grid,
-			  GArray	   *spans)
-{
-	gint start_day, end_day, span_start_day, span_end_day, rows_per_cell;
-	gint free_row, row, day, span_num, spans_index, num_spans, max_day;
-	EWeekViewEventSpan span, *old_span;
-
-	start_day = e_week_view_find_day (week_view, event->start, FALSE);
-	end_day = e_week_view_find_day (week_view, event->end, TRUE);
-	max_day = week_view->multi_week_view ? week_view->weeks_shown * 7 - 1
-		: 7 - 1;
-	start_day = CLAMP (start_day, 0, max_day);
-	end_day = CLAMP (end_day, 0, max_day);
-
-#if 0
-	g_print ("In e_week_view_layout_event Start:%i End: %i\n",
-		 start_day, end_day);
-#endif
-
-	/* Iterate through each of the spans of the event, where each span
-	   is a sequence of 1 or more days displayed next to each other. */
-	span_start_day = start_day;
-	rows_per_cell = E_WEEK_VIEW_MAX_ROWS_PER_CELL;
-	span_num = 0;
-	spans_index = spans->len;
-	num_spans = 0;
-	while (span_start_day <= end_day) {
-		span_end_day = e_week_view_find_span_end (week_view,
-							  span_start_day);
-		span_end_day = MIN (span_end_day, end_day);
-#if 0
-		g_print ("  Span start:%i end:%i\n", span_start_day,
-			 span_end_day);
-#endif
-		/* Try each row until we find a free one or we fall off the
-		   bottom of the available rows. */
-		row = 0;
-		free_row = -1;
-		while (free_row == -1 && row < rows_per_cell) {
-			free_row = row;
-			for (day = span_start_day; day <= span_end_day;
-			     day++) {
-				if (grid[day * rows_per_cell + row]) {
-					free_row = -1;
-					break;
-				}
-			}
-			row++;
-		};
-
-		if (free_row != -1) {
-			/* Mark the cells as full. */
-			for (day = span_start_day; day <= span_end_day;
-			     day++) {
-				grid[day * rows_per_cell + free_row] = 1;
-				week_view->rows_per_day[day] = MAX (week_view->rows_per_day[day], free_row + 1);
-			}
-#if 0
-			g_print ("  Span start:%i end:%i row:%i\n",
-				 span_start_day, span_end_day, free_row);
-#endif
-			/* Add the span to the array, and try to reuse any
-			   canvas items from the old spans. */
-			span.start_day = span_start_day;
-			span.num_days = span_end_day - span_start_day + 1;
-			span.row = free_row;
-			span.background_item = NULL;
-			span.text_item = NULL;
-			if (event->num_spans > span_num) {
-				old_span = &g_array_index (week_view->spans, EWeekViewEventSpan, event->spans_index + span_num);
-				span.background_item = old_span->background_item;
-				span.text_item = old_span->text_item;
-				old_span->background_item = NULL;
-				old_span->text_item = NULL;
-			}
-
-			g_array_append_val (spans, span);
-			num_spans++;
-		}
-
-		span_start_day = span_end_day + 1;
-		span_num++;
-	}
-
-	/* Set the event's spans. */
-	event->spans_index = spans_index;
-	event->num_spans = num_spans;
-}
-
-
-static void
-e_week_view_ensure_events_sorted (EWeekView *week_view)
-{
-	if (!week_view->events_sorted) {
-		qsort (week_view->events->data,
-		       week_view->events->len,
-		       sizeof (EWeekViewEvent),
-		       e_week_view_event_sort_func);
-		week_view->events_sorted = TRUE;
-	}
-}
-
-
-static gint
-e_week_view_event_sort_func (const void *arg1,
-			     const void *arg2)
-{
-	EWeekViewEvent *event1, *event2;
-
-	event1 = (EWeekViewEvent*) arg1;
-	event2 = (EWeekViewEvent*) arg2;
-
-	if (event1->start < event2->start)
-		return -1;
-	if (event1->start > event2->start)
-		return 1;
-
-	if (event1->end > event2->end)
-		return -1;
-	if (event1->end < event2->end)
-		return 1;
-
-	return 0;
-}
-
-
-static void
-e_week_view_reshape_events (EWeekView *week_view)
-{
-	EWeekViewEvent *event;
-	gint event_num, span_num;
-	gint num_days, day, day_x, day_y, day_w, day_h, max_rows;
-	gboolean is_weekend;
-
-	for (event_num = 0; event_num < week_view->events->len; event_num++) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-		for (span_num = 0; span_num < event->num_spans; span_num++) {
-			e_week_view_reshape_event_span (week_view, event_num,
-							span_num);
-		}
-	}
-
-	/* Reshape the jump buttons and show/hide them as appropriate. */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	for (day = 0; day < num_days; day++) {
-
-		is_weekend = (day % 7 >= 5) ? TRUE : FALSE;
-		if (!is_weekend || (week_view->multi_week_view
-				    && !week_view->compress_weekend))
-			max_rows = week_view->rows_per_cell;
-		else
-			max_rows = week_view->rows_per_compressed_cell;
-
-		/* Determine whether the jump button should be shown. */
-		if (week_view->rows_per_day[day] <= max_rows) {
-			gnome_canvas_item_hide (week_view->jump_buttons[day]);
-		} else {
-			e_week_view_get_day_position (week_view, day,
-						      &day_x, &day_y,
-						      &day_w, &day_h);
-
-			gnome_canvas_item_set (week_view->jump_buttons[day],
-					       "GnomeCanvasPixbuf::x", (gdouble) (day_x + day_w - E_WEEK_VIEW_JUMP_BUTTON_X_PAD - E_WEEK_VIEW_JUMP_BUTTON_WIDTH),
-					       "GnomeCanvasPixbuf::y", (gdouble) (day_y + day_h - E_WEEK_VIEW_JUMP_BUTTON_Y_PAD - E_WEEK_VIEW_JUMP_BUTTON_HEIGHT),
-					       NULL);
-
-			gnome_canvas_item_show (week_view->jump_buttons[day]);
-			gnome_canvas_item_raise_to_top (week_view->jump_buttons[day]);
-		}
-	}
-
-	for (day = num_days; day < E_WEEK_VIEW_MAX_WEEKS * 7; day++) {
-		gnome_canvas_item_hide (week_view->jump_buttons[day]);
-	}
-}
-
-
-static void
-e_week_view_reshape_event_span (EWeekView *week_view,
-				gint event_num,
-				gint span_num)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	GdkFont *font;
-	gint span_x, span_y, span_w, num_icons, icons_width, time_width;
-	gint min_text_x, max_text_w, width;
-	gboolean show_icons = TRUE, use_max_width = FALSE;
-	gboolean one_day_event;
-	CalComponent *comp;
-	gdouble text_x, text_y, text_w, text_h;
-	gchar *text, *end_of_line;
-	gint line_len, text_width;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + span_num);
-	comp = event->comp;
-	font = GTK_WIDGET (week_view)->style->font;
-
-	one_day_event = e_week_view_is_one_day_event (week_view, event_num);
-
-	/* If the span will not be visible destroy the canvas items and
-	   return. */
-	if (!e_week_view_get_span_position (week_view, event_num, span_num,
-					    &span_x, &span_y, &span_w)) {
-		if (span->background_item)
-			gtk_object_destroy (GTK_OBJECT (span->background_item));
-		if (span->text_item)
-			gtk_object_destroy (GTK_OBJECT (span->text_item));
-		span->background_item = NULL;
-		span->text_item = NULL;
-		return;
-	}
-
-	if (!one_day_event && week_view->editing_event_num == event_num
-	    && week_view->editing_span_num == span_num) {
-		show_icons = FALSE;
-		use_max_width = TRUE;
-	}
-
-	num_icons = 0;
-#if 0
-	if (show_icons) {
-		if (ico->dalarm.enabled || ico->malarm.enabled
-		    || ico->palarm.enabled || ico->aalarm.enabled)
-			num_icons++;
-		if (ico->recur)
-			num_icons++;
-	}
-#endif
-
-	/* Create the background canvas item if necessary. */
-	if (!span->background_item) {
-		span->background_item =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view->main_canvas)->root),
-					       e_week_view_event_item_get_type (),
-					       NULL);
-	}
-
-	gnome_canvas_item_set (span->background_item,
-			       "event_num", event_num,
-			       "span_num", span_num,
-			       NULL);
-
-	/* Create the text item if necessary. */
-	if (!span->text_item) {
-		CalComponentText text;
-
-		cal_component_get_summary (comp, &text);
-		span->text_item =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view->main_canvas)->root),
-					       e_text_get_type (),
-					       "font_gdk", GTK_WIDGET (week_view)->style->font,
-					       "anchor", GTK_ANCHOR_NW,
-					       "clip", TRUE,
-#if 0
-					       "max_lines", 1,
-#endif
-					       "editable", TRUE,
-					       "text", text.value ? text.value : "",
-					       "use_ellipsis", TRUE,
-					       NULL);
-		gtk_signal_connect (GTK_OBJECT (span->text_item), "event",
-				    GTK_SIGNAL_FUNC (e_week_view_on_text_item_event),
-				    week_view);
-	}
-
-	/* Calculate the position of the text item.
-	   For events < 1 day it starts after the times & icons and ends at the
-	   right edge of the span.
-	   For events > 1 day we need to determine whether times are shown at
-	   the start and end of the span, then try to center the text item with
-	   the icons in the middle, but making sure we don't go over the times.
-	*/
-
-
-	/* Calculate the space necessary to display a time, e.g. "13:00". */
-	if (week_view->use_small_font && week_view->small_font)
-		time_width = week_view->digit_width * 2
-			+ week_view->small_digit_width * 2;
-	else
-		time_width = week_view->digit_width * 4
-			+ week_view->colon_width;
-
-	/* Calculate the space needed for the icons. */
-	icons_width = (E_WEEK_VIEW_ICON_WIDTH + E_WEEK_VIEW_ICON_X_PAD)
-		* num_icons;
-
-	/* The y position and height are the same for both event types. */
-	text_y = span_y + E_WEEK_VIEW_EVENT_BORDER_HEIGHT
-		+ E_WEEK_VIEW_EVENT_TEXT_Y_PAD;
-	text_h = font->ascent + font->descent;
-
-	if (one_day_event) {
-		text_x = span_x + E_WEEK_VIEW_EVENT_L_PAD + icons_width;
-
-		switch (week_view->time_format) {
-		case E_WEEK_VIEW_TIME_BOTH_SMALL_MIN:
-		case E_WEEK_VIEW_TIME_BOTH:
-			text_x += time_width * 2 + week_view->space_width
-				+ E_WEEK_VIEW_EVENT_TIME_R_PAD;
-			break;
-		case E_WEEK_VIEW_TIME_START_SMALL_MIN:
-		case E_WEEK_VIEW_TIME_START:
-			text_x += time_width + E_WEEK_VIEW_EVENT_TIME_R_PAD;
-			break;
-		case E_WEEK_VIEW_TIME_NONE:
-			break;
-		}
-		text_w = span_x + span_w - E_WEEK_VIEW_EVENT_BORDER_WIDTH
-			- E_WEEK_VIEW_EVENT_R_PAD - text_x;
-
-	} else {
-		if (use_max_width) {
-			text_x = span_x + E_WEEK_VIEW_EVENT_L_PAD
-				+ E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;
-			text_w = span_x + span_w - E_WEEK_VIEW_EVENT_R_PAD
-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				- E_WEEK_VIEW_EVENT_TEXT_X_PAD - text_x;
-		} else {
-			/* Get the requested size of the label. */
-			gtk_object_get (GTK_OBJECT (span->text_item),
-					"text", &text,
-					NULL);
-			text_width = 0;
-			if (text) {
-				end_of_line = strchr (text, '\n');
-				if (end_of_line)
-					line_len = end_of_line - text;
-				else
-					line_len = strlen (text);
-				text_width = gdk_text_width (font, text, line_len);
-				g_free (text);
-			}
-
-			/* Add on the width of the icons and find the default
-			   position. */
-			width = text_width + icons_width;
-			text_x = span_x + (span_w - width) / 2;
-
-			/* Now calculate the left-most valid position, and make
-			   sure we don't go to the left of that. */
-			min_text_x = span_x + E_WEEK_VIEW_EVENT_L_PAD
-				+ E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				+ E_WEEK_VIEW_EVENT_TEXT_X_PAD;
-			if (event->start > week_view->day_starts[span->start_day])
-				min_text_x += time_width
-					+ E_WEEK_VIEW_EVENT_TIME_R_PAD;
-
-			text_x = MAX (text_x, min_text_x);
-
-			/* Now calculate the largest valid width, using the
-			   calculated x position, and make sure we don't
-			   exceed that. */
-			max_text_w = span_x + span_w - E_WEEK_VIEW_EVENT_R_PAD
-				- E_WEEK_VIEW_EVENT_BORDER_WIDTH
-				- E_WEEK_VIEW_EVENT_TEXT_X_PAD - text_x;
-			if (event->end < week_view->day_starts[span->start_day
-							      + span->num_days])
-				max_text_w -= time_width
-					+ E_WEEK_VIEW_EVENT_TIME_R_PAD;
-
-			text_w = MIN (width, max_text_w);
-
-			/* Now take out the space for the icons. */
-			text_x += icons_width;
-			text_w -= icons_width;
-		}
-	}
-
-	text_w = MAX (text_w, 0);
-	gnome_canvas_item_set (span->text_item,
-			       "clip_width", (gdouble) text_w,
-			       "clip_height", (gdouble) text_h,
-			       NULL);
-	e_canvas_item_move_absolute(span->text_item,
-				    text_x, text_y);
-}
-
-
-/* Finds the day containing the given time.
-   If include_midnight_in_prev_day is TRUE then if the time exactly
-   matches the start of a day the previous day is returned. This is useful
-   when calculating the end day of an event. */
-static gint
-e_week_view_find_day (EWeekView *week_view,
-		      time_t time_to_find,
-		      gboolean include_midnight_in_prev_day)
-{
-	gint num_days, day;
-	time_t *day_starts;
-
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-	day_starts = week_view->day_starts;
-
-	if (time_to_find < day_starts[0])
-		return -1;
-	if (time_to_find > day_starts[num_days])
-		return num_days;
-
-	for (day = 1; day <= num_days; day++) {
-		if (time_to_find <= day_starts[day]) {
-			if (time_to_find == day_starts[day]
-			    && !include_midnight_in_prev_day)
-				return day;
-			return day - 1;
-		}
-	}
-
-	g_assert_not_reached ();
-	return num_days;
-}
-
-
-/* This returns the last day in the same span as the given day. A span is all
-   the days which are displayed next to each other from left to right.
-   In the week view all spans are only 1 day, since Tuesday is below Monday
-   rather than beside it etc. In the month view, if the weekends are not
-   compressed then each week is a span, otherwise Monday to Saturday of each
-   week is a span, and the Sundays are separate spans. */
-static gint
-e_week_view_find_span_end (EWeekView *week_view,
-			   gint day)
-{
-	gint week, day_of_week, end_day;
-
-	if (week_view->multi_week_view) {
-		week = day / 7;
-		day_of_week = day % 7;
-		if (week_view->compress_weekend && day_of_week <= 5)
-			end_day = 5;
-		else
-			end_day = 6;
-		return week * 7 + end_day;
-	} else {
-		return day;
-	}
-}
-
-
-static void
-e_week_view_on_adjustment_changed (GtkAdjustment *adjustment,
-				   EWeekView *week_view)
-{
-	GDate date;
-	gint week_offset;
-	struct tm tm;
-	time_t lower, start, end;
-	guint32 old_first_day_julian, new_first_day_julian;
-
-	/* If we don't have a valid date set yet, just return. */
-	if (!g_date_valid (&week_view->first_day_shown))
-		return;
-
-	/* Determine the first date shown. */
-	date = week_view->base_date;
-	week_offset = floor (adjustment->value + 0.5);
-	g_date_add_days (&date, week_offset * 7);
-
-	/* Convert the old & new first days shown to julian values. */
-	old_first_day_julian = g_date_julian (&week_view->first_day_shown);
-	new_first_day_julian = g_date_julian (&date);
-
-	/* If we are already showing the date, just return. */
-	if (old_first_day_julian == new_first_day_julian)
-		return;
-
-	/* Set the new first day shown. */
-	week_view->first_day_shown = date;
-
-	/* Convert it to a time_t. */
-	g_date_to_struct_tm (&date, &tm);
-	lower = mktime (&tm);
-	lower = time_day_begin (lower);
-
-	e_week_view_recalc_day_starts (week_view, lower);
-	e_week_view_queue_reload_events (week_view);
-
-	/* Update the selection, if needed. */
-	if (week_view->selection_start_day != -1) {
-		start = week_view->day_starts[week_view->selection_start_day];
-		end = week_view->day_starts[week_view->selection_end_day + 1];
-		gnome_calendar_set_selected_time_range (week_view->calendar,
-							start, end);
-	}
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-}
-
-
-void
-e_week_view_start_editing_event (EWeekView *week_view,
-				 gint	    event_num,
-				 gint	    span_num,
-				 gchar     *initial_text)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	ETextEventProcessor *event_processor = NULL;
-	ETextEventProcessorCommand command;
-
-	/* If we are already editing the event, just return. */
-	if (event_num == week_view->editing_event_num
-	    && span_num == week_view->editing_span_num)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + span_num);
-
-	/* If the event is not shown, don't try to edit it. */
-	if (!span->text_item)
-		return;
-
-	if (initial_text) {
-		gnome_canvas_item_set (span->text_item,
-				       "text", initial_text,
-				       NULL);
-	}
-
-	e_canvas_item_grab_focus (span->text_item);
-
-	/* Try to move the cursor to the end of the text. */
-	gtk_object_get (GTK_OBJECT (span->text_item),
-			"event_processor", &event_processor,
-			NULL);
-	if (event_processor) {
-		command.action = E_TEP_MOVE;
-		command.position = E_TEP_END_OF_BUFFER;
-		gtk_signal_emit_by_name (GTK_OBJECT (event_processor),
-					 "command", &command);
-	}
-}
-
-
-/* This stops any current edit. */
-void
-e_week_view_stop_editing_event (EWeekView *week_view)
-{
-	GtkWidget *toplevel;
-
-	/* Check we are editing an event. */
-	if (week_view->editing_event_num == -1)
-		return;
-
-	/* Set focus to the toplevel so the item loses focus. */
-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (week_view));
-	if (toplevel && GTK_IS_WINDOW (toplevel))
-		gtk_window_set_focus (GTK_WINDOW (toplevel), NULL);
-}
-
-
-static gboolean
-e_week_view_on_text_item_event (GnomeCanvasItem *item,
-				GdkEvent *event,
-				EWeekView *week_view)
-{
-	gint event_num, span_num;
-
-#if 0
-	g_print ("In e_week_view_on_text_item_event\n");
-#endif
-
-	switch (event->type) {
-	case GDK_KEY_PRESS:
-		if (event && event->key.keyval == GDK_Return) {
-			/* We set the keyboard focus to the EDayView, so the
-			   EText item loses it and stops the edit. */
-			gtk_widget_grab_focus (GTK_WIDGET (week_view));
-
-			/* Stop the signal last or we will also stop any
-			   other events getting to the EText item. */
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-			return TRUE;
-		}
-		break;
-	case GDK_BUTTON_PRESS:
-		if (!e_week_view_find_event_from_item (week_view, item,
-						       &event_num, &span_num))
-			return FALSE;
-
-		if (event->button.button == 3) {
-			if (!GTK_WIDGET_HAS_FOCUS (week_view))
-				gtk_widget_grab_focus (GTK_WIDGET (week_view));
-			e_week_view_show_popup_menu (week_view,
-						     (GdkEventButton*) event,
-						     event_num);
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item->canvas),
-						      "button_press_event");
-			return TRUE;
-		}
-
-		week_view->pressed_event_num = event_num;
-		week_view->pressed_span_num = span_num;
-
-		/* Only let the EText handle the event while editing. */
-		if (!E_TEXT (item)->editing) {
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-
-			if (event) {
-				week_view->drag_event_x = event->button.x;
-				week_view->drag_event_y = event->button.y;
-			} else
-				g_warning ("No GdkEvent");
-
-			/* FIXME: Remember the day offset from the start of
-			   the event. */
-
-			return TRUE;
-		}
-		break;
-	case GDK_BUTTON_RELEASE:
-		if (!E_TEXT (item)->editing) {
-			/* This shouldn't ever happen. */
-			if (!e_week_view_find_event_from_item (week_view,
-							       item,
-							       &event_num,
-							       &span_num))
-				return FALSE;
-
-			if (week_view->pressed_event_num != -1
-			    && week_view->pressed_event_num == event_num
-			    && week_view->pressed_span_num == span_num) {
-				e_week_view_start_editing_event (week_view,
-								 event_num,
-								 span_num,
-								 NULL);
-				week_view->pressed_event_num = -1;
-			}
-
-			/* Stop the signal last or we will also stop any
-			   other events getting to the EText item. */
-			gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
-						      "event");
-			return TRUE;
-		}
-		week_view->pressed_event_num = -1;
-		break;
-	case GDK_FOCUS_CHANGE:
-		if (event->focus_change.in) {
-			e_week_view_on_editing_started (week_view, item);
-		} else {
-			e_week_view_on_editing_stopped (week_view, item);
-		}
-
-		return FALSE;
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-
-static void
-e_week_view_on_editing_started (EWeekView *week_view,
-				GnomeCanvasItem *item)
-{
-	gint event_num, span_num;
-
-	if (!e_week_view_find_event_from_item (week_view, item,
-					       &event_num, &span_num))
-		return;
-
-#if 0
-	g_print ("In e_week_view_on_editing_started event_num:%i span_num:%i\n", event_num, span_num);
-#endif
-
-	week_view->editing_event_num = event_num;
-	week_view->editing_span_num = span_num;
-
-	/* We need to reshape long events so the whole width is used while
-	   editing. */
-	if (!e_week_view_is_one_day_event (week_view, event_num)) {
-		e_week_view_reshape_event_span (week_view, event_num,
-						span_num);
-	}
-}
-
-
-static void
-e_week_view_on_editing_stopped (EWeekView *week_view,
-				GnomeCanvasItem *item)
-{
-	gint event_num, span_num;
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gchar *text = NULL;
-	CalComponentText summary;
-	const char *uid;
-
-	/* Note: the item we are passed here isn't reliable, so we just stop
-	   the edit of whatever item was being edited. We also receive this
-	   event twice for some reason. */
-	event_num = week_view->editing_event_num;
-	span_num = week_view->editing_span_num;
-
-	/* If no item is being edited, just return. */
-	if (event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + span_num);
-
-	/* Reset the edit fields. */
-	week_view->editing_event_num = -1;
-
-	/* Check that the event is still valid. */
-	cal_component_get_uid (event->comp, &uid);
-	if (!uid)
-		return;
-
-	gtk_object_get (GTK_OBJECT (span->text_item),
-			"text", &text,
-			NULL);
-
-	/* Only update the summary if necessary. */
-	cal_component_get_summary (event->comp, &summary);
-	if (text && summary.value && !strcmp (text, summary.value)) {
-		g_free (text);
-		if (!e_week_view_is_one_day_event (week_view, event_num))
-			e_week_view_reshape_event_span (week_view, event_num,
-							span_num);
-		return;
-	}
-
-	summary.value = text;
-	cal_component_set_summary (event->comp, &summary);
-	g_free (text);
-
-	if (!cal_client_update_object (week_view->client, event->comp))
-		g_message ("e_week_view_on_editing_stopped(): Could not update the object!");
-}
-
-
-static gboolean
-e_week_view_find_event_from_item (EWeekView	  *week_view,
-				  GnomeCanvasItem *item,
-				  gint		  *event_num_return,
-				  gint		  *span_num_return)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint event_num, span_num, num_events;
-
-	num_events = week_view->events->len;
-	for (event_num = 0; event_num < num_events; event_num++) {
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-		for (span_num = 0; span_num < event->num_spans; span_num++) {
-			span = &g_array_index (week_view->spans,
-					       EWeekViewEventSpan,
-					       event->spans_index + span_num);
-			if (span->text_item == item) {
-				*event_num_return = event_num;
-				*span_num_return = span_num;
-				return TRUE;
-			}
-		}
-	}
-
-	return FALSE;
-}
-
-
-/* Finds the index of the event with the given uid.
-   Returns TRUE if an event with the uid was found.
-   Note that for recurring events there may be several EWeekViewEvents, one
-   for each instance, all with the same iCalObject and uid. So only use this
-   function if you know the event doesn't recur or you are just checking to
-   see if any events with the uid exist. */
-static gboolean
-e_week_view_find_event_from_uid (EWeekView	  *week_view,
-				 const gchar	  *uid,
-				 gint		  *event_num_return)
-{
-	EWeekViewEvent *event;
-	gint event_num, num_events;
-
-	num_events = week_view->events->len;
-	for (event_num = 0; event_num < num_events; event_num++) {
-		const char *u;
-
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
-
-		cal_component_get_uid (event->comp, &u);
-		if (u && !strcmp (uid, u)) {
-			*event_num_return = event_num;
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-
-gboolean
-e_week_view_is_one_day_event	(EWeekView	*week_view,
-				 gint		 event_num)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-	if (event->num_spans != 1)
-		return FALSE;
-
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index);
-
-	if (event->start == week_view->day_starts[span->start_day]
-	    && event->end == week_view->day_starts[span->start_day + 1])
-		return FALSE;
-
-	if (span->num_days == 1
-	    && event->start >= week_view->day_starts[span->start_day]
-	    && event->end <= week_view->day_starts[span->start_day + 1])
-		return TRUE;
-
-	return FALSE;
-}
-
-
-static gint
-e_week_view_key_press (GtkWidget *widget, GdkEventKey *event)
-{
-	EWeekView *week_view;
-	CalComponent *comp;
-	gint event_num;
-	gchar *initial_text;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dtstart, dtend;
-	const char *uid;
-
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (E_IS_WEEK_VIEW (widget), FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-
-	week_view = E_WEEK_VIEW (widget);
-
-	/* The Escape key aborts a resize operation. */
-#if 0
-	if (week_view->resize_drag_pos != E_WEEK_VIEW_POS_NONE) {
-		if (event->keyval == GDK_Escape) {
-			e_week_view_abort_resize (week_view, event->time);
-		}
-		return FALSE;
-	}
-#endif
-
-	if (week_view->selection_start_day == -1)
-		return FALSE;
-
-	/* We only want to start an edit with a return key or a simple
-	   character. */
-	if (event->keyval == GDK_Return) {
-		initial_text = NULL;
-	} else if ((event->keyval < 0x20)
-		   || (event->keyval > 0xFF)
-		   || (event->length == 0)
-		   || (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))) {
-		return FALSE;
-	} else {
-		initial_text = event->string;
-	}
-
-	/* Add a new event covering the selected range. */
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-	dtstart = week_view->day_starts[week_view->selection_start_day];
-	dtend = week_view->day_starts[week_view->selection_end_day + 1];
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	*date.value = icaltime_from_timet (dtstart, FALSE, FALSE);
-	cal_component_set_dtstart (comp, &date);
-	*date.value = icaltime_from_timet (dtend, FALSE, FALSE);
-	cal_component_set_dtend (comp, &date);
-
-	/* We add the event locally and start editing it. When we get the
-	   "update_event" callback from the server, we basically ignore it.
-	   If we were to wait for the "update_event" callback it wouldn't be
-	   as responsive and we may lose a few keystrokes. */
-	e_week_view_add_event (comp, dtstart, dtend, week_view);
-	e_week_view_check_layout (week_view);
-	gtk_widget_queue_draw (week_view->main_canvas);
-
-	cal_component_get_uid (comp, &uid);
-	if (e_week_view_find_event_from_uid (week_view, uid, &event_num)) {
-		e_week_view_start_editing_event (week_view, event_num, 0,
-						 initial_text);
-	} else {
-		g_warning ("Couldn't find event to start editing.\n");
-	}
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	return TRUE;
-}
-
-
-void
-e_week_view_show_popup_menu (EWeekView	     *week_view,
-			     GdkEventButton  *bevent,
-			     gint	      event_num)
-{
-	EWeekViewEvent *event;
-	int have_selection, not_being_edited, num_items, i;
-	struct menu_item *context_menu;
-
-	static struct menu_item items[] = {
-		{ N_("New appointment..."), (GtkSignalFunc) e_week_view_on_new_appointment, NULL, TRUE }
-	};
-
-	static struct menu_item child_items[] = {
-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_week_view_on_edit_appointment, NULL, TRUE },
-		{ N_("Delete this appointment"), (GtkSignalFunc) e_week_view_on_delete_appointment, NULL, TRUE },
-		{ NULL, NULL, NULL, TRUE },
-		{ N_("New appointment..."), (GtkSignalFunc) e_week_view_on_new_appointment, NULL, TRUE }
-	};
-
-	static struct menu_item recur_child_items[] = {
-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_week_view_on_edit_appointment, NULL, TRUE },
-		{ N_("Make this appointment movable"), (GtkSignalFunc) e_week_view_on_unrecur_appointment, NULL, TRUE },
-		{ N_("Delete this occurrence"), (GtkSignalFunc) e_week_view_on_delete_occurrence, NULL, TRUE },
-		{ N_("Delete all occurrences"), (GtkSignalFunc) e_week_view_on_delete_appointment, NULL, TRUE },
-		{ NULL, NULL, NULL, TRUE },
-		{ N_("New appointment..."), (GtkSignalFunc) e_week_view_on_new_appointment, NULL, TRUE }
-	};
-
-	have_selection = GTK_WIDGET_HAS_FOCUS (week_view)
-		&& week_view->selection_start_day != -1;
-
-	if (event_num == -1) {
-		num_items = 1;
-		context_menu = &items[0];
-		context_menu[0].sensitive = have_selection;
-	} else {
-		event = &g_array_index (week_view->events,
-					EWeekViewEvent, event_num);
-
-		/* This used to be set only if the event wasn't being edited
-		   in the event editor, but we can't check that at present.
-		   We could possibly set up another method of checking it. */
-		not_being_edited = TRUE;
-
-		if (cal_component_has_recurrences (event->comp)) {
-			num_items = 6;
-			context_menu = &recur_child_items[0];
-			context_menu[0].sensitive = not_being_edited;
-			context_menu[1].sensitive = not_being_edited;
-			context_menu[2].sensitive = not_being_edited;
-			context_menu[3].sensitive = not_being_edited;
-			context_menu[5].sensitive = have_selection;
-		} else {
-			num_items = 4;
-			context_menu = &child_items[0];
-			context_menu[0].sensitive = not_being_edited;
-			context_menu[1].sensitive = not_being_edited;
-			context_menu[3].sensitive = have_selection;
-		}
-	}
-
-	for (i = 0; i < num_items; i++)
-		context_menu[i].data = week_view;
-
-	week_view->popup_event_num = event_num;
-	popup_menu (context_menu, num_items, bevent);
-}
-
-
-static void
-e_week_view_on_new_appointment (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	CalComponent *comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	time_t dt;
-
-	week_view = E_WEEK_VIEW (data);
-
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	dt = week_view->day_starts[week_view->selection_start_day];
-	*date.value = icaltime_from_timet (dt, TRUE, FALSE);
-	cal_component_set_dtstart (comp, &date);
-
-	dt = week_view->day_starts[week_view->selection_end_day + 1];
-	*date.value = icaltime_from_timet (dt, TRUE, FALSE);
-	cal_component_set_dtend (comp, &date);
-
-	cal_component_commit_sequence (comp);
-
-	gnome_calendar_edit_object (week_view->calendar, comp);
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-
-static void
-e_week_view_on_edit_appointment (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-
-	week_view = E_WEEK_VIEW (data);
-
-	if (week_view->popup_event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				week_view->popup_event_num);
-
-	gnome_calendar_edit_object (week_view->calendar, event->comp);
-}
-
-
-static void
-e_week_view_on_delete_occurrence (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	CalComponent *comp;
-	CalComponentDateTime *date=NULL;
-	GSList *list;
-
-	week_view = E_WEEK_VIEW (data);
-
-	if (week_view->popup_event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				week_view->popup_event_num);
-
-	/* We must duplicate the CalComponent, or we won't know it has changed
-	   when we get the "update_event" callback. */
-
-	comp = cal_component_clone (event->comp);
-	cal_component_get_exdate_list (comp, &list);
-	list = g_slist_append (list, date);
-	date = g_new0 (CalComponentDateTime, 1);
-	date->value = g_new (struct icaltimetype, 1);
-	*date->value = icaltime_from_timet (event->start, TRUE, FALSE);
-	cal_component_set_exdate_list (comp, list);
-	cal_component_free_exdate_list (list);
-
-	if (!cal_client_update_object (week_view->client, comp))
-		g_message ("e_week_view_on_delete_occurrence(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-
-static void
-e_week_view_on_delete_appointment (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	const char *uid;
-
-	week_view = E_WEEK_VIEW (data);
-
-	if (week_view->popup_event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				week_view->popup_event_num);
-
-	cal_component_get_uid (event->comp, &uid);
-
-	/* We don't check the return value; FALSE can mean the object was not in
-	 * the server anyways.
-	 */
-	cal_client_remove_object (week_view->client, uid);
-}
-
-
-static void
-e_week_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)
-{
-	EWeekView *week_view;
-	EWeekViewEvent *event;
-	CalComponent *comp, *new_comp;
-	CalComponentDateTime date;
-	struct icaltimetype itt;
-	GSList *list;
-
-	week_view = E_WEEK_VIEW (data);
-
-	if (week_view->popup_event_num == -1)
-		return;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent,
-				week_view->popup_event_num);
-
-	date.value = &itt;
-	date.tzid = NULL;
-
-	/* For the recurring object, we add a exception to get rid of the
-	   instance. */
-	comp = cal_component_clone (event->comp);
-	cal_component_get_exdate_list (comp, &list);
-	*date.value = icaltime_from_timet (event->start, TRUE, FALSE);
-	list = g_slist_append (list, &date);
-	cal_component_set_exdate_list (comp, list);
-	g_slist_free (list);
-
-	/* For the unrecurred instance we duplicate the original object,
-	   create a new uid for it, get rid of the recurrence rules, and set
-	   the start & end times to the instances times. */
-	new_comp = cal_component_clone (event->comp);
-	cal_component_set_uid (new_comp, cal_component_gen_uid ());
-	cal_component_set_rdate_list (new_comp, NULL);
-	cal_component_set_rrule_list (new_comp, NULL);
-	cal_component_set_exdate_list (new_comp, NULL);
-	cal_component_set_exrule_list (new_comp, NULL);
-
-	*date.value = icaltime_from_timet (event->start, TRUE, FALSE);
-	cal_component_set_dtstart (new_comp, &date);
-	*date.value = icaltime_from_timet (event->end, TRUE, FALSE);
-	cal_component_set_dtend (new_comp, &date);
-
-	/* Now update both CalComponents. Note that we do this last since at
-	   present the updates happen synchronously so our event may disappear.
-	*/
-	if (!cal_client_update_object (week_view->client, comp))
-		g_message ("e_week_view_on_unrecur_appointment(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	if (!cal_client_update_object (week_view->client, new_comp))
-		g_message ("e_week_view_on_unrecur_appointment(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (new_comp));
-}
-
-
-static gboolean
-e_week_view_on_jump_button_event (GnomeCanvasItem *item,
-				  GdkEvent *event,
-				  EWeekView *week_view)
-{
-	gint day;
-
-	if (event->type == GDK_BUTTON_PRESS) {
-		for (day = 0; day < E_WEEK_VIEW_MAX_WEEKS * 7; day++) {
-			if (item == week_view->jump_buttons[day]) {
-				gnome_calendar_dayjump
-					(week_view->calendar,
-					 week_view->day_starts[day]);
-				return TRUE;
-			}
-		}
-
-	}
-
-	return FALSE;
-}
diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h
deleted file mode 100644
index e4d5ee72db..0000000000
--- a/calendar/gui/e-week-view.h
+++ /dev/null
@@ -1,390 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Damon Chaplin <damon@helixcode.com>
- *
- * Copyright 1999, Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-#ifndef _E_WEEK_VIEW_H_
-#define _E_WEEK_VIEW_H_
-
-#include <gtk/gtktable.h>
-#include <libgnomeui/gnome-canvas.h>
-
-#include "gnome-cal.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * EWeekView - displays the Week & Month views of the calendar.
- */
-
-/* The maximum number of weeks we show. 5 is usually enough for 1 month,
-   but we allow 6 for longer selections. */
-#define E_WEEK_VIEW_MAX_WEEKS		6
-
-/* The size of the reminder & recurrence icons, and padding around them. */
-#define E_WEEK_VIEW_ICON_WIDTH		16
-#define E_WEEK_VIEW_ICON_HEIGHT		16
-#define E_WEEK_VIEW_ICON_X_PAD		0
-#define E_WEEK_VIEW_ICON_Y_PAD		0
-
-/* The space on the left & right of the event. (The triangle to indicate the
-   event continues is displayed in this space). */
-#define E_WEEK_VIEW_EVENT_L_PAD		2
-#define E_WEEK_VIEW_EVENT_R_PAD		3
-
-/* The vertical spacing between rows of events. */
-#define E_WEEK_VIEW_EVENT_Y_SPACING	1
-
-/* The size of the border around the event. */
-#define E_WEEK_VIEW_EVENT_BORDER_WIDTH	1
-#define E_WEEK_VIEW_EVENT_BORDER_HEIGHT	1
-
-/* The padding on each side of the event text. */
-#define E_WEEK_VIEW_EVENT_TEXT_X_PAD	4
-#define E_WEEK_VIEW_EVENT_TEXT_Y_PAD	1
-
-/* The space on the right of the time string, if it is shown. */
-#define E_WEEK_VIEW_EVENT_TIME_R_PAD	2
-
-/* The padding above and on the right of the date string at the top of each
-   cell. */
-#define E_WEEK_VIEW_DATE_T_PAD		2
-#define E_WEEK_VIEW_DATE_R_PAD		4
-
-/* The padding above and below the line under the date string, in the Week
-   view, and also the space on the left of it. */
-#define E_WEEK_VIEW_DATE_LINE_T_PAD	1
-#define E_WEEK_VIEW_DATE_LINE_B_PAD	1
-#define E_WEEK_VIEW_DATE_LINE_L_PAD	10
-
-/* The padding below the date string in the Month view. */
-#define E_WEEK_VIEW_DATE_B_PAD		1
-
-/* These index our colors array. */
-typedef enum
-{
-	E_WEEK_VIEW_COLOR_EVEN_MONTHS,
-	E_WEEK_VIEW_COLOR_ODD_MONTHS,
-	E_WEEK_VIEW_COLOR_EVENT_BACKGROUND,
-	E_WEEK_VIEW_COLOR_EVENT_BORDER,
-	
-	E_WEEK_VIEW_COLOR_LAST
-} EWeekViewColors;
-
-/* These specify which part of the selection we are dragging, if any. */
-typedef enum
-{
-	E_WEEK_VIEW_DRAG_NONE,
-	E_WEEK_VIEW_DRAG_START,
-	E_WEEK_VIEW_DRAG_END
-} EWeekViewDragPosition;
-
-/* These specify which times are shown for the 1-day events. We use the small
-   font for the minutes if it can be loaded and the option is on. */
-typedef enum
-{
-	E_WEEK_VIEW_TIME_NONE,
-	E_WEEK_VIEW_TIME_START,
-	E_WEEK_VIEW_TIME_BOTH,
-	E_WEEK_VIEW_TIME_START_SMALL_MIN,
-	E_WEEK_VIEW_TIME_BOTH_SMALL_MIN
-} EWeekViewTimeFormat;
-
-/* Specifies the position of the mouse. */
-typedef enum
-{
-	E_WEEK_VIEW_POS_OUTSIDE,
-	E_WEEK_VIEW_POS_NONE,
-	E_WEEK_VIEW_POS_EVENT,
-	E_WEEK_VIEW_POS_LEFT_EDGE,
-	E_WEEK_VIEW_POS_RIGHT_EDGE
-} EWeekViewPosition;
-
-
-typedef struct _EWeekViewEventSpan EWeekViewEventSpan;
-struct _EWeekViewEventSpan {
-	guint start_day : 6;
-	guint num_days : 3;
-	guint row : 7;
-	GnomeCanvasItem *background_item;
-	GnomeCanvasItem *text_item;
-};
-
-typedef struct _EWeekViewEvent EWeekViewEvent;
-struct _EWeekViewEvent {
-	CalComponent *comp;
-	time_t start;
-	time_t end;
-	guint16 start_minute;	/* Minutes from the start of the day. */
-	guint16 end_minute;
-	gint spans_index;
-	guint num_spans;
-};
-
-
-#define E_WEEK_VIEW(obj)          GTK_CHECK_CAST (obj, e_week_view_get_type (), EWeekView)
-#define E_WEEK_VIEW_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_week_view_get_type (), EWeekViewClass)
-#define E_IS_WEEK_VIEW(obj)       GTK_CHECK_TYPE (obj, e_week_view_get_type ())
-
-
-typedef struct _EWeekView       EWeekView;
-typedef struct _EWeekViewClass  EWeekViewClass;
-
-struct _EWeekView
-{
-	GtkTable table;
-
-	/* The top canvas where the dates are shown. */
-	GtkWidget *titles_canvas;
-	GnomeCanvasItem *titles_canvas_item;
-
-	/* The main canvas where the appointments are shown. */
-	GtkWidget *main_canvas;
-	GnomeCanvasItem *main_canvas_item;
-
-	GnomeCanvasItem *jump_buttons[E_WEEK_VIEW_MAX_WEEKS * 7];
-
-	GtkWidget *vscrollbar;
-
-	/* The calendar we are associated with. */
-	GnomeCalendar *calendar;
-
-	/* Calendar client object we are monitoring */
-	CalClient *client;
-
-	/* The array of EWeekViewEvent elements. */
-	GArray *events;
-	gboolean events_sorted;
-	gboolean events_need_layout;
-	gboolean events_need_reshape;
-
-	/* The id of our idle function to reload all events. */
-	gint reload_events_idle_id;
-
-	/* An array of EWeekViewEventSpan elements. Each event has its own
-	   space within this array, and uses the spans_index and num_spans
-	   fields of the EWeekViewEvent struct to access it. */
-	GArray *spans;
-
-	/* The start of each day displayed. */
-	time_t day_starts[E_WEEK_VIEW_MAX_WEEKS * 7 + 1];
-
-	/* The base date, where the adjustment value is 0. */
-	GDate base_date;
-
-	/* The first day shown in the view. */
-	GDate first_day_shown;
-
-	/* If we are displaying multiple weeks in rows. If this is FALSE only
-	   one week is shown, with a different layout. */
-	gboolean multi_week_view;
-
-	/* How many weeks we are showing. This is only relevant if
-	   display_month is TRUE. */
-	gint weeks_shown;
-
-	/* If Sat & Sun are compressed. Only applicable in month view, since
-	   they are always compressed into 1 cell in the week view. */
-	gboolean compress_weekend;
-
-	/* The vertical offset of the events from the top of the cells. */
-	gint events_y_offset;
-
-	/* The height of the events, not including spacing between them. */
-	gint row_height;
-
-	/* The number of rows of events in each cell. */
-	gint rows_per_cell;
-	gint rows_per_compressed_cell;
-
-	/* The number of rows we have used for each day (i.e. each cell) */
-	gint rows_per_day[E_WEEK_VIEW_MAX_WEEKS * 7];
-
-	/* If the small font is used for displaying the minutes. */
-	gboolean use_small_font;
-
-	/* Small font to display the minutes. */
-	GdkFont *small_font;
-
-	/* The widths of various pieces of text, used to determine which of
-	   several date formats to display, set in e_week_view_style_set(). */
-	gint space_width;		/* One space character ' '. */
-	gint colon_width;		/* Size of ':' in the font. */
-	gint slash_width;		/* Size of '/' in the font. */
-	gint digit_width;		/* Size of a '0' digit. */
-	gint small_digit_width;		/* Size of a small_font '0' digit. */
-	gint day_widths[7];		/* Monday first. */
-	gint max_day_width;
-	gint abbr_day_widths[7];
-	gint max_abbr_day_width;
-	gint month_widths[12];
-	gint max_month_width;
-	gint abbr_month_widths[12];
-	gint max_abbr_month_width;
-
-	/* The size of the main grid of days and of the cells. A row
-	   corresponds to a compressed day, so normal days usually take
-	   up 2 rows. Note that the offsets arrays have one more element
-	   than the widths/heights arrays since they also contain the
-	   right/bottom edge. */
-	gint rows;
-	gint columns;
-	gint col_widths[7];
-	gint col_offsets[8];
-	gint row_heights[E_WEEK_VIEW_MAX_WEEKS * 2];
-	gint row_offsets[E_WEEK_VIEW_MAX_WEEKS * 2 + 1];
-
-	/* This specifies which times we are showing for the events, depending
-	   on how much room is available. */
-	EWeekViewTimeFormat time_format;
-
-	/* The GC used for painting in different colors. */
-	GdkGC *main_gc;
-
-	/* The icons. */
-	GdkPixmap *reminder_icon;
-	GdkBitmap *reminder_mask;
-	GdkPixmap *recurrence_icon;
-	GdkBitmap *recurrence_mask;
-
-	/* Colors for drawing. */
-	GdkColor colors[E_WEEK_VIEW_COLOR_LAST];
-
-	/* The normal & resizing cursors. */
-	GdkCursor *normal_cursor;
-	GdkCursor *move_cursor;
-	GdkCursor *resize_width_cursor;
-
-	/* This remembers the last cursor set on the window. */
-	GdkCursor *last_cursor_set;
-
-	/* The currently selected region, in days from the first day shown.
-	   If selection_start_day is -1 there is no current selection. */
-	gint selection_start_day;
-	gint selection_end_day;
-
-	/* This specifies which end of the selection is being dragged, or is
-	   E_WEEK_VIEW_DRAG_NONE if the selection isn't being dragged. */
-	EWeekViewDragPosition selection_drag_pos;
-
-	/* This is the event the mouse button was pressed on. If the button
-	   is released we start editing it, but if the mouse is dragged we set
-	   this to -1. */
-	gint pressed_event_num;
-	gint pressed_span_num;
-
-	/* The event span currently being edited. The num is -1 if no event is
-	   being edited. */
-	gint editing_event_num;
-	gint editing_span_num;
-
-	/* The event that the context menu is for. */
-	gint popup_event_num;
-
-	/* The last mouse position when dragging, in the entire canvas. */
-	gint drag_event_x;
-	gint drag_event_y;
-};
-
-struct _EWeekViewClass
-{
-	GtkTableClass parent_class;
-};
-
-
-GtkType	   e_week_view_get_type			(void);
-GtkWidget* e_week_view_new			(void);
-
-void       e_week_view_set_calendar		(EWeekView	*week_view,
-						 GnomeCalendar	*calendar);
-
-/* The first day shown. Note that it will be rounded down to the start of a
-   week when set. The returned value will be invalid if no date has been set
-   yet. */
-void	   e_week_view_get_first_day_shown	(EWeekView	*week_view,
-						 GDate		*date);
-void	   e_week_view_set_first_day_shown	(EWeekView	*week_view,
-						 GDate		*date);
-
-void       e_week_view_set_cal_client		(EWeekView	*week_view,
-						 CalClient	*client);
-
-/* The selected time range. The EWeekView will show the corresponding
-   month and the days between start_time and end_time will be selected.
-   To select a single day, use the same value for start_time & end_time. */
-void       e_week_view_get_selected_time_range	(EWeekView	*week_view,
-						 time_t		*start_time,
-						 time_t		*end_time);
-void	   e_week_view_set_selected_time_range	(EWeekView	*week_view,
-						 time_t		 start_time,
-						 time_t		 end_time);
-
-
-/* Whether to display 1 week or 1 month (5 weeks). It defaults to 1 week. */
-gboolean   e_week_view_get_multi_week_view	(EWeekView	*week_view);
-void       e_week_view_set_multi_week_view	(EWeekView	*week_view,
-						 gboolean	 multi_week_view);
-
-/* The number of weeks shown in the multi-week view. */
-gint	   e_week_view_get_weeks_shown		(EWeekView	*week_view);
-void	   e_week_view_set_weeks_shown		(EWeekView	*week_view,
-						 gint		 weeks_shown);
-
-/* Whether the weekend (Sat/Sun) should be compressed into 1 cell in the Month
-   view. In the Week view they are always compressed. */
-gboolean   e_week_view_get_compress_weekend	(EWeekView	*week_view);
-void       e_week_view_set_compress_weekend	(EWeekView	*week_view,
-						 gboolean	 compress);
-
-/*
- * Internal functions called by the associated canvas items.
- */
-void       e_week_view_get_day_position		(EWeekView	*week_view,
-						 gint		 day,
-						 gint		*day_x,
-						 gint		*day_y,
-						 gint		*day_w,
-						 gint		*day_h);
-gboolean   e_week_view_get_span_position	(EWeekView	*week_view,
-						 gint		 event_num,
-						 gint		 span_num,
-						 gint		*span_x,
-						 gint		*span_y,
-						 gint		*span_w);
-gboolean   e_week_view_is_one_day_event		(EWeekView	*week_view,
-						 gint		 event_num);
-void	   e_week_view_start_editing_event	(EWeekView	*week_view,
-						 gint		 event_num,
-						 gint		 span_num,
-						 gchar		*initial_text);
-void	   e_week_view_stop_editing_event	(EWeekView	*week_view);
-
-void	   e_week_view_show_popup_menu		(EWeekView	*week_view,
-						 GdkEventButton *event,
-						 gint		 event_num);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_WEEK_VIEW_H_ */
diff --git a/calendar/gui/event-editor-dialog.glade b/calendar/gui/event-editor-dialog.glade
deleted file mode 100644
index 3a81c0d1de..0000000000
--- a/calendar/gui/event-editor-dialog.glade
+++ /dev/null
@@ -1,1960 +0,0 @@
-<?xml version="1.0"?>
-<GTK-Interface>
-
-<project>
-  <name>event-editor-dialog</name>
-  <program_name>event-editor-dialog</program_name>
-  <directory></directory>
-  <source_directory>.</source_directory>
-  <pixmaps_directory>pixmaps</pixmaps_directory>
-  <language>C</language>
-  <gnome_support>True</gnome_support>
-  <gettext_support>True</gettext_support>
-  <output_main_file>False</output_main_file>
-  <output_support_files>False</output_support_files>
-  <output_build_files>False</output_build_files>
-  <output_translatable_strings>True</output_translatable_strings>
-  <translatable_strings_file>event-editor-dialog.glade.h</translatable_strings_file>
-</project>
-
-<widget>
-  <class>GnomeApp</class>
-  <name>event-editor-dialog</name>
-  <visible>False</visible>
-  <title>event-editor-dialog</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>dock2</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>dialog-contents</name>
-      <border_width>2</border_width>
-      <can_focus>True</can_focus>
-      <show_tabs>True</show_tabs>
-      <show_border>True</show_border>
-      <tab_pos>GTK_POS_TOP</tab_pos>
-      <scrollable>False</scrollable>
-      <tab_hborder>2</tab_hborder>
-      <tab_vborder>2</tab_vborder>
-      <popup_enable>False</popup_enable>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox2</name>
-	<border_width>4</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>table5</name>
-	  <rows>1</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>4</row_spacing>
-	  <column_spacing>4</column_spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label13</name>
-	    <label>_Summary:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>7.45058e-09</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>general-summary</default_focus_target>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkEntry</class>
-	    <name>general-summary</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame4</name>
-	  <label>Time</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkTable</class>
-	    <name>table3</name>
-	    <border_width>4</border_width>
-	    <rows>2</rows>
-	    <columns>3</columns>
-	    <homogeneous>False</homogeneous>
-	    <row_spacing>4</row_spacing>
-	    <column_spacing>4</column_spacing>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label15</name>
-	      <label>Start time:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <name>label16</name>
-	      <label>End time:</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <child>
-		<left_attach>0</left_attach>
-		<right_attach>1</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkCheckButton</class>
-	      <name>all-day-event</name>
-	      <can_focus>True</can_focus>
-	      <label>A_ll day event</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <child>
-		<left_attach>2</left_attach>
-		<right_attach>3</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>False</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>start-time</name>
-	      <creation_function>make_date_edit_with_time</creation_function>
-	      <string1></string1>
-	      <string2></string2>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Tue, 16 May 2000 19:11:05 GMT</last_modification_time>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>0</top_attach>
-		<bottom_attach>1</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>True</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>Custom</class>
-	      <name>end-time</name>
-	      <creation_function>make_date_edit_with_time</creation_function>
-	      <int1>0</int1>
-	      <int2>0</int2>
-	      <last_modification_time>Tue, 16 May 2000 19:11:10 GMT</last_modification_time>
-	      <child>
-		<left_attach>1</left_attach>
-		<right_attach>2</right_attach>
-		<top_attach>1</top_attach>
-		<bottom_attach>2</bottom_attach>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-		<xexpand>False</xexpand>
-		<yexpand>False</yexpand>
-		<xshrink>False</xshrink>
-		<yshrink>False</yshrink>
-		<xfill>True</xfill>
-		<yfill>False</yfill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkScrolledWindow</class>
-	  <name>scrolledwindow3</name>
-	  <hscrollbar_policy>GTK_POLICY_NEVER</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>GtkText</class>
-	    <name>description</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame5</name>
-	  <label>Classification</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox6</name>
-	    <border_width>4</border_width>
-	    <homogeneous>False</homogeneous>
-	    <spacing>4</spacing>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name>classification-radio</name>
-	      <can_focus>True</can_focus>
-	      <label>Pu_blic</label>
-	      <active>True</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>classification_radio_group</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name></name>
-	      <can_focus>True</can_focus>
-	      <label>Pri_vate</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>classification_radio_group</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkRadioButton</class>
-	      <name></name>
-	      <can_focus>True</can_focus>
-	      <label>_Confidential</label>
-	      <active>False</active>
-	      <draw_indicator>True</draw_indicator>
-	      <group>classification_radio_group</group>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label11</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>table4</name>
-	<border_width>4</border_width>
-	<rows>4</rows>
-	<columns>5</columns>
-	<homogeneous>False</homogeneous>
-	<row_spacing>4</row_spacing>
-	<column_spacing>4</column_spacing>
-
-	<widget>
-	  <class>GtkSpinButton</class>
-	  <name>alarm-display-amount</name>
-	  <can_focus>True</can_focus>
-	  <climb_rate>1</climb_rate>
-	  <digits>0</digits>
-	  <numeric>True</numeric>
-	  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	  <snap>False</snap>
-	  <wrap>False</wrap>
-	  <value>0</value>
-	  <lower>0</lower>
-	  <upper>100</upper>
-	  <step>1</step>
-	  <page>10</page>
-	  <page_size>10</page_size>
-	  <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>GtkSpinButton</class>
-	  <name>alarm-audio-amount</name>
-	  <can_focus>True</can_focus>
-	  <climb_rate>1</climb_rate>
-	  <digits>0</digits>
-	  <numeric>False</numeric>
-	  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	  <snap>False</snap>
-	  <wrap>False</wrap>
-	  <value>0</value>
-	  <lower>0</lower>
-	  <upper>100</upper>
-	  <step>1</step>
-	  <page>10</page>
-	  <page_size>10</page_size>
-	  <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>GtkSpinButton</class>
-	  <name>alarm-program-amount</name>
-	  <can_focus>True</can_focus>
-	  <climb_rate>1</climb_rate>
-	  <digits>0</digits>
-	  <numeric>False</numeric>
-	  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	  <snap>False</snap>
-	  <wrap>False</wrap>
-	  <value>0</value>
-	  <lower>0</lower>
-	  <upper>100</upper>
-	  <step>1</step>
-	  <page>10</page>
-	  <page_size>10</page_size>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkSpinButton</class>
-	  <name>alarm-mail-amount</name>
-	  <can_focus>True</can_focus>
-	  <climb_rate>1</climb_rate>
-	  <digits>0</digits>
-	  <numeric>False</numeric>
-	  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-	  <snap>False</snap>
-	  <wrap>False</wrap>
-	  <value>0</value>
-	  <lower>0</lower>
-	  <upper>100</upper>
-	  <step>1</step>
-	  <page>10</page>
-	  <page_size>10</page_size>
-	  <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>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>alarm-display-unit</name>
-	  <can_focus>True</can_focus>
-	  <items>Minutes
-Hours
-Days
-</items>
-	  <initial_choice>0</initial_choice>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>alarm-audio-unit</name>
-	  <can_focus>True</can_focus>
-	  <items>Minutes
-Hours
-Days
-</items>
-	  <initial_choice>0</initial_choice>
-	  <child>
-	    <left_attach>2</left_attach>
-	    <right_attach>3</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>alarm-program-unit</name>
-	  <can_focus>True</can_focus>
-	  <items>Minutes
-Hours
-Days
-</items>
-	  <initial_choice>0</initial_choice>
-	  <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>False</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkOptionMenu</class>
-	  <name>alarm-mail-unit</name>
-	  <can_focus>True</can_focus>
-	  <items>Minutes
-Hours
-Days
-</items>
-	  <initial_choice>0</initial_choice>
-	  <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>False</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>alarm-mail-mail-to</name>
-	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</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>GnomeFileEntry</class>
-	  <name>alarm-program-run-program</name>
-	  <max_saved>10</max_saved>
-	  <directory>False</directory>
-	  <modal>False</modal>
-	  <child>
-	    <left_attach>4</left_attach>
-	    <right_attach>5</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>GtkEntry</class>
-	    <child_name>GnomeEntry:entry</child_name>
-	    <name>alarm-program-run-program-entry</name>
-	    <can_focus>True</can_focus>
-	    <editable>True</editable>
-	    <text_visible>True</text_visible>
-	    <text_max_length>0</text_max_length>
-	    <text></text>
-	  </widget>
-	</widget>
-
-	<widget>
-	  <class>GtkCheckButton</class>
-	  <name>alarm-display</name>
-	  <can_focus>True</can_focus>
-	  <label>_Display</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
-	  <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>GtkCheckButton</class>
-	  <name>alarm-audio</name>
-	  <can_focus>True</can_focus>
-	  <label>_Audio</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkCheckButton</class>
-	  <name>alarm-program</name>
-	  <can_focus>True</can_focus>
-	  <label>_Program</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
-	  <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>GtkCheckButton</class>
-	  <name>alarm-mail</name>
-	  <can_focus>True</can_focus>
-	  <label>_Mail</label>
-	  <active>False</active>
-	  <draw_indicator>True</draw_indicator>
-	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>3</top_attach>
-	    <bottom_attach>4</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label18</name>
-	  <label>Mail _to:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>7.45058e-09</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>alarm-mail-mail-to</focus_target>
-	  <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>False</yfill>
-	  </child>
-	</widget>
-
-	<widget>
-	  <class>GtkLabel</class>
-	  <name>label17</name>
-	  <label>_Run program:</label>
-	  <justify>GTK_JUSTIFY_CENTER</justify>
-	  <wrap>False</wrap>
-	  <xalign>0</xalign>
-	  <yalign>0.5</yalign>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <focus_target>alarm-program-run-program-entry</focus_target>
-	  <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>False</yfill>
-	  </child>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label42</name>
-	<label>Reminder</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-
-      <widget>
-	<class>GtkVBox</class>
-	<name>vbox3</name>
-	<border_width>6</border_width>
-	<homogeneous>False</homogeneous>
-	<spacing>6</spacing>
-
-	<widget>
-	  <class>GtkFrame</class>
-	  <name>frame8</name>
-	  <label>Recurrence rule</label>
-	  <label_xalign>0</label_xalign>
-	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkHBox</class>
-	    <name>hbox7</name>
-	    <homogeneous>False</homogeneous>
-	    <spacing>0</spacing>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox4</name>
-	      <border_width>4</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>0</spacing>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>False</fill>
-	      </child>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>recurrence-rule-none</name>
-		<can_focus>True</can_focus>
-		<label>None</label>
-		<active>True</active>
-		<draw_indicator>True</draw_indicator>
-		<group>recurrence_rule_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>recurrence-rule-daily</name>
-		<can_focus>True</can_focus>
-		<label>Daily</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>recurrence_rule_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>recurrence-rule-weekly</name>
-		<can_focus>True</can_focus>
-		<label>Weekly</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>recurrence_rule_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>recurrence-rule-monthly</name>
-		<can_focus>True</can_focus>
-		<label>Monthly</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>recurrence_rule_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>recurrence-rule-yearly</name>
-		<can_focus>True</can_focus>
-		<label>Yearly</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>recurrence_rule_group</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-	    </widget>
-
-	    <widget>
-	      <class>GtkVSeparator</class>
-	      <name>vseparator1</name>
-	      <child>
-		<padding>0</padding>
-		<expand>False</expand>
-		<fill>True</fill>
-	      </child>
-	    </widget>
-
-	    <widget>
-	      <class>GtkNotebook</class>
-	      <name>recurrence-rule-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>GtkTable</class>
-		<name>table6</name>
-		<rows>3</rows>
-		<columns>3</columns>
-		<homogeneous>False</homogeneous>
-		<row_spacing>0</row_spacing>
-		<column_spacing>0</column_spacing>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<child_name>Notebook:tab</child_name>
-		<name>label23</name>
-		<label>label23</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>GtkAlignment</class>
-		<name>alignment1</name>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xscale>1</xscale>
-		<yscale>1</yscale>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox7</name>
-		  <border_width>4</border_width>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-
-		  <widget>
-		    <class>GtkHBox</class>
-		    <name>hbox13</name>
-		    <homogeneous>False</homogeneous>
-		    <spacing>0</spacing>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>True</fill>
-		    </child>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label31</name>
-		      <label>Every </label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0.5</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkSpinButton</class>
-		      <name>recurrence-rule-daily-days</name>
-		      <can_focus>True</can_focus>
-		      <climb_rate>1</climb_rate>
-		      <digits>0</digits>
-		      <numeric>False</numeric>
-		      <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		      <snap>False</snap>
-		      <wrap>False</wrap>
-		      <value>1</value>
-		      <lower>0</lower>
-		      <upper>100</upper>
-		      <step>1</step>
-		      <page>10</page>
-		      <page_size>10</page_size>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>True</fill>
-		      </child>
-		    </widget>
-
-		    <widget>
-		      <class>GtkLabel</class>
-		      <name>label32</name>
-		      <label>day(s)</label>
-		      <justify>GTK_JUSTIFY_CENTER</justify>
-		      <wrap>False</wrap>
-		      <xalign>0.5</xalign>
-		      <yalign>0.5</yalign>
-		      <xpad>0</xpad>
-		      <ypad>0</ypad>
-		      <child>
-			<padding>0</padding>
-			<expand>False</expand>
-			<fill>False</fill>
-		      </child>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<child_name>Notebook:tab</child_name>
-		<name>label24</name>
-		<label>label24</label>
-		<justify>GTK_JUSTIFY_CENTER</justify>
-		<wrap>False</wrap>
-		<xalign>0.5</xalign>
-		<yalign>0.5</yalign>
-		<xpad>0</xpad>
-		<ypad>0</ypad>
-	      </widget>
-
-	      <widget>
-		<class>GtkVBox</class>
-		<name>vbox8</name>
-		<border_width>4</border_width>
-		<homogeneous>False</homogeneous>
-		<spacing>2</spacing>
-
-		<widget>
-		  <class>GtkHBox</class>
-		  <name>hbox14</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label33</name>
-		    <label>Every </label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0.5</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkSpinButton</class>
-		    <name>recurrence-rule-weekly-weeks</name>
-		    <can_focus>True</can_focus>
-		    <climb_rate>1</climb_rate>
-		    <digits>0</digits>
-		    <numeric>False</numeric>
-		    <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		    <snap>False</snap>
-		    <wrap>False</wrap>
-		    <value>1</value>
-		    <lower>0</lower>
-		    <upper>100</upper>
-		    <step>1</step>
-		    <page>10</page>
-		    <page_size>10</page_size>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>True</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label34</name>
-		    <label>week(s)</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0.5</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-		</widget>
-
-		<widget>
-		  <class>GtkHBox</class>
-		  <name>hbox15</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>recurrence-rule-weekly-mon</name>
-		    <can_focus>True</can_focus>
-		    <label>Mon</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>recurrence-rule-weekly-tue</name>
-		    <can_focus>True</can_focus>
-		    <label>Tue</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>recurrence-rule-weekly-wed</name>
-		    <can_focus>True</can_focus>
-		    <label>Wed</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>recurrence-rule-weekly-thu</name>
-		    <can_focus>True</can_focus>
-		    <label>Thu</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>recurrence-rule-weekly-fri</name>
-		    <can_focus>True</can_focus>
-		    <label>Fri</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>recurrence-rule-weekly-sat</name>
-		    <can_focus>True</can_focus>
-		    <label>Sat</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkCheckButton</class>
-		    <name>recurrence-rule-weekly-sun</name>
-		    <can_focus>True</can_focus>
-		    <label>Sun</label>
-		    <active>False</active>
-		    <draw_indicator>True</draw_indicator>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<child_name>Notebook:tab</child_name>
-		<name>label25</name>
-		<label>label25</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>table8</name>
-		<rows>2</rows>
-		<columns>4</columns>
-		<homogeneous>False</homogeneous>
-		<row_spacing>2</row_spacing>
-		<column_spacing>2</column_spacing>
-
-		<widget>
-		  <class>GtkRadioButton</class>
-		  <name>recurrence-rule-monthly-on-day</name>
-		  <can_focus>True</can_focus>
-		  <label>Recur on the</label>
-		  <active>True</active>
-		  <draw_indicator>True</draw_indicator>
-		  <group>recurrence_rule_monthly_group</group>
-		  <child>
-		    <left_attach>0</left_attach>
-		    <right_attach>1</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>False</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkRadioButton</class>
-		  <name>recurrence-rule-monthly-weekday</name>
-		  <can_focus>True</can_focus>
-		  <label>Recur on the</label>
-		  <active>False</active>
-		  <draw_indicator>True</draw_indicator>
-		  <group>recurrence_rule_monthly_group</group>
-		  <child>
-		    <left_attach>0</left_attach>
-		    <right_attach>1</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>False</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label35</name>
-		  <label>th day of the month</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <left_attach>2</left_attach>
-		    <right_attach>3</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>1</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>False</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkOptionMenu</class>
-		  <name>recurrence-rule-monthly-week</name>
-		  <can_focus>True</can_focus>
-		  <items>1st
-2nd
-3rd
-4th
-5th
-</items>
-		  <initial_choice>0</initial_choice>
-		  <child>
-		    <left_attach>1</left_attach>
-		    <right_attach>2</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>False</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkOptionMenu</class>
-		  <name>recurrence-rule-monthly-weekpos</name>
-		  <can_focus>True</can_focus>
-		  <items>Monday
-Tuesday
-Wednesday
-Thursday
-Friday
-Saturday
-Sunday
-</items>
-		  <initial_choice>0</initial_choice>
-		  <child>
-		    <left_attach>2</left_attach>
-		    <right_attach>3</right_attach>
-		    <top_attach>1</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>False</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>False</xfill>
-		    <yfill>False</yfill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkHBox</class>
-		  <name>hbox19</name>
-		  <border_width>3</border_width>
-		  <homogeneous>False</homogeneous>
-		  <spacing>3</spacing>
-		  <child>
-		    <left_attach>3</left_attach>
-		    <right_attach>4</right_attach>
-		    <top_attach>0</top_attach>
-		    <bottom_attach>2</bottom_attach>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <xexpand>True</xexpand>
-		    <yexpand>False</yexpand>
-		    <xshrink>False</xshrink>
-		    <yshrink>False</yshrink>
-		    <xfill>True</xfill>
-		    <yfill>True</yfill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label36</name>
-		    <label>Every</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0.5</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkSpinButton</class>
-		    <name>recurrence-rule-monthly-every-n-months</name>
-		    <can_focus>True</can_focus>
-		    <climb_rate>1</climb_rate>
-		    <digits>0</digits>
-		    <numeric>False</numeric>
-		    <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		    <snap>False</snap>
-		    <wrap>False</wrap>
-		    <value>1</value>
-		    <lower>1</lower>
-		    <upper>100</upper>
-		    <step>1</step>
-		    <page>10</page>
-		    <page_size>10</page_size>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>True</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label37</name>
-		    <label>month(s)</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0.5</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-		</widget>
-
-		<widget>
-		  <class>GtkSpinButton</class>
-		  <name>recurrence-rule-monthly-day-nth</name>
-		  <can_focus>True</can_focus>
-		  <climb_rate>1</climb_rate>
-		  <digits>0</digits>
-		  <numeric>False</numeric>
-		  <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		  <snap>False</snap>
-		  <wrap>False</wrap>
-		  <value>1</value>
-		  <lower>0</lower>
-		  <upper>100</upper>
-		  <step>1</step>
-		  <page>10</page>
-		  <page_size>10</page_size>
-		  <child>
-		    <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>GtkLabel</class>
-		<child_name>Notebook:tab</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>
-		<class>GtkVBox</class>
-		<name>vbox11</name>
-		<border_width>4</border_width>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-
-		<widget>
-		  <class>GtkHBox</class>
-		  <name>hbox20</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>0</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label38</name>
-		    <label>Every </label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0.5</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkSpinButton</class>
-		    <name>recurrence-rule-yearly-every-n-years</name>
-		    <can_focus>True</can_focus>
-		    <climb_rate>1</climb_rate>
-		    <digits>0</digits>
-		    <numeric>False</numeric>
-		    <update_policy>GTK_UPDATE_ALWAYS</update_policy>
-		    <snap>False</snap>
-		    <wrap>False</wrap>
-		    <value>1</value>
-		    <lower>0</lower>
-		    <upper>100</upper>
-		    <step>1</step>
-		    <page>10</page>
-		    <page_size>10</page_size>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>True</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkLabel</class>
-		    <name>label39</name>
-		    <label>year(s)</label>
-		    <justify>GTK_JUSTIFY_CENTER</justify>
-		    <wrap>False</wrap>
-		    <xalign>0.5</xalign>
-		    <yalign>0.5</yalign>
-		    <xpad>0</xpad>
-		    <ypad>0</ypad>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkLabel</class>
-		<child_name>Notebook:tab</child_name>
-		<name>label27</name>
-		<label>label27</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>GtkHBox</class>
-	  <name>hbox8</name>
-	  <homogeneous>False</homogeneous>
-	  <spacing>4</spacing>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>True</fill>
-	  </child>
-
-	  <widget>
-	    <class>GtkFrame</class>
-	    <name>frame9</name>
-	    <label>Ending date</label>
-	    <label_xalign>0</label_xalign>
-	    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox5</name>
-	      <border_width>4</border_width>
-	      <homogeneous>True</homogeneous>
-	      <spacing>2</spacing>
-
-	      <widget>
-		<class>GtkRadioButton</class>
-		<name>recurrence-ending-date-repeat-forever</name>
-		<can_focus>True</can_focus>
-		<label>Repeat forever</label>
-		<active>False</active>
-		<draw_indicator>True</draw_indicator>
-		<group>recurrence_ending_date</group>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>hbox12</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-
-		<widget>
-		  <class>GtkRadioButton</class>
-		  <name>recurrence-ending-date-end-on</name>
-		  <can_focus>True</can_focus>
-		  <label>End on </label>
-		  <active>False</active>
-		  <draw_indicator>True</draw_indicator>
-		  <group>recurrence_ending_date</group>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>Custom</class>
-		  <name>recurrence-ending-date-end-on-date</name>
-		  <width>100</width>
-		  <creation_function>make_date_edit</creation_function>
-		  <int1>0</int1>
-		  <int2>0</int2>
-		  <last_modification_time>Sat, 13 May 2000 18:02:55 GMT</last_modification_time>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>True</fill>
-		  </child>
-		</widget>
-	      </widget>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>hbox10</name>
-		<homogeneous>False</homogeneous>
-		<spacing>0</spacing>
-		<child>
-		  <padding>0</padding>
-		  <expand>False</expand>
-		  <fill>False</fill>
-		</child>
-
-		<widget>
-		  <class>GtkRadioButton</class>
-		  <name>recurrence-ending-date-end-after</name>
-		  <can_focus>True</can_focus>
-		  <label>End after</label>
-		  <active>False</active>
-		  <draw_indicator>True</draw_indicator>
-		  <group>recurrence_ending_date</group>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkSpinButton</class>
-		  <name>recurrence-ending-date-end-after-count</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>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>True</fill>
-		  </child>
-		</widget>
-
-		<widget>
-		  <class>GtkLabel</class>
-		  <name>label28</name>
-		  <label>occurrence(s)</label>
-		  <justify>GTK_JUSTIFY_CENTER</justify>
-		  <wrap>False</wrap>
-		  <xalign>0.5</xalign>
-		  <yalign>0.5</yalign>
-		  <xpad>0</xpad>
-		  <ypad>0</ypad>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>False</fill>
-		  </child>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkFrame</class>
-	    <name>frame10</name>
-	    <label>Exceptions</label>
-	    <label_xalign>0</label_xalign>
-	    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	    <child>
-	      <padding>0</padding>
-	      <expand>True</expand>
-	      <fill>True</fill>
-	    </child>
-
-	    <widget>
-	      <class>GtkVBox</class>
-	      <name>vbox12</name>
-	      <border_width>4</border_width>
-	      <homogeneous>False</homogeneous>
-	      <spacing>4</spacing>
-
-	      <widget>
-		<class>Custom</class>
-		<name>recurrence-exceptions-date</name>
-		<creation_function>make_date_edit</creation_function>
-		<int1>0</int1>
-		<int2>0</int2>
-		<last_modification_time>Tue, 16 May 2000 01:42:29 GMT</last_modification_time>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-	      </widget>
-
-	      <widget>
-		<class>GtkHBox</class>
-		<name>hbox21</name>
-		<homogeneous>False</homogeneous>
-		<spacing>4</spacing>
-		<child>
-		  <padding>0</padding>
-		  <expand>True</expand>
-		  <fill>True</fill>
-		</child>
-
-		<widget>
-		  <class>GtkVBox</class>
-		  <name>vbox13</name>
-		  <homogeneous>False</homogeneous>
-		  <spacing>2</spacing>
-		  <child>
-		    <padding>0</padding>
-		    <expand>False</expand>
-		    <fill>True</fill>
-		  </child>
-
-		  <widget>
-		    <class>GtkButton</class>
-		    <name>recurrence-exceptions-add</name>
-		    <can_focus>True</can_focus>
-		    <label>Add</label>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkButton</class>
-		    <name>recurrence-exceptions-change</name>
-		    <can_focus>True</can_focus>
-		    <label>Change</label>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-
-		  <widget>
-		    <class>GtkButton</class>
-		    <name>recurrence-exceptions-delete</name>
-		    <can_focus>True</can_focus>
-		    <label>Delete</label>
-		    <child>
-		      <padding>0</padding>
-		      <expand>False</expand>
-		      <fill>False</fill>
-		    </child>
-		  </widget>
-		</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>recurrence-exceptions-list</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>label40</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>
-		    </widget>
-		  </widget>
-		</widget>
-	      </widget>
-	    </widget>
-	  </widget>
-	</widget>
-      </widget>
-
-      <widget>
-	<class>GtkLabel</class>
-	<child_name>Notebook:tab</child_name>
-	<name>label12</name>
-	<label>Recurrence</label>
-	<justify>GTK_JUSTIFY_CENTER</justify>
-	<wrap>False</wrap>
-	<xalign>0.5</xalign>
-	<yalign>0.5</yalign>
-	<xpad>0</xpad>
-	<ypad>0</ypad>
-      </widget>
-    </widget>
-  </widget>
-</widget>
-
-</GTK-Interface>
diff --git a/calendar/gui/event-editor-dialog.glade.h b/calendar/gui/event-editor-dialog.glade.h
deleted file mode 100644
index 57638f7f78..0000000000
--- a/calendar/gui/event-editor-dialog.glade.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
- * DO NOT compile it as part of your application.
- */
-
-gchar *s = N_("event-editor-dialog");
-gchar *s = N_("_Summary:");
-gchar *s = N_("Time");
-gchar *s = N_("Start time:");
-gchar *s = N_("End time:");
-gchar *s = N_("A_ll day event");
-gchar *s = N_("Classification");
-gchar *s = N_("Pu_blic");
-gchar *s = N_("Pri_vate");
-gchar *s = N_("_Confidential");
-gchar *s = N_("General");
-gchar *s = N_("Minutes\n"
-              "Hours\n"
-              "Days\n"
-              "");
-gchar *s = N_("Minutes\n"
-              "Hours\n"
-              "Days\n"
-              "");
-gchar *s = N_("Minutes\n"
-              "Hours\n"
-              "Days\n"
-              "");
-gchar *s = N_("Minutes\n"
-              "Hours\n"
-              "Days\n"
-              "");
-gchar *s = N_("_Display");
-gchar *s = N_("_Audio");
-gchar *s = N_("_Program");
-gchar *s = N_("_Mail");
-gchar *s = N_("Mail _to:");
-gchar *s = N_("_Run program:");
-gchar *s = N_("Reminder");
-gchar *s = N_("Recurrence rule");
-gchar *s = N_("None");
-gchar *s = N_("Daily");
-gchar *s = N_("Weekly");
-gchar *s = N_("Monthly");
-gchar *s = N_("Yearly");
-gchar *s = N_("label23");
-gchar *s = N_("Every ");
-gchar *s = N_("day(s)");
-gchar *s = N_("label24");
-gchar *s = N_("Every ");
-gchar *s = N_("week(s)");
-gchar *s = N_("Mon");
-gchar *s = N_("Tue");
-gchar *s = N_("Wed");
-gchar *s = N_("Thu");
-gchar *s = N_("Fri");
-gchar *s = N_("Sat");
-gchar *s = N_("Sun");
-gchar *s = N_("label25");
-gchar *s = N_("Recur on the");
-gchar *s = N_("Recur on the");
-gchar *s = N_("th day of the month");
-gchar *s = N_("1st\n"
-              "2nd\n"
-              "3rd\n"
-              "4th\n"
-              "5th\n"
-              "");
-gchar *s = N_("Monday\n"
-              "Tuesday\n"
-              "Wednesday\n"
-              "Thursday\n"
-              "Friday\n"
-              "Saturday\n"
-              "Sunday\n"
-              "");
-gchar *s = N_("Every");
-gchar *s = N_("month(s)");
-gchar *s = N_("label26");
-gchar *s = N_("Every ");
-gchar *s = N_("year(s)");
-gchar *s = N_("label27");
-gchar *s = N_("Ending date");
-gchar *s = N_("Repeat forever");
-gchar *s = N_("End on ");
-gchar *s = N_("End after");
-gchar *s = N_("occurrence(s)");
-gchar *s = N_("Exceptions");
-gchar *s = N_("Add");
-gchar *s = N_("Change");
-gchar *s = N_("Delete");
-gchar *s = N_("Recurrence");
diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c
deleted file mode 100644
index 57242978e8..0000000000
--- a/calendar/gui/event-editor.c
+++ /dev/null
@@ -1,1887 +0,0 @@
-/* Evolution calendar - Event editor dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Miguel de Icaza <miguel@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *          Seth Alves <alves@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include <e-util/e-dialog-widgets.h>
-#include <widgets/misc/e-dateedit.h>
-#include <gal/widgets/e-unicode.h>
-#include <cal-util/timeutil.h>
-#include "event-editor.h"
-#include "e-meeting-edit.h"
-
-
-
-
-typedef struct {
-	/* Glade XML data */
-	GladeXML *xml;
-
-	/* UI handler */
-	BonoboUIComponent *uic;
-
-	/* Client to use */
-	CalClient *client;
-	
-	/* Calendar object/uid we are editing; this is an internal copy */
-	CalComponent *comp;
-
-	/* Widgets from the Glade file */
-
-	GtkWidget *app;
-
-	GtkWidget *general_summary;
-
-	GtkWidget *start_time;
-	GtkWidget *end_time;
-	GtkWidget *all_day_event;
-
-	GtkWidget *description;
-
-	GtkWidget *alarm_display;
-	GtkWidget *alarm_program;
-	GtkWidget *alarm_audio;
-	GtkWidget *alarm_mail;
-	GtkWidget *alarm_display_amount;
-	GtkWidget *alarm_display_unit;
-	GtkWidget *alarm_audio_amount;
-	GtkWidget *alarm_audio_unit;
-	GtkWidget *alarm_program_amount;
-	GtkWidget *alarm_program_unit;
-	GtkWidget *alarm_program_run_program;
-	GtkWidget *alarm_program_run_program_entry;
-	GtkWidget *alarm_mail_amount;
-	GtkWidget *alarm_mail_unit;
-	GtkWidget *alarm_mail_mail_to;
-
-	GtkWidget *classification_radio;
-
-	GtkWidget *recurrence_rule_notebook;
-	GtkWidget *recurrence_rule_none;
-	GtkWidget *recurrence_rule_daily;
-	GtkWidget *recurrence_rule_weekly;
-	GtkWidget *recurrence_rule_monthly;
-	GtkWidget *recurrence_rule_yearly;
-
-	GtkWidget *recurrence_rule_daily_days;
-
-	GtkWidget *recurrence_rule_weekly_weeks;
-	GtkWidget *recurrence_rule_weekly_sun;
-	GtkWidget *recurrence_rule_weekly_mon;
-	GtkWidget *recurrence_rule_weekly_tue;
-	GtkWidget *recurrence_rule_weekly_wed;
-	GtkWidget *recurrence_rule_weekly_thu;
-	GtkWidget *recurrence_rule_weekly_fri;
-	GtkWidget *recurrence_rule_weekly_sat;
-
-	GtkWidget *recurrence_rule_monthly_on_day;
-	GtkWidget *recurrence_rule_monthly_weekday;
-	GtkWidget *recurrence_rule_monthly_day_nth;
-	GtkWidget *recurrence_rule_monthly_week;
-	GtkWidget *recurrence_rule_monthly_weekpos;
-	GtkWidget *recurrence_rule_monthly_every_n_months;
-	GtkWidget *recurrence_rule_yearly_every_n_years;
-
-	GtkWidget *recurrence_ending_date_repeat_forever;
-	GtkWidget *recurrence_ending_date_end_on;
-	GtkWidget *recurrence_ending_date_end_on_date;
-	GtkWidget *recurrence_ending_date_end_after;
-	GtkWidget *recurrence_ending_date_end_after_count;
-
-	GtkWidget *recurrence_exceptions_date;
-	GtkWidget *recurrence_exceptions_list;
-	GtkWidget *recurrence_exception_add;
-	GtkWidget *recurrence_exception_delete;
-	GtkWidget *recurrence_exception_change;
-
-	GtkWidget *exception_list;
-	GtkWidget *exception_date;
-} EventEditorPrivate;
-
-
-
-static void event_editor_class_init (EventEditorClass *class);
-static void event_editor_init (EventEditor *ee);
-static void event_editor_destroy (GtkObject *object);
-
-static GtkObjectClass *parent_class;
-
-extern int day_begin, day_end;
-extern char *user_name;
-extern int am_pm_flag;
-extern int week_starts_on_monday;
-
-
-static void append_exception (EventEditor *ee, time_t t);
-static void check_all_day (EventEditor *ee);
-static void set_all_day (GtkWidget *toggle, EventEditor *ee);
-static void alarm_toggle (GtkWidget *toggle, EventEditor *ee);
-static void check_dates (EDateEdit *dedit, EventEditor *ee);
-static void check_times (EDateEdit *dedit, EventEditor *ee);
-static void recurrence_toggled (GtkWidget *radio, EventEditor *ee);
-static void recurrence_exception_added (GtkWidget *widget, EventEditor *ee);
-static void recurrence_exception_deleted (GtkWidget *widget, EventEditor *ee);
-static void recurrence_exception_changed (GtkWidget *widget, EventEditor *ee);
-
-
-
-/**
- * event_editor_get_type:
- * @void:
- *
- * Registers the #EventEditor class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #EventEditor class.
- **/
-GtkType
-event_editor_get_type (void)
-{
-	static GtkType event_editor_type = 0;
-
-	if (!event_editor_type) {
-		static const GtkTypeInfo event_editor_info = {
-			"EventEditor",
-			sizeof (EventEditor),
-			sizeof (EventEditorClass),
-			(GtkClassInitFunc) event_editor_class_init,
-			(GtkObjectInitFunc) event_editor_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		event_editor_type = gtk_type_unique (GTK_TYPE_OBJECT, &event_editor_info);
-	}
-
-	return event_editor_type;
-}
-
-/* Class initialization function for the event editor */
-static void
-event_editor_class_init (EventEditorClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	object_class->destroy = event_editor_destroy;
-}
-
-/* Object initialization function for the event editor */
-static void
-event_editor_init (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	priv = g_new0 (EventEditorPrivate, 1);
-	ee->priv = priv;
-}
-
-/* Frees the rows and the row data in the recurrence exceptions GtkCList */
-static void
-free_exception_clist_data (GtkCList *clist)
-{
-	int i;
-
-	for (i = 0; i < clist->rows; i++) {
-		gpointer data;
-
-		data = gtk_clist_get_row_data (clist, i);
-		g_free (data);
-		gtk_clist_set_row_data (clist, i, NULL);
-	}
-
-	gtk_clist_clear (clist);
-}
-
-/* Destroy handler for the event editor */
-static void
-event_editor_destroy (GtkObject *object)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (object));
-
-	ee = EVENT_EDITOR (object);
-	priv = ee->priv;
-
-	if (priv->uic) {
-		bonobo_object_unref (BONOBO_OBJECT (priv->uic));
-		priv->uic = NULL;
-	}
-
-	free_exception_clist_data (GTK_CLIST (priv->recurrence_exceptions_list));
-
-	if (priv->app) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->app), ee);
-		gtk_widget_destroy (priv->app);
-		priv->app = NULL;
-	}
-
-	if (priv->comp) {
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-		priv->comp = NULL;
-	}
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), ee);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-		priv->client = NULL;
-	}
-
-	if (priv->xml) {
-		gtk_object_unref (GTK_OBJECT (priv->xml));
-		priv->xml = NULL;
-	}
-
-	g_free (priv);
-	ee->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/* Creates an appropriate title for the event editor dialog */
-static char *
-make_title_from_comp (CalComponent *comp)
-{
-	const char *summary;
-	CalComponentVType type;
-	CalComponentText text;
-	
-	if (!comp)
-		return g_strdup (_("Edit Appointment"));
-
-	cal_component_get_summary (comp, &text);
-	if (text.value)
-		summary = text.value;
-	else
-		summary =  _("No summary");
-
-	
-	type = cal_component_get_vtype (comp);
-	switch (type) {
-	case CAL_COMPONENT_EVENT:
-		return g_strdup_printf (_("Appointment - %s"), summary);
-
-	case CAL_COMPONENT_TODO:
-		return g_strdup_printf (_("Task - %s"), summary);
-
-	case CAL_COMPONENT_JOURNAL:
-		return g_strdup_printf (_("Journal entry - %s"), summary);
-
-	default:
-		g_message ("make_title_from_comp(): Cannot handle object of type %d", type);
-		return NULL;
-	}
-}
-
-/* Gets the widgets from the XML file and returns if they are all available.
- * For the widgets whose values can be simply set with e-dialog-utils, it does
- * that as well.
- */
-static gboolean
-get_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	priv = ee->priv;
-
-#define GW(name) glade_xml_get_widget (priv->xml, name)
-
-	priv->app = GW ("event-editor-dialog");
-
-	priv->general_summary = GW ("general-summary");
-
-	priv->start_time = GW ("start-time");
-	priv->end_time = GW ("end-time");
-	priv->all_day_event = GW ("all-day-event");
-
-	priv->description = GW ("description");
-
-	priv->alarm_display = GW ("alarm-display");
-	priv->alarm_program = GW ("alarm-program");
-	priv->alarm_audio = GW ("alarm-audio");
-	priv->alarm_mail = GW ("alarm-mail");
-	priv->alarm_display_amount = GW ("alarm-display-amount");
-	priv->alarm_display_unit = GW ("alarm-display-unit");
-	priv->alarm_audio_amount = GW ("alarm-audio-amount");
-	priv->alarm_audio_unit = GW ("alarm-audio-unit");
-	priv->alarm_program_amount = GW ("alarm-program-amount");
-	priv->alarm_program_unit = GW ("alarm-program-unit");
-	priv->alarm_program_run_program = GW ("alarm-program-run-program");
-	priv->alarm_program_run_program_entry = GW ("alarm-program-run-program-entry");
-	priv->alarm_mail_amount = GW ("alarm-mail-amount");
-	priv->alarm_mail_unit = GW ("alarm-mail-unit");
-	priv->alarm_mail_mail_to = GW ("alarm-mail-mail-to");
-
-	priv->classification_radio = GW ("classification-radio");
-
-	priv->recurrence_rule_notebook = GW ("recurrence-rule-notebook");
-	priv->recurrence_rule_none = GW ("recurrence-rule-none");
-	priv->recurrence_rule_daily = GW ("recurrence-rule-daily");
-	priv->recurrence_rule_weekly = GW ("recurrence-rule-weekly");
-	priv->recurrence_rule_monthly = GW ("recurrence-rule-monthly");
-	priv->recurrence_rule_yearly = GW ("recurrence-rule-yearly");
-
-	priv->recurrence_rule_daily_days = GW ("recurrence-rule-daily-days");
-
-	priv->recurrence_rule_weekly_weeks = GW ("recurrence-rule-weekly-weeks");
-	priv->recurrence_rule_weekly_sun = GW ("recurrence-rule-weekly-sun");
-	priv->recurrence_rule_weekly_mon = GW ("recurrence-rule-weekly-mon");
-	priv->recurrence_rule_weekly_tue = GW ("recurrence-rule-weekly-tue");
-	priv->recurrence_rule_weekly_wed = GW ("recurrence-rule-weekly-wed");
-	priv->recurrence_rule_weekly_thu = GW ("recurrence-rule-weekly-thu");
-	priv->recurrence_rule_weekly_fri = GW ("recurrence-rule-weekly-fri");
-	priv->recurrence_rule_weekly_sat = GW ("recurrence-rule-weekly-sat");
-
-	priv->recurrence_rule_monthly_on_day = GW ("recurrence-rule-monthly-on-day");
-	priv->recurrence_rule_monthly_weekday = GW ("recurrence-rule-monthly-weekday");
-	priv->recurrence_rule_monthly_day_nth = GW ("recurrence-rule-monthly-day-nth");
-	priv->recurrence_rule_monthly_week = GW ("recurrence-rule-monthly-week");
-	priv->recurrence_rule_monthly_weekpos = GW ("recurrence-rule-monthly-weekpos");
-	priv->recurrence_rule_monthly_every_n_months = GW ("recurrence-rule-monthly-every-n-months");
-	priv->recurrence_rule_yearly_every_n_years = GW ("recurrence-rule-yearly-every-n-years");
-
-	priv->recurrence_ending_date_repeat_forever = GW ("recurrence-ending-date-repeat-forever");
-	priv->recurrence_ending_date_end_on = GW ("recurrence-ending-date-end-on");
-	priv->recurrence_ending_date_end_on_date = GW ("recurrence-ending-date-end-on-date");
-	priv->recurrence_ending_date_end_after = GW ("recurrence-ending-date-end-after");
-	priv->recurrence_ending_date_end_after_count = GW ("recurrence-ending-date-end-after-count");
-
-	priv->recurrence_exceptions_date = GW ("recurrence-exceptions-date");
-	priv->recurrence_exceptions_list = GW ("recurrence-exceptions-list");
-	priv->recurrence_exception_add = GW ("recurrence-exceptions-add");
-	priv->recurrence_exception_delete = GW ("recurrence-exceptions-delete");
-	priv->recurrence_exception_change = GW ("recurrence-exceptions-change");
-
-	priv->exception_list = GW ("recurrence-exceptions-list");
-	priv->exception_date = GW ("recurrence-exceptions-date");
-
-#undef GW
-
-	return (priv->general_summary
-		&& priv->start_time
-		&& priv->end_time
-		&& priv->all_day_event
-		&& priv->description
-		&& priv->alarm_display
-		&& priv->alarm_program
-		&& priv->alarm_audio
-		&& priv->alarm_mail
-		&& priv->alarm_display_amount
-		&& priv->alarm_display_unit
-		&& priv->alarm_audio_amount
-		&& priv->alarm_audio_unit
-		&& priv->alarm_program_amount
-		&& priv->alarm_program_unit
-		&& priv->alarm_program_run_program
-		&& priv->alarm_program_run_program_entry
-		&& priv->alarm_mail_amount
-		&& priv->alarm_mail_unit
-		&& priv->alarm_mail_mail_to
-		&& priv->classification_radio
-		&& priv->recurrence_rule_notebook
-		&& priv->recurrence_rule_none
-		&& priv->recurrence_rule_daily
-		&& priv->recurrence_rule_weekly
-		&& priv->recurrence_rule_monthly
-		&& priv->recurrence_rule_yearly
-		&& priv->recurrence_rule_daily_days
-		&& priv->recurrence_rule_weekly_weeks
-		&& priv->recurrence_rule_monthly_on_day
-		&& priv->recurrence_rule_monthly_weekday
-		&& priv->recurrence_rule_monthly_day_nth
-		&& priv->recurrence_rule_monthly_week
-		&& priv->recurrence_rule_monthly_weekpos
-		&& priv->recurrence_rule_monthly_every_n_months
-		&& priv->recurrence_rule_yearly_every_n_years
-		&& priv->recurrence_ending_date_repeat_forever
-		&& priv->recurrence_ending_date_end_on
-		&& priv->recurrence_ending_date_end_on_date
-		&& priv->recurrence_ending_date_end_after
-		&& priv->recurrence_ending_date_end_after_count
-		&& priv->recurrence_exceptions_date
-		&& priv->recurrence_exceptions_list
-		&& priv->recurrence_exception_add
-		&& priv->recurrence_exception_delete
-		&& priv->recurrence_exception_change
-		&& priv->exception_list
-		&& priv->exception_date);
-}
-
-
-
-static const int classification_map[] = {
-	CAL_COMPONENT_CLASS_PUBLIC,
-	CAL_COMPONENT_CLASS_PRIVATE,
-	CAL_COMPONENT_CLASS_CONFIDENTIAL,
-	-1
-};
-
-#if 0
-static const int alarm_unit_map[] = {
-	ALARM_MINUTES,
-	ALARM_HOURS,
-	ALARM_DAYS,
-	-1
-};
-
-static void
-alarm_unit_set (GtkWidget *widget, enum AlarmUnit unit)
-{
-	e_dialog_option_menu_set (widget, unit, alarm_unit_map);
-}
-
-static enum AlarmUnit
-alarm_unit_get (GtkWidget *widget)
-{
-	return e_dialog_option_menu_get (widget, alarm_unit_map);
-}
-#endif
-
-/* Recurrence types for mapping them to radio buttons */
-static const int recur_options_map[] = {
-	ICAL_NO_RECURRENCE,
-	ICAL_DAILY_RECURRENCE,
-	ICAL_WEEKLY_RECURRENCE,
-	ICAL_MONTHLY_RECURRENCE,
-	ICAL_YEARLY_RECURRENCE,
-	-1
-};
-
-static icalrecurrencetype_frequency
-recur_options_get (GtkWidget *widget)
-{
-	return e_dialog_radio_get (widget, recur_options_map);
-}
-
-static const int month_pos_map[] = { 0, 1, 2, 3, 4, -1 };
-static const int weekday_map[] = { 0, 1, 2, 3, 4, 5, 6, -1 };
-
-/* Hooks the widget signals */
-static void
-init_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	priv = ee->priv;
-
-	/* Start and end times */
-
-	gtk_signal_connect (GTK_OBJECT (priv->start_time), "date_changed",
-			    GTK_SIGNAL_FUNC (check_dates), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->start_time), "time_changed",
-			    GTK_SIGNAL_FUNC (check_times), ee);
-
-	gtk_signal_connect (GTK_OBJECT (priv->end_time), "date_changed",
-			    GTK_SIGNAL_FUNC (check_dates), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->end_time), "time_changed",
-			    GTK_SIGNAL_FUNC (check_times), ee);
-
-	gtk_signal_connect (GTK_OBJECT (priv->all_day_event), "toggled",
-			    GTK_SIGNAL_FUNC (set_all_day), ee);
-
-	/* Alarms */
-
-	gtk_signal_connect (GTK_OBJECT (priv->alarm_display), "toggled",
-			    GTK_SIGNAL_FUNC (alarm_toggle), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->alarm_program), "toggled",
-			    GTK_SIGNAL_FUNC (alarm_toggle), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->alarm_audio), "toggled",
-			    GTK_SIGNAL_FUNC (alarm_toggle), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->alarm_mail), "toggled",
-			    GTK_SIGNAL_FUNC (alarm_toggle), ee);
-
-	/* Recurrence types */
-
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_rule_none), "toggled",
-			    GTK_SIGNAL_FUNC (recurrence_toggled), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_rule_daily), "toggled",
-			    GTK_SIGNAL_FUNC (recurrence_toggled), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_rule_weekly), "toggled",
-			    GTK_SIGNAL_FUNC (recurrence_toggled), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_rule_monthly), "toggled",
-			    GTK_SIGNAL_FUNC (recurrence_toggled), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_rule_yearly), "toggled",
-			    GTK_SIGNAL_FUNC (recurrence_toggled), ee);
-
-	/* Exception buttons */
-
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_exception_add), "clicked",
-			    GTK_SIGNAL_FUNC (recurrence_exception_added), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_exception_delete), "clicked",
-			    GTK_SIGNAL_FUNC (recurrence_exception_deleted), ee);
-	gtk_signal_connect (GTK_OBJECT (priv->recurrence_exception_change), "clicked",
-			    GTK_SIGNAL_FUNC (recurrence_exception_changed), ee);
-}
-
-/* Fills the widgets with default values */
-static void
-clear_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	time_t now;
-
-	priv = ee->priv;
-
-	now = time (NULL);
-
-	/* Summary, description */
-
-	e_dialog_editable_set (priv->general_summary, NULL);
-	e_dialog_editable_set (priv->description, NULL);
-
-	/* Start and end times */
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time), ee);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time), ee);
-
-	e_date_edit_set_time (E_DATE_EDIT (priv->start_time), now);
-	e_date_edit_set_time (E_DATE_EDIT (priv->end_time), now);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time), ee);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time), ee);
-
-	check_all_day (ee);
-
-	/* Alarms */
-
-	/* FIXMe: these should use configurable defaults */
-
-	e_dialog_toggle_set (priv->alarm_display, FALSE);
-	e_dialog_toggle_set (priv->alarm_program, FALSE);
-	e_dialog_toggle_set (priv->alarm_audio, FALSE);
-	e_dialog_toggle_set (priv->alarm_mail, FALSE);
-
-	e_dialog_spin_set (priv->alarm_display_amount, 15);
-	e_dialog_spin_set (priv->alarm_audio_amount, 15);
-	e_dialog_spin_set (priv->alarm_program_amount, 15);
-	e_dialog_spin_set (priv->alarm_mail_amount, 15);
-
-#if 0
-	alarm_unit_set (priv->alarm_display_unit, ALARM_MINUTES);
-	alarm_unit_set (priv->alarm_audio_unit, ALARM_MINUTES);
-	alarm_unit_set (priv->alarm_program_unit, ALARM_MINUTES);
-	alarm_unit_set (priv->alarm_mail_unit, ALARM_MINUTES);
-#endif
-
-	e_dialog_editable_set (priv->alarm_program_run_program_entry, NULL);
-	e_dialog_editable_set (priv->alarm_mail_mail_to, NULL);
-
-	/* Classification */
-
-	e_dialog_radio_set (priv->classification_radio, 
-			    CAL_COMPONENT_CLASS_PRIVATE, classification_map);
-
-	/* Recurrences */
-
-	e_dialog_radio_set (priv->recurrence_rule_none, ICAL_NO_RECURRENCE, recur_options_map);
-
-	e_dialog_spin_set (priv->recurrence_rule_daily_days, 1);
-
-	e_dialog_spin_set (priv->recurrence_rule_weekly_weeks, 1);
-	e_dialog_toggle_set (priv->recurrence_rule_weekly_sun, FALSE);
-	e_dialog_toggle_set (priv->recurrence_rule_weekly_mon, FALSE);
-	e_dialog_toggle_set (priv->recurrence_rule_weekly_tue, FALSE);
-	e_dialog_toggle_set (priv->recurrence_rule_weekly_wed, FALSE);
-	e_dialog_toggle_set (priv->recurrence_rule_weekly_thu, FALSE);
-	e_dialog_toggle_set (priv->recurrence_rule_weekly_fri, FALSE);
-	e_dialog_toggle_set (priv->recurrence_rule_weekly_sat, FALSE);
-
-	e_dialog_toggle_set (priv->recurrence_rule_monthly_on_day, TRUE);
-	e_dialog_spin_set (priv->recurrence_rule_monthly_day_nth, 1);
-	e_dialog_spin_set (priv->recurrence_rule_monthly_every_n_months, 1);
-	e_dialog_option_menu_set (priv->recurrence_rule_monthly_week, 0, month_pos_map);
-	e_dialog_option_menu_set (priv->recurrence_rule_monthly_weekpos, 0, weekday_map);
-	e_dialog_spin_set (priv->recurrence_rule_monthly_every_n_months, 1);
-
-	e_dialog_spin_set (priv->recurrence_rule_yearly_every_n_years, 1);
-
-	e_dialog_toggle_set (priv->recurrence_ending_date_repeat_forever, TRUE);
-	e_dialog_spin_set (priv->recurrence_ending_date_end_after_count, 1);
-	e_date_edit_set_time (E_DATE_EDIT (priv->recurrence_ending_date_end_on_date), time_add_day (time (NULL), 1));
-
-	/* Exceptions list */
-
-	free_exception_clist_data (GTK_CLIST (priv->recurrence_exceptions_list));
-}
-
-/* Fills in the widgets with the proper values */
-static void
-fill_widgets (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	CalComponentText text;
-	CalComponentClassification cl;
-	CalComponentDateTime d;
-	GSList *list, *l;
-	time_t dtstart, dtend;
-
-	priv = ee->priv;
-
-	clear_widgets (ee);
-
-	if (!priv->comp)
-		return;
-
-	cal_component_get_summary (priv->comp, &text);
-	e_dialog_editable_set (priv->general_summary, text.value);
-
-	cal_component_get_description_list (priv->comp, &l);
-	if (l) {
-		text = *(CalComponentText *)l->data;
-		e_dialog_editable_set (priv->description, text.value);
-	}
-	cal_component_free_text_list (l);
-	
-	/* Start and end times */
-
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time), ee);
-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time), ee);
-
-	/* All-day events are inclusive, i.e. if the end date shown is 2nd Feb
-	   then the event includes all of the 2nd Feb. We would normally show
-	   3rd Feb as the end date, since it really ends at midnight on 3rd,
-	   so we have to subtract a day so we only show the 2nd. */
-	cal_component_get_dtstart (priv->comp, &d);
-	dtstart = icaltime_as_timet (*d.value);
-	cal_component_get_dtend (priv->comp, &d);
-	dtend = icaltime_as_timet (*d.value);
-	if (time_day_begin (dtstart) == dtstart
-	    && time_day_begin (dtend) == dtend) {
-		dtend = time_add_day (dtend, -1);
-	}
-
-	e_date_edit_set_time (E_DATE_EDIT (priv->start_time), dtstart);
-	e_date_edit_set_time (E_DATE_EDIT (priv->end_time), dtend);
-
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time), ee);
-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time), ee);
-
-	check_all_day (ee);
-
-	/* Alarms */
-#if 0
-	e_dialog_toggle_set (priv->alarm_display, priv->ico->dalarm.enabled);
-	e_dialog_toggle_set (priv->alarm_program, priv->ico->palarm.enabled);
-	e_dialog_toggle_set (priv->alarm_audio, priv->ico->aalarm.enabled);
-	e_dialog_toggle_set (priv->alarm_mail, priv->ico->malarm.enabled);
-#endif
-	/* Alarm data */
-#if 0
-	e_dialog_spin_set (priv->alarm_display_amount, priv->ico->dalarm.count);
-	e_dialog_spin_set (priv->alarm_audio_amount, priv->ico->aalarm.count);
-	e_dialog_spin_set (priv->alarm_program_amount, priv->ico->palarm.count);
-	e_dialog_spin_set (priv->alarm_mail_amount, priv->ico->malarm.count);
-
-	alarm_unit_set (priv->alarm_display_unit, priv->ico->dalarm.units);
-	alarm_unit_set (priv->alarm_audio_unit, priv->ico->aalarm.units);
-	alarm_unit_set (priv->alarm_program_unit, priv->ico->palarm.units);
-	alarm_unit_set (priv->alarm_mail_unit, priv->ico->malarm.units);
-
-	e_dialog_editable_set (priv->alarm_program_run_program_entry, priv->ico->palarm.data);
-	e_dialog_editable_set (priv->alarm_mail_mail_to, priv->ico->malarm.data);
-#endif
-	/* Classification */
-	cal_component_get_classification (priv->comp, &cl);
-	switch (cl) {
-	case CAL_COMPONENT_CLASS_PUBLIC:
-	    	e_dialog_radio_set (priv->classification_radio, CAL_COMPONENT_CLASS_PUBLIC,
-				    classification_map);
-	case CAL_COMPONENT_CLASS_PRIVATE:
-	    	e_dialog_radio_set (priv->classification_radio, CAL_COMPONENT_CLASS_PRIVATE,
-				    classification_map);
-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:
-	    	e_dialog_radio_set (priv->classification_radio, CAL_COMPONENT_CLASS_CONFIDENTIAL,
-				    classification_map);
-	default:
-		/* What do do?  We can't g_assert_not_reached() since it is a
-		 * value from an external file.
-		 */
-	}
-	
-	/* Recurrences */
-#ifndef NO_WARNINGS
-#warning "FIX ME"
-#endif
-
-	/* Need to handle recurrence dates as well as recurrence rules */
-	/* Need to handle more than one rrule */
-	if (cal_component_has_rrules (priv->comp)) {
-		struct icalrecurrencetype *r;
-		int i;
-		
-		cal_component_get_rrule_list (priv->comp, &list);
-		r = list->data;
-		
-		switch (r->freq) {
-		case ICAL_DAILY_RECURRENCE:
-			e_dialog_radio_set (priv->recurrence_rule_daily, ICAL_DAILY_RECURRENCE,
-					    recur_options_map);
-			e_dialog_spin_set (priv->recurrence_rule_daily_days, r->interval);
-			break;
-
-		case ICAL_WEEKLY_RECURRENCE:
-			e_dialog_radio_set (priv->recurrence_rule_weekly, ICAL_WEEKLY_RECURRENCE,
-					    recur_options_map);
-			e_dialog_spin_set (priv->recurrence_rule_weekly_weeks, r->interval);
-
-			e_dialog_toggle_set (priv->recurrence_rule_weekly_sun, FALSE);
-			e_dialog_toggle_set (priv->recurrence_rule_weekly_mon, FALSE);
-			e_dialog_toggle_set (priv->recurrence_rule_weekly_tue, FALSE);
-			e_dialog_toggle_set (priv->recurrence_rule_weekly_wed, FALSE);
-			e_dialog_toggle_set (priv->recurrence_rule_weekly_thu, FALSE);
-			e_dialog_toggle_set (priv->recurrence_rule_weekly_fri, FALSE);
-			e_dialog_toggle_set (priv->recurrence_rule_weekly_sat, FALSE);
-
-			for (i=0; i<8 && r->by_day[i] != SHRT_MAX; i++) {
-				switch (r->by_day[i]) {
-				case ICAL_SUNDAY_WEEKDAY:
-					e_dialog_toggle_set (priv->recurrence_rule_weekly_sun, TRUE);
-					break;
-				case ICAL_MONDAY_WEEKDAY:
-					e_dialog_toggle_set (priv->recurrence_rule_weekly_mon, TRUE);
-					break;
-				case ICAL_TUESDAY_WEEKDAY:
-					e_dialog_toggle_set (priv->recurrence_rule_weekly_tue, TRUE);
-					break;
-				case ICAL_WEDNESDAY_WEEKDAY:
-					e_dialog_toggle_set (priv->recurrence_rule_weekly_wed, TRUE);
-					break;
-				case ICAL_THURSDAY_WEEKDAY:
-					e_dialog_toggle_set (priv->recurrence_rule_weekly_thu, TRUE);
-					break;
-				case ICAL_FRIDAY_WEEKDAY:
-					e_dialog_toggle_set (priv->recurrence_rule_weekly_fri, TRUE);
-					break;
-				case ICAL_SATURDAY_WEEKDAY:
-					e_dialog_toggle_set (priv->recurrence_rule_weekly_sat, TRUE);
-					break;
-				case ICAL_NO_WEEKDAY:
-					break;
-				}
-			}
-			break;
-
-		case ICAL_MONTHLY_RECURRENCE:
-			e_dialog_radio_set (priv->recurrence_rule_monthly, ICAL_MONTHLY_RECURRENCE,
-					    recur_options_map);
-			
-			if (r->by_month_day[0] != SHRT_MAX) {
-				e_dialog_toggle_set (priv->recurrence_rule_monthly_on_day, TRUE);
-				e_dialog_spin_set (priv->recurrence_rule_monthly_day_nth, 
-						   r->by_month_day[0]);
-			} else if (r->by_day[0] != SHRT_MAX) {
-				e_dialog_toggle_set (priv->recurrence_rule_monthly_weekday, TRUE);
-				/* libical does not handle ints in by day */
-/*  				e_dialog_option_menu_set (priv->recurrence_rule_monthly_week, */
-/*  							  priv->ico->recur->u.month_pos, */
-/*  							  month_pos_map); */
-/*  				e_dialog_option_menu_set (priv->recurrence_rule_monthly_weekpos, */
-/*  							  priv->ico->recur->weekday, */
-/*  							  weekday_map); */
-			}
-			
-			e_dialog_spin_set (priv->recurrence_rule_monthly_every_n_months,
-					   r->interval);
-			break;
-
-		case ICAL_YEARLY_RECURRENCE:
-			e_dialog_radio_set (priv->recurrence_rule_yearly, ICAL_YEARLY_RECURRENCE,
-					    recur_options_map);
-			e_dialog_spin_set (priv->recurrence_rule_yearly_every_n_years,
-					   r->interval);
-			break;
-
-		default:
-			g_assert_not_reached ();
-		}
-
-		if (r->until.year == 0) {
-			if (r->count == 0)
-				e_dialog_toggle_set (priv->recurrence_ending_date_repeat_forever,
-						     TRUE);
-			else {
-				e_dialog_toggle_set (priv->recurrence_ending_date_end_after, TRUE);
-				e_dialog_spin_set (priv->recurrence_ending_date_end_after_count,
-						   r->count);
-			}
-		} else {
-			time_t t = icaltime_as_timet (r->until);
-			e_dialog_toggle_set (priv->recurrence_ending_date_end_on, TRUE);
-			/* Shorten by one day, as we store end-on date a day ahead */
-			/* FIXME is this correct? */
-			e_date_edit_set_time (E_DATE_EDIT (priv->recurrence_ending_date_end_on_date), time_add_day (t, -1));
-		}
-		cal_component_free_recur_list (list);
-	}
-
-	/* Exceptions list */
-#ifndef NO_WARNINGS
-#warning "FIX ME"
-#endif
-	/* Need to handle exception rules as well as dates */
-	cal_component_get_exdate_list (priv->comp, &list);
-	for (l = list; l; l = l->next) {
-		struct icaltimetype *t;
-		time_t ext;
-		
-		t = l->data;
-		ext = icaltime_as_timet (*t);
-		append_exception (ee, ext);
-	}
-	cal_component_free_exdate_list (list);
-}
-
-
-
-/* Decode the radio button group for classifications */
-static CalComponentClassification
-classification_get (GtkWidget *widget)
-{
-	return e_dialog_radio_get (widget, classification_map);
-}
-
-/* Get the values of the widgets in the event editor and put them in the iCalObject */
-static void
-dialog_to_comp_object (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	CalComponent *comp;
-	CalComponentText *text;
-	CalComponentDateTime date;
-	struct icalrecurrencetype recur;
-	time_t t;
-	gboolean all_day_event;
-	GtkCList *exception_list;
-	GSList *list;
-	int i, pos = 0;
-	
-	priv = ee->priv;
-	comp = priv->comp;
-
-	text = g_new0 (CalComponentText, 1);
-	text->value = e_dialog_editable_get (priv->general_summary);
-	cal_component_set_summary (comp, text);
-
-	list = NULL;
-	text->value  = e_dialog_editable_get (priv->description);
-	list = g_slist_prepend (list, text);
-	cal_component_set_description_list (comp, list);
-	cal_component_free_text_list (list);
-	
-	date.value = g_new (struct icaltimetype, 1);
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->start_time));
-	*date.value = icaltime_from_timet (t, FALSE, FALSE);
-	date.tzid = NULL;
-	cal_component_set_dtstart (comp, &date);
-
-	/* If the all_day toggle is set, the end date is inclusive of the
-	   entire day on which it points to. */
-	all_day_event = e_dialog_toggle_get (priv->all_day_event);
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->end_time));
-	if (all_day_event)
-		t = time_day_end (t);
-
-	*date.value = icaltime_from_timet (t, FALSE, FALSE);
-	cal_component_set_dtend (comp, &date);
-	g_free (date.value);
-
-#if 0
-	ico->dalarm.enabled = e_dialog_toggle_get (priv->alarm_display);
-	ico->aalarm.enabled = e_dialog_toggle_get (priv->alarm_program);
-	ico->palarm.enabled = e_dialog_toggle_get (priv->alarm_audio);
-	ico->malarm.enabled = e_dialog_toggle_get (priv->alarm_mail);
-
-	ico->dalarm.count = e_dialog_spin_get_int (priv->alarm_display_amount);
-	ico->aalarm.count = e_dialog_spin_get_int (priv->alarm_audio_amount);
-	ico->palarm.count = e_dialog_spin_get_int (priv->alarm_program_amount);
-	ico->malarm.count = e_dialog_spin_get_int (priv->alarm_mail_amount);
-
-	ico->dalarm.units = alarm_unit_get (priv->alarm_display_unit);
-	ico->aalarm.units = alarm_unit_get (priv->alarm_audio_unit);
-	ico->palarm.units = alarm_unit_get (priv->alarm_program_unit);
-	ico->malarm.units = alarm_unit_get (priv->alarm_mail_unit);
-
-	if (ico->palarm.data)
-		g_free (ico->palarm.data);
-
-	if (ico->malarm.data)
-		g_free (ico->malarm.data);
-
-	ico->palarm.data = e_dialog_editable_get (priv->alarm_program_run_program_entry);
-	ico->malarm.data = e_dialog_editable_get (priv->alarm_mail_mail_to);
-#endif
-
-	cal_component_set_classification (comp, classification_get (priv->classification_radio));
-
-	/* Recurrence information */
-  	icalrecurrencetype_clear (&recur);
-	recur.freq = recur_options_get (priv->recurrence_rule_none);
-
-	switch (recur.freq) {
-	case ICAL_NO_RECURRENCE:
-		/* nothing */
-		break;
-
-	case ICAL_DAILY_RECURRENCE:
-		recur.interval = e_dialog_spin_get_int (priv->recurrence_rule_daily_days);
-		break;
-
-	case ICAL_WEEKLY_RECURRENCE:		
-		recur.interval = e_dialog_spin_get_int (priv->recurrence_rule_weekly_weeks);
-		
-		if (e_dialog_toggle_get (priv->recurrence_rule_weekly_sun))
-			recur.by_day[pos++] = ICAL_SUNDAY_WEEKDAY;		
-		if (e_dialog_toggle_get (priv->recurrence_rule_weekly_mon))
-			recur.by_day[pos++] = ICAL_MONDAY_WEEKDAY;
-		if (e_dialog_toggle_get (priv->recurrence_rule_weekly_tue))
-			recur.by_day[pos++] = ICAL_TUESDAY_WEEKDAY;
-		if (e_dialog_toggle_get (priv->recurrence_rule_weekly_wed))
-			recur.by_day[pos++] = ICAL_WEDNESDAY_WEEKDAY;
-		if (e_dialog_toggle_get (priv->recurrence_rule_weekly_thu))
-			recur.by_day[pos++] = ICAL_THURSDAY_WEEKDAY;
-		if (e_dialog_toggle_get (priv->recurrence_rule_weekly_fri))
-			recur.by_day[pos++] = ICAL_FRIDAY_WEEKDAY;
-		if (e_dialog_toggle_get (priv->recurrence_rule_weekly_sat))
-			recur.by_day[pos++] = ICAL_SATURDAY_WEEKDAY;
-
-		break;
-
-	case ICAL_MONTHLY_RECURRENCE:
-
-		if (e_dialog_toggle_get (priv->recurrence_rule_monthly_on_day)) {
-				/* by day of in the month (ex: the 5th) */
-			recur.by_month_day[0] = 
-				e_dialog_spin_get_int (priv->recurrence_rule_monthly_day_nth);
-		} else if (e_dialog_toggle_get (priv->recurrence_rule_monthly_weekday)) {
-
-/* "recurrence-rule-monthly-weekday" is TRUE */
-				/* by position on the calendar (ex: 2nd monday) */
-			/* libical does not handle this yet */
-/*  			ico->recur->u.month_pos = e_dialog_option_menu_get ( */
-/*  				priv->recurrence_rule_monthly_week, */
-/*  				month_pos_map); */
-/*  			ico->recur->weekday = e_dialog_option_menu_get ( */
-/*  				priv->recurrence_rule_monthly_weekpos, */
-/*  				weekday_map); */
-
-		} else
-			g_assert_not_reached ();
-
-		recur.interval = e_dialog_spin_get_int (priv->recurrence_rule_monthly_every_n_months);
-
-		break;
-
-	case ICAL_YEARLY_RECURRENCE:
-		recur.interval = e_dialog_spin_get_int (priv->recurrence_rule_yearly_every_n_years);
-		break;
-		
-	default:
-		g_assert_not_reached ();
-	}
-
-	if (recur.freq != ICAL_NO_RECURRENCE) {
-		/* recurrence start of week */
-		if (week_starts_on_monday)
-			recur.week_start = ICAL_MONDAY_WEEKDAY;
-		else
-			recur.week_start = ICAL_SUNDAY_WEEKDAY;
-
-		/* recurrence ending date */
-		if (e_dialog_toggle_get (priv->recurrence_ending_date_end_on)) {
-			/* Also here, to ensure that the event is used, we add a day
-			 * to get the next day, in accordance to the RFC
-			 */
-			t = e_date_edit_get_time (E_DATE_EDIT (priv->recurrence_ending_date_end_on_date));
-			t = time_add_day (t, 1);
-			recur.until = icaltime_from_timet (t, TRUE, FALSE);
-		} else if (e_dialog_toggle_get (priv->recurrence_ending_date_end_after)) {
-			recur.count = e_dialog_spin_get_int (priv->recurrence_ending_date_end_after_count);
-		}
-		list = NULL;
-		list = g_slist_append (list, &recur);
-		cal_component_set_rrule_list (comp, list);
-		g_slist_free (list);
-	} else {
-		list = NULL;
-		cal_component_set_rrule_list (comp, list);		
-	}
-	
-	/* Set exceptions */
-	list = NULL;
-	exception_list = GTK_CLIST (priv->recurrence_exceptions_list);
-	for (i = 0; i < exception_list->rows; i++) {
-		struct icaltimetype *tt;
-		time_t *t;
-		
-		t = gtk_clist_get_row_data (exception_list, i);
-		tt = g_new0 (struct icaltimetype, 1);
-		*tt = icaltime_from_timet (*t, FALSE, FALSE);
-		
-		list = g_slist_prepend (list, tt);
-	}
-	cal_component_set_exdate_list (comp, list);
-	if (list)
-		cal_component_free_exdate_list (list);
-
-	cal_component_commit_sequence (comp);
-}
-
-static void
-save_event_object (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	char *title;
-
-	priv = ee->priv;
-
-	if (!priv->comp)
-		return;
-
-	dialog_to_comp_object (ee);
-
-	title = make_title_from_comp (priv->comp);
-	gtk_window_set_title (GTK_WINDOW (priv->app), title);
-	g_free (title);
-
-	if (!cal_client_update_object (priv->client, priv->comp))
-		g_message ("save_event_object(): Could not update the object!");
-}
-
-/* Closes the dialog box and emits the appropriate signals */
-static void
-close_dialog (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	priv = ee->priv;
-
-	g_assert (priv->app != NULL);
-
-	gtk_object_destroy (GTK_OBJECT (ee));
-}
-
-
-
-static void
-debug_xml_cb (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee = EVENT_EDITOR (data);
-	EventEditorPrivate *priv = ee->priv;
-	
-	bonobo_win_dump (BONOBO_WIN (priv->app), "on demand");
-}
-
-/* File/Save callback */
-static void
-file_save_cb (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-	save_event_object (ee);
-}
-
-/* File/Save and Close callback */
-static void
-file_save_and_close_cb (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-	save_event_object (ee);
-	close_dialog (ee);
-}
-
-/* File/Delete callback */
-static void
-file_delete_cb (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	const char *uid;
-	
-	ee = EVENT_EDITOR (data);
-
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = ee->priv;
-	
-	g_return_if_fail (priv->comp);
-
-	cal_component_get_uid (priv->comp, &uid);
-
-	/* We don't check the return value; FALSE can mean the object was not in
-	 * the server anyways.
-	 */
-	cal_client_remove_object (priv->client, uid);
-
-	close_dialog (ee);
-}
-
-/* File/Close callback */
-static void
-file_close_cb (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (data);
-
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	close_dialog (ee);
-}
-
-static void
-schedule_meeting_cb (GtkWidget *widget, gpointer data)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	EMeetingEditor *editor;
-
-	ee = EVENT_EDITOR (data);
-
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = (EventEditorPrivate *)ee->priv;
-
-	editor = e_meeting_editor_new (priv->comp, priv->client);
-	e_meeting_edit (editor);
-	e_meeting_editor_free (editor);
-}
-
-
-/*
- * NB. there is an insane amount of replication here between
- * this and the task-editor.
- */
-static BonoboUIVerb verbs [] = {
-
-	BONOBO_UI_UNSAFE_VERB ("FileSave", file_save_cb),
-	BONOBO_UI_UNSAFE_VERB ("FileDelete", file_delete_cb),
-	BONOBO_UI_UNSAFE_VERB ("FileClose", file_close_cb),
-	BONOBO_UI_UNSAFE_VERB ("FileSaveAndClose", file_save_and_close_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("ActionScheduleMeeting", schedule_meeting_cb),
-
-	BONOBO_UI_UNSAFE_VERB ("DebugDumpXml", debug_xml_cb),
-
-	BONOBO_UI_VERB_END
-};
-
-
-
-/* Callback used when the dialog box is destroyed */
-static gint
-app_delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-	EventEditor *ee;
-
-	/* FIXME: need to check for a dirty object */
-
-	ee = EVENT_EDITOR (data);
-	close_dialog (ee);
-
-	return TRUE;
-}
-
-/**
- * event_editor_construct:
- * @ee: An event editor.
- * 
- * Constructs an event editor by loading its Glade data.
- * 
- * Return value: The same object as @ee, or NULL if the widgets could not be
- * created.  In the latter case, the event editor will automatically be
- * destroyed.
- **/
-EventEditor *
-event_editor_construct (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkWidget *bonobo_win;
-
-	g_return_val_if_fail (ee != NULL, NULL);
-	g_return_val_if_fail (IS_EVENT_EDITOR (ee), NULL);
-
-	priv = ee->priv;
-
-	/* Load the content widgets */
-
-	priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/event-editor-dialog.glade", NULL);
-	if (!priv->xml) {
-		g_message ("event_editor_construct(): Could not load the Glade XML file!");
-		goto error;
-	}
-
-	if (!get_widgets (ee)) {
-		g_message ("event_editor_construct(): Could not find all widgets in the XML file!");
-		goto error;
-	}
-
-	init_widgets (ee);
-
-	priv->uic = bonobo_ui_component_new ("event-editor-dialog");
-	if (!priv->uic) {
-		g_message ("task_editor_construct(): Could not create the UI component");
-		goto error;
-	}
-
-	/* Construct the app */
-	bonobo_win = bonobo_win_new ("event-editor-dialog", "Event Editor");
-
-	/* FIXME: The sucking bit */
-	{
-		GtkWidget *contents;
-
-		contents = gnome_dock_get_client_area (
-			GNOME_DOCK (GNOME_APP (priv->app)->dock));
-		if (!contents) {
-			g_message ("event_editor_construct(): Could not get contents");
-			goto error;
-		}
-		gtk_widget_ref (contents);
-		gtk_container_remove (GTK_CONTAINER (contents->parent), contents);
-		bonobo_win_set_contents (BONOBO_WIN (bonobo_win), contents);
-		gtk_widget_destroy (priv->app);
-		priv->app = bonobo_win;
-	}
-
-	{
-		BonoboUIContainer *container = bonobo_ui_container_new ();
-		bonobo_ui_container_set_win (container, BONOBO_WIN (priv->app));
-		bonobo_ui_component_set_container (
-			priv->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)));
-	}
-
-	bonobo_ui_component_add_verb_list_with_data (
-		priv->uic, verbs, ee);
-
-	bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR,
-			       "evolution-event-editor.xml",
-			       "evolution-event-editor");
-
-	/* Hook to destruction of the dialog */
-
-	gtk_signal_connect (GTK_OBJECT (priv->app), "delete_event",
-			    GTK_SIGNAL_FUNC (app_delete_event_cb), ee);
-
-
-	/* Add focus to the summary entry */
-	
-	gtk_widget_grab_focus (GTK_WIDGET (priv->general_summary));
-
-	/* Show the dialog */
-
-	gtk_widget_show (priv->app);
-
-	return ee;
-
- error:
-
-	gtk_object_unref (GTK_OBJECT (ee));
-	return NULL;
-}
-
-/**
- * event_editor_new:
- * 
- * Creates a new event editor dialog.
- * 
- * Return value: A newly-created event editor dialog, or NULL if the event
- * editor could not be created.
- **/
-EventEditor *
-event_editor_new (void)
-{
-	EventEditor *ee;
-
-	ee = EVENT_EDITOR (gtk_type_new (TYPE_EVENT_EDITOR));
-	return event_editor_construct (EVENT_EDITOR (ee));
-}
-
-/* Brings attention to a window by raising it and giving it focus */
-static void
-raise_and_focus (GtkWidget *widget)
-{
-	g_assert (GTK_WIDGET_REALIZED (widget));
-	gdk_window_show (widget->window);
-	gtk_widget_grab_focus (widget);
-}
-
-/* Callback used when the calendar client tells us that an object changed */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	CalComponent *comp;
-	CalClientGetStatus status;
-	const gchar *editing_uid;
-
-	ee = EVENT_EDITOR (data);
-
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = ee->priv;
-	
-	/* If we aren't showing the object which has been updated, return. */
-	if (!priv->comp)
-	  return;
-	cal_component_get_uid (priv->comp, &editing_uid);
-	if (strcmp (uid, editing_uid))
-	  return;
-
-
-	/* Get the event from the server. */
-	status = cal_client_get_object (priv->client, uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Everything is fine */
-		break;
-
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);
-		return;
-
-	case CAL_CLIENT_GET_NOT_FOUND:
-		/* The object is no longer in the server, so do nothing */
-		return;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	raise_and_focus (priv->app);
-}
-
-/* Callback used when the calendar client tells us that an object was removed */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	EventEditor *ee;
-	EventEditorPrivate *priv;
-	const gchar *editing_uid;
-
-	ee = EVENT_EDITOR (data);
-
-	g_return_if_fail (ee != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = ee->priv;
-
-	/* If we aren't showing the object which has been updated, return. */
-	if (!priv->comp)
-	  return;
-	cal_component_get_uid (priv->comp, &editing_uid);
-	if (strcmp (uid, editing_uid))
-	  return;
-
-
-	raise_and_focus (priv->app);
-}
-
-void 
-event_editor_set_cal_client (EventEditor *ee, CalClient *client)
-{
-	EventEditorPrivate *priv;
-
-	g_return_if_fail (ee != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = ee->priv;
-
-	if (client == priv->client)
-		return;
-
-	if (client)
-		g_return_if_fail (IS_CAL_CLIENT (client));
-
-	if (client)
-		g_return_if_fail (cal_client_is_loaded (client));	
-	
-	if (client)
-		gtk_object_ref (GTK_OBJECT (client));
-
-	if (priv->client) {
-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), ee);
-		gtk_object_unref (GTK_OBJECT (priv->client));
-	}
-
-	priv->client = client;
-
-	if (priv->client) {
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated",
-				    GTK_SIGNAL_FUNC (obj_updated_cb), ee);
-		gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed",
-				    GTK_SIGNAL_FUNC (obj_removed_cb), ee);
-	}
-}
-
-/**
- * event_editor_set_event_object:
- * @ee: An event editor.
- * @comp: A calendar object.
- * 
- * Sets the calendar object that an event editor dialog will manipulate.
- **/
-void
-event_editor_set_event_object (EventEditor *ee, CalComponent *comp)
-{
-	EventEditorPrivate *priv;
-	char *title;
-
-	g_return_if_fail (ee != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = ee->priv;
-
-	if (priv->comp) {
-		gtk_object_unref (GTK_OBJECT (priv->comp));
-		priv->comp = NULL;
-	}
-
-	if (comp) {
-		priv->comp = cal_component_clone (comp);
-	}
-
-	title = make_title_from_comp (priv->comp);
-	gtk_window_set_title (GTK_WINDOW (priv->app), title);
-	g_free (title);
-
-	fill_widgets (ee);
-}
-
-/**
- * event_editor_focus:
- * @ee: An event editor.
- * 
- * Makes sure an event editor is shown, on top of other windows, and focused.
- **/
-void
-event_editor_focus (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-
-	g_return_if_fail (ee != NULL);
-	g_return_if_fail (IS_EVENT_EDITOR (ee));
-
-	priv = ee->priv;
-	gtk_widget_show_now (priv->app);
-	raise_and_focus (priv->app);
-}
-
-static void
-alarm_toggle (GtkWidget *toggle, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkWidget *alarm_amount = NULL;
-	GtkWidget *alarm_unit = NULL;
-	gboolean active;
-
-	priv = ee->priv;
-
-	active = GTK_TOGGLE_BUTTON (toggle)->active;
-
-	if (toggle == priv->alarm_display) {
-		alarm_amount = priv->alarm_display_amount;
-		alarm_unit = priv->alarm_display_unit;
-	} else if (toggle == priv->alarm_audio) {
-		alarm_amount = priv->alarm_audio_amount;
-		alarm_unit = priv->alarm_audio_unit;
-	} else if (toggle == priv->alarm_program) {
-		alarm_amount = priv->alarm_program_amount;
-		alarm_unit = priv->alarm_program_unit;
-		gtk_widget_set_sensitive (priv->alarm_program_run_program, active);
-	} else if (toggle == priv->alarm_mail) {
-		alarm_amount = priv->alarm_mail_amount;
-		alarm_unit = priv->alarm_mail_unit;
-		gtk_widget_set_sensitive (priv->alarm_mail_mail_to, active);
-	} else
-		g_assert_not_reached ();
-
-	gtk_widget_set_sensitive (alarm_amount, active);
-	gtk_widget_set_sensitive (alarm_unit, active);
-}
-
-/*
- * Checks if the day range occupies all the day, and if so, check the
- * box accordingly
- */
-static void
-check_all_day (EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	time_t ev_start, ev_end;
-
-	priv = ee->priv;
-
-	ev_start = e_date_edit_get_time (E_DATE_EDIT (priv->start_time));
-	ev_end = e_date_edit_get_time (E_DATE_EDIT (priv->end_time));
-
-	/* all day event checkbox */
-	if (time_day_begin (ev_start) == ev_start
-	    && time_day_begin (ev_end) == ev_end)
-		e_dialog_toggle_set (priv->all_day_event, TRUE);
-	else
-		e_dialog_toggle_set (priv->all_day_event, FALSE);
-}
-
-/*
- * Callback: all day event box clicked
- */
-static void
-set_all_day (GtkWidget *toggle, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	struct tm start_tm, end_tm;
-	time_t start_t, end_t;
-	gboolean all_day;
-
-	priv = ee->priv;
-
-	/* If the all_day toggle is set, the end date is inclusive of the
-	   entire day on which it points to. */
-	all_day = GTK_TOGGLE_BUTTON (toggle)->active;
-
-	start_t = e_date_edit_get_time (E_DATE_EDIT (priv->start_time));
-	start_tm = *localtime (&start_t);
-	start_tm.tm_min  = 0;
-	start_tm.tm_sec  = 0;
-
-	if (all_day)
-		start_tm.tm_hour = 0;
-	else
-		start_tm.tm_hour = day_begin;
-
-	e_date_edit_set_time (E_DATE_EDIT (priv->start_time),
-			      mktime (&start_tm));
-
-	end_t = e_date_edit_get_time (E_DATE_EDIT (priv->end_time));
-	end_tm = *localtime (&end_t);
-	end_tm.tm_min  = 0;
-	end_tm.tm_sec  = 0;
-
-	if (all_day) {
-		/* mktime() will fix this if we go past the end of the month.*/
-		end_tm.tm_hour = 0;
-	} else {
-		if (end_tm.tm_year == start_tm.tm_year
-		    && end_tm.tm_mon == start_tm.tm_mon
-		    && end_tm.tm_mday == start_tm.tm_mday
-		    && end_tm.tm_hour <= start_tm.tm_hour)
-			end_tm.tm_hour = start_tm.tm_hour + 1;
-	}
-
-	e_date_edit_set_show_time (E_DATE_EDIT (priv->start_time), !all_day);
-	e_date_edit_set_show_time (E_DATE_EDIT (priv->end_time), !all_day);
-	e_date_edit_set_time (E_DATE_EDIT (priv->end_time), mktime (&end_tm));
-}
-
-/*
- * Callback: checks that the dates are start < end
- */
-static void
-check_dates (EDateEdit *dedit, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	time_t start, end;
-	struct tm tm_start, tm_end;
-
-	priv = ee->priv;
-
-	start = e_date_edit_get_time (E_DATE_EDIT (priv->start_time));
-	end = e_date_edit_get_time (E_DATE_EDIT (priv->end_time));
-
-	if (start > end) {
-		tm_start = *localtime (&start);
-		tm_end = *localtime (&end);
-
-		if (GTK_WIDGET (dedit) == priv->start_time) {
-			tm_end.tm_year = tm_start.tm_year;
-			tm_end.tm_mon  = tm_start.tm_mon;
-			tm_end.tm_mday = tm_start.tm_mday;
-
-			gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time), ee);
-			e_date_edit_set_time (E_DATE_EDIT (priv->end_time),
-					      mktime (&tm_end));
-			gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time), ee);
-		} else if (GTK_WIDGET (dedit) == priv->end_time) {
-			tm_start.tm_year = tm_end.tm_year;
-			tm_start.tm_mon  = tm_end.tm_mon;
-			tm_start.tm_mday = tm_end.tm_mday;
-
-#if 0
-			gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time), ee);
-			e_date_edit_set_time (E_DATE_EDIT (priv->start_time),
-					      mktime (&tm_start));
-			gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time), ee);
-#endif
-		}
-	}
-}
-
-/*
- * Callback: checks that start_time < end_time and whether the
- * selected hour range spans all of the day
- */
-static void
-check_times (EDateEdit *dedit, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	time_t start, end;
-	struct tm tm_start, tm_end;
-
-	priv = ee->priv;
-#if 0
-	gdk_pointer_ungrab (GDK_CURRENT_TIME);
-	gdk_flush ();
-#endif
-	start = e_date_edit_get_time (E_DATE_EDIT (priv->start_time));
-	end = e_date_edit_get_time (E_DATE_EDIT (priv->end_time));
-
-	if (start > end) {
-		tm_start = *localtime (&start);
-		tm_end = *localtime (&end);
-
-		if (GTK_WIDGET (dedit) == priv->start_time) {
-			tm_end.tm_min  = tm_start.tm_min;
-			tm_end.tm_sec  = tm_start.tm_sec;
-			tm_end.tm_hour = tm_start.tm_hour + 1;
-
-			if (tm_end.tm_hour >= 24) {
-				tm_end.tm_hour = 24; /* mktime() will bump the day */
-				tm_end.tm_min = 0;
-				tm_end.tm_sec = 0;
-			}
-
-			gtk_signal_handler_block_by_data (GTK_OBJECT (priv->end_time), ee);
-			e_date_edit_set_time (E_DATE_EDIT (priv->end_time),
-					      mktime (&tm_end));
-			gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->end_time), ee);
-		} else if (GTK_WIDGET (dedit) == priv->end_time) {
-			tm_start.tm_min  = tm_end.tm_min;
-			tm_start.tm_sec  = tm_end.tm_sec;
-			tm_start.tm_hour = tm_end.tm_hour - 1;
-
-			if (tm_start.tm_hour < 0) {
-				tm_start.tm_hour = 0;
-				tm_start.tm_min = 0;
-				tm_start.tm_min = 0;
-			}
-
-			gtk_signal_handler_block_by_data (GTK_OBJECT (priv->start_time), ee);
-			e_date_edit_set_time (E_DATE_EDIT (priv->start_time),
-					      mktime (&tm_start));
-			gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_time), ee);
-		}
-	}
-
-	/* Check whether the event spans the whole day */
-
-	check_all_day (ee);
-}
-
-static void
-recurrence_toggled (GtkWidget *radio, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	icalrecurrencetype_frequency rf;
-
-	priv = ee->priv;
-
-	if (!GTK_TOGGLE_BUTTON (radio)->active)
-		return;
-
-	rf = e_dialog_radio_get (radio, recur_options_map);
-
-	/* This is a hack to get things working */
-	gtk_notebook_set_page (GTK_NOTEBOOK (priv->recurrence_rule_notebook), 
-			       (int) (rf - ICAL_HOURLY_RECURRENCE));
-}
-
-
-static char *
-get_exception_string (time_t t)
-{
-	static char buf[256];
-
-	strftime (buf, sizeof (buf), _("%a %b %d %Y"), localtime (&t));
-	return buf;
-}
-
-
-static void
-append_exception (EventEditor *ee, time_t t)
-{
-	EventEditorPrivate *priv;
-	time_t *tt;
-	char *c[1];
-	int i;
-	GtkCList *clist;
-
-	priv = ee->priv;
-
-	tt = g_new (time_t, 1);
-	*tt = t;
-
-	clist = GTK_CLIST (priv->recurrence_exceptions_list);
-
-	c[0] = get_exception_string (t);
-	i = e_utf8_gtk_clist_append (clist, c);
-
-	gtk_clist_set_row_data (clist, i, tt);
-	gtk_clist_select_row (clist, i, 0);
-
-/*  	gtk_widget_set_sensitive (ee->recur_ex_vbox, TRUE); */
-}
-
-
-static void
-recurrence_exception_added (GtkWidget *widget, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	time_t t;
-
-	priv = ee->priv;
-
-	t = e_date_edit_get_time (E_DATE_EDIT (priv->recurrence_exceptions_date));
-	append_exception (ee, t);
-}
-
-
-static void
-recurrence_exception_deleted (GtkWidget *widget, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkCList *clist;
-	int sel;
-
-	priv = ee->priv;
-
-	clist = GTK_CLIST (priv->recurrence_exceptions_list);
-	if (!clist->selection)
-		return;
-
-	sel = GPOINTER_TO_INT (clist->selection->data);
-
-	g_free (gtk_clist_get_row_data (clist, sel)); /* free the time_t stored there */
-
-	gtk_clist_remove (clist, sel);
-	if (sel >= clist->rows)
-		sel--;
-
-	gtk_clist_select_row (clist, sel, 0);
-}
-
-
-static void
-recurrence_exception_changed (GtkWidget *widget, EventEditor *ee)
-{
-	EventEditorPrivate *priv;
-	GtkCList *clist;
-	time_t *t;
-	int sel;
-
-	priv = ee->priv;
-
-	clist = GTK_CLIST (priv->recurrence_exceptions_list);
-	if (!clist->selection)
-		return;
-
-	sel = GPOINTER_TO_INT (clist->selection->data);
-
-	t = gtk_clist_get_row_data (clist, sel);
-	*t = e_date_edit_get_time (E_DATE_EDIT (priv->recurrence_exceptions_date));
-
-	e_utf8_gtk_clist_set_text (clist, sel, 0, get_exception_string (*t));
-}
-
-
-GtkWidget *
-make_date_edit (void)
-{
-	return date_edit_new (time (NULL), FALSE);
-}
-
-
-GtkWidget *
-make_date_edit_with_time (void)
-{
-	return date_edit_new (time (NULL), TRUE);
-}
-
-
-GtkWidget *
-date_edit_new (time_t the_time, int show_time)
-{
-	GtkWidget *dedit;
-
-	dedit = e_date_edit_new ();
-	/* FIXME: Set other options. */
-	e_date_edit_set_show_time (E_DATE_EDIT (dedit), show_time);
-	e_date_edit_set_time_popup_range (E_DATE_EDIT (dedit), 8, 18);
-	return dedit;
-}
-
-
-
-GtkWidget *
-make_spin_button (int val, int low, int high)
-{
-	GtkAdjustment *adj;
-	GtkWidget *spin;
-
-	adj = GTK_ADJUSTMENT (gtk_adjustment_new (val, low, high, 1, 10, 10));
-	spin = gtk_spin_button_new (adj, 0.5, 0);
-	gtk_widget_set_usize (spin, 60, 0);
-
-	return spin;
-}
-
-
-/* todo
-
-   build some of the recur stuff by hand to take into account
-   the start-on-monday preference?
-
-   get the apply button to work right
-
-   make the properties stuff unglobal
-
-   figure out why alarm units aren't sticking between edits
-
-   closing the dialog window with the wm caused a crash
-   Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-   on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
- */
diff --git a/calendar/gui/event-editor.h b/calendar/gui/event-editor.h
deleted file mode 100644
index 009beb4dd5..0000000000
--- a/calendar/gui/event-editor.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Evolution calendar - Event editor dialog
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Miguel de Icaza <miguel@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *          Seth Alves <alves@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __EVENT_EDITOR_DIALOG_H__
-#define __EVENT_EDITOR_DIALOG_H__
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkobject.h>
-#include "gnome-cal.h"
-
-
-
-#define TYPE_EVENT_EDITOR            (event_editor_get_type ())
-#define EVENT_EDITOR(obj)            (GTK_CHECK_CAST ((obj), TYPE_EVENT_EDITOR, EventEditor))
-#define EVENT_EDITOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_EVENT_EDITOR,	\
-				      EventEditorClass))
-#define IS_EVENT_EDITOR(obj)         (GTK_CHECK_TYPE ((obj), TYPE_EVENT_EDITOR))
-#define IS_EVENT_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_EVENT_EDITOR))
-
-typedef struct _EventEditor EventEditor;
-typedef struct _EventEditorClass EventEditorClass;
-
-struct _EventEditor {
-	GtkObject object;
-
-	/* Private data */
-	gpointer priv;
-};
-
-struct _EventEditorClass {
-	GtkObjectClass parent_class;
-};
-
-
-GtkType event_editor_get_type (void);
-EventEditor *event_editor_construct (EventEditor *ee);
-
-EventEditor *event_editor_new (void);
-
-void event_editor_set_cal_client (EventEditor *ee, CalClient *client);
-void event_editor_set_event_object (EventEditor *ee, CalComponent *comp);
-
-void event_editor_focus (EventEditor *ee);
-
-#if 0
-/* Convenience function to create and show a new event editor for an
- * event that goes from day_begin to day_end of the specified day.
- */
-void event_editor_new_whole_day (GnomeCalendar *owner, time_t day);
-#endif
-
-GtkWidget *make_date_edit (void);
-GtkWidget *make_date_edit_with_time (void);
-GtkWidget *date_edit_new (time_t the_time, int show_time);
-
-GtkWidget *make_spin_button (int val, int low, int high);
-
-
-
-#endif /* __EVENT_EDITOR_DIALOG_H__ */
diff --git a/calendar/gui/evolution-calendar-control.c b/calendar/gui/evolution-calendar-control.c
deleted file mode 100644
index 7ebe2b5f8e..0000000000
--- a/calendar/gui/evolution-calendar-control.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-#include <config.h>
-#include <gnome.h>
-#include <glade/glade.h>
-#include <bonobo.h>
-#include <bonobo/bonobo-control.h>
-#include <glade/glade.h>
-
-#ifdef USING_OAF
-#include <liboaf/liboaf.h>
-#else
-#include <libgnorba/gnorba.h>
-#endif
-
-#include <cal-util/timeutil.h>
-#include <gui/alarm.h>
-#include <gui/gnome-cal.h>
-#include <gui/calendar-commands.h>
-
-#define PROPERTY_CALENDAR_URI "folder_uri"
-
-#define PROPERTY_CALENDAR_URI_IDX 1
-
-#ifdef USING_OAF
-#define CONTROL_FACTORY_ID   "OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"
-#else
-#define CONTROL_FACTORY_ID   "control-factory:calendar"
-#endif
-
-CORBA_Environment ev;
-CORBA_ORB orb;
-
-
-static void
-control_activate_cb (BonoboControl *control, 
-		     gboolean activate, 
-		     gpointer user_data)
-{
-	if (activate)
-		calendar_control_activate (control, user_data);
-	else
-		calendar_control_deactivate (control);
-}
-
-
-
-static void
-init_bonobo (int *argc, char **argv)
-{
-#ifdef USING_OAF
-	/* FIXME: VERSION instead of "0.0".  */
-	gnome_init_with_popt_table ("evolution-calendar", "0.0",
-				    *argc, argv, oaf_popt_options,
-				    0, NULL);
-	oaf_init (*argc, argv);
-#else
-	gnome_CORBA_init_with_popt_table (
-		"evolution-calendar", "0.0",
-		argc, argv, NULL, 0, NULL, GNORBA_INIT_SERVER_FUNC, &ev);
-#endif
-
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-
-	glade_gnome_init ();
-}
-
-
-
-static void
-get_prop (BonoboPropertyBag *bag,
-	  BonoboArg         *arg,
-	  guint              arg_id,
-	  gpointer           user_data)
-{
-	/*GnomeCalendar *gcal = user_data;*/
-
-	switch (arg_id) {
-
-	case PROPERTY_CALENDAR_URI_IDX:
-		/*
-		if (fb && fb->uri)
-			BONOBO_ARG_SET_STRING (arg, fb->uri);
-		else
-			BONOBO_ARG_SET_STRING (arg, "");
-		*/
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-	}
-}
-
-static void
-set_prop (BonoboPropertyBag *bag,
-	  const BonoboArg   *arg,
-	  guint              arg_id,
-	  gpointer           user_data)
-{
-	GnomeCalendar *gcal = user_data;
-	char *filename;
-
-	switch (arg_id) {
-
-	case PROPERTY_CALENDAR_URI_IDX:
-		printf ("set_prop: '%s'\n", BONOBO_ARG_GET_STRING (arg));
-		filename = g_strdup_printf ("%s/calendar.vcf",
-					    BONOBO_ARG_GET_STRING (arg));
-		calendar_set_uri (gcal, filename);
-		g_free (filename);
-		break;
-
-	default:
-		g_warning ("Unhandled arg %d\n", arg_id);
-		break;
-	}
-}
-
-
-static void
-calendar_properties_init (GnomeCalendar *gcal)
-{
-	gcal->properties = bonobo_property_bag_new (get_prop, set_prop, gcal);
-
-	bonobo_property_bag_add (gcal->properties,
-				 PROPERTY_CALENDAR_URI,
-				 PROPERTY_CALENDAR_URI_IDX,
-				 BONOBO_ARG_STRING,
-				 NULL,
-				 _("The URI that the calendar will display"),
-				 0);
-
-	bonobo_control_set_property_bag (gcal->control, gcal->properties);
-}
-
-
-
-static BonoboObject *
-calendar_control_factory (BonoboGenericFactory *Factory, void *closure)
-{
-	BonoboControl *control;
-
-	/* Create the control. */
-	GnomeCalendar *cal = new_calendar (full_name, NULL, NULL, 0);
-
-	gtk_widget_show (GTK_WIDGET (cal));
-
-	control = bonobo_control_new (GTK_WIDGET (cal));
-	cal->control = control;
-
-	calendar_properties_init (cal);
-
-	gtk_signal_connect (GTK_OBJECT (control), "activate",
-			    control_activate_cb, cal);
-
-	return BONOBO_OBJECT (control);
-}
-
-
-static void
-calendar_control_factory_init (void)
-{
-	static BonoboGenericFactory *factory = NULL;
-
-	if (factory != NULL)
-		return;
-
-	puts ("XXXXXX - initializing calendar factory!!!");
-
-	factory = bonobo_generic_factory_new (CONTROL_FACTORY_ID, calendar_control_factory, NULL);
-
-	if (factory == NULL)
-		g_error ("I could not register a Calendar control factory.");
-}
-
-
-int
-main (int argc, char **argv)
-{
-	init_bonobo (&argc, argv);
-	glade_gnome_init ();
-	alarm_init ();
-	e_cursors_init ();
-
-	init_calendar ();
-
-	//g_log_set_always_fatal ((GLogLevelFlags) 0xFFFF);
-	g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
-				G_LOG_LEVEL_CRITICAL |
-				G_LOG_LEVEL_WARNING);
-
-	CORBA_exception_init (&ev);
-
-	calendar_control_factory_init ();
-	component_factory_init ();
-
-	bonobo_main ();
-
-	return 0;
-}
diff --git a/calendar/gui/evolution-calendar.oafinfo b/calendar/gui/evolution-calendar.oafinfo
deleted file mode 100644
index 74fb43af70..0000000000
--- a/calendar/gui/evolution-calendar.oafinfo
+++ /dev/null
@@ -1,89 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad"
-            type="factory"
-            location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Control:1.0"/>
-	        <item value="IDL:Bonobo/PersistStream:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="text/calendar"/>
-		<item value="text/x-calendar"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="name" type="string"
-		       value="Evolution calendar iTip/iMip viewer"/>
-	<oaf_attribute name="description" type="string"
-                       value="Factory for the calendar iTip view control"/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"
-            type="exe"
-            location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Factory for the Evolution calendar component."/>
-
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-shell-component:evolution-calendar:2eb9eb63-d305-4918-9c35-faae5db19e51"
-            type="factory"
-            location="OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution/ShellComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-	               value="Evolution component for handling the calendar."/>
-
-	<oaf_attribute name="evolution:shell-component-icon" type="string"
-		       value="evolution-calendar.png"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"
-		type="exe"
-		location="evolution-calendar">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME:GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-			value="Factory for the Calendar Summary component."/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c"
-	    type="factory"
-	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Evolution:SummaryComponent:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-		       value="Evolution calendar executive summary component."/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/getdate.y b/calendar/gui/getdate.y
deleted file mode 100644
index 43917089d6..0000000000
--- a/calendar/gui/getdate.y
+++ /dev/null
@@ -1,1004 +0,0 @@
-%{
-/*
-**  Originally) written by Steven M. Bellovin <smb@research.att.com> while
-**  at the University of North Carolina at Chapel Hill.  Later tweaked by
-**  a couple of people on Usenet.  Completely overhauled by Rich $alz
-**  <rsalz@bbn.com> and Jim Berets <jberets@bbn.com> in August, 1990;
-**  send any email to Rich.
-**
-**  This grammar has 10 shift/reduce conflicts.
-**
-**  This code is in the public domain and has no copyright.
-*/
-/* SUPPRESS 287 on yaccpar_sccsid *//* Unused static variable */
-/* SUPPRESS 288 on yyerrlab *//* Label unused */
-
-#include <config.h>
-#include <gnome.h>
-	
-/* Since the code of getdate.y is not included in the Emacs executable
-   itself, there is no need to #define static in this file.  Even if
-   the code were included in the Emacs executable, it probably
-   wouldn't do any harm to #undef it here; this will only cause
-   problems if we try to write to a static variable, which I don't
-   think this code needs to do.  */
-#ifdef emacs
-#undef static
-#endif
-
-#include <stdio.h>
-#include <ctype.h>
-
-/* The code at the top of get_date which figures out the offset of the
-   current time zone checks various CPP symbols to see if special
-   tricks are need, but defaults to using the gettimeofday system call.
-   Include <sys/time.h> if that will be used.  */
-
-#if	defined(vms)
-
-#include <types.h>
-#include <time.h>
-
-#else
-
-#include <sys/types.h>
-
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-
-#ifdef timezone
-#undef timezone /* needed for sgi */
-#endif
-
-#if defined(HAVE_SYS_TIMEB_H)
-#include <sys/timeb.h>
-#else
-/*
-** We use the obsolete `struct timeb' as part of our interface!
-** Since the system doesn't have it, we define it here;
-** our callers must do likewise.
-*/
-struct timeb {
-    time_t		time;		/* Seconds since the epoch	*/
-    unsigned short	millitm;	/* Field not used		*/
-    short		timezone;	/* Minutes west of GMT		*/
-    short		dstflag;	/* Field not used		*/
-};
-#endif /* defined(HAVE_SYS_TIMEB_H) */
-
-#endif	/* defined(vms) */
-
-#if defined (STDC_HEADERS) || defined (USG)
-#include <string.h>
-#endif
-
-/* Some old versions of bison generate parsers that use bcopy.
-   That loses on systems that don't provide the function, so we have
-   to redefine it here.  */
-#if !defined (HAVE_BCOPY) && defined (HAVE_MEMCPY) && !defined (bcopy)
-#define bcopy(from, to, len) memcpy ((to), (from), (len))
-#endif
-
-#if defined (STDC_HEADERS)
-#include <stdlib.h>
-#endif
-
-/* NOTES on rebuilding getdate.c (particularly for inclusion in CVS
-   releases):
-
-   We don't want to mess with all the portability hassles of alloca.
-   In particular, most (all?) versions of bison will use alloca in
-   their parser.  If bison works on your system (e.g. it should work
-   with gcc), then go ahead and use it, but the more general solution
-   is to use byacc instead of bison, which should generate a portable
-   parser.  I played with adding "#define alloca dont_use_alloca", to
-   give an error if the parser generator uses alloca (and thus detect
-   unportable getdate.c's), but that seems to cause as many problems
-   as it solves.  */
-
-extern struct tm	*gmtime();
-extern struct tm	*localtime();
-
-#define yyparse getdate_yyparse
-#define yylex getdate_yylex
-#define yyerror getdate_yyerror
-
-static int yylex (void);
-static int yyerror (char *s);
-
-#define EPOCH		1970
-#define HOUR(x)		((time_t)(x) * 60)
-#define SECSPERDAY	(24L * 60L * 60L)
-
-
-/*
-**  An entry in the lexical lookup table.
-*/
-typedef struct _TABLE {
-    char	*name;
-    int		type;
-    time_t	value;
-} TABLE;
-
-
-/*
-**  Daylight-savings mode:  on, off, or not yet known.
-*/
-typedef enum _DSTMODE {
-    DSTon, DSToff, DSTmaybe
-} DSTMODE;
-
-/*
-**  Meridian:  am, pm, or 24-hour style.
-*/
-typedef enum _MERIDIAN {
-    MERam, MERpm, MER24
-} MERIDIAN;
-
-
-/*
-**  Global variables.  We could get rid of most of these by using a good
-**  union as the yacc stack.  (This routine was originally written before
-**  yacc had the %union construct.)  Maybe someday; right now we only use
-**  the %union very rarely.
-*/
-static char	*yyInput;
-static DSTMODE	yyDSTmode;
-static time_t	yyDayOrdinal;
-static time_t	yyDayNumber;
-static int	yyHaveDate;
-static int	yyHaveDay;
-static int	yyHaveRel;
-static int	yyHaveTime;
-static int	yyHaveZone;
-static time_t	yyTimezone;
-static time_t	yyDay;
-static time_t	yyHour;
-static time_t	yyMinutes;
-static time_t	yyMonth;
-static time_t	yySeconds;
-static time_t	yyYear;
-static MERIDIAN	yyMeridian;
-static time_t	yyRelMonth;
-static time_t	yyRelSeconds;
-
-%}
-
-%union {
-    time_t		Number;
-    enum _MERIDIAN	Meridian;
-}
-
-%token	tAGO tDAY tDAYZONE tID tMERIDIAN tMINUTE_UNIT tMONTH tMONTH_UNIT
-%token	tSEC_UNIT tSNUMBER tUNUMBER tZONE tDST
-
-%type	<Number>	tDAY tDAYZONE tMINUTE_UNIT tMONTH tMONTH_UNIT
-%type	<Number>	tSEC_UNIT tSNUMBER tUNUMBER tZONE
-%type	<Meridian>	tMERIDIAN o_merid
-
-%%
-
-spec	: /* NULL */
-	| spec item
-	;
-
-item	: time {
-	    yyHaveTime++;
-	}
-	| zone {
-	    yyHaveZone++;
-	}
-	| date {
-	    yyHaveDate++;
-	}
-	| day {
-	    yyHaveDay++;
-	}
-	| rel {
-	    yyHaveRel++;
-	}
-	| number
-	;
-
-time	: tUNUMBER tMERIDIAN {
-	    yyHour = $1;
-	    yyMinutes = 0;
-	    yySeconds = 0;
-	    yyMeridian = $2;
-	}
-	| tUNUMBER ':' tUNUMBER o_merid {
-	    yyHour = $1;
-	    yyMinutes = $3;
-	    yySeconds = 0;
-	    yyMeridian = $4;
-	}
-	| tUNUMBER ':' tUNUMBER tSNUMBER {
-	    yyHour = $1;
-	    yyMinutes = $3;
-	    yyMeridian = MER24;
-	    yyDSTmode = DSToff;
-	    yyTimezone = - ($4 % 100 + ($4 / 100) * 60);
-	}
-	| tUNUMBER ':' tUNUMBER ':' tUNUMBER o_merid {
-	    yyHour = $1;
-	    yyMinutes = $3;
-	    yySeconds = $5;
-	    yyMeridian = $6;
-	}
-	| tUNUMBER ':' tUNUMBER ':' tUNUMBER tSNUMBER {
-	    yyHour = $1;
-	    yyMinutes = $3;
-	    yySeconds = $5;
-	    yyMeridian = MER24;
-	    yyDSTmode = DSToff;
-	    yyTimezone = - ($6 % 100 + ($6 / 100) * 60);
-	}
-	;
-
-zone	: tZONE {
-	    yyTimezone = $1;
-	    yyDSTmode = DSToff;
-	}
-	| tDAYZONE {
-	    yyTimezone = $1;
-	    yyDSTmode = DSTon;
-	}
-	|
-	  tZONE tDST {
-	    yyTimezone = $1;
-	    yyDSTmode = DSTon;
-	}
-	;
-
-day	: tDAY {
-	    yyDayOrdinal = 1;
-	    yyDayNumber = $1;
-	}
-	| tDAY ',' {
-	    yyDayOrdinal = 1;
-	    yyDayNumber = $1;
-	}
-	| tUNUMBER tDAY {
-	    yyDayOrdinal = $1;
-	    yyDayNumber = $2;
-	}
-	;
-
-date	: tUNUMBER '/' tUNUMBER {
-	    yyMonth = $1;
-	    yyDay = $3;
-	}
-	| tUNUMBER '/' tUNUMBER '/' tUNUMBER {
-	    yyMonth = $1;
-	    yyDay = $3;
-	    yyYear = $5;
-	}
-	| tUNUMBER tSNUMBER tSNUMBER {
-	    /* ISO 8601 format.  yyyy-mm-dd.  */
-	    yyYear = $1;
-	    yyMonth = -$2;
-	    yyDay = -$3;
-	}
-	| tUNUMBER tMONTH tSNUMBER {
-	    /* e.g. 17-JUN-1992.  */
-	    yyDay = $1;
-	    yyMonth = $2;
-	    yyYear = -$3;
-	}
-	| tMONTH tUNUMBER {
-	    yyMonth = $1;
-	    yyDay = $2;
-	}
-	| tMONTH tUNUMBER ',' tUNUMBER {
-	    yyMonth = $1;
-	    yyDay = $2;
-	    yyYear = $4;
-	}
-	| tUNUMBER tMONTH {
-	    yyMonth = $2;
-	    yyDay = $1;
-	}
-	| tUNUMBER tMONTH tUNUMBER {
-	    yyMonth = $2;
-	    yyDay = $1;
-	    yyYear = $3;
-	}
-	;
-
-rel	: relunit tAGO {
-	    yyRelSeconds = -yyRelSeconds;
-	    yyRelMonth = -yyRelMonth;
-	}
-	| relunit
-	;
-
-relunit	: tUNUMBER tMINUTE_UNIT {
-	    yyRelSeconds += $1 * $2 * 60L;
-	}
-	| tSNUMBER tMINUTE_UNIT {
-	    yyRelSeconds += $1 * $2 * 60L;
-	}
-	| tMINUTE_UNIT {
-	    yyRelSeconds += $1 * 60L;
-	}
-	| tSNUMBER tSEC_UNIT {
-	    yyRelSeconds += $1;
-	}
-	| tUNUMBER tSEC_UNIT {
-	    yyRelSeconds += $1;
-	}
-	| tSEC_UNIT {
-	    yyRelSeconds++;
-	}
-	| tSNUMBER tMONTH_UNIT {
-	    yyRelMonth += $1 * $2;
-	}
-	| tUNUMBER tMONTH_UNIT {
-	    yyRelMonth += $1 * $2;
-	}
-	| tMONTH_UNIT {
-	    yyRelMonth += $1;
-	}
-	;
-
-number	: tUNUMBER {
-	    if (yyHaveTime && yyHaveDate && !yyHaveRel)
-		yyYear = $1;
-	    else {
-		if($1>10000) {
-		    yyHaveDate++;
-		    yyDay= ($1)%100;
-		    yyMonth= ($1/100)%100;
-		    yyYear = $1/10000;
-		}
-		else {
-		    yyHaveTime++;
-		    if ($1 < 100) {
-			yyHour = $1;
-			yyMinutes = 0;
-		    }
-		    else {
-		    	yyHour = $1 / 100;
-		    	yyMinutes = $1 % 100;
-		    }
-		    yySeconds = 0;
-		    yyMeridian = MER24;
-	        }
-	    }
-	}
-	;
-
-o_merid	: /* NULL */ {
-	    $$ = MER24;
-	}
-	| tMERIDIAN {
-	    $$ = $1;
-	}
-	;
-
-%%
-
-/* Month and day table. */
-static TABLE const MonthDayTable[] = {
-    { N_("january"),	tMONTH,  1 },
-    { N_("february"),	tMONTH,  2 },
-    { N_("march"),		tMONTH,  3 },
-    { N_("april"),		tMONTH,  4 },
-    { N_("may"),		tMONTH,  5 },
-    { N_("june"),		tMONTH,  6 },
-    { N_("july"),		tMONTH,  7 },
-    { N_("august"),		tMONTH,  8 },
-    { N_("september"),	tMONTH,  9 },
-    { N_("sept"),		tMONTH,  9 },
-    { N_("october"),	tMONTH, 10 },
-    { N_("november"),	tMONTH, 11 },
-    { N_("december"),	tMONTH, 12 },
-    { N_("sunday"),		tDAY, 0 },
-    { N_("monday"),		tDAY, 1 },
-    { N_("tuesday"),	tDAY, 2 },
-    { N_("tues"),		tDAY, 2 },
-    { N_("wednesday"),	tDAY, 3 },
-    { N_("wednes"),		tDAY, 3 },
-    { N_("thursday"),	tDAY, 4 },
-    { N_("thur"),		tDAY, 4 },
-    { N_("thurs"),		tDAY, 4 },
-    { N_("friday"),		tDAY, 5 },
-    { N_("saturday"),	tDAY, 6 },
-    { NULL }
-};
-
-/* Time units table. */
-static TABLE const UnitsTable[] = {
-    { N_("year"),		tMONTH_UNIT,	12 },
-    { N_("month"),		tMONTH_UNIT,	1 },
-    { N_("fortnight"),	tMINUTE_UNIT,	14 * 24 * 60 },
-    { N_("week"),		tMINUTE_UNIT,	7 * 24 * 60 },
-    { N_("day"),		tMINUTE_UNIT,	1 * 24 * 60 },
-    { N_("hour"),		tMINUTE_UNIT,	60 },
-    { N_("minute"),		tMINUTE_UNIT,	1 },
-    { N_("min"),		tMINUTE_UNIT,	1 },
-    { N_("second"),		tSEC_UNIT,	1 },
-    { N_("sec"),		tSEC_UNIT,	1 },
-    { NULL }
-};
-
-/* Assorted relative-time words. */
-static TABLE const OtherTable[] = {
-    { N_("tomorrow"),	tMINUTE_UNIT,	1 * 24 * 60 },
-    { N_("yesterday"),	tMINUTE_UNIT,	-1 * 24 * 60 },
-    { N_("today"),		tMINUTE_UNIT,	0 },
-    { N_("now"),		tMINUTE_UNIT,	0 },
-    { N_("last"),		tUNUMBER,	-1 },
-    { N_("this"),		tMINUTE_UNIT,	0 },
-    { N_("next"),		tUNUMBER,	2 },
-    { N_("first"),		tUNUMBER,	1 },
-/*  { N_("second"),		tUNUMBER,	2 }, */
-    { N_("third"),		tUNUMBER,	3 },
-    { N_("fourth"),		tUNUMBER,	4 },
-    { N_("fifth"),		tUNUMBER,	5 },
-    { N_("sixth"),		tUNUMBER,	6 },
-    { N_("seventh"),	tUNUMBER,	7 },
-    { N_("eighth"),		tUNUMBER,	8 },
-    { N_("ninth"),		tUNUMBER,	9 },
-    { N_("tenth"),		tUNUMBER,	10 },
-    { N_("eleventh"),	tUNUMBER,	11 },
-    { N_("twelfth"),	tUNUMBER,	12 },
-    { N_("ago"),		tAGO,	1 },
-    { NULL }
-};
-
-/* The timezone table. */
-/* Some of these are commented out because a time_t can't store a float. */
-static TABLE const TimezoneTable[] = {
-    { "gmt",	tZONE,     HOUR( 0) },	/* Greenwich Mean */
-    { "ut",	tZONE,     HOUR( 0) },	/* Universal (Coordinated) */
-    { "utc",	tZONE,     HOUR( 0) },
-    { "wet",	tZONE,     HOUR( 0) },	/* Western European */
-    { "bst",	tDAYZONE,  HOUR( 0) },	/* British Summer */
-    { "wat",	tZONE,     HOUR( 1) },	/* West Africa */
-    { "at",	tZONE,     HOUR( 2) },	/* Azores */
-#if	0
-    /* For completeness.  BST is also British Summer, and GST is
-     * also Guam Standard. */
-    { "bst",	tZONE,     HOUR( 3) },	/* Brazil Standard */
-    { "gst",	tZONE,     HOUR( 3) },	/* Greenland Standard */
-#endif
-#if 0
-    { "nft",	tZONE,     HOUR(3.5) },	/* Newfoundland */
-    { "nst",	tZONE,     HOUR(3.5) },	/* Newfoundland Standard */
-    { "ndt",	tDAYZONE,  HOUR(3.5) },	/* Newfoundland Daylight */
-#endif
-    { "ast",	tZONE,     HOUR( 4) },	/* Atlantic Standard */
-    { "adt",	tDAYZONE,  HOUR( 4) },	/* Atlantic Daylight */
-    { "est",	tZONE,     HOUR( 5) },	/* Eastern Standard */
-    { "edt",	tDAYZONE,  HOUR( 5) },	/* Eastern Daylight */
-    { "cst",	tZONE,     HOUR( 6) },	/* Central Standard */
-    { "cdt",	tDAYZONE,  HOUR( 6) },	/* Central Daylight */
-    { "mst",	tZONE,     HOUR( 7) },	/* Mountain Standard */
-    { "mdt",	tDAYZONE,  HOUR( 7) },	/* Mountain Daylight */
-    { "pst",	tZONE,     HOUR( 8) },	/* Pacific Standard */
-    { "pdt",	tDAYZONE,  HOUR( 8) },	/* Pacific Daylight */
-    { "yst",	tZONE,     HOUR( 9) },	/* Yukon Standard */
-    { "ydt",	tDAYZONE,  HOUR( 9) },	/* Yukon Daylight */
-    { "hst",	tZONE,     HOUR(10) },	/* Hawaii Standard */
-    { "hdt",	tDAYZONE,  HOUR(10) },	/* Hawaii Daylight */
-    { "cat",	tZONE,     HOUR(10) },	/* Central Alaska */
-    { "ahst",	tZONE,     HOUR(10) },	/* Alaska-Hawaii Standard */
-    { "nt",	tZONE,     HOUR(11) },	/* Nome */
-    { "idlw",	tZONE,     HOUR(12) },	/* International Date Line West */
-    { "cet",	tZONE,     -HOUR(1) },	/* Central European */
-    { "met",	tZONE,     -HOUR(1) },	/* Middle European */
-    { "mewt",	tZONE,     -HOUR(1) },	/* Middle European Winter */
-    { "mest",	tDAYZONE,  -HOUR(1) },	/* Middle European Summer */
-    { "swt",	tZONE,     -HOUR(1) },	/* Swedish Winter */
-    { "sst",	tDAYZONE,  -HOUR(1) },	/* Swedish Summer */
-    { "fwt",	tZONE,     -HOUR(1) },	/* French Winter */
-    { "fst",	tDAYZONE,  -HOUR(1) },	/* French Summer */
-    { "eet",	tZONE,     -HOUR(2) },	/* Eastern Europe, USSR Zone 1 */
-    { "bt",	tZONE,     -HOUR(3) },	/* Baghdad, USSR Zone 2 */
-#if 0
-    { "it",	tZONE,     -HOUR(3.5) },/* Iran */
-#endif
-    { "zp4",	tZONE,     -HOUR(4) },	/* USSR Zone 3 */
-    { "zp5",	tZONE,     -HOUR(5) },	/* USSR Zone 4 */
-#if 0
-    { "ist",	tZONE,     -HOUR(5.5) },/* Indian Standard */
-#endif
-    { "zp6",	tZONE,     -HOUR(6) },	/* USSR Zone 5 */
-#if	0
-    /* For completeness.  NST is also Newfoundland Stanard, and SST is
-     * also Swedish Summer. */
-    { "nst",	tZONE,     -HOUR(6.5) },/* North Sumatra */
-    { "sst",	tZONE,     -HOUR(7) },	/* South Sumatra, USSR Zone 6 */
-#endif	/* 0 */
-    { "wast",	tZONE,     -HOUR(7) },	/* West Australian Standard */
-    { "wadt",	tDAYZONE,  -HOUR(7) },	/* West Australian Daylight */
-#if 0
-    { "jt",	tZONE,     -HOUR(7.5) },/* Java (3pm in Cronusland!) */
-#endif
-    { "cct",	tZONE,     -HOUR(8) },	/* China Coast, USSR Zone 7 */
-    { "jst",	tZONE,     -HOUR(9) },	/* Japan Standard, USSR Zone 8 */
-#if 0
-    { "cast",	tZONE,     -HOUR(9.5) },/* Central Australian Standard */
-    { "cadt",	tDAYZONE,  -HOUR(9.5) },/* Central Australian Daylight */
-#endif
-    { "east",	tZONE,     -HOUR(10) },	/* Eastern Australian Standard */
-    { "eadt",	tDAYZONE,  -HOUR(10) },	/* Eastern Australian Daylight */
-    { "gst",	tZONE,     -HOUR(10) },	/* Guam Standard, USSR Zone 9 */
-    { "nzt",	tZONE,     -HOUR(12) },	/* New Zealand */
-    { "nzst",	tZONE,     -HOUR(12) },	/* New Zealand Standard */
-    { "nzdt",	tDAYZONE,  -HOUR(12) },	/* New Zealand Daylight */
-    { "idle",	tZONE,     -HOUR(12) },	/* International Date Line East */
-    {  NULL  }
-};
-
-/* Military timezone table. */
-static TABLE const MilitaryTable[] = {
-    { "a",	tZONE,	HOUR(  1) },
-    { "b",	tZONE,	HOUR(  2) },
-    { "c",	tZONE,	HOUR(  3) },
-    { "d",	tZONE,	HOUR(  4) },
-    { "e",	tZONE,	HOUR(  5) },
-    { "f",	tZONE,	HOUR(  6) },
-    { "g",	tZONE,	HOUR(  7) },
-    { "h",	tZONE,	HOUR(  8) },
-    { "i",	tZONE,	HOUR(  9) },
-    { "k",	tZONE,	HOUR( 10) },
-    { "l",	tZONE,	HOUR( 11) },
-    { "m",	tZONE,	HOUR( 12) },
-    { "n",	tZONE,	HOUR(- 1) },
-    { "o",	tZONE,	HOUR(- 2) },
-    { "p",	tZONE,	HOUR(- 3) },
-    { "q",	tZONE,	HOUR(- 4) },
-    { "r",	tZONE,	HOUR(- 5) },
-    { "s",	tZONE,	HOUR(- 6) },
-    { "t",	tZONE,	HOUR(- 7) },
-    { "u",	tZONE,	HOUR(- 8) },
-    { "v",	tZONE,	HOUR(- 9) },
-    { "w",	tZONE,	HOUR(-10) },
-    { "x",	tZONE,	HOUR(-11) },
-    { "y",	tZONE,	HOUR(-12) },
-    { "z",	tZONE,	HOUR(  0) },
-    { NULL }
-};
-
-
-
-
-/* ARGSUSED */
-static int
-yyerror(s)
-    char	*s;
-{
-  return 0;
-}
-
-
-static time_t
-ToSeconds(Hours, Minutes, Seconds, Meridian)
-    time_t	Hours;
-    time_t	Minutes;
-    time_t	Seconds;
-    MERIDIAN	Meridian;
-{
-    if (Minutes < 0 || Minutes > 59 || Seconds < 0 || Seconds > 59)
-	return -1;
-    switch (Meridian) {
-    case MER24:
-	if (Hours < 0 || Hours > 23)
-	    return -1;
-	return (Hours * 60L + Minutes) * 60L + Seconds;
-    case MERam:
-	if (Hours < 1 || Hours > 12)
-	    return -1;
-	return (Hours * 60L + Minutes) * 60L + Seconds;
-    case MERpm:
-	if (Hours < 1 || Hours > 12)
-	    return -1;
-	return ((Hours + 12) * 60L + Minutes) * 60L + Seconds;
-    default:
-	abort ();
-    }
-    /* NOTREACHED */
-}
-
-
-static time_t
-Convert(Month, Day, Year, Hours, Minutes, Seconds, Meridian, DSTmode)
-    time_t	Month;
-    time_t	Day;
-    time_t	Year;
-    time_t	Hours;
-    time_t	Minutes;
-    time_t	Seconds;
-    MERIDIAN	Meridian;
-    DSTMODE	DSTmode;
-{
-    static int DaysInMonth[12] = {
-	31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-    };
-    time_t	tod;
-    time_t	Julian;
-    int		i;
-
-    if (Year < 0)
-	Year = -Year;
-    if (Year < 100)
-	Year += 1900;
-    DaysInMonth[1] = Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0)
-		    ? 29 : 28;
-    if (Year < EPOCH || Year > 1999
-     || Month < 1 || Month > 12
-     /* Lint fluff:  "conversion from long may lose accuracy" */
-     || Day < 1 || Day > DaysInMonth[(int)--Month])
-	return -1;
-
-    for (Julian = Day - 1, i = 0; i < Month; i++)
-	Julian += DaysInMonth[i];
-    for (i = EPOCH; i < Year; i++)
-	Julian += 365 + (i % 4 == 0);
-    Julian *= SECSPERDAY;
-    Julian += yyTimezone * 60L;
-    if ((tod = ToSeconds(Hours, Minutes, Seconds, Meridian)) < 0)
-	return -1;
-    Julian += tod;
-    if (DSTmode == DSTon
-     || (DSTmode == DSTmaybe && localtime(&Julian)->tm_isdst))
-	Julian -= 60 * 60;
-    return Julian;
-}
-
-
-static time_t
-DSTcorrect(Start, Future)
-    time_t	Start;
-    time_t	Future;
-{
-    time_t	StartDay;
-    time_t	FutureDay;
-
-    StartDay = (localtime(&Start)->tm_hour + 1) % 24;
-    FutureDay = (localtime(&Future)->tm_hour + 1) % 24;
-    return (Future - Start) + (StartDay - FutureDay) * 60L * 60L;
-}
-
-
-static time_t
-RelativeDate(Start, DayOrdinal, DayNumber)
-    time_t	Start;
-    time_t	DayOrdinal;
-    time_t	DayNumber;
-{
-    struct tm	*tm;
-    time_t	now;
-
-    now = Start;
-    tm = localtime(&now);
-    now += SECSPERDAY * ((DayNumber - tm->tm_wday + 7) % 7);
-    now += 7 * SECSPERDAY * (DayOrdinal <= 0 ? DayOrdinal : DayOrdinal - 1);
-    return DSTcorrect(Start, now);
-}
-
-
-static time_t
-RelativeMonth(Start, RelMonth)
-    time_t	Start;
-    time_t	RelMonth;
-{
-    struct tm	*tm;
-    time_t	Month;
-    time_t	Year;
-
-    if (RelMonth == 0)
-	return 0;
-    tm = localtime(&Start);
-    Month = 12 * tm->tm_year + tm->tm_mon + RelMonth;
-    Year = Month / 12;
-    Month = Month % 12 + 1;
-    return DSTcorrect(Start,
-	    Convert(Month, (time_t)tm->tm_mday, Year,
-		(time_t)tm->tm_hour, (time_t)tm->tm_min, (time_t)tm->tm_sec,
-		MER24, DSTmaybe));
-}
-
-
-static int
-LookupWord(buff)
-    char		*buff;
-{
-    register char	*p;
-    register char	*q;
-    register const TABLE	*tp;
-    int			i;
-    int			abbrev;
-
-    /* Make it lowercase. */
-    for (p = buff; *p; p++)
-	if (isupper(*p))
-	    *p = tolower(*p);
-
-    if (strcmp(buff, "am") == 0 || strcmp(buff, "a.m.") == 0) {
-	yylval.Meridian = MERam;
-	return tMERIDIAN;
-    }
-    if (strcmp(buff, "pm") == 0 || strcmp(buff, "p.m.") == 0) {
-	yylval.Meridian = MERpm;
-	return tMERIDIAN;
-    }
-
-    /* See if we have an abbreviation for a month. */
-    if (strlen(buff) == 3)
-	abbrev = 1;
-    else if (strlen(buff) == 4 && buff[3] == '.') {
-	abbrev = 1;
-	buff[3] = '\0';
-    }
-    else
-	abbrev = 0;
-
-    for (tp = MonthDayTable; tp->name; tp++) {
-	if (abbrev) {
-	    if (strncmp(buff, tp->name, 3) == 0) {
-		yylval.Number = tp->value;
-		return tp->type;
-	    }
-	}
-	else if (strcmp(buff, tp->name) == 0) {
-	    yylval.Number = tp->value;
-	    return tp->type;
-	}
-    }
-
-    for (tp = TimezoneTable; tp->name; tp++)
-	if (strcmp(buff, tp->name) == 0) {
-	    yylval.Number = tp->value;
-	    return tp->type;
-	}
-
-    if (strcmp(buff, "dst") == 0) 
-	return tDST;
-
-    for (tp = UnitsTable; tp->name; tp++)
-	if (strcmp(buff, tp->name) == 0) {
-	    yylval.Number = tp->value;
-	    return tp->type;
-	}
-
-    /* Strip off any plural and try the units table again. */
-    i = strlen(buff) - 1;
-    if (buff[i] == 's') {
-	buff[i] = '\0';
-	for (tp = UnitsTable; tp->name; tp++)
-	    if (strcmp(buff, tp->name) == 0) {
-		yylval.Number = tp->value;
-		return tp->type;
-	    }
-	buff[i] = 's';		/* Put back for "this" in OtherTable. */
-    }
-
-    for (tp = OtherTable; tp->name; tp++)
-	if (strcmp(buff, tp->name) == 0) {
-	    yylval.Number = tp->value;
-	    return tp->type;
-	}
-
-    /* Military timezones. */
-    if (buff[1] == '\0' && isalpha(*buff)) {
-	for (tp = MilitaryTable; tp->name; tp++)
-	    if (strcmp(buff, tp->name) == 0) {
-		yylval.Number = tp->value;
-		return tp->type;
-	    }
-    }
-
-    /* Drop out any periods and try the timezone table again. */
-    for (i = 0, p = q = buff; *q; q++)
-	if (*q != '.')
-	    *p++ = *q;
-	else
-	    i++;
-    *p = '\0';
-    if (i)
-	for (tp = TimezoneTable; tp->name; tp++)
-	    if (strcmp(buff, tp->name) == 0) {
-		yylval.Number = tp->value;
-		return tp->type;
-	    }
-
-    return tID;
-}
-
-
-static int
-yylex()
-{
-    register char	c;
-    register char	*p;
-    char		buff[20];
-    int			Count;
-    int			sign;
-
-    for ( ; ; ) {
-	while (isspace(*yyInput))
-	    yyInput++;
-
-	if (isdigit(c = *yyInput) || c == '-' || c == '+') {
-	    if (c == '-' || c == '+') {
-		sign = c == '-' ? -1 : 1;
-		if (!isdigit(*++yyInput))
-		    /* skip the '-' sign */
-		    continue;
-	    }
-	    else
-		sign = 0;
-	    for (yylval.Number = 0; isdigit(c = *yyInput++); )
-		yylval.Number = 10 * yylval.Number + c - '0';
-	    yyInput--;
-	    if (sign < 0)
-		yylval.Number = -yylval.Number;
-	    return sign ? tSNUMBER : tUNUMBER;
-	}
-	if (isalpha(c)) {
-	    for (p = buff; isalpha(c = *yyInput++) || c == '.'; )
-		if (p < &buff[sizeof buff - 1])
-		    *p++ = c;
-	    *p = '\0';
-	    yyInput--;
-	    return LookupWord(buff);
-	}
-	if (c != '(')
-	    return *yyInput++;
-	Count = 0;
-	do {
-	    c = *yyInput++;
-	    if (c == '\0')
-		return c;
-	    if (c == '(')
-		Count++;
-	    else if (c == ')')
-		Count--;
-	} while (Count > 0);
-    }
-}
-
-#define TM_YEAR_ORIGIN 1900
-
-/* Yield A - B, measured in seconds.  */
-static long
-difftm (a, b)
-     struct tm *a, *b;
-{
-  int ay = a->tm_year + (TM_YEAR_ORIGIN - 1);
-  int by = b->tm_year + (TM_YEAR_ORIGIN - 1);
-  int days = (
-	      /* difference in day of year */
-	      a->tm_yday - b->tm_yday
-	      /* + intervening leap days */
-	      +  ((ay >> 2) - (by >> 2))
-	      -  (ay/100 - by/100)
-	      +  ((ay/100 >> 2) - (by/100 >> 2))
-	      /* + difference in years * 365 */
-	      +  (long)(ay-by) * 365
-	      );
-  return (60*(60*(24*days + (a->tm_hour - b->tm_hour))
-	      + (a->tm_min - b->tm_min))
-	  + (a->tm_sec - b->tm_sec));
-}
-
-time_t
-get_date(char *p, struct timeb *now);
-
-time_t
-get_date(p, now)
-    char		*p;
-    struct timeb	*now;
-{
-    struct tm		*tm, gmt;
-    struct timeb	ftz;
-    time_t		Start;
-    time_t		tod;
-    time_t nowtime;
-
-    yyInput = p;
-    if (now == NULL) {
-        now = &ftz;
-	(void)time (&nowtime);
-
-	if (! (tm = gmtime (&nowtime)))
-	    return -1;
-	gmt = *tm;	/* Make a copy, in case localtime modifies *tm.  */
-
-	if (! (tm = localtime (&nowtime)))
-	    return -1;
-	
-	ftz.timezone = difftm (&gmt, tm) / 60;
-	if(tm->tm_isdst)
-	    ftz.timezone += 60;
-    }
-    else
-    {
-	nowtime = now->time;
-    }
-
-    tm = localtime(&nowtime);
-    yyYear = tm->tm_year;
-    yyMonth = tm->tm_mon + 1;
-    yyDay = tm->tm_mday;
-    yyTimezone = now->timezone;
-    yyDSTmode = DSTmaybe;
-    yyHour = 0;
-    yyMinutes = 0;
-    yySeconds = 0;
-    yyMeridian = MER24;
-    yyRelSeconds = 0;
-    yyRelMonth = 0;
-    yyHaveDate = 0;
-    yyHaveDay = 0;
-    yyHaveRel = 0;
-    yyHaveTime = 0;
-    yyHaveZone = 0;
-
-    if (yyparse()
-     || yyHaveTime > 1 || yyHaveZone > 1 || yyHaveDate > 1 || yyHaveDay > 1)
-	return -1;
-
-    if (yyHaveDate || yyHaveTime || yyHaveDay) {
-	Start = Convert(yyMonth, yyDay, yyYear, yyHour, yyMinutes, yySeconds,
-		    yyMeridian, yyDSTmode);
-	if (Start < 0)
-	    return -1;
-    }
-    else {
-	Start = nowtime;
-	if (!yyHaveRel)
-	    Start -= ((tm->tm_hour * 60L + tm->tm_min) * 60L) + tm->tm_sec;
-    }
-
-    Start += yyRelSeconds;
-    Start += RelativeMonth(Start, yyRelMonth);
-
-    if (yyHaveDay && !yyHaveDate) {
-	tod = RelativeDate(Start, yyDayOrdinal, yyDayNumber);
-	Start += tod;
-    }
-
-    /* Have to do *something* with a legitimate -1 so it's distinguishable
-     * from the error return value.  (Alternately could set errno on error.) */
-    return Start == -1 ? 0 : Start;
-}
-
-
-#if	defined(TEST)
-
-/* ARGSUSED */
-int
-main(ac, av)
-    int		ac;
-    char	*av[];
-{
-    char	buff[128];
-    time_t	d;
-
-    (void)printf("Enter date, or blank line to exit.\n\t> ");
-    (void)fflush(stdout);
-    while (gets(buff) && buff[0]) {
-	d = get_date(buff, (struct timeb *)NULL);
-	if (d == -1)
-	    (void)printf("Bad format - couldn't convert.\n");
-	else
-	    (void)printf("%s", ctime(&d));
-	(void)printf("\t> ");
-	(void)fflush(stdout);
-    }
-    exit(0);
-    /* NOTREACHED */
-}
-#endif	/* defined(TEST) */
diff --git a/calendar/gui/gncal-todo.c b/calendar/gui/gncal-todo.c
deleted file mode 100644
index bf03383769..0000000000
--- a/calendar/gui/gncal-todo.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/* To-do widget for gncal
- *
- * Copyright (C) 2000 The Free Software Foundation
- *
- * Author: Federico Mena <federico@helixcode.com>
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <gal/widgets/e-unicode.h>
-#include "event-editor.h"
-#include "gncal-todo.h"
-
-int todo_show_due_date = 0;
-int todo_show_priority = 0;
-int todo_show_time_remaining = 0;
-
-int todo_item_dstatus_highlight_overdue = 0;
-int todo_item_dstatus_highlight_due_today = 0;
-int todo_item_dstatus_highlight_not_due_yet = 0;
-
-
-char *todo_overdue_font_text;
-gint todo_current_sort_column = 0;
-gint todo_current_sort_type = GTK_SORT_ASCENDING;
-
-gboolean todo_style_changed =0;
-gboolean todo_list_autoresize = 1;
-gboolean todo_list_redraw_in_progess = 0;
-
-
-static void
-ok_button (GtkWidget *widget, GnomeDialog *dialog)
-{
-	CalComponent *comp;
-	CalClient *cal_client;
-	GnomeDateEdit *due_date;
-	GtkEditable *entry;
-	GtkSpinButton *priority;
-	GtkText *comment;
-	CalComponentText *text = g_new0 (CalComponentText, 1);
-	CalComponentDateTime date;
-	GSList *l;
-	gchar *t;
-	time_t d;
-	int p;
-
-	comp = gtk_object_get_user_data (GTK_OBJECT (dialog));
-
-	cal_client = (CalClient*) (gtk_object_get_data (GTK_OBJECT (dialog), "cal_client"));
-
-	/* Due date */
-	due_date = GNOME_DATE_EDIT (gtk_object_get_data(GTK_OBJECT(dialog), "due_date"));
-	d = gnome_date_edit_get_date (due_date);
-	date.value = g_new0 (struct icaltimetype, 1);
-	*date.value = icaltime_from_timet (d, 1, TRUE);
-	cal_component_set_dtend (comp, &date);
-
-	/* Summary */
-	entry = GTK_EDITABLE (gtk_object_get_data (GTK_OBJECT (dialog), "summary_entry"));
-	t = gtk_editable_get_chars (entry, 0, -1);
-	text->value = t;
-	cal_component_set_summary (comp, text);
-	g_free (t);
-
-	/* Priority */
-	priority = GTK_SPIN_BUTTON (gtk_object_get_data(GTK_OBJECT(dialog), "priority"));
-	p = gtk_spin_button_get_value_as_int (priority);
-	cal_component_set_priority (comp, &p);
-
-	/* Comment */
-	cal_component_get_comment_list (comp, &l);
-	comment = GTK_TEXT(gtk_object_get_data (GTK_OBJECT(dialog), "comment"));
-	t = gtk_editable_get_chars (entry, 0, -1);
-	text->value = t;
-	l = g_slist_append (l, text);
-	cal_component_set_comment_list (comp, l);
-	cal_component_free_text_list (l);
-
-	if (!cal_client_update_object (cal_client, comp))
-		g_message ("ok_button(): Could not update the object!");
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	gtk_widget_destroy (GTK_WIDGET (dialog));
-}
-
-static void
-cancel_button (GtkWidget *widget, GnomeDialog *dialog)
-{
-	CalComponent *comp;
-
-	comp = gtk_object_get_user_data (GTK_OBJECT (dialog));
-
-	gtk_object_unref (GTK_OBJECT (comp));
-
-	gtk_widget_destroy (GTK_WIDGET (dialog));
-}
-
-static gint
-delete_event (GtkWidget *widget, GdkEvent *event, GnomeDialog *dialog)
-{
-	cancel_button (NULL, dialog);
-	return TRUE;
-}
-
-/* I've hacked this so we can use it separate from the rest of GncalTodo.
-   This whole file will go once we've got the new editor working. */
-void
-gncal_todo_edit (CalClient *client, CalComponent *comp)
-{
-	GtkWidget *dialog;
-	GtkWidget *hbox;
-	GtkWidget *due_box;
-	GtkWidget *due_label;
-	GtkWidget *due_entry;
-	GtkWidget *comment_box;
-	GtkWidget *comment_label;
-	GtkWidget *comment_text;
-	GtkWidget *comment_internal_box;
-	GtkWidget *comment_sep;
-	GtkWidget *w;
-	GtkWidget *pri_box;
-	GtkWidget *pri_label;
-	GtkWidget *pri_spin;
-	GtkObject *pri_adj;
-	GtkWidget *entry;
-	gboolean new;
-	CalComponentText text;
-	CalComponentDateTime date;
-	GSList *l;
-	time_t d;
-	gint *p;
-
-	new = (CAL_COMPONENT_NO_TYPE == cal_component_get_vtype (comp));
-	if (new)
-		cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);
-
-	dialog = gnome_dialog_new (new ? _("Create to-do item") : _("Edit to-do item"),
-				   GNOME_STOCK_BUTTON_OK,
-				   GNOME_STOCK_BUTTON_CANCEL,
-				   NULL);
-#if 0
-	gnome_dialog_set_parent (GNOME_DIALOG (dialog),
-	  GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (todo->calendar))));
-#endif
-	hbox = gtk_hbox_new (FALSE, 4);
-	gtk_container_border_width (GTK_CONTAINER (hbox), 4);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox),
-			    hbox, FALSE, FALSE, 0);
-	gtk_widget_show (hbox);
-
-
-	due_box = gtk_hbox_new (FALSE, 4);
-	gtk_container_border_width (GTK_CONTAINER (due_box), 4);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), due_box, FALSE, FALSE, 0);
-	gtk_widget_show (due_box);
-
-	pri_box = gtk_hbox_new (FALSE, 4);
-	gtk_container_border_width (GTK_CONTAINER (pri_box), 4);
-	gtk_box_pack_start(GTK_BOX (GNOME_DIALOG (dialog)->vbox), pri_box, FALSE, FALSE, 0);
-	gtk_widget_show (pri_box);
-
-	comment_box = gtk_hbox_new (FALSE, 4);
-	gtk_container_border_width (GTK_CONTAINER (comment_box), 4);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), comment_box, FALSE, FALSE, 0);
-	gtk_widget_show (comment_box);
-
-	comment_internal_box = gtk_vbox_new(FALSE,2);
-	gtk_container_border_width (GTK_CONTAINER (comment_internal_box), 4);
-
-	gtk_box_pack_start (GTK_BOX (comment_box), comment_internal_box, TRUE, TRUE, 0);
-	gtk_widget_show (comment_internal_box);
-
-	w = gtk_label_new (_("Summary:"));
-	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
-	gtk_widget_show (w);
-
-	entry = gtk_entry_new ();
-	cal_component_get_summary (comp, &text);
-	e_utf8_gtk_entry_set_text (GTK_ENTRY (entry), text.value);
-	gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
-	gtk_widget_show (entry);
-
-
-	due_label = gtk_label_new (_("Due Date:"));
-	gtk_box_pack_start (GTK_BOX (due_box), due_label, FALSE, FALSE, 0);
-	gtk_widget_show (due_label);
-
-	due_entry = gtk_entry_new ();
-	cal_component_get_dtend (comp, &date);
-	/* FIXME: Does GnomeDateEdit support no time set? */
-	if (date.value)
-	  d = icaltime_as_timet (*date.value);
-	else
-	  d = time (NULL);
-	due_entry = date_edit_new (d, TRUE);
-	gtk_box_pack_start (GTK_BOX (due_box), due_entry, TRUE, TRUE, 0);
-	gtk_widget_show (due_entry);
-
-	pri_label = gtk_label_new (_("Priority:"));
-	gtk_box_pack_start (GTK_BOX (pri_box), pri_label, FALSE, FALSE, 0);
-	gtk_widget_show (pri_label);
-
-	pri_adj = gtk_adjustment_new (5.0, 1.0, 9.0, 1.0, 3.0, 0.0);
-	pri_spin = gtk_spin_button_new (GTK_ADJUSTMENT(pri_adj), 0.0, 0);
-	gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (pri_spin), TRUE);
-	gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (pri_spin), FALSE);
-	gtk_spin_button_set_snap_to_ticks (GTK_SPIN_BUTTON (pri_spin), FALSE);
-	cal_component_get_priority (comp, &p);
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (pri_spin), (gfloat) *p);
-	gtk_box_pack_start (GTK_BOX (pri_box), pri_spin, FALSE, FALSE, 0);
-	gtk_widget_show (pri_spin);
-
-	comment_sep = gtk_hseparator_new ();
-	gtk_box_pack_start (GTK_BOX (comment_box), comment_sep, FALSE, FALSE, 0);
-	gtk_widget_show(comment_sep);
-
-	comment_label = gtk_label_new (_("Item Comments:"));
-	gtk_label_set_justify(GTK_LABEL(comment_label), GTK_JUSTIFY_LEFT);
-	gtk_box_pack_start (GTK_BOX (comment_internal_box), comment_label, TRUE, TRUE, 0);
-	gtk_widget_show (comment_label);
-
-	comment_text = gtk_text_new (NULL, NULL);
-	gtk_text_set_editable (GTK_TEXT (comment_text), TRUE);
-	gtk_text_set_word_wrap( GTK_TEXT(comment_text), TRUE);
-	gtk_text_freeze(GTK_TEXT(comment_text));
-#ifndef NO_WARNINGS
-#warning "FIX ME"
-#endif
-	/* Need to handle multiple comments */
-	cal_component_get_comment_list (comp, &l);
-	if (l) {
-		CalComponentText text = *(CalComponentText*)l->data;
-
-		gtk_text_insert(GTK_TEXT(comment_text), NULL, NULL, NULL,
-				text.value, strlen(text.value));
-	}
-	cal_component_free_text_list (l);
-	gtk_text_thaw(GTK_TEXT(comment_text));
-	gtk_box_pack_start (GTK_BOX (comment_internal_box), comment_text, FALSE, TRUE, 0);
-	gtk_widget_show (comment_text);
-
-	gtk_object_set_user_data (GTK_OBJECT (dialog), comp);
-	gtk_object_ref (GTK_OBJECT (comp));
-
-	gtk_object_set_data (GTK_OBJECT (dialog), "cal_client", client);
-	gtk_object_set_data (GTK_OBJECT (dialog), "summary_entry", entry);
-	gtk_object_set_data (GTK_OBJECT (dialog), "due_date", due_entry);
-	gtk_object_set_data (GTK_OBJECT (dialog), "priority", pri_spin);
-	gtk_object_set_data (GTK_OBJECT (dialog), "comment", comment_text);
-
-	gnome_dialog_button_connect (GNOME_DIALOG (dialog), 0, (GtkSignalFunc) ok_button, dialog);
-	gnome_dialog_button_connect (GNOME_DIALOG (dialog), 1, (GtkSignalFunc) cancel_button, dialog);
-
-	gtk_signal_connect (GTK_OBJECT (dialog), "delete_event",
-			    (GtkSignalFunc) delete_event,
-			    dialog);
-
-	gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);
-	gnome_dialog_editable_enters (GNOME_DIALOG (dialog), GTK_EDITABLE(entry));
-
-	gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
-	gtk_widget_show (dialog);
-	gtk_widget_grab_focus (entry);
-}
diff --git a/calendar/gui/gncal-todo.h b/calendar/gui/gncal-todo.h
deleted file mode 100644
index a48f8ce47d..0000000000
--- a/calendar/gui/gncal-todo.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* To-do widget for gncal
- *
- * Copyright (C) 2000 The Free Software Foundation
- *
- * Author: Federico Mena <federico@helixcode.com>
- */
-
-#ifndef GNCAL_TODO_H
-#define GNCAL_TODO_H
-
-#include <libgnome/gnome-defs.h>
-#include "gnome-cal.h"
-
-BEGIN_GNOME_DECLS
-
-
-void gncal_todo_edit (CalClient *client, CalComponent *comp);
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
deleted file mode 100644
index 6b80823dfa..0000000000
--- a/calendar/gui/gnome-cal.c
+++ /dev/null
@@ -1,2273 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * GnomeCalendar widget
- * Copyright (C) 1998 the Free Software Foundation
- *
- * Authors: Miguel de Icaza (miguel@kernel.org)
- *          Federico Mena-Quintero <federico@helixcode.com>
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <unistd.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-#include <gnome.h>
-#include <gal/e-paned/e-hpaned.h>
-#include <gal/e-paned/e-vpaned.h>
-#include <cal-util/timeutil.h>
-#include "dialogs/alarm-notify-dialog.h"
-#include "alarm.h"
-#include "e-calendar-table.h"
-#include "e-day-view.h"
-#include "e-week-view.h"
-#include "event-editor.h"
-#include "gnome-cal.h"
-#include "calendar-commands.h"
-#include "calendar-config.h"
-
-
-
-/* These must match the page numbers in the GtkNotebook. */
-typedef enum {
-	VIEW_NOT_SET = -1,
-	VIEW_DAY = 0,
-	VIEW_WORK_WEEK,
-	VIEW_WEEK,
-	VIEW_MONTH
-} ViewType;
-
-/* States for the calendar loading and creation state machine */
-typedef enum {
-	LOAD_STATE_NOT_LOADED,
-	LOAD_STATE_WAIT_LOAD,
-	LOAD_STATE_WAIT_LOAD_BEFORE_CREATE,
-	LOAD_STATE_WAIT_CREATE,
-	LOAD_STATE_LOADED
-} LoadState;
-
-/* Private part of the GnomeCalendar structure */
-struct _GnomeCalendarPrivate {
-	CalClient   *client;
-
-	/* Loading state; we can be loading or creating a calendar */
-	LoadState load_state;
-
-	/* URI being loaded, NULL if we are not being loaded */
-	char *loading_uri;
-
-	/* Mapping of component UIDs to event editors */
-	GHashTable  *object_editor_hash;
-
-	/* This is the last selection explicitly selected by the user. We try
-	   to keep it the same when we switch views, but we may have to alter
-	   it depending on the view (e.g. the week views only select days, so
-	   any times are lost. */
-	time_t      selection_start_time;
-	time_t      selection_end_time;
-
-	/* Widgets */
-
-	GtkWidget   *hpane;
-	GtkWidget   *notebook;
-	GtkWidget   *vpane;
-	ECalendar   *date_navigator;
-	GtkWidget   *todo;
-
-	GtkWidget   *day_view;
-	GtkWidget   *work_week_view;
-	GtkWidget   *week_view;
-	GtkWidget   *month_view;
-
-	/* These are the toolbar radio buttons for switching views. */
-	GtkWidget   *day_button;
-	GtkWidget   *work_week_button;
-	GtkWidget   *week_button;
-	GtkWidget   *month_button;
-
-	/* This is the view currently shown. We use it to keep track of the
-	   positions of the panes. range_selected is TRUE if a range of dates
-	   was selected in the date navigator to show the view. */
-	ViewType current_view_type;
-	gboolean range_selected;
-
-	/* These are the saved positions of the panes. They are multiples of
-	   calendar month widths & heights in the date navigator, so that they
-	   will work OK after theme changes. */
-	gfloat	     hpane_pos;
-	gfloat	     vpane_pos;
-	gfloat	     hpane_pos_month_view;
-	gfloat	     vpane_pos_month_view;
-
-	/* The signal handler id for our GtkCalendar "day_selected" handler. */
-	guint	     day_selected_id;
-
-	/* Alarm ID for the midnight refresh function */
-	gpointer midnight_alarm_refresh_id;
-
-	/* UID->alarms hash */
-	GHashTable *alarms;
-};
-
-
-
-/* An entry in the UID->alarms hash table.  The UID key *is* the uid field in
- * this structure, so don't free it separately.
- */
-typedef struct {
-	char *uid;
-	GList *alarm_ids;
-} ObjectAlarms;
-
-
-
-static void gnome_calendar_class_init (GnomeCalendarClass *class);
-static void gnome_calendar_init (GnomeCalendar *gcal);
-static void gnome_calendar_destroy (GtkObject *object);
-
-static void gnome_calendar_set_view_internal	(GnomeCalendar	*gcal,
-						 char		*page_name,
-						 gboolean	 range_selected,
-						 gboolean	 focus);
-static void gnome_calendar_set_pane_positions	(GnomeCalendar	*gcal);
-static void gnome_calendar_update_view_times (GnomeCalendar *gcal);
-static void gnome_calendar_update_date_navigator (GnomeCalendar *gcal);
-
-static void gnome_calendar_on_date_navigator_style_set (GtkWidget *widget,
-							GtkStyle  *previous_style,
-							gpointer data);
-static void gnome_calendar_update_paned_quanta (GnomeCalendar	*gcal);
-static void gnome_calendar_on_date_navigator_size_allocate (GtkWidget     *widget,
-							    GtkAllocation *allocation,
-							    gpointer data);
-static void gnome_calendar_on_date_navigator_date_range_changed (ECalendarItem *calitem,
-								 GnomeCalendar *gcal);
-static void gnome_calendar_on_date_navigator_selection_changed (ECalendarItem    *calitem,
-								GnomeCalendar    *gcal);
-static gboolean gnome_calendar_get_days_shown	(GnomeCalendar	*gcal,
-						 GDate		*start_date,
-						 gint		*days_shown);
-
-
-static GtkVBoxClass *parent_class;
-
-static void setup_alarm (GnomeCalendar *cal, CalAlarmInstance *ai);
-
-
-
-GtkType
-gnome_calendar_get_type (void)
-{
-	static GtkType gnome_calendar_type = 0;
-
-	if (!gnome_calendar_type) {
-		static const GtkTypeInfo gnome_calendar_info = {
-			"GnomeCalendar",
-			sizeof (GnomeCalendar),
-			sizeof (GnomeCalendarClass),
-			(GtkClassInitFunc) gnome_calendar_class_init,
-			(GtkObjectInitFunc) gnome_calendar_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		gnome_calendar_type = gtk_type_unique (GTK_TYPE_VBOX, &gnome_calendar_info);
-	}
-
-	return gnome_calendar_type;
-}
-
-/* Class initialization function for the gnome calendar */
-static void
-gnome_calendar_class_init (GnomeCalendarClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_VBOX);
-
-	object_class->destroy = gnome_calendar_destroy;
-}
-
-static void
-setup_widgets (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *w;
-
-	priv = gcal->priv;
-
-	/* The main HPaned, with the notebook of calendar views on the left
-	   and the ECalendar and ToDo list on the right. */
-	priv->hpane = e_hpaned_new ();
-	gtk_widget_show (priv->hpane);
-	gtk_box_pack_start (GTK_BOX (gcal), priv->hpane, TRUE, TRUE, 0);
-
-	/* The Notebook containing the 4 calendar views. */
-	priv->notebook = gtk_notebook_new ();
-	gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->notebook), FALSE);
-	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), FALSE);
-	gtk_widget_show (priv->notebook);
-	e_paned_pack1 (E_PANED (priv->hpane), priv->notebook, TRUE, TRUE);
-
-	/* The VPaned widget, to contain the GtkCalendar & ToDo list. */
-	priv->vpane = e_vpaned_new ();
-	gtk_widget_show (priv->vpane);
-	e_paned_pack2 (E_PANED (priv->hpane), priv->vpane, FALSE, TRUE);
-
-	/* The ECalendar. */
-	w = e_calendar_new ();
-	priv->date_navigator = E_CALENDAR (w);
-	gtk_widget_show (w);
-	e_paned_pack1 (E_PANED (priv->vpane), w, FALSE, TRUE);
-	gtk_signal_connect (GTK_OBJECT (priv->date_navigator),
-			    "style_set",
-			    GTK_SIGNAL_FUNC (gnome_calendar_on_date_navigator_style_set),
-			    gcal);
-	gtk_signal_connect_after (GTK_OBJECT (priv->date_navigator),
-				  "size_allocate",
-				  (GtkSignalFunc) gnome_calendar_on_date_navigator_size_allocate,
-				  gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->date_navigator->calitem),
-			    "selection_changed",
-			    (GtkSignalFunc) gnome_calendar_on_date_navigator_selection_changed,
-			    gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->date_navigator->calitem),
-			    "date_range_changed",
-			    GTK_SIGNAL_FUNC (gnome_calendar_on_date_navigator_date_range_changed),
-			    gcal);
-
-	/* The ToDo list. */
-	priv->todo = e_calendar_table_new ();
-	e_paned_pack2 (E_PANED (priv->vpane), priv->todo, TRUE, TRUE);
-	gtk_widget_show (priv->todo);
-
-	/* The Day View. */
-	priv->day_view = e_day_view_new ();
-	e_day_view_set_calendar (E_DAY_VIEW (priv->day_view), gcal);
-	gtk_widget_show (priv->day_view);
-	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-				  priv->day_view, gtk_label_new (""));
-
-	/* The Work Week View. */
-	priv->work_week_view = e_day_view_new ();
-	e_day_view_set_work_week_view (E_DAY_VIEW (priv->work_week_view),
-				       TRUE);
-	e_day_view_set_days_shown (E_DAY_VIEW (priv->work_week_view), 5);
-	e_day_view_set_calendar (E_DAY_VIEW (priv->work_week_view), gcal);
-	gtk_widget_show (priv->work_week_view);
-	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-				  priv->work_week_view, gtk_label_new (""));
-
-	/* The Week View. */
-	priv->week_view = e_week_view_new ();
-	e_week_view_set_calendar (E_WEEK_VIEW (priv->week_view), gcal);
-	gtk_widget_show (priv->week_view);
-	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-				  priv->week_view, gtk_label_new (""));
-
-	/* The Month View. */
-	priv->month_view = e_week_view_new ();
-	e_week_view_set_calendar (E_WEEK_VIEW (priv->month_view), gcal);
-	e_week_view_set_multi_week_view (E_WEEK_VIEW (priv->month_view), TRUE);
-	gtk_widget_show (priv->month_view);
-	gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-				  priv->month_view, gtk_label_new (""));
-
-	gnome_calendar_update_config_settings (gcal, TRUE);
-}
-
-/* Object initialization function for the gnome calendar */
-static void
-gnome_calendar_init (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = g_new0 (GnomeCalendarPrivate, 1);
-	gcal->priv = priv;
-
-	priv->load_state = LOAD_STATE_NOT_LOADED;
-
-	priv->object_editor_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->alarms = g_hash_table_new (g_str_hash, g_str_equal);
-
-	priv->current_view_type = VIEW_NOT_SET;
-	priv->range_selected = FALSE;
-
-	priv->selection_start_time = time_day_begin (time (NULL));
-	priv->selection_end_time = time_add_day (priv->selection_start_time, 1);
-
-	setup_widgets (gcal);
-}
-
-/* Used from g_hash_table_foreach(); frees an object alarms entry */
-static void
-free_object_alarms (gpointer key, gpointer value, gpointer data)
-{
-	ObjectAlarms *oa;
-
-	oa = value;
-
-	g_assert (oa->uid != NULL);
-	g_free (oa->uid);
-	oa->uid = NULL;
-
-	g_assert (oa->alarm_ids != NULL);
-	g_list_free (oa->alarm_ids);
-	oa->alarm_ids = NULL;
-
-	g_free (oa);
-}
-
-/* Used from g_hash_table_foreach(); frees an UID string */
-static void
-free_uid (gpointer key, gpointer value, gpointer data)
-{
-	char *uid;
-
-	uid = key;
-	g_free (uid);
-}
-
-static void
-gnome_calendar_destroy (GtkObject *object)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (object));
-
-	gcal = GNOME_CALENDAR (object);
-	priv = gcal->priv;
-
-	priv->load_state = LOAD_STATE_NOT_LOADED;
-
-	if (priv->loading_uri) {
-		g_free (priv->loading_uri);
-		priv->loading_uri = NULL;
-	}
-
-	if (priv->client) {
-		gtk_object_unref (GTK_OBJECT (priv->client));
-		priv->client = NULL;
-	}
-
-	g_hash_table_foreach (priv->alarms, free_object_alarms, NULL);
-	g_hash_table_destroy (priv->alarms);
-	priv->alarms = NULL;
-
-	g_hash_table_foreach (priv->object_editor_hash, free_uid, NULL);
-	g_hash_table_destroy (priv->object_editor_hash);
-	priv->object_editor_hash = NULL;
-
-	g_free (priv);
-	gcal->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-static GtkWidget *
-get_current_page (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	return GTK_NOTEBOOK (priv->notebook)->cur_page->child;
-}
-
-char *
-gnome_calendar_get_current_view_name (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *page;
-
-	g_return_val_if_fail (gcal != NULL, NULL);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
-
-	priv = gcal->priv;
-
-	page = get_current_page (gcal);
-
-	if (page == priv->day_view)
-		return "dayview";
-	else if (page == priv->work_week_view)
-		return "workweekview";
-	else if (page == priv->week_view)
-		return "weekview";
-	else if (page == priv->month_view)
-		return "monthview";
-	else {
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-void
-gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (new_time != -1);
-
-	priv = gcal->priv;
-
-	priv->selection_start_time = time_day_begin (new_time);
-	priv->selection_end_time = time_add_day (priv->selection_start_time, 1);
-
-	gnome_calendar_update_view_times (gcal);
-	gnome_calendar_update_date_navigator (gcal);
-}
-
-
-static void
-gnome_calendar_update_view_times (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *page;
-
-	priv = gcal->priv;
-
-	page = get_current_page (gcal);
-
-	if (page == priv->day_view || page == priv->work_week_view) {
-		e_day_view_set_selected_time_range (E_DAY_VIEW (page),
-						    priv->selection_start_time,
-						    priv->selection_end_time);
-	} else if (page == priv->week_view || page == priv->month_view) {
-		e_week_view_set_selected_time_range (E_WEEK_VIEW (page),
-						     priv->selection_start_time,
-						     priv->selection_end_time);
-	} else {
-		g_warning ("My penguin is gone!");
-		g_assert_not_reached ();
-	}
-}
-
-static void
-gnome_calendar_direction (GnomeCalendar *gcal, int direction)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *cp;
-	time_t start_time, end_time;
-
-	priv = gcal->priv;
-
-	cp = get_current_page (gcal);
-
-	start_time = priv->selection_start_time;
-	end_time = priv->selection_end_time;
-
-	if (cp == priv->day_view) {
-		start_time = time_add_day (start_time, direction);
-		end_time = time_add_day (end_time, direction);
-	} else if (cp == priv->work_week_view) {
-		start_time = time_add_week (start_time, direction);
-		end_time = time_add_week (end_time, direction);
-	} else if (cp == priv->week_view) {
-		start_time = time_add_week (start_time, direction);
-		end_time = time_add_week (end_time, direction);
-	} else if (cp == priv->month_view) {
-		start_time = time_add_month (start_time, direction);
-		end_time = time_add_month (end_time, direction);
-	} else {
-		g_warning ("Weee!  Where did the penguin go?");
-		g_assert_not_reached ();
-		return;
-	}
-
-	priv->selection_start_time = start_time;
-	priv->selection_end_time = end_time;
-
-	gnome_calendar_update_view_times (gcal);
-	gnome_calendar_update_date_navigator (gcal);
-}
-
-void
-gnome_calendar_next (GnomeCalendar *gcal)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	gnome_calendar_direction (gcal, 1);
-}
-
-void
-gnome_calendar_previous (GnomeCalendar *gcal)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	gnome_calendar_direction (gcal, -1);
-}
-
-void
-gnome_calendar_dayjump (GnomeCalendar *gcal, time_t time)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	priv->selection_start_time = time_day_begin (time);
-	priv->selection_end_time = time_add_day (priv->selection_start_time, 1);
-	if (priv->day_button)
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->day_button), TRUE);
-}
-
-void
-gnome_calendar_goto_today (GnomeCalendar *gcal)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	gnome_calendar_goto (gcal, time (NULL));
-
-	gtk_widget_grab_focus (get_current_page (gcal));
-}
-
-
-/* This sets which view is currently shown. It also updates the selection time
-   of the view so it shows the appropriate days. */
-void
-gnome_calendar_set_view		(GnomeCalendar	*gcal,
-				 char		*page_name,
-				 gboolean	 range_selected,
-				 gboolean	 focus)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (page_name != NULL);
-
-	gnome_calendar_set_view_internal (gcal, page_name, range_selected, focus);
-	gnome_calendar_update_view_times (gcal);
-	gnome_calendar_update_date_navigator (gcal);
-}
-
-
-/* This sets the view without changing the selection or updating the date
-   navigator. If a range of dates isn't selected it will also reset the number
-   of days/weeks shown to the default (i.e. 1 day for the day view or 5 weeks
-   for the month view). */
-static void
-gnome_calendar_set_view_internal	(GnomeCalendar	*gcal,
-					 char		*page_name,
-					 gboolean	 range_selected,
-					 gboolean	 focus)
-{
-	GnomeCalendarPrivate *priv;
-	int view;
-	gboolean round_selection;
-	GtkWidget *focus_widget;
-
-	priv = gcal->priv;
-
-	round_selection = FALSE;
-
-	if (!strcmp (page_name, "dayview")) {
-		view = VIEW_DAY;
-		focus_widget = priv->day_view;
-
-		if (!range_selected)
-			e_day_view_set_days_shown (E_DAY_VIEW (priv->day_view), 1);
-	} else if (!strcmp (page_name, "workweekview")) {
-		view = VIEW_WORK_WEEK;
-		focus_widget = priv->work_week_view;
-	} else if (!strcmp (page_name, "weekview")) {
-		view = VIEW_WEEK;
-		focus_widget = priv->week_view;
-		round_selection = TRUE;
-	} else if (!strcmp (page_name, "monthview")) {
-		view = VIEW_MONTH;
-		focus_widget = priv->month_view;
-
-		if (!range_selected)
-			e_week_view_set_weeks_shown (E_WEEK_VIEW (priv->month_view), 5);
-		round_selection = TRUE;
-	} else {
-		g_warning ("Unknown calendar view: %s", page_name);
-		g_assert_not_reached ();
-		return;
-	}
-
-	priv->current_view_type = view;
-	priv->range_selected = range_selected;
-
-	gtk_notebook_set_page (GTK_NOTEBOOK (priv->notebook), view);
-
-	if (focus)
-		gtk_widget_grab_focus (focus_widget);
-
-	gnome_calendar_set_pane_positions (gcal);
-
-	/* For the week & month views we want the selection in the date
-	   navigator to be rounded to the nearest week when the arrow buttons
-	   are pressed to move to the previous/next month. */
-	gtk_object_set (GTK_OBJECT (priv->date_navigator->calitem),
-			"round_selection_when_moving", round_selection,
-			NULL);
-}
-
-
-static void
-gnome_calendar_set_pane_positions	(GnomeCalendar	*gcal)
-{
-	GnomeCalendarPrivate *priv;
-	gint top_border, bottom_border, left_border, right_border;
-	gint col_width, row_height;
-	gfloat right_pane_width, top_pane_height;
-
-	priv = gcal->priv;
-
-	/* Get the size of the calendar month width & height. */
-	e_calendar_get_border_size (priv->date_navigator,
-				    &top_border, &bottom_border,
-				    &left_border, &right_border);
-	gtk_object_get (GTK_OBJECT (priv->date_navigator->calitem),
-			"row_height", &row_height,
-			"column_width", &col_width,
-			NULL);
-
-	if (priv->current_view_type == VIEW_MONTH && !priv->range_selected) {
-		right_pane_width = priv->hpane_pos_month_view;
-		top_pane_height = priv->vpane_pos_month_view;
-	} else {
-		right_pane_width = priv->hpane_pos;
-		top_pane_height = priv->vpane_pos;
-	}
-
-	/* We add the borders before multiplying due to the way we are using
-	   the EPaned quantum feature. */
-	if (right_pane_width < 0.001)
-		right_pane_width = 0.0;
-	else
-		right_pane_width = (right_pane_width * (col_width + left_border + right_border)
-				    + 0.5);
-	if (top_pane_height < 0.001)
-		top_pane_height = 0.0;
-	else
-		top_pane_height = (top_pane_height * (row_height + top_border + bottom_border)
-				   + 0.5);
-
-	e_paned_set_position (E_PANED (priv->hpane), -1);
-	e_paned_set_position (E_PANED (priv->vpane), -1);
-
-	/* We add one to each dimension since we can't use 0. */
-
-	gtk_widget_set_usize (priv->vpane, right_pane_width + 1, -2);
-	gtk_widget_set_usize (GTK_WIDGET (priv->date_navigator), -2, top_pane_height + 1);
-}
-
-#if 0
-
-/* Sends a mail notification of an alarm trigger */
-static void
-mail_notification (char *mail_address, char *text, time_t app_time)
-{
-	pid_t pid;
-	int   p [2];
-	char *command;
-
-	pipe (p);
-	pid = fork ();
-	if (pid == 0){
-		int dev_null;
-
-		dev_null = open ("/dev/null", O_RDWR);
-		dup2 (p [0], 0);
-		dup2 (dev_null, 1);
-		dup2 (dev_null, 2);
-		execl ("/usr/lib/sendmail", "/usr/lib/sendmail",
-		       mail_address, NULL);
-		_exit (127);
-	}
-	command = g_strconcat ("To: ", mail_address, "\n",
-			       "Subject: ", _("Reminder of your appointment at "),
-			       ctime (&app_time), "\n\n", text, "\n", NULL);
-	write (p [1], command, strlen (command));
- 	close (p [1]);
-	close (p [0]);
-	g_free (command);
-}
-
-static int
-max_open_files (void)
-{
-        static int files;
-
-        if (files)
-                return files;
-
-        files = sysconf (_SC_OPEN_MAX);
-        if (files != -1)
-                return files;
-#ifdef OPEN_MAX
-        return files = OPEN_MAX;
-#else
-        return files = 256;
-#endif
-}
-
-/* Executes a program as a notification of an alarm trigger */
-static void
-program_notification (char *command, int close_standard)
-{
-	struct sigaction ignore, save_intr, save_quit;
-	int status = 0, i;
-	pid_t pid;
-
-	ignore.sa_handler = SIG_IGN;
-	sigemptyset (&ignore.sa_mask);
-	ignore.sa_flags = 0;
-
-	sigaction (SIGINT, &ignore, &save_intr);
-	sigaction (SIGQUIT, &ignore, &save_quit);
-
-	if ((pid = fork ()) < 0){
-		fprintf (stderr, "\n\nfork () = -1\n");
-		return;
-	}
-	if (pid == 0){
-		pid = fork ();
-		if (pid == 0){
-			const int top = max_open_files ();
-			sigaction (SIGINT,  &save_intr, NULL);
-			sigaction (SIGQUIT, &save_quit, NULL);
-
-			for (i = (close_standard ? 0 : 3); i < top; i++)
-				close (i);
-
-			/* FIXME: As an excercise to the reader, copy the
-			 * code from mc to setup shell properly instead of
-			 * /bin/sh.  Yes, this comment is larger than a cut and paste.
-			 */
-			execl ("/bin/sh", "/bin/sh", "-c", command, (char *) 0);
-
-			_exit (127);
-		} else {
-			_exit (127);
-		}
-	}
-	wait (&status);
-	sigaction (SIGINT,  &save_intr, NULL);
-	sigaction (SIGQUIT, &save_quit, NULL);
-}
-
-#endif
-
-/* Queues a snooze alarm */
-static void
-snooze (GnomeCalendar *gcal, CalComponent *comp, time_t occur, int snooze_mins, gboolean audio)
-{
-	time_t now, trigger;
-	struct tm tm;
-	CalAlarmInstance ai;
-
-	now = time (NULL);
-	tm = *localtime (&now);
-	tm.tm_min += snooze_mins;
-
-	trigger = mktime (&tm);
-	if (trigger == -1) {
-		g_message ("snooze(): produced invalid time_t; not queueing alarm!");
-		return;
-	}
-
-#if 0
-	cal_component_get_uid (comp, &ai.uid);
-	ai.type = audio ? ALARM_AUDIO : ALARM_DISPLAY;
-#endif
-	ai.trigger = trigger;
-	ai.occur = occur;
-
-	setup_alarm (gcal, &ai);
-}
-
-struct alarm_notify_closure {
-	GnomeCalendar *gcal;
-	CalComponent *comp;
-	time_t occur;
-};
-
-/* Callback used for the result of the alarm notification dialog */
-static void
-display_notification_cb (AlarmNotifyResult result, int snooze_mins, gpointer data)
-{
-	struct alarm_notify_closure *c;
-
-	c = data;
-
-	switch (result) {
-	case ALARM_NOTIFY_CLOSE:
-		break;
-
-	case ALARM_NOTIFY_SNOOZE:
-		snooze (c->gcal, c->comp, c->occur, snooze_mins, FALSE);
-		break;
-
-	case ALARM_NOTIFY_EDIT:
-		gnome_calendar_edit_object (c->gcal, c->comp);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	gtk_object_unref (GTK_OBJECT (c->comp));
-	g_free (c);
-}
-
-/* Present a display notification of an alarm trigger */
-static void
-display_notification (time_t trigger, time_t occur, CalComponent *comp, GnomeCalendar *gcal)
-{
-	gboolean result;
-	struct alarm_notify_closure *c;
-
-	gtk_object_ref (GTK_OBJECT (comp));
-
-	c = g_new (struct alarm_notify_closure, 1);
-	c->gcal = gcal;
-	c->comp = comp;
-	c->occur = occur;
-
-	result = alarm_notify_dialog (trigger, occur, comp, display_notification_cb, c);
-	if (!result) {
-		g_message ("display_notification(): could not display the alarm notification dialog");
-		g_free (c);
-		gtk_object_unref (GTK_OBJECT (comp));
-	}
-}
-
-/* Present an audible notification of an alarm trigger */
-static void
-audio_notification (time_t trigger, time_t occur, CalComponent *comp, GnomeCalendar *gcal)
-{
-	g_message ("AUDIO NOTIFICATION!");
-	/* FIXME */
-}
-
-struct trigger_alarm_closure {
-	GnomeCalendar *gcal;
-	char *uid;
-	CalComponentAlarmAction type;
-	time_t occur;
-};
-
-/* Callback function used when an alarm is triggered */
-static void
-trigger_alarm_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	struct trigger_alarm_closure *c;
-	GnomeCalendarPrivate *priv;
-	CalComponent *comp;
-	CalClientGetStatus status;
-	const char *uid;
-	ObjectAlarms *oa;
-   	GList *l;
-
-	c = data;
-	priv = c->gcal->priv;
-
-	/* Fetch the object */
-
-	status = cal_client_get_object (priv->client, c->uid, &comp);
-
-	switch (status) {
-	case CAL_CLIENT_GET_SUCCESS:
-		/* Go on */
-		break;
-	case CAL_CLIENT_GET_SYNTAX_ERROR:
-	case CAL_CLIENT_GET_NOT_FOUND:
-		g_message ("trigger_alarm_cb(): syntax error in fetched object");
-		return;
-	}
-
-	g_assert (comp != NULL);
-
-	/* Present notification */
-
-	switch (c->type) {
-	case CAL_COMPONENT_ALARM_EMAIL:
-#if 0
-		g_assert (ico->malarm.enabled);
-		mail_notification (ico->malarm.data, ico->summary, c->occur);
-#endif
-		break;
-
-	case CAL_COMPONENT_ALARM_PROCEDURE:
-#if 0
-		g_assert (ico->palarm.enabled);
-		program_notification (ico->palarm.data, FALSE);
-#endif
-		break;
-
-	case CAL_COMPONENT_ALARM_DISPLAY:
-#if 0
-		g_assert (ico->dalarm.enabled);
-#endif
-		display_notification (trigger, c->occur, comp, c->gcal);
-		break;
-
-	case CAL_COMPONENT_ALARM_AUDIO:
-#if 0
-		g_assert (ico->aalarm.enabled);
-#endif
-		audio_notification (trigger, c->occur, comp, c->gcal);
-		break;
-
-	default:
-		break;
-	}
-
-	/* Remove the alarm from the hash table */
-	cal_component_get_uid (comp, &uid);
-	oa = g_hash_table_lookup (priv->alarms, uid);
-	g_assert (oa != NULL);
-
-	l = g_list_find (oa->alarm_ids, alarm_id);
-	g_assert (l != NULL);
-
-	oa->alarm_ids = g_list_remove_link (oa->alarm_ids, l);
-	g_list_free_1 (l);
-
-	if (!oa->alarm_ids) {
-		g_hash_table_remove (priv->alarms, uid);
-		g_free (oa->uid);
-		g_free (oa);
-	}
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-/* Frees a struct trigger_alarm_closure */
-static void
-free_trigger_alarm_closure (gpointer data)
-{
-	struct trigger_alarm_closure *c;
-
-	c = data;
-	g_free (c->uid);
-	g_free (c);
-}
-
-/* Queues the specified alarm */
-static void
-setup_alarm (GnomeCalendar *gcal, CalAlarmInstance *ai)
-{
-	GnomeCalendarPrivate *priv;
-	struct trigger_alarm_closure *c;
-	gpointer alarm;
-	ObjectAlarms *oa;
-
-	priv = gcal->priv;
-
-	c = g_new (struct trigger_alarm_closure, 1);
-	c->gcal = gcal;
-	c->uid = g_strdup (ai->uid);
-#if 0
-	c->type = ai->type;
-#endif
-	c->occur = ai->occur;
-
-	alarm = alarm_add (ai->trigger, trigger_alarm_cb, c, free_trigger_alarm_closure);
-	if (!alarm) {
-		g_message ("setup_alarm(): Could not set up alarm");
-		g_free (c->uid);
-		g_free (c);
-		return;
-	}
-
-	oa = g_hash_table_lookup (priv->alarms, ai->uid);
-	if (oa)
-		oa->alarm_ids = g_list_prepend (oa->alarm_ids, alarm);
-	else {
-		oa = g_new (ObjectAlarms, 1);
-		oa->uid = g_strdup (ai->uid);
-		oa->alarm_ids = g_list_prepend (NULL, alarm);
-
-		g_hash_table_insert (priv->alarms, oa->uid, oa);
-	}
-}
-
-static void load_alarms (GnomeCalendar *cal);
-
-/* Called nightly to refresh the day's alarms */
-static void
-midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data)
-{
-	GnomeCalendar *cal;
-	GnomeCalendarPrivate *priv;
-
-	cal = GNOME_CALENDAR (data);
-	priv = cal->priv;
-
-	priv->midnight_alarm_refresh_id = NULL;
-
-	load_alarms (cal);
-}
-
-/* Loads and queues the alarms from the current time up to midnight. */
-static void
-load_alarms (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	time_t now;
-	time_t end_of_day;
-	GList *alarms, *l;
-
-	priv = gcal->priv;
-
-	now = time (NULL);
-	end_of_day = time_day_end (now);
-
-	/* Queue alarms */
-
-	alarms = cal_client_get_alarms_in_range (priv->client, now, end_of_day);
-
-	for (l = alarms; l; l = l->next)
-		setup_alarm (gcal, l->data);
-
-	cal_alarm_instance_list_free (alarms);
-
-	/* Queue the midnight alarm refresh */
-
-	priv->midnight_alarm_refresh_id = alarm_add (end_of_day, midnight_refresh_cb, gcal, NULL);
-	if (!priv->midnight_alarm_refresh_id) {
-		g_message ("load_alarms(): Could not set up the midnight refresh alarm!");
-		/* FIXME: what to do? */
-	}
-}
-
-/* Loads the initial data into the calendar; this should be called right after
- * the cal_loaded signal from the client is invoked.
- */
-static void
-initial_load (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	load_alarms (gcal);
-	gnome_calendar_tag_calendar (gcal, priv->date_navigator);
-}
-
-/* Removes any queued alarms for the specified UID */
-static void
-remove_alarms_for_object (GnomeCalendar *gcal, const char *uid)
-{
-	GnomeCalendarPrivate *priv;
-	ObjectAlarms *oa;
-	GList *l;
-
-	priv = gcal->priv;
-
-	oa = g_hash_table_lookup (priv->alarms, uid);
-	if (!oa)
-		return;
-
-	for (l = oa->alarm_ids; l; l = l->next) {
-		gpointer alarm_id;
-
-		alarm_id = l->data;
-		alarm_remove (alarm_id);
-	}
-
-	g_hash_table_remove (priv->alarms, uid);
-
-	g_free (oa->uid);
-	g_list_free (oa->alarm_ids);
-	g_free (oa);
-}
-
-/* Adds today's alarms for the specified object */
-static void
-add_alarms_for_object (GnomeCalendar *gcal, const char *uid)
-{
-	GnomeCalendarPrivate *priv;
-	GList *alarms;
-	gboolean result;
-	time_t now, end_of_day;
-	GList *l;
-
-	priv = gcal->priv;
-
-	now = time (NULL);
-	end_of_day = time_day_end (now);
-
-	result = cal_client_get_alarms_for_object (priv->client, uid, now, end_of_day, &alarms);
-	if (!result) {
-		/* FIXME: should we warn here, or is it OK if the object
-		 * disappeared in the meantime?
-		 */
-		return;
-	}
-
-	for (l = alarms; l; l = l->next)
-		setup_alarm (gcal, l->data);
-
-	cal_alarm_instance_list_free (alarms);
-}
-
-/* Displays an error to indicate that loading a calendar failed */
-static void
-load_error (GnomeCalendar *gcal, const char *uri)
-{
-	char *msg;
-
-	msg = g_strdup_printf (_("Could not load the calendar in `%s'"), uri);
-	gnome_error_dialog_parented (msg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
-	g_free (msg);
-}
-
-/* Displays an error to indicate that creating a calendar failed */
-static void
-create_error (GnomeCalendar *gcal, const char *uri)
-{
-	char *msg;
-
-	msg = g_strdup_printf (_("Could not create a calendar in `%s'"), uri);
-	gnome_error_dialog_parented (msg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
-	g_free (msg);
-}
-
-/* Displays an error to indicate that the specified URI method is not supported */
-static void
-method_error (GnomeCalendar *gcal, const char *uri)
-{
-	char *msg;
-
-	msg = g_strdup_printf (_("The method required to load `%s' is not supported"), uri);
-	gnome_error_dialog_parented (msg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
-	g_free (msg);
-}
-
-/* Callback from the calendar client when a calendar is loaded */
-static void
-cal_loaded_cb (CalClient *client, CalClientLoadStatus status, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	gboolean free_uri;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	g_assert (priv->load_state != LOAD_STATE_NOT_LOADED && priv->load_state != LOAD_STATE_LOADED);
-	g_assert (priv->loading_uri != NULL);
-
-	free_uri = TRUE;
-
-	switch (priv->load_state) {
-	case LOAD_STATE_WAIT_LOAD:
-		if (status == CAL_CLIENT_LOAD_SUCCESS) {
-			priv->load_state = LOAD_STATE_LOADED;
-			initial_load (gcal);
-		} else if (status == CAL_CLIENT_LOAD_ERROR) {
-			priv->load_state = LOAD_STATE_NOT_LOADED;
-			load_error (gcal, priv->loading_uri);
-		} else if (status == CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED) {
-			priv->load_state = LOAD_STATE_NOT_LOADED;
-			method_error (gcal, priv->loading_uri);
-		} else
-			g_assert_not_reached ();
-
-		break;
-
-	case LOAD_STATE_WAIT_LOAD_BEFORE_CREATE:
-		if (status == CAL_CLIENT_LOAD_SUCCESS) {
-			priv->load_state = LOAD_STATE_LOADED;
-			initial_load (gcal);
-		} else if (status == CAL_CLIENT_LOAD_ERROR) {
-			priv->load_state = LOAD_STATE_WAIT_CREATE;
-			free_uri = FALSE;
-
-			if (!cal_client_create_calendar (priv->client, priv->loading_uri)) {
-				priv->load_state = LOAD_STATE_NOT_LOADED;
-				free_uri = TRUE;
-				g_message ("cal_loaded_cb(): Could not issue the create request");
-			}
-		} else if (status == CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED) {
-			priv->load_state = LOAD_STATE_NOT_LOADED;
-			method_error (gcal, priv->loading_uri);
-		} else
-			g_assert_not_reached ();
-
-		break;
-
-	case LOAD_STATE_WAIT_CREATE:
-		if (status == CAL_CLIENT_LOAD_SUCCESS) {
-			priv->load_state = LOAD_STATE_LOADED;
-			initial_load (gcal);
-		} else if (status == CAL_CLIENT_LOAD_ERROR) {
-			priv->load_state = LOAD_STATE_NOT_LOADED;
-			create_error (gcal, priv->loading_uri);
-		} else if (status == CAL_CLIENT_LOAD_IN_USE) {
-			/* Someone created the URI while we were issuing the
-			 * create request, so we just try to reload.
-			 */
-			priv->load_state = LOAD_STATE_WAIT_LOAD;
-			free_uri = FALSE;
-
-			if (!cal_client_load_calendar (priv->client, priv->loading_uri)) {
-				priv->load_state = LOAD_STATE_NOT_LOADED;
-				free_uri = TRUE;
-				g_message ("cal_loaded_cb(): Could not issue the load request");
-			}
-		} else if (status == CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED) {
-			priv->load_state = LOAD_STATE_NOT_LOADED;
-			method_error (gcal, priv->loading_uri);
-		} else
-			g_assert_not_reached ();
-
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	if (free_uri) {
-		g_free (priv->loading_uri);
-		priv->loading_uri = NULL;
-	}
-}
-
-/* Callback from the calendar client when an object is updated */
-static void
-obj_updated_cb (CalClient *client, const char *uid, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	remove_alarms_for_object (gcal, uid);
-	add_alarms_for_object (gcal, uid);
-
-	gnome_calendar_tag_calendar (gcal, priv->date_navigator);
-}
-
-/* Callback from the calendar client when an object is removed */
-static void
-obj_removed_cb (CalClient *client, const char *uid, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	remove_alarms_for_object (gcal, uid);
-
-	gnome_calendar_tag_calendar (gcal, priv->date_navigator);
-}
-
-
-GtkWidget *
-gnome_calendar_construct (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_val_if_fail (gcal != NULL, NULL);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
-
-	priv = gcal->priv;
-
-	priv->client = cal_client_new ();
-	if (!priv->client)
-		return NULL;
-
-	gtk_signal_connect (GTK_OBJECT (priv->client), "cal_loaded",
-			    GTK_SIGNAL_FUNC (cal_loaded_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated",
-			    GTK_SIGNAL_FUNC (obj_updated_cb), gcal);
-	gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed",
-			    GTK_SIGNAL_FUNC (obj_removed_cb), gcal);
-
-	e_calendar_table_set_cal_client (E_CALENDAR_TABLE (priv->todo), priv->client);
-
-	e_day_view_set_cal_client (E_DAY_VIEW (priv->day_view), priv->client);
-	e_day_view_set_cal_client (E_DAY_VIEW (priv->work_week_view), priv->client);
-	e_week_view_set_cal_client (E_WEEK_VIEW (priv->week_view), priv->client);
-	e_week_view_set_cal_client (E_WEEK_VIEW (priv->month_view), priv->client);
-
-	gnome_calendar_set_view (gcal, "dayview", FALSE, FALSE);
-
-	return GTK_WIDGET (gcal);
-}
-
-GtkWidget *
-gnome_calendar_new (void)
-{
-	GnomeCalendar *gcal;
-
-	gcal = gtk_type_new (gnome_calendar_get_type ());
-
-	if (!gnome_calendar_construct (gcal)) {
-		g_message ("gnome_calendar_new(): Could not construct the calendar GUI");
-		gtk_object_unref (GTK_OBJECT (gcal));
-		return NULL;
-	}
-
-	return GTK_WIDGET (gcal);
-}
-
-/**
- * gnome_calendar_get_cal_client:
- * @gcal: A calendar view.
- * 
- * Queries the calendar client interface object that a calendar view is using.
- * 
- * Return value: A calendar client interface object.
- **/
-CalClient *
-gnome_calendar_get_cal_client (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_val_if_fail (gcal != NULL, NULL);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
-
-	priv = gcal->priv;
-
-	return priv->client;
-}
-
-gboolean
-gnome_calendar_open (GnomeCalendar *gcal, char *file, GnomeCalendarOpenMode gcom)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_val_if_fail (gcal != NULL, FALSE);
-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), FALSE);
-	g_return_val_if_fail (file != NULL, FALSE);
-
-	priv = gcal->priv;
-	g_return_val_if_fail (priv->load_state == LOAD_STATE_NOT_LOADED, FALSE);
-
-	g_assert (priv->loading_uri == NULL);
-
-	priv->loading_uri = g_strdup (file);
-
-	if (gcom == CALENDAR_OPEN)
-		priv->load_state = LOAD_STATE_WAIT_LOAD;
-	else if (gcom == CALENDAR_OPEN_OR_CREATE)
-		priv->load_state = LOAD_STATE_WAIT_LOAD_BEFORE_CREATE;
-	else {
-		g_assert_not_reached ();
-		return FALSE;
-	}
-
-	if (!cal_client_load_calendar (priv->client, file)) {
-		priv->load_state = LOAD_STATE_NOT_LOADED;
-		g_free (priv->loading_uri);
-		priv->loading_uri = NULL;
-
-		g_message ("gnome_calendar_open(): Could not issue the request");
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-#if 0
-
-static void
-stop_beeping (GtkObject* object, gpointer data)
-{
-	guint timer_tag, beep_tag;
-	timer_tag = GPOINTER_TO_INT (gtk_object_get_data (object, "timer_tag"));
-	beep_tag  = GPOINTER_TO_INT (gtk_object_get_data (object, "beep_tag"));
-
-	if (beep_tag > 0) {
-		gtk_timeout_remove (beep_tag);
-		gtk_object_set_data (object, "beep_tag", GINT_TO_POINTER (0));
-	}
-	if (timer_tag > 0) {
-		gtk_timeout_remove (timer_tag);
-		gtk_object_set_data (object, "timer_tag", GINT_TO_POINTER (0));
-	}
-}
-
-static gint
-start_beeping (gpointer data)
-{
-	gdk_beep ();
-
-	return TRUE;
-}
-
-static gint
-timeout_beep (gpointer data)
-{
-	stop_beeping (data, NULL);
-	return FALSE;
-}
-
-void
-calendar_notify (time_t activation_time, CalendarAlarm *which, void *data)
-{
-	iCalObject *ico = data;
-	guint beep_tag, timer_tag;
-	int ret;
-	gchar* snooze_button = (enable_snooze ? _("Snooze") : NULL);
-	time_t now, diff;
-
-	if (&ico->aalarm == which){
-		time_t app = ico->aalarm.trigger + ico->aalarm.offset;
-		GtkWidget *w;
-		char *msg;
-
-		msg = g_strconcat (_("Reminder of your appointment at "),
-					ctime (&app), "`",
-					ico->summary, "'", NULL);
-
-		/* Idea: we need Snooze option :-) */
-		w = gnome_message_box_new (msg, GNOME_MESSAGE_BOX_INFO, _("Ok"), snooze_button, NULL);
-		beep_tag = gtk_timeout_add (1000, start_beeping, NULL);
-		if (enable_aalarm_timeout)
-			timer_tag = gtk_timeout_add (audio_alarm_timeout*1000,
-						     timeout_beep, w);
-		else
-			timer_tag = 0;
-		gtk_object_set_data (GTK_OBJECT (w), "timer_tag",
-				     GINT_TO_POINTER (timer_tag));
-		gtk_object_set_data (GTK_OBJECT (w), "beep_tag",
-				     GINT_TO_POINTER (beep_tag));
-		gtk_widget_ref (w);
-		gtk_window_set_modal (GTK_WINDOW (w), FALSE);
-		ret = gnome_dialog_run (GNOME_DIALOG (w));
-		switch (ret) {
-		case 1:
-			stop_beeping (GTK_OBJECT (w), NULL);
-			now = time (NULL);
-			diff = now - which->trigger;
-			which->trigger = which->trigger + diff + snooze_secs;
-			which->offset  = which->offset - diff - snooze_secs;
-			alarm_add (which, &calendar_notify, data);
-			break;
-		default:
-			stop_beeping (GTK_OBJECT (w), NULL);
-			break;
-		}
-
-		gtk_widget_unref (w);
-		return;
-	}
-
-        if (&ico->palarm == which){
-		execute (ico->palarm.data, 0);
-		return;
-	}
-
-	if (&ico->malarm == which){
-		time_t app = ico->malarm.trigger + ico->malarm.offset;
-
-		mail_notify (ico->malarm.data, ico->summary, app);
-		return;
-	}
-
-	if (&ico->dalarm == which){
-		time_t app = ico->dalarm.trigger + ico->dalarm.offset;
-		GtkWidget *w;
-		char *msg;
-
-		if (beep_on_display)
-			gdk_beep ();
-		msg = g_strconcat (_("Reminder of your appointment at "),
-					ctime (&app), "`",
-					ico->summary, "'", NULL);
-		w = gnome_message_box_new (msg, GNOME_MESSAGE_BOX_INFO,
-					   _("Ok"), snooze_button, NULL);
-		gtk_window_set_modal (GTK_WINDOW (w), FALSE);
-		ret = gnome_dialog_run (GNOME_DIALOG (w));
-		switch (ret) {
-		case 1:
-			now = time (NULL);
-			diff = now - which->trigger;
-			which->trigger = which->trigger + diff + snooze_secs;
-			which->offset  = which->offset - diff - snooze_secs;
-			alarm_add (which, &calendar_notify, data);
-			break;
-		default:
-			break;
-		}
-
-		return;
-	}
-}
-
-#endif
-
-struct calendar_tag_closure
-{
-	ECalendarItem *calitem;
-	time_t start_time;
-	time_t end_time;
-};
-
-/* Marks the specified range in a GtkCalendar */
-static gboolean
-gnome_calendar_tag_calendar_cb (CalComponent *comp,
-				time_t istart,
-				time_t iend,
-				gpointer data)
-{
-	struct calendar_tag_closure *c = data;
-	time_t t;
-
-	t = time_day_begin (istart);
-
-	do {
-		struct tm tm;
-
-		tm = *localtime (&t);
-
-		e_calendar_item_mark_day (c->calitem, tm.tm_year + 1900,
-					  tm.tm_mon, tm.tm_mday,
-					  E_CALENDAR_ITEM_MARK_BOLD);
-
-		t = time_day_end (t);
-	} while (t < iend);
-
-	return TRUE;
-}
-
-/*
- * Tags the dates with appointments in a GtkCalendar based on the
- * GnomeCalendar contents
- */
-void
-gnome_calendar_tag_calendar (GnomeCalendar *gcal, ECalendar *ecal)
-{
-	GnomeCalendarPrivate *priv;
-	struct calendar_tag_closure c;
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	struct tm start_tm = { 0 }, end_tm = { 0 };
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (ecal != NULL);
-	g_return_if_fail (E_IS_CALENDAR (ecal));
-
-	priv = gcal->priv;
-
-	/* If the ECalendar isn't visible, we just return. */
-	if (!GTK_WIDGET_VISIBLE (ecal))
-		return;
-
-	e_calendar_item_clear_marks (ecal->calitem);
-
-	if (!cal_client_is_loaded (priv->client))
-		return;
-
-	e_calendar_item_get_date_range	(ecal->calitem,
-					 &start_year, &start_month, &start_day,
-					 &end_year, &end_month, &end_day);
-
-	start_tm.tm_year = start_year - 1900;
-	start_tm.tm_mon = start_month;
-	start_tm.tm_mday = start_day;
-	start_tm.tm_hour = 0;
-	start_tm.tm_min = 0;
-	start_tm.tm_sec = 0;
-	start_tm.tm_isdst = -1;
-
-	end_tm.tm_year = end_year - 1900;
-	end_tm.tm_mon = end_month;
-	end_tm.tm_mday = end_day;
-	end_tm.tm_hour = 0;
-	end_tm.tm_min = 0;
-	end_tm.tm_sec = 0;
-	end_tm.tm_isdst = -1;
-
-	c.calitem = ecal->calitem;
-	c.start_time = mktime (&start_tm);
-	c.end_time = mktime (&end_tm);
-
-	cal_client_generate_instances (priv->client, CALOBJ_TYPE_EVENT,
-				       c.start_time, c.end_time,
-				       gnome_calendar_tag_calendar_cb, &c);
-}
-
-
-/* Tells the calendar to reload all config settings.
-   If initializing is TRUE it sets the pane positions as well. (We don't
-   want to reset the pane positions after the user clicks 'Apply' in the
-   preferences dialog.) */
-void
-gnome_calendar_update_config_settings (GnomeCalendar *gcal,
-				       gboolean	      initializing)
-{
-	GnomeCalendarPrivate *priv;
-	CalWeekdays working_days;
-	gint week_start_day, time_divisions;
-	gint start_hour, start_minute, end_hour, end_minute;
-	gboolean use_24_hour, show_event_end, compress_weekend;
-	gboolean dnav_show_week_no;
-
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	working_days = calendar_config_get_working_days ();
-	/* CalWeekdays and EDayViewDays use the same bit-masks, so we can
-	   use the same value. */
-	e_day_view_set_working_days (E_DAY_VIEW (priv->day_view),
-				     (EDayViewDays) working_days);
-	e_day_view_set_working_days (E_DAY_VIEW (priv->work_week_view),
-				     (EDayViewDays) working_days);
-
-	/* Note that this is 0 (Sun) to 6 (Sat). */
-	week_start_day = calendar_config_get_week_start_day ();
-	/* FIXME: Add support for these. */
-#if 0
-	e_day_view_set_week_start_day (E_DAY_VIEW (priv->day_view),
-				       week_start_day);
-	e_day_view_set_week_start_day (E_DAY_VIEW (priv->work_week_view),
-				       week_start_day);
-	e_week_view_set_week_start_day (E_WEEK_VIEW (priv->week_view),
-					week_start_day);
-	e_week_view_set_week_start_day (E_WEEK_VIEW (priv->month_view),
-					week_start_day);
-#endif
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (E_CALENDAR (priv->date_navigator)->calitem),
-			       "week_start_day", (week_start_day + 6) % 7,
-			       NULL);
-
-	start_hour = calendar_config_get_day_start_hour ();
-	start_minute = calendar_config_get_day_start_minute ();
-	end_hour = calendar_config_get_day_end_hour ();
-	end_minute = calendar_config_get_day_end_minute ();
-	e_day_view_set_working_day (E_DAY_VIEW (priv->day_view),
-				    start_hour, start_minute,
-				    end_hour, end_minute);
-	e_day_view_set_working_day (E_DAY_VIEW (priv->work_week_view),
-				    start_hour, start_minute,
-				    end_hour, end_minute);
-
-	use_24_hour = calendar_config_get_24_hour_format ();
-	e_day_view_set_24_hour_format (E_DAY_VIEW (priv->day_view),
-				       use_24_hour);
-	e_day_view_set_24_hour_format (E_DAY_VIEW (priv->work_week_view),
-				       use_24_hour);
-	/* FIXME: Add support for these. */
-#if 0
-	e_week_view_set_24_hour_format (E_WEEK_VIEW (priv->week_view),
-					use_24_hour);
-	e_week_view_set_24_hour_format (E_WEEK_VIEW (priv->month_view),
-					use_24_hour);
-#endif
-
-	time_divisions = calendar_config_get_time_divisions ();
-	e_day_view_set_mins_per_row (E_DAY_VIEW (priv->day_view),
-				     time_divisions);
-	e_day_view_set_mins_per_row (E_DAY_VIEW (priv->work_week_view),
-				     time_divisions);
-
-	show_event_end = calendar_config_get_show_event_end ();
-	/* FIXME: Add support for these. */
-#if 0
-	e_day_view_set_show_event_end (E_DAY_VIEW (priv->day_view),
-				       show_event_end);
-	e_day_view_set_show_event_end (E_DAY_VIEW (priv->work_week_view),
-				       show_event_end);
-	e_week_view_set_show_event_end (E_WEEK_VIEW (priv->week_view),
-					show_event_end);
-	e_week_view_set_show_event_end (E_WEEK_VIEW (priv->month_view),
-					show_event_end);
-#endif
-
-	compress_weekend = calendar_config_get_compress_weekend ();
-	e_week_view_set_compress_weekend (E_WEEK_VIEW (priv->month_view),
-					  compress_weekend);
-
-	dnav_show_week_no = calendar_config_get_dnav_show_week_no ();
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (E_CALENDAR (priv->date_navigator)->calitem),
-			       "show_week_numbers", dnav_show_week_no,
-			       NULL);
-
-	if (initializing) {
-		priv->hpane_pos = calendar_config_get_hpane_pos ();
-		priv->vpane_pos = calendar_config_get_vpane_pos ();
-		priv->hpane_pos_month_view = calendar_config_get_month_hpane_pos ();
-		priv->vpane_pos_month_view = calendar_config_get_month_vpane_pos ();
-	} else {
-		gnome_calendar_update_paned_quanta (gcal);
-	}
-}
-
-
-/*
- * FIXME: These are for the old config code and will be removed eventually.
- */
-
-/* This is called when the day begin & end times, the AM/PM flag, or the
-   week_starts_on_monday flags are changed. */
-void
-gnome_calendar_time_format_changed (GnomeCalendar *gcal)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-#if 0
-	gtk_calendar_display_options (gcal->gtk_calendar,
-				      (week_starts_on_monday
-				       ? (gcal->gtk_calendar->display_flags
-					  | GTK_CALENDAR_WEEK_START_MONDAY)
-				       : (gcal->gtk_calendar->display_flags
-					  & ~GTK_CALENDAR_WEEK_START_MONDAY)));
-#endif
-}
-
-/* This is called when any of the color settings are changed.
-   FIXME: Need to update for the new views. */
-void
-gnome_calendar_colors_changed (GnomeCalendar *gcal)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-}
-
-void
-gnome_calendar_todo_properties_changed (GnomeCalendar *gcal)
-{
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-}
-
-
-
-
-void
-gnome_calendar_set_selected_time_range (GnomeCalendar *gcal,
-					time_t	       start_time,
-					time_t	       end_time)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	priv->selection_start_time = start_time;
-	priv->selection_end_time = end_time;
-
-	gnome_calendar_update_date_navigator (gcal);
-}
-
-/**
- * gnome_calendar_get_selected_time_range:
- * @gcal: A calendar view.
- * @start_time: Return value for the start of the time selection.
- * @end_time: Return value for the end of the time selection.
- * 
- * Queries the time selection range on the calendar view.
- **/
-void
-gnome_calendar_get_selected_time_range (GnomeCalendar *gcal,
-					time_t	 *start_time,
-					time_t	 *end_time)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
-
-	if (start_time)
-		*start_time = priv->selection_start_time;
-
-	if (end_time)
-		*end_time = priv->selection_end_time;
-}
-
-
-/* Callback used when an event editor finishes editing an object */
-static void
-released_event_object_cb (EventEditor *ee, const char *uid, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	gboolean result;
-	gpointer orig_key;
-	char *orig_uid;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	result = g_hash_table_lookup_extended (priv->object_editor_hash, uid, &orig_key, NULL);
-	g_assert (result != FALSE);
-
-	orig_uid = orig_key;
-
-	g_hash_table_remove (priv->object_editor_hash, orig_uid);
-	g_free (orig_uid);
-}
-
-
-/* Callback used when an event editor dialog is closed */
-struct editor_closure
-{
-	GnomeCalendar *gcal;
-	char *uid;
-};
-
-static void
-editor_closed_cb (GtkWidget *widget, gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	struct editor_closure *ec;
-	gboolean result;
-	gpointer orig_key;
-	char *orig_uid;
-
-	g_print ("editor_closed_cb ()\n");
-
-	ec = (struct editor_closure *)data;
-	gcal = ec->gcal;
-	priv = gcal->priv;
-
-	result = g_hash_table_lookup_extended (priv->object_editor_hash, ec->uid, &orig_key, NULL);
-	g_assert (result != FALSE);
-
-	orig_uid = orig_key;
-
-	g_hash_table_remove (priv->object_editor_hash, orig_uid);
-	g_free (orig_uid);
-}
-
-void
-gnome_calendar_edit_object (GnomeCalendar *gcal, CalComponent *comp)
-{
-	GnomeCalendarPrivate *priv;
-	EventEditor *ee;
-	struct editor_closure *ec;
-	const char *uid;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (comp != NULL);
-
-	priv = gcal->priv;
-
-	cal_component_get_uid (comp, &uid);
-
-	ee = g_hash_table_lookup (priv->object_editor_hash, uid);
-	if (!ee) {
-		ec = g_new0 (struct editor_closure, 1);
-
-		ee = event_editor_new ();
-		if (!ee) {
-			g_message ("gnome_calendar_edit_object(): Could not create the event editor");
-			return;
-		}
-
-		ec->gcal = gcal;
-		ec->uid = g_strdup (uid);
-
-		g_hash_table_insert (priv->object_editor_hash, ec->uid, ee);
-
-		gtk_signal_connect (GTK_OBJECT (ee), "destroy",
-				    GTK_SIGNAL_FUNC (editor_closed_cb),
-				    ec);
-
-		event_editor_set_cal_client (EVENT_EDITOR (ee), priv->client);
-		event_editor_set_event_object (EVENT_EDITOR (ee), comp);
-	}
-
-	event_editor_focus (ee);
-}
-
-/**
- * gnome_calendar_new_appointment:
- * @gcal: An Evolution calendar.
- *
- * Opens an event editor dialog for a new appointment.  The appointment's start
- * and end times are set to the currently selected time range in the calendar
- * views.
- **/
-void
-gnome_calendar_new_appointment (GnomeCalendar *gcal)
-{
-	CalComponent *comp;
-	time_t dtstart, dtend;
-	CalComponentDateTime dt;
-	struct icaltimetype itt;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	gnome_calendar_get_current_time_range (gcal, &dtstart, &dtend);
-	dt.value = &itt;
-	dt.tzid = NULL;
-
-	comp = cal_component_new ();
-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);
-
-	itt = icaltime_from_timet (dtstart, FALSE, FALSE);
-	cal_component_set_dtstart (comp, &dt);
-
-	itt = icaltime_from_timet (dtend, FALSE, FALSE);
-	cal_component_set_dtend (comp, &dt);
-
-	cal_component_commit_sequence (comp);
-
-	gnome_calendar_edit_object (gcal, comp);
-	gtk_object_unref (GTK_OBJECT (comp));
-
-}
-
-/* Returns the selected time range for the current view. Note that this may be
-   different from the fields in the GnomeCalendar, since the view may clip
-   this or choose a more appropriate time. */
-void
-gnome_calendar_get_current_time_range (GnomeCalendar *gcal,
-				       time_t	 *start_time,
-				       time_t	 *end_time)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *page;
-
-	priv = gcal->priv;
-
-	page = get_current_page (gcal);
-
-	if (page == priv->day_view || page == priv->work_week_view)
-		e_day_view_get_selected_time_range (E_DAY_VIEW (page), start_time, end_time);
-	else if (page == priv->week_view || page == priv->month_view)
-		e_week_view_get_selected_time_range (E_WEEK_VIEW (page), start_time, end_time);
-	else {
-		g_message ("My penguin is gone!");
-		g_assert_not_reached ();
-	}
-}
-
-
-
-/* This updates the month shown and the days selected in the calendar, if
-   necessary. */
-static void
-gnome_calendar_update_date_navigator (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GDate start_date, end_date;
-	gint days_shown;
-
-	priv = gcal->priv;
-
-	/* If the ECalendar isn't visible, we just return. */
-	if (!GTK_WIDGET_VISIBLE (priv->date_navigator))
-		return;
-
-	if (gnome_calendar_get_days_shown (gcal, &start_date, &days_shown)) {
-		end_date = start_date;
-		g_date_add_days (&end_date, days_shown - 1);
-
-		e_calendar_item_set_selection (priv->date_navigator->calitem,
-					       &start_date, &end_date);
-	}
-}
-
-
-static gboolean
-gnome_calendar_get_days_shown	(GnomeCalendar	*gcal,
-				 GDate		*start_date,
-				 gint		*days_shown)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *page;
-
-	priv = gcal->priv;
-
-	page = get_current_page (gcal);
-
-	if (page == priv->day_view || page == priv->work_week_view) {
-		g_date_clear (start_date, 1);
-		g_date_set_time (start_date, E_DAY_VIEW (page)->lower);
-		*days_shown = e_day_view_get_days_shown (E_DAY_VIEW (page));
-		return TRUE;
-	} else if (page == priv->week_view || page == priv->month_view) {
-		*start_date = E_WEEK_VIEW (page)->first_day_shown;
-		if (e_week_view_get_multi_week_view (E_WEEK_VIEW (page)))
-			*days_shown = e_week_view_get_weeks_shown (E_WEEK_VIEW (page)) * 7;
-		else
-			*days_shown = 7;
-
-		return TRUE;
-	} else {
-		g_assert_not_reached ();
-		return FALSE;
-	}
-}
-
-
-static void
-gnome_calendar_on_date_navigator_selection_changed (ECalendarItem    *calitem,
-						    GnomeCalendar    *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GDate start_date, end_date, new_start_date, new_end_date;
-	gint days_shown, new_days_shown;
-	gint start_year, start_month, start_day;
-	gint end_year, end_month, end_day;
-	gboolean starts_on_week_start_day;
-	struct tm tm;
-
-	priv = gcal->priv;
-
-	starts_on_week_start_day = FALSE;
-
-	if (!gnome_calendar_get_days_shown (gcal, &start_date, &days_shown))
-		return;
-
-	end_date = start_date;
-	g_date_add_days (&end_date, days_shown - 1);
-
-	e_calendar_item_get_selection (calitem, &new_start_date, &new_end_date);
-
-	/* If the selection hasn't changed just return. */
-	if (!g_date_compare (&start_date, &new_start_date)
-	    && !g_date_compare (&end_date, &new_end_date))
-		return;
-
-	new_days_shown = g_date_julian (&new_end_date) - g_date_julian (&new_start_date) + 1;
-
-	/* FIXME: This assumes weeks start on Monday for now. */
-	if (g_date_weekday (&new_start_date) - 1 == 0)
-		starts_on_week_start_day = TRUE;
-
-	/* Switch views as appropriate, and change the number of days or weeks
-	   shown. */
-	if (new_days_shown > 9) {
-		e_week_view_set_weeks_shown (E_WEEK_VIEW (priv->month_view),
-					     (new_days_shown + 6) / 7);
-		e_week_view_set_first_day_shown (E_WEEK_VIEW (priv->month_view), &new_start_date);
-
-		gnome_calendar_set_view_internal (gcal, "monthview", TRUE, FALSE);
-		gnome_calendar_update_date_navigator (gcal);
-	} else if (new_days_shown == 7 && starts_on_week_start_day) {
-		e_week_view_set_first_day_shown (E_WEEK_VIEW (priv->week_view), &new_start_date);
-
-		gnome_calendar_set_view_internal (gcal, "weekview", TRUE, FALSE);
-		gnome_calendar_update_date_navigator (gcal);
-	} else {
-		start_year = g_date_year (&new_start_date);
-		start_month = g_date_month (&new_start_date) - 1;
-		start_day = g_date_day (&new_start_date);
-		end_year = g_date_year (&new_end_date);
-		end_month = g_date_month (&new_end_date) - 1;
-		end_day = g_date_day (&new_end_date);
-
-		tm.tm_year = start_year - 1900;
-		tm.tm_mon  = start_month;
-		tm.tm_mday = start_day;
-		tm.tm_hour = 0;
-		tm.tm_min  = 0;
-		tm.tm_sec  = 0;
-		tm.tm_isdst = -1;
-		priv->selection_start_time = mktime (&tm);
-
-		tm.tm_year = end_year - 1900;
-		tm.tm_mon  = end_month;
-		tm.tm_mday = end_day + 1; /* mktime() will normalize this. */
-		tm.tm_hour = 0;
-		tm.tm_min  = 0;
-		tm.tm_sec  = 0;
-		tm.tm_isdst = -1;
-		priv->selection_end_time = mktime (&tm);
-
-		e_day_view_set_days_shown (E_DAY_VIEW (priv->day_view), new_days_shown);
-		gnome_calendar_set_view (gcal, "dayview", TRUE, FALSE);
-	}
-
-	gnome_calendar_update_view_buttons (gcal);
-	gtk_widget_grab_focus (get_current_page (gcal));
-}
-
-
-static void
-gnome_calendar_on_date_navigator_date_range_changed (ECalendarItem *calitem,
-						     GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
-	gnome_calendar_tag_calendar (gcal, priv->date_navigator);
-}
-
-
-static void
-gnome_calendar_on_date_navigator_style_set (GtkWidget     *widget,
-					    GtkStyle      *previous_style,
-					    gpointer       data)
-{
-	gnome_calendar_update_paned_quanta (GNOME_CALENDAR (data));
-}
-
-
-static void
-gnome_calendar_update_paned_quanta (GnomeCalendar	*gcal)
-{
-	GnomeCalendarPrivate *priv;
-	gint row_height, col_width;
-	gint top_border, bottom_border, left_border, right_border;
-
-	priv = gcal->priv;
-
-	e_calendar_get_border_size (priv->date_navigator,
-				    &top_border, &bottom_border,
-				    &left_border, &right_border);
-	gtk_object_get (GTK_OBJECT (priv->date_navigator->calitem),
-			"row_height", &row_height,
-			"column_width", &col_width,
-			NULL);
-
-	/* The EPaned quantum feature works better if we add on the calendar
-	   borders to the quantum size. Otherwise if you shrink the date
-	   navigator you get left with the border widths/heights which looks
-	   bad. EPaned should be more flexible really. */
-	col_width += left_border + right_border;
-	row_height += top_border + bottom_border;
-
-	/* We don't have to use the EPaned quantum feature. We could just let
-	   the calendar expand to fill the allocated space, showing as many
-	   months as will fit. But for that to work nicely the EPaned should
-	   resize the widgets as the bar is dragged. Otherwise the user has
-	   to mess around to get the number of months that they want. */
-#if 1
-	gtk_object_set (GTK_OBJECT (priv->hpane),
-			"quantum", (guint) col_width,
-			NULL);
-	gtk_object_set (GTK_OBJECT (priv->vpane),
-			"quantum", (guint) row_height,
-			NULL);
-#endif
-
-	gnome_calendar_set_pane_positions (gcal);
-}
-
-
-static void
-gnome_calendar_on_date_navigator_size_allocate (GtkWidget     *widget,
-						GtkAllocation *allocation,
-						gpointer data)
-{
-	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
-	gint width, height, row_height, col_width;
-	gint top_border, bottom_border, left_border, right_border;
-	gfloat hpane_pos, vpane_pos;
-
-	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
-
-	if (priv->current_view_type != VIEW_NOT_SET) {
-		e_calendar_get_border_size (priv->date_navigator,
-					    &top_border, &bottom_border,
-					    &left_border, &right_border);
-		gtk_object_get (GTK_OBJECT (priv->date_navigator->calitem),
-				"row_height", &row_height,
-				"column_width", &col_width,
-				NULL);
-
-		/* We subtract one from each dimension since we added 1 in
-		   gnome_calendar_set_view_internal(). */
-		width = allocation->width - 1;
-		height = allocation->height - 1;
-
-		/* We add the border sizes to work around the EPaned
-		   quantized feature. */
-		col_width += left_border + right_border;
-		row_height += top_border + bottom_border;
-
-		hpane_pos = (gfloat) width / col_width;
-		vpane_pos = (gfloat) height / row_height;
-
-		if (priv->current_view_type == VIEW_MONTH
-		    && !priv->range_selected) {
-			priv->hpane_pos_month_view = hpane_pos;
-			priv->vpane_pos_month_view = vpane_pos;
-			calendar_config_set_month_hpane_pos (hpane_pos);
-			calendar_config_set_month_vpane_pos (vpane_pos);
-		} else {
-			priv->hpane_pos = hpane_pos;
-			priv->vpane_pos = vpane_pos;
-			calendar_config_set_hpane_pos (hpane_pos);
-			calendar_config_set_vpane_pos (vpane_pos);
-		}
-	}
-}
-
-void
-gnome_calendar_set_view_buttons	(GnomeCalendar	*gcal,
-				 GtkWidget	*day_button,
-				 GtkWidget	*work_week_button,
-				 GtkWidget	*week_button,
-				 GtkWidget	*month_button)
-{
-	GnomeCalendarPrivate *priv;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-	g_return_if_fail (day_button != NULL);
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (day_button));
-	g_return_if_fail (work_week_button != NULL);
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (work_week_button));
-	g_return_if_fail (week_button != NULL);
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (week_button));
-	g_return_if_fail (month_button != NULL);
-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (month_button));
-
-	priv = gcal->priv;
-
-	priv->day_button = day_button;
-	priv->work_week_button = work_week_button;
-	priv->week_button = week_button;
-	priv->month_button = month_button;
-}
-
-/* This makes the appropriate radio button in the toolbar active.  It blocks the
- * signals so that we can do a clean setup without affecting the views.
- */
-void
-gnome_calendar_update_view_buttons (GnomeCalendar *gcal)
-{
-	GnomeCalendarPrivate *priv;
-	GtkWidget *page, *button;
-
-	priv = gcal->priv;
-
-	page = get_current_page (gcal);
-
-	if (page == priv->day_view)
-		button = priv->day_button;
-	else if (page == priv->work_week_view)
-		button = priv->work_week_button;
-	else if (page == priv->week_view)
-		button = priv->week_button;
-	else if (page == priv->month_view)
-		button = priv->month_button;
-	else {
-		g_assert_not_reached ();
-		return;
-	}
-
-	if (button) {
-		gtk_signal_handler_block_by_data (GTK_OBJECT (button), gcal);
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (button), gcal);
-	}
-}
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
deleted file mode 100644
index 2474e92bea..0000000000
--- a/calendar/gui/gnome-cal.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * GnomeCalendar widget
- * Copyright (C) 1998 the Free Software Foundation
- *
- * Authors: Miguel de Icaza (miguel@kernel.org)
- *          Federico Mena-Quintero <federico@helixcode.com>
- */
-
-#ifndef GNOME_CALENDAR_APP_H
-#define GNOME_CALENDAR_APP_H
-
-#include <time.h>
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkvbox.h>
-#include <bonobo.h>
-#include <widgets/misc/e-calendar.h>
-#include <cal-client/cal-client.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-#define GNOME_TYPE_CALENDAR            (gnome_calendar_get_type ())
-#define GNOME_CALENDAR(obj)            (GTK_CHECK_CAST ((obj), GNOME_TYPE_CALENDAR, GnomeCalendar))
-#define GNOME_CALENDAR_CLASS(klass)    (GTK_CHECK_CAST_CLASS ((klass), GNOME_TYPE_CALENDAR,	\
-					GnomeCalendarClass))
-#define GNOME_IS_CALENDAR(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_CALENDAR))
-#define GNOME_IS_CALENDAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_CALENDAR))
-
-typedef struct _GnomeCalendar GnomeCalendar;
-typedef struct _GnomeCalendarClass GnomeCalendarClass;
-typedef struct _GnomeCalendarPrivate GnomeCalendarPrivate;
-
-struct _GnomeCalendar {
-	GtkVBox vbox;
-
-	/* Private data */
-	GnomeCalendarPrivate *priv;
-};
-
-struct _GnomeCalendarClass {
-	GtkVBoxClass parent_class;
-};
-
-
-typedef enum {
-	CALENDAR_OPEN,
-	CALENDAR_OPEN_OR_CREATE
-} GnomeCalendarOpenMode;
-
-GtkType    gnome_calendar_get_type         	(void);
-GtkWidget *gnome_calendar_construct		(GnomeCalendar *gcal);
-
-GtkWidget *gnome_calendar_new			(void);
-
-CalClient *gnome_calendar_get_cal_client	(GnomeCalendar *gcal);
-
-gboolean   gnome_calendar_open                  (GnomeCalendar *gcal,
-						 char *file,
-						 GnomeCalendarOpenMode gcom);
-/*
-int	   gnome_calendar_create		(GnomeCalendar *gcal,
-						 char *file);
-*/
-void       gnome_calendar_next             	(GnomeCalendar *gcal);
-void       gnome_calendar_previous         	(GnomeCalendar *gcal);
-void       gnome_calendar_goto             	(GnomeCalendar *gcal,
-						 time_t new_time);
-void       gnome_calendar_dayjump          	(GnomeCalendar *gcal,
-						 time_t time);
-/* Jumps to the current day */
-void       gnome_calendar_goto_today            (GnomeCalendar *gcal);
-void       gnome_calendar_tag_calendar          (GnomeCalendar *gcal,
-						 ECalendar     *ecal);
-char      *gnome_calendar_get_current_view_name (GnomeCalendar *gcal);
-void	   gnome_calendar_set_view		(GnomeCalendar	*gcal,
-						 char		*page_name,
-						 gboolean	 reset_range_shown,
-						 gboolean	 focus);
-
-void	   gnome_calendar_set_selected_time_range (GnomeCalendar *gcal,
-						   time_t	  start_time,
-						   time_t	  end_time);
-void	   gnome_calendar_get_selected_time_range (GnomeCalendar *gcal,
-						   time_t	 *start_time,
-						   time_t	 *end_time);
-
-void       gnome_calendar_edit_object           (GnomeCalendar *gcal,
-						 CalComponent  *comp);
-
-void       gnome_calendar_new_appointment       (GnomeCalendar *gcal);
-
-/* Returns the selected time range for the current view. Note that this may be
-   different from the fields in the GnomeCalendar, since the view may clip
-   this or choose a more appropriate time. */
-void	   gnome_calendar_get_current_time_range (GnomeCalendar *gcal,
-						  time_t	 *start_time,
-						  time_t	 *end_time);
-
-/* Tells the calendar to reload all config settings. initializing should be
-   TRUE when we are setting the config settings for the first time. */
-void	   gnome_calendar_update_config_settings (GnomeCalendar *gcal,
-						  gboolean	 initializing);
-
-/*
- * FIXME: These are for the old config code and will be removed eventually.
- */
-
-/* Notifies the calendar that the time format has changed and it must update
-   all its views */
-void	   gnome_calendar_time_format_changed	(GnomeCalendar *gcal);
-
-/* Notifies the calendar that the todo list properties have changed and its
-   time to update the views. */
-void	   gnome_calendar_colors_changed	(GnomeCalendar *gcal);
-
-/* Notifies the calendar that the todo list properties have changed and its
-   time to update the views. */
-void	   gnome_calendar_todo_properties_changed (GnomeCalendar *gcal);
-
-
-
-void	   gnome_calendar_set_view_buttons	(GnomeCalendar	*gcal,
-						 GtkWidget	*day_button,
-						 GtkWidget	*work_week_button,
-						 GtkWidget	*week_button,
-						 GtkWidget	*month_button);
-
-/* This makes the appropriate radio button in the toolbar active.
-   It sets the ignore_view_button_clicks flag so the "clicked" signal handlers
-   just return without doing anything. */
-void	   gnome_calendar_update_view_buttons	(GnomeCalendar	*gcal);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/gnome-cal.html b/calendar/gui/gnome-cal.html
deleted file mode 100644
index 5a7d0a537f..0000000000
--- a/calendar/gui/gnome-cal.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!-- Some simple instructions on how to use the help browser -->
-<BODY>
-<!-- <TITLE>GNOME Calendar Documentation</TITLE> -->
-<H2> GNOME Calendar Documentation </H2>
-<p>
-The GNOME calendar program is the calendaring program of the GNOME
-system.  It uses the vCalendar standard for transfering calendar
-information (and is also the on-disk format used). 
-
-<p>
-
-<a name="cmdline">
-<h2>Command line options</h2>
-
-Several options are available on the command line, they are:
-<ul>
-	<li><tt>--events</tt> Displays the events for the date
-	specified (or today, if no date is specified).
-
-	<li><tt>--from DATE</tt> Define the beginning of the range for
-	the event display, or the startup day on the calenday views.
-	By default, the event will span the whole day specified in
-	DATE. 
-
-	<li><tt>--to DATE</tt> Define the range end for the event
-	display.  If this is not specified, it will default to the end
-	of the day specified by the <tt>--from</tt> option.
-
-	<li><tt>--file FILE</tt> Set the calendar to the FILE
-	specified on the command line. 
-
-	<li><tt>--todo</tt> Dumps the to-do values to standard output. 
-</ul>
-
-<p>
-
-DATE is interpreted as being in the local time- zone, unless a
-specific timezone is specified.  Examples of valid date specifications
-include: "1 month ago",  "2 hours ago",  "400000 seconds ago",  "last
-year", "last Monday",  "yesterday",  "a fortnight ago",  "3/31/92
-10:00:07 PST",  "January 23, 1987 10:05pm", "22:00 GMT".
-
-</BODY>
-
diff --git a/calendar/gui/gnome-calendar-conduit.png b/calendar/gui/gnome-calendar-conduit.png
deleted file mode 100644
index e867ba90b2..0000000000
--- a/calendar/gui/gnome-calendar-conduit.png
+++ /dev/null
diff --git a/calendar/gui/gnome-month-item.c b/calendar/gui/gnome-month-item.c
deleted file mode 100644
index 58e393e4ee..0000000000
--- a/calendar/gui/gnome-month-item.c
+++ /dev/null
@@ -1,1246 +0,0 @@
-/* General-purpose monthly calendar canvas item for GNOME
- *
- * Copyright (C) 1998 Red Hat Software, Inc.
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx>
- */
-
-#include <config.h>
-#include <math.h>
-#include <time.h>
-#include <gnome.h>
-#include "gnome-month-item.h"
-
-
-#define DEFAULT_FONT "-*-helvetica-medium-r-normal--10-*-*-*-p-*-*-*"
-
-
-/* Number of days in a month, for normal and leap years */
-static const int days_in_month[2][12] = {
-	{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
-	{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-};
-
-/* The weird month of September 1752, where 3 Sep through 13 Sep were eliminated due to the
- * Gregorian reformation.
- */
-static const int sept_1752[42] = {
-	 0,  0,  1,  2, 14, 15, 16,
-	17, 18, 19, 20, 21, 22, 23,
-	24, 25, 26, 27, 28, 29, 30,
-	 0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0
-};
-
-#define REFORMATION_DAY 639787		/* First day of the reformation, counted from 1 Jan 1 */
-#define MISSING_DAYS 11			/* They corrected out 11 days */
-#define THURSDAY 4			/* First day of reformation */
-#define SATURDAY 6			/* Offset value; 1 Jan 1 was a Saturday */
-#define SEPT_1752_START 2		/* Start day within month */
-#define SEPT_1752_END 20		/* End day within month */
-
-
-enum {
-	ARG_0,
-	ARG_YEAR,
-	ARG_MONTH,
-	ARG_X,
-	ARG_Y,
-	ARG_WIDTH,
-	ARG_HEIGHT,
-	ARG_ANCHOR,
-	ARG_HEAD_PADDING,
-	ARG_DAY_PADDING,
-	ARG_DAY_NAMES,
-	ARG_HEADING_HEIGHT,
-	ARG_HEADING_ANCHOR,
-	ARG_DAY_ANCHOR,
-	ARG_START_ON_MONDAY,
-	ARG_HEAD_FONT,
-	ARG_HEAD_FONTSET,
-	ARG_HEAD_FONT_GDK,
-	ARG_DAY_FONT,
-	ARG_DAY_FONTSET,
-	ARG_DAY_FONT_GDK,
-	ARG_HEAD_COLOR,
-	ARG_HEAD_COLOR_GDK,
-	ARG_OUTLINE_COLOR,
-	ARG_OUTLINE_COLOR_GDK,
-	ARG_DAY_BOX_COLOR,
-	ARG_DAY_BOX_COLOR_GDK,
-	ARG_DAY_COLOR,
-	ARG_DAY_COLOR_GDK
-};
-
-
-static void gnome_month_item_class_init (GnomeMonthItemClass *class);
-static void gnome_month_item_init       (GnomeMonthItem      *mitem);
-static void gnome_month_item_destroy    (GtkObject           *object);
-static void gnome_month_item_set_arg    (GtkObject           *object,
-					 GtkArg              *arg,
-					 guint                arg_id);
-static void gnome_month_item_get_arg    (GtkObject           *object,
-					 GtkArg              *arg,
-					 guint                arg_id);
-
-
-
-static GnomeCanvasGroupClass *parent_class;
-
-
-GtkType
-gnome_month_item_get_type (void)
-{
-	static GtkType month_item_type = 0;
-
-	if (!month_item_type) {
-		GtkTypeInfo month_item_info = {
-			"GnomeMonthItem",
-			sizeof (GnomeMonthItem),
-			sizeof (GnomeMonthItemClass),
-			(GtkClassInitFunc) gnome_month_item_class_init,
-			(GtkObjectInitFunc) gnome_month_item_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		month_item_type = gtk_type_unique (gnome_canvas_group_get_type (), &month_item_info);
-	}
-
-	return month_item_type;
-}
-
-static void
-gnome_month_item_class_init (GnomeMonthItemClass *class)
-{
-	GtkObjectClass *object_class;
-	GnomeCanvasItemClass *item_class;
-
-	object_class = (GtkObjectClass *) class;
-	item_class = (GnomeCanvasItemClass *) class;
-
-	parent_class = gtk_type_class (gnome_canvas_group_get_type ());
-
-	gtk_object_add_arg_type ("GnomeMonthItem::year", GTK_TYPE_UINT, GTK_ARG_READWRITE, ARG_YEAR);
-	gtk_object_add_arg_type ("GnomeMonthItem::month", GTK_TYPE_UINT, GTK_ARG_READWRITE, ARG_MONTH);
-	gtk_object_add_arg_type ("GnomeMonthItem::x", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_X);
-	gtk_object_add_arg_type ("GnomeMonthItem::y", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_Y);
-	gtk_object_add_arg_type ("GnomeMonthItem::width", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_WIDTH);
-	gtk_object_add_arg_type ("GnomeMonthItem::height", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_HEIGHT);
-	gtk_object_add_arg_type ("GnomeMonthItem::anchor", GTK_TYPE_ANCHOR_TYPE, GTK_ARG_READWRITE, ARG_ANCHOR);
-	gtk_object_add_arg_type ("GnomeMonthItem::heading_padding", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_HEAD_PADDING);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_padding", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_DAY_PADDING);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_names", GTK_TYPE_POINTER, GTK_ARG_WRITABLE, ARG_DAY_NAMES);
-	gtk_object_add_arg_type ("GnomeMonthItem::heading_height", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_HEADING_HEIGHT);
-	gtk_object_add_arg_type ("GnomeMonthItem::heading_anchor", GTK_TYPE_ANCHOR_TYPE, GTK_ARG_READWRITE, ARG_HEADING_ANCHOR);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_anchor", GTK_TYPE_ANCHOR_TYPE, GTK_ARG_READWRITE, ARG_DAY_ANCHOR);
-	gtk_object_add_arg_type ("GnomeMonthItem::start_on_monday", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_START_ON_MONDAY);
-	gtk_object_add_arg_type ("GnomeMonthItem::heading_font", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_HEAD_FONT);
-	gtk_object_add_arg_type ("GnomeMonthItem::heading_fontset", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_HEAD_FONTSET);
-	gtk_object_add_arg_type ("GnomeMonthItem::heading_font_gdk", GTK_TYPE_GDK_FONT, GTK_ARG_READWRITE, ARG_HEAD_FONT_GDK);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_font", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_DAY_FONT);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_fontset", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_DAY_FONTSET);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_font_gdk", GTK_TYPE_GDK_FONT, GTK_ARG_READWRITE, ARG_DAY_FONT_GDK);
-	gtk_object_add_arg_type ("GnomeMonthItem::heading_color", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_HEAD_COLOR);
-	gtk_object_add_arg_type ("GnomeMonthItem::heading_color_gdk", GTK_TYPE_GDK_COLOR, GTK_ARG_READWRITE, ARG_HEAD_COLOR_GDK);
-	gtk_object_add_arg_type ("GnomeMonthItem::outline_color", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_OUTLINE_COLOR);
-	gtk_object_add_arg_type ("GnomeMonthItem::outline_color_gdk", GTK_TYPE_GDK_COLOR, GTK_ARG_READWRITE, ARG_OUTLINE_COLOR_GDK);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_box_color", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_DAY_BOX_COLOR);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_box_color_gdk", GTK_TYPE_GDK_COLOR, GTK_ARG_READWRITE, ARG_DAY_BOX_COLOR_GDK);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_color", GTK_TYPE_STRING, GTK_ARG_WRITABLE, ARG_DAY_COLOR);
-	gtk_object_add_arg_type ("GnomeMonthItem::day_color_gdk", GTK_TYPE_GDK_COLOR, GTK_ARG_READWRITE, ARG_DAY_COLOR_GDK);
-
-	object_class->destroy = gnome_month_item_destroy;
-	object_class->set_arg = gnome_month_item_set_arg;
-	object_class->get_arg = gnome_month_item_get_arg;
-}
-
-/* Calculates the minimum heading height based on the heading font size and padding.  It also
- * calculates the minimum width of the month item based on the width of the headings.
- */
-static void
-check_heading_sizes (GnomeMonthItem *mitem)
-{
-	double m_height;
-	double m_width;
-	int width;
-	int max_width;
-	int i;
-
-	/* Calculate minimum height */
-
-	m_height = mitem->head_font->ascent + mitem->head_font->descent + 2 * mitem->head_padding;
-
-	if (mitem->head_height < m_height)
-		mitem->head_height = m_height;
-	
-	/* Go through each heading and remember the widest one */
-
-	max_width = 0;
-
-	for (i = 0; i < 7; i++) {
-		width = gdk_string_width (mitem->head_font, mitem->day_names[i]);
-		if (max_width < width)
-			max_width = width;
-	}
-
-	m_width = 7 * (max_width + 2 * mitem->head_padding);
-
-	if (mitem->width < m_width)
-		mitem->width = m_width;
-}
-
-/* Calculates the minimum width and height of the month item based on the day font size and padding.
- * Assumes that the minimum heading height has already been computed.
- */
-static void
-check_day_sizes (GnomeMonthItem *mitem)
-{
-	double m_height;
-	double m_width;
-	int width;
-	int max_width;
-	char buf[100];
-	int i;
-
-	/* Calculate minimum height */
-
-	m_height = mitem->head_height + 6 * (mitem->day_font->ascent + mitem->day_font->descent + 2 * mitem->day_padding);
-
-	if (mitem->height < m_height)
-		mitem->height = m_height;
-
-	/* Calculate minimum width */
-
-	max_width = 0;
-
-	for (i = 1; i < 32; i++) {
-		sprintf (buf, "%d", i);
-		width = gdk_string_width (mitem->day_font, buf);
-		if (max_width < width)
-			max_width = width;
-	}
-
-	m_width = 7 * (max_width + 2 * mitem->day_padding);
-
-	if (mitem->width < m_width)
-		mitem->width = m_width;
-}
-
-/* Calculates the minimum size of the month item based on the font sizes and paddings.  If the
- * current size of the month item is smaller than the required minimum size, this function will
- * change the size to the appropriate values.
- */
-static void
-check_sizes (GnomeMonthItem *mitem)
-{
-	check_heading_sizes (mitem);
-	check_day_sizes (mitem);
-}
-
-/* Recalculates the position of the toplevel calendar group based on the logical position and anchor */
-static void
-reanchor (GnomeMonthItem *mitem)
-{
-	double x, y;
-
-	x = mitem->x;
-	y = mitem->y;
-
-	switch (mitem->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_SW:
-		break;
-
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_S:
-		x -= mitem->width / 2;
-		break;
-
-	case GTK_ANCHOR_NE:
-	case GTK_ANCHOR_E:
-	case GTK_ANCHOR_SE:
-		x -= mitem->width;
-		break;
-	}
-
-	switch (mitem->anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_NE:
-		break;
-
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_E:
-		y -= mitem->height / 2;
-		break;
-
-	case GTK_ANCHOR_SW:
-	case GTK_ANCHOR_S:
-	case GTK_ANCHOR_SE:
-		y -= mitem->height;
-		break;
-	}
-
-	/* Explicitly use the canvas group class prefix since the month item class has x and y
-	 * arguments as well.
-	 */
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),
-			       "GnomeCanvasGroup::x", x,
-			       "GnomeCanvasGroup::y", y,
-			       NULL);
-}
-
-/* Takes an anchor specification and the corners of a rectangle, and returns an anchored point with
- * respect to that rectangle.
- */
-static void
-get_label_anchor (GtkAnchorType anchor, double x1, double y1, double x2, double y2, double *x, double *y)
-{
-	switch (anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_SW:
-		*x = x1;
-		break;
-
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_S:
-		*x = (x1 + x2) / 2.0;
-		break;
-
-	case GTK_ANCHOR_NE:
-	case GTK_ANCHOR_E:
-	case GTK_ANCHOR_SE:
-		*x = x2;
-		break;
-	}
-
-	switch (anchor) {
-	case GTK_ANCHOR_NW:
-	case GTK_ANCHOR_N:
-	case GTK_ANCHOR_NE:
-		*y = y1;
-		break;
-
-	case GTK_ANCHOR_W:
-	case GTK_ANCHOR_CENTER:
-	case GTK_ANCHOR_E:
-		*y = (y1 + y2) / 2.0;
-		break;
-
-	case GTK_ANCHOR_SW:
-	case GTK_ANCHOR_S:
-	case GTK_ANCHOR_SE:
-		*y = y2;
-		break;
-	}
-}
-
-/* Resets the position of the day name headings in the calendar */
-static void
-reshape_headings (GnomeMonthItem *mitem)
-{
-	double width;
-	int i;
-	double x, y;
-
-	width = mitem->width / 7;
-
-	for (i = 0; i < 7; i++) {
-		/* Group */
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_HEAD_GROUP + i],
-				       "x", width * i,
-				       "y", 0.0,
-				       NULL);
-
-		/* Box */
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_HEAD_BOX + i],
-				       "x1", 0.0,
-				       "y1", 0.0,
-				       "x2", width,
-				       "y2", mitem->head_height,
-				       NULL);
-
-		/* Label */
-		get_label_anchor (mitem->head_anchor,
-				  mitem->head_padding,
-				  mitem->head_padding,
-				  width - mitem->head_padding,
-				  mitem->head_height - mitem->head_padding,
-				  &x, &y);
-
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_HEAD_LABEL + i],
-				       "x", x,
-				       "y", y,
-				       "anchor", mitem->head_anchor,
-				       NULL);
-	}
-}
-
-/* Resets the position of the days in the calendar */
-static void
-reshape_days (GnomeMonthItem *mitem)
-{
-	double width, height;
-	double x, y;
-	int row, col;
-	int i;
-
-	width = mitem->width / 7;
-	height = (mitem->height - mitem->head_height) / 6;
-
-	i = 0;
-
-	for (row = 0; row < 6; row++)
-		for (col = 0; col < 7; col++) {
-			/* Group */
-			gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_DAY_GROUP + i],
-					       "x", width * col,
-					       "y", mitem->head_height + height * row,
-					       NULL);
-
-			/* Box */
-			gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_DAY_BOX + i],
-					       "x1", 0.0,
-					       "y1", 0.0,
-					       "x2", width,
-					       "y2", height,
-					       NULL);
-
-			/* Label */
-			get_label_anchor (mitem->day_anchor,
-					  mitem->day_padding,
-					  mitem->day_padding,
-					  width - mitem->day_padding,
-					  height - mitem->day_padding,
-					  &x, &y);
-
-			gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_DAY_LABEL + i],
-					       "x", x,
-					       "y", y,
-					       "anchor", mitem->day_anchor,
-					       NULL);
-
-			i++;
-		}
-}
-
-/* Changes the positions and resizes the items in the calendar to match the new size of the
- * calendar.
- */
-static void
-reshape (GnomeMonthItem *mitem)
-{
-	check_sizes (mitem);
-	reanchor (mitem);
-	reshape_headings (mitem);
-	reshape_days (mitem);
-}
-
-/* Sets the font for all the day headings */
-static void
-set_head_font (GnomeMonthItem *mitem)
-{
-	int i;
-
-	for (i = 0; i < 7; i++)
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_HEAD_LABEL + i],
-				       "font_gdk", mitem->head_font,
-				       NULL);
-}
-
-/* Sets the color for all the headings */
-static void
-set_head_color (GnomeMonthItem *mitem)
-{
-	int i;
-	GdkColor outline;
-	GdkColor head;
-
-	outline.pixel = mitem->outline_pixel;
-	head.pixel = mitem->head_pixel;
-
-	for (i = 0; i < 7; i++) {
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_HEAD_BOX + i],
-				       "fill_color_gdk", &outline,
-				       NULL);
-
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_HEAD_LABEL + i],
-				       "fill_color_gdk", &head,
-				       NULL);
-	}
-}
-
-/* Creates the items for the day name headings */
-static void
-create_headings (GnomeMonthItem *mitem)
-{
-	int i;
-
-	/* Just create the items; they will be positioned and configured by a call to reshape() */
-
-	for (i = 0; i < 7; i++) {
-		/* Group */
-		mitem->items[GNOME_MONTH_ITEM_HEAD_GROUP + i] =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (mitem),
-					       gnome_canvas_group_get_type (),
-					       NULL);
-
-		/* Box */
-		mitem->items[GNOME_MONTH_ITEM_HEAD_BOX + i] =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (mitem->items[GNOME_MONTH_ITEM_HEAD_GROUP + i]),
-					       gnome_canvas_rect_get_type (),
-					       NULL);
-
-		/* Label */
-		mitem->items[GNOME_MONTH_ITEM_HEAD_LABEL + i] =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (mitem->items[GNOME_MONTH_ITEM_HEAD_GROUP + i]),
-					       gnome_canvas_text_get_type (),
-					       NULL);
-	}
-
-	set_head_font (mitem);
-	set_head_color (mitem);
-}
-
-/* Returns the number of leap years since year 1 up to (but not including) the specified year */
-static int
-leap_years_up_to (int year)
-{
-	return (year / 4					/* trivial leapness */
-		- ((year > 1700) ? (year / 100 - 17) : 0)	/* minus centuries since 1700 */
-		+ ((year > 1600) ? ((year - 1600) / 400) : 0));	/* plus centuries since 1700 divisible by 400 */
-}
-
-/* Returns whether the specified year is a leap year */
-static int
-is_leap_year (int year)
-{
-	if (year <= 1752)
-		return !(year % 4);
-	else
-		return (!(year % 4) && (year % 100)) || !(year % 400);
-}
-
-/* Returns the 1-based day number within the year of the specified date */
-static int
-day_in_year (int day, int month, int year)
-{
-	int is_leap, i;
-
-	is_leap = is_leap_year (year);
-
-	for (i = 0; i < month; i++)
-		day += days_in_month [is_leap][i];
-
-	return day;
-}
-
-/* Returns the day of the week (zero-based, zero is Sunday) for the specified date.  For the days
- * that were removed on the Gregorian reformation, it returns Thursday.
- */
-static int
-day_in_week (int day, int month, int year)
-{
-	int n;
-
-	n = (year - 1) * 365 + leap_years_up_to (year - 1) + day_in_year (day, month, year);
-
-	if (n < REFORMATION_DAY)
-		return (n - 1 + SATURDAY) % 7;
-
-	if (n >= (REFORMATION_DAY + MISSING_DAYS))
-		return (n - 1 + SATURDAY - MISSING_DAYS) % 7;
-
-	return THURSDAY;
-}
-
-/* Fills the 42-element days array with the day numbers for the specified month.  Slots outside the
- * bounds of the month are filled with zeros.  The starting and ending indexes of the days are
- * returned in the start and end arguments.
- */
-static void
-build_month (int month, int year, int start_on_monday, int *days, int *start, int *end)
-{
-	int i;
-	int d_month, d_week;
-
-	/* Note that months are zero-based, so September is month 8 */
-
-	if ((year == 1752) && (month == 8)) {
-		memcpy (days, sept_1752, 42 * sizeof (int));
-
-		if (start)
-			*start = SEPT_1752_START;
-
-		if (end)
-			*end = SEPT_1752_END;
-
-		return;
-	}
-
-	for (i = 0; i < 42; i++)
-		days[i] = 0;
-
-	d_month = days_in_month[is_leap_year (year)][month];
-	d_week = day_in_week (1, month, year);
-
-	if (start_on_monday)
-		d_week = (d_week + 6) % 7;
-
-	for (i = 0; i < d_month; i++)
-		days[d_week + i] = i + 1;
-
-	if (start)
-		*start = d_week;
-
-	if (end)
-		*end = d_week + d_month - 1;
-}
-
-/* Set the day numbers in the monthly calendar */
-static void
-set_days (GnomeMonthItem *mitem)
-{
-	int i;
-	int start, end;
-	char buf[100];
-
-	build_month (mitem->month, mitem->year, mitem->start_on_monday, mitem->day_numbers, &start, &end);
-
-	/* Clear days before start of month */
-
-	for (i = 0; i < start; i++)
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_DAY_LABEL + i],
-				       "text", NULL,
-				       NULL);
-
-	/* Set days of month */
-
-	for (; start <= end; start++, i++) {
-		sprintf (buf, "%d", mitem->day_numbers[start]);
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_DAY_LABEL + i],
-				       "text", buf,
-				       NULL);
-	}
-
-	/* Clear days after end of month */
-
-	for (; i < 42; i++)
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_DAY_LABEL + i],
-				       "text", NULL,
-				       NULL);
-}
-
-/* Sets the font for all the day numbers */
-static void
-set_day_font (GnomeMonthItem *mitem)
-{
-	int i;
-
-	for (i = 0; i < 42; i++)
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_DAY_LABEL + i],
-				       "font_gdk", mitem->day_font,
-				       NULL);
-}
-
-/* Sets the color for all the day items */
-static void
-set_day_color (GnomeMonthItem *mitem)
-{
-	int i;
-	GdkColor outline;
-	GdkColor day_box;
-	GdkColor day;
-
-	outline.pixel = mitem->outline_pixel;
-	day_box.pixel = mitem->day_box_pixel;
-	day.pixel = mitem->day_pixel;
-
-	for (i = 0; i < 42; i++) {
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_DAY_BOX + i],
-				       "outline_color_gdk", &outline,
-				       "fill_color_gdk", &day_box,
-				       NULL);
-
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_DAY_LABEL + i],
-				       "fill_color_gdk", &day,
-				       NULL);
-	}
-}
-
-/* Creates the items for the days */
-static void
-create_days (GnomeMonthItem *mitem)
-{
-	int i;
-
-	/* Just create the items; they will be positioned and configured by a call to reshape() */
-
-	for (i = 0; i < 42; i++) {
-		/* Group */
-		mitem->items[GNOME_MONTH_ITEM_DAY_GROUP + i] =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (mitem),
-					       gnome_canvas_group_get_type (),
-					       NULL);
-
-		/* Box */
-		mitem->items[GNOME_MONTH_ITEM_DAY_BOX + i] =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (mitem->items[GNOME_MONTH_ITEM_DAY_GROUP + i]),
-					       gnome_canvas_rect_get_type (),
-					       NULL);
-
-		/* Label */
-		mitem->items[GNOME_MONTH_ITEM_DAY_LABEL + i] =
-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (mitem->items[GNOME_MONTH_ITEM_DAY_GROUP + i]),
-					       gnome_canvas_text_get_type (),
-					       NULL);
-	}
-
-	set_day_font (mitem);
-	set_day_color (mitem);
-	set_days (mitem);
-}
-
-/* Resets the text of the day name headings */
-static void
-set_day_names (GnomeMonthItem *mitem)
-{
-	int i;
-
-	for (i = 0; i < 7; i++)
-		gnome_canvas_item_set (mitem->items[GNOME_MONTH_ITEM_HEAD_LABEL + i],
-				       "text", mitem->day_names[mitem->start_on_monday ? ((i + 1) % 7) : i],
-				       NULL);
-}
-
-/* Creates all the canvas items that make up the calendar */
-static void
-create_items (GnomeMonthItem *mitem)
-{
-	mitem->items = g_new (GnomeCanvasItem *, GNOME_MONTH_ITEM_LAST);
-
-	create_headings (mitem);
-	create_days (mitem);
-
-	/* Initialize by default to three-letter day names */
-
-	mitem->day_names[0] = g_strdup (_("Sun"));
-	mitem->day_names[1] = g_strdup (_("Mon"));
-	mitem->day_names[2] = g_strdup (_("Tue"));
-	mitem->day_names[3] = g_strdup (_("Wed"));
-	mitem->day_names[4] = g_strdup (_("Thu"));
-	mitem->day_names[5] = g_strdup (_("Fri"));
-	mitem->day_names[6] = g_strdup (_("Sat"));
-	
-	set_day_names (mitem);
-	reshape (mitem);
-}
-
-static void
-gnome_month_item_init (GnomeMonthItem *mitem)
-{
-	time_t t;
-	struct tm tm;
-
-	/* Initialize to the current month by default */
-
-	t = time (NULL);
-	tm = *localtime (&t);
-
-	mitem->year = tm.tm_year + 1900;
-	mitem->month = tm.tm_mon;
-
-	mitem->x = 0.0;
-	mitem->y = 0.0;
-	mitem->width = 150.0; /* not unreasonable defaults, I hope */
-	mitem->height = 100.0;
-	mitem->anchor = GTK_ANCHOR_NW;
-	mitem->head_padding = 0.0;
-	mitem->day_padding = 2.0;
-	mitem->head_height = 14.0;
-	mitem->head_anchor = GTK_ANCHOR_CENTER;
-	mitem->day_anchor = GTK_ANCHOR_CENTER;
-
-	/* Load the default fonts */
-
-	mitem->head_font = gdk_font_load (DEFAULT_FONT);
-	if (!mitem->head_font) {
-		mitem->head_font = gdk_font_load ("fixed");
-		g_assert (mitem->head_font != NULL);
-	}
-
-	mitem->day_font = gdk_font_load (DEFAULT_FONT);
-	if (!mitem->day_font) {
-		mitem->day_font = gdk_font_load ("fixed");
-		g_assert (mitem->day_font != NULL);
-	}
-}
-
-GnomeCanvasItem *
-gnome_month_item_new (GnomeCanvasGroup *parent)
-{
-	GnomeMonthItem *mitem;
-
-	g_return_val_if_fail (parent != NULL, NULL);
-	g_return_val_if_fail (GNOME_IS_CANVAS_GROUP (parent), NULL);
-
-	mitem = GNOME_MONTH_ITEM (gnome_canvas_item_new (parent,
-							 gnome_month_item_get_type (),
-							 NULL));
-
-	gnome_month_item_construct (mitem);
-
-	return GNOME_CANVAS_ITEM (mitem);
-}
-
-void
-gnome_month_item_construct (GnomeMonthItem *mitem)
-{
-	GdkColor color;
-
-	g_return_if_fail (mitem != NULL);
-	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));
-
-	gnome_canvas_get_color (GNOME_CANVAS_ITEM (mitem)->canvas, "#d6d6d6d6d6d6", &color);
-	mitem->head_pixel = color.pixel;
-	mitem->day_box_pixel = color.pixel;
-
-	gnome_canvas_get_color (GNOME_CANVAS_ITEM (mitem)->canvas, "black", &color);
-	mitem->outline_pixel = color.pixel;
-	mitem->day_pixel = color.pixel;
-
-	create_items (mitem);
-}
-
-static void
-free_day_names (GnomeMonthItem *mitem)
-{
-	int i;
-
-	if (mitem->day_names[0])
-		for (i = 0; i < 7; i++)
-			g_free (mitem->day_names[i]);
-}
-
-static void
-gnome_month_item_destroy (GtkObject *object)
-{
-	GnomeMonthItem *mitem;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (GNOME_IS_MONTH_ITEM (object));
-
-	mitem = GNOME_MONTH_ITEM (object);
-
-	free_day_names (mitem);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-/* Sets the color of the specified pixel value to that of the specified argument, which must be in
- * GdkColor format if format is TRUE, otherwise it must be in string format.
- */
-static void
-set_color_arg (GnomeMonthItem *mitem, gulong *pixel, GtkArg *arg, int gdk_format, int set_head, int set_day)
-{
-	GdkColor color;
-
-	if (gdk_format)
-		*pixel = ((GdkColor *) GTK_VALUE_BOXED (*arg))->pixel;
-	else {
-		if (gnome_canvas_get_color (GNOME_CANVAS_ITEM (mitem)->canvas, GTK_VALUE_STRING (*arg), &color))
-			*pixel = color.pixel;
-		else
-			*pixel = 0;
-	}
-
-	if (set_head)
-		set_head_color (mitem);
-
-	if (set_day)
-		set_day_color (mitem);
-}
-
-static void
-gnome_month_item_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	GnomeMonthItem *mitem;
-	char **day_names;
-	int i;
-
-	mitem = GNOME_MONTH_ITEM (object);
-
-	switch (arg_id) {
-	case ARG_YEAR:
-		mitem->year = GTK_VALUE_UINT (*arg);
-		set_days (mitem);
-		break;
-
-	case ARG_MONTH:
-		mitem->month = GTK_VALUE_UINT (*arg);
-		set_days (mitem);
-		break;
-
-	case ARG_X:
-		mitem->x = GTK_VALUE_DOUBLE (*arg);
-		reanchor (mitem);
-		break;
-
-	case ARG_Y:
-		mitem->y = GTK_VALUE_DOUBLE (*arg);
-		reanchor (mitem);
-		break;
-
-	case ARG_WIDTH:
-		mitem->width = fabs (GTK_VALUE_DOUBLE (*arg));
-		reshape (mitem);
-		break;
-
-	case ARG_HEIGHT:
-		mitem->height = fabs (GTK_VALUE_DOUBLE (*arg));
-		reshape (mitem);
-		break;
-
-	case ARG_ANCHOR:
-		mitem->anchor = GTK_VALUE_ENUM (*arg);
-		reanchor (mitem);
-		break;
-
-	case ARG_HEAD_PADDING:
-		mitem->head_padding = fabs (GTK_VALUE_DOUBLE (*arg));
-		reshape (mitem);
-		break;
-
-	case ARG_DAY_PADDING:
-		mitem->day_padding = fabs (GTK_VALUE_DOUBLE (*arg));
-		reshape (mitem);
-		break;
-
-	case ARG_DAY_NAMES:
-		day_names = GTK_VALUE_POINTER (*arg);
-
-		/* First, check that none of the names is null */
-
-		for (i = 0; i < 7; i++)
-			if (!day_names[i]) {
-				g_warning ("Day number %d was NULL; day names cannot be NULL!", i);
-				return;
-			}
-
-		/* Set the new names */
-
-		free_day_names (mitem);
-		for (i = 0; i < 7; i++)
-			mitem->day_names[i] = g_strdup (day_names[i]);
-
-		set_day_names (mitem);
-		reshape (mitem);
-		break;
-
-	case ARG_HEADING_HEIGHT:
-		mitem->head_height = fabs (GTK_VALUE_DOUBLE (*arg));
-		reshape (mitem);
-		break;
-
-	case ARG_HEADING_ANCHOR:
-		mitem->head_anchor = GTK_VALUE_ENUM (*arg);
-		reshape (mitem);
-		break;
-
-	case ARG_DAY_ANCHOR:
-		mitem->day_anchor = GTK_VALUE_ENUM (*arg);
-		reshape (mitem);
-		break;
-
-	case ARG_START_ON_MONDAY:
-		mitem->start_on_monday = GTK_VALUE_BOOL (*arg);
-		set_day_names (mitem);
-		set_days (mitem);
-		break;
-
-	case ARG_HEAD_FONT:
-		gdk_font_unref (mitem->head_font);
-
-		mitem->head_font = gdk_font_load (GTK_VALUE_STRING (*arg));
-		if (!mitem->head_font) {
-			mitem->head_font = gdk_font_load ("fixed");
-			g_assert (mitem->head_font != NULL);
-		}
-
-		set_head_font (mitem);
-		reshape (mitem);
-		break;
-
-	case ARG_HEAD_FONTSET:
-		gdk_font_unref (mitem->head_font);
-
-		mitem->head_font = gdk_fontset_load (GTK_VALUE_STRING (*arg));
-		if (!mitem->head_font) {
-			mitem->head_font =
-			  gdk_fontset_load ("-*-fixed-medium-r-semicondensed--13-120-75-75-c-60-*-*");
-			g_assert (mitem->head_font != NULL);
-		}
-
-		set_head_font (mitem);
-		reshape (mitem);
-		break;
-
-	case ARG_HEAD_FONT_GDK:
-		gdk_font_unref (mitem->head_font);
-
-		mitem->head_font = GTK_VALUE_BOXED (*arg);
-		gdk_font_ref (mitem->head_font);
-		set_head_font (mitem);
-		reshape (mitem);
-		break;
-
-	case ARG_DAY_FONT:
-		gdk_font_unref (mitem->day_font);
-
-		mitem->day_font = gdk_font_load (GTK_VALUE_STRING (*arg));
-		if (!mitem->day_font) {
-			mitem->day_font = gdk_font_load ("fixed");
-			g_assert (mitem->day_font != NULL);
-		}
-
-		set_day_font (mitem);
-		reshape (mitem);
-		break;
-
-	case ARG_DAY_FONTSET:
-		gdk_font_unref (mitem->day_font);
-
-		mitem->day_font = gdk_fontset_load (GTK_VALUE_STRING (*arg));
-		if (!mitem->day_font) {
-			mitem->day_font =
-			  gdk_fontset_load ("-*-fixed-medium-r-semicondensed--13-120-75-75-c-60-*-*");
-			g_assert (mitem->day_font != NULL);
-		}
-
-		set_day_font (mitem);
-		reshape (mitem);
-		break;
-
-	case ARG_DAY_FONT_GDK:
-		gdk_font_unref (mitem->day_font);
-
-		mitem->day_font = GTK_VALUE_BOXED (*arg);
-		gdk_font_ref (mitem->day_font);
-		set_day_font (mitem);
-		reshape (mitem);
-		break;
-
-	case ARG_HEAD_COLOR:
-		set_color_arg (mitem, &mitem->head_pixel, arg, FALSE, TRUE, FALSE);
-		break;
-
-	case ARG_HEAD_COLOR_GDK:
-		set_color_arg (mitem, &mitem->head_pixel, arg, TRUE, TRUE, FALSE);
-		break;
-
-	case ARG_OUTLINE_COLOR:
-		set_color_arg (mitem, &mitem->outline_pixel, arg, FALSE, TRUE, TRUE);
-		break;
-
-	case ARG_OUTLINE_COLOR_GDK:
-		set_color_arg (mitem, &mitem->outline_pixel, arg, TRUE, TRUE, TRUE);
-		break;
-
-	case ARG_DAY_BOX_COLOR:
-		set_color_arg (mitem, &mitem->day_box_pixel, arg, FALSE, FALSE, TRUE);
-		break;
-
-	case ARG_DAY_BOX_COLOR_GDK:
-		set_color_arg (mitem, &mitem->day_box_pixel, arg, TRUE, FALSE, TRUE);
-		break;
-
-	case ARG_DAY_COLOR:
-		set_color_arg (mitem, &mitem->day_pixel, arg, FALSE, FALSE, TRUE);
-		break;
-
-	case ARG_DAY_COLOR_GDK:
-		set_color_arg (mitem, &mitem->day_pixel, arg, TRUE, FALSE, TRUE);
-		break;
-
-	default:
-		break;
-	}
-}
-
-/* Allocates a GdkColor structure filled with the specified pixel, and puts it into the specified
- * arg for returning it in the get_arg method.
- */
-static void
-get_color_arg (GnomeMonthItem *mitem, gulong pixel, GtkArg *arg)
-{
-	GdkColor *color;
-
-	color = g_new (GdkColor, 1);
-	color->pixel = pixel;
-	gdk_color_context_query_color (GNOME_CANVAS_ITEM (mitem)->canvas->cc, color);
-	GTK_VALUE_BOXED (*arg) = color;
-}
-
-static void
-gnome_month_item_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
-{
-	GnomeMonthItem *mitem;
-
-	mitem = GNOME_MONTH_ITEM (object);
-
-	switch (arg_id) {
-	case ARG_YEAR:
-		GTK_VALUE_UINT (*arg) = mitem->year;
-		break;
-
-	case ARG_MONTH:
-		GTK_VALUE_UINT (*arg) = mitem->month;
-		break;
-
-	case ARG_X:
-		GTK_VALUE_DOUBLE (*arg) = mitem->x;
-		break;
-
-	case ARG_Y:
-		GTK_VALUE_DOUBLE (*arg) = mitem->y;
-		break;
-
-	case ARG_WIDTH:
-		GTK_VALUE_DOUBLE (*arg) = mitem->width;
-		break;
-
-	case ARG_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = mitem->height;
-		break;
-
-	case ARG_ANCHOR:
-		GTK_VALUE_ENUM (*arg) = mitem->anchor;
-		break;
-
-	case ARG_HEAD_PADDING:
-		GTK_VALUE_DOUBLE (*arg) = mitem->head_padding;
-		break;
-
-	case ARG_DAY_PADDING:
-		GTK_VALUE_DOUBLE (*arg) = mitem->day_padding;
-		break;
-
-	case ARG_HEADING_HEIGHT:
-		GTK_VALUE_DOUBLE (*arg) = mitem->head_height;
-		break;
-
-	case ARG_HEADING_ANCHOR:
-		GTK_VALUE_ENUM (*arg) = mitem->head_anchor;
-		break;
-
-	case ARG_DAY_ANCHOR:
-		GTK_VALUE_ENUM (*arg) = mitem->day_anchor;
-		break;
-
-	case ARG_START_ON_MONDAY:
-		GTK_VALUE_BOOL (*arg) = mitem->start_on_monday;
-		break;
-
-	case ARG_HEAD_FONT_GDK:
-		GTK_VALUE_BOXED (*arg) = mitem->head_font;
-		break;
-
-	case ARG_DAY_FONT_GDK:
-		GTK_VALUE_BOXED (*arg) = mitem->day_font;
-		break;
-
-	case ARG_HEAD_COLOR_GDK:
-		get_color_arg (mitem, mitem->head_pixel, arg);
-		break;
-
-	case ARG_OUTLINE_COLOR_GDK:
-		get_color_arg (mitem, mitem->outline_pixel, arg);
-		break;
-
-	case ARG_DAY_BOX_COLOR_GDK:
-		get_color_arg (mitem, mitem->day_box_pixel, arg);
-		break;
-
-	case ARG_DAY_COLOR_GDK:
-		get_color_arg (mitem, mitem->day_pixel, arg);
-		break;
-
-	default:
-		arg->type = GTK_TYPE_INVALID;
-		break;
-	}
-}
-
-GnomeCanvasItem *
-gnome_month_item_num2child (GnomeMonthItem *mitem, int child_num)
-{
-	g_return_val_if_fail (mitem != NULL, NULL);
-	g_return_val_if_fail (GNOME_IS_MONTH_ITEM (mitem), NULL);
-
-	return mitem->items[child_num];
-}
-
-int
-gnome_month_item_child2num (GnomeMonthItem *mitem, GnomeCanvasItem *child)
-{
-	int i;
-
-	g_return_val_if_fail (mitem != NULL, -1);
-	g_return_val_if_fail (GNOME_IS_MONTH_ITEM (mitem), -1);
-	g_return_val_if_fail (child != NULL, -1);
-	g_return_val_if_fail (GNOME_IS_CANVAS_ITEM (child), -1);
-
-	for (i = 0; i < GNOME_MONTH_ITEM_LAST; i++)
-		if (mitem->items[i] == child)
-			return i;
-
-	return -1;
-}
-
-int
-gnome_month_item_num2day (GnomeMonthItem *mitem, int child_num)
-{
-	g_return_val_if_fail (mitem != NULL, 0);
-	g_return_val_if_fail (GNOME_IS_MONTH_ITEM (mitem), 0);
-
-	if ((child_num >= GNOME_MONTH_ITEM_DAY_GROUP) && (child_num < GNOME_MONTH_ITEM_LAST)) {
-		child_num = (child_num - GNOME_MONTH_ITEM_DAY_GROUP) % 42;
-		return mitem->day_numbers[child_num];
-	} else
-		return 0;
-}
-
-int
-gnome_month_item_day2index (GnomeMonthItem *mitem, int day_num)
-{
-	int i;
-
-	g_return_val_if_fail (mitem != NULL, -1);
-	g_return_val_if_fail (GNOME_IS_MONTH_ITEM (mitem), -1);
-	g_return_val_if_fail (day_num >= 1, -1);
-
-	/* Find first day of month */
-
-	for (i = 0; mitem->day_numbers[i] == 0; i++)
-		;
-
-	/* Find the specified day */
-
-	for (; (mitem->day_numbers[i] != 0) && (i < 42); i++)
-		if (mitem->day_numbers[i] == day_num)
-			return i;
-
-	/* Bail out */
-
-	return -1;
-}
diff --git a/calendar/gui/gnome-month-item.h b/calendar/gui/gnome-month-item.h
deleted file mode 100644
index 0ec4fd484c..0000000000
--- a/calendar/gui/gnome-month-item.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/* General-purpose monthly calendar canvas item for GNOME
- *
- * Copyright (C) 1998 Red Hat Software, Inc.
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx>
- */
-
-#ifndef GNOME_MONTH_ITEM_H
-#define GNOME_MONTH_ITEM_H
-
-#include <libgnome/gnome-defs.h>
-#include <gtk/gtkpacker.h> /* why the hell is GtkAnchorType here and not in gtkenums.h? */
-#include <libgnomeui/gnome-canvas.h>
-
-
-BEGIN_GNOME_DECLS
-
-
-/* These values are used to identify the canvas items that make up a complete GnomeMonthItem, which
- * is made up of the following "pieces":
- *
- *	Headings line:
- *		- 7 GnomeCanvasGroups:
- *			Each group contains one box (GnomeCanvasRectangle) and one label
- *			(GnomeCanvasText)
- *
- *	Day slots:
- *		- 42 GnomeCanvasGroups:
- *			Each group contains one box (GnomeCanvasRectangle) and one label
- *			(GnomeCanvasText)
- *
- * The headings are organized from left to right.  The day slots are organized as a table in
- * row-major order.
- *
- * If you want to access the individual items of the GnomeMonthItem, you can use these numbers with
- * the gnome_month_item_num2child() function.  If you want to convert a number into the
- * corresponding GnomeCanvasItem, you can use the gnome_month_item_child2num() function.
- */
-typedef enum {
-	GNOME_MONTH_ITEM_HEAD_GROUP = 0,	/* 7 groups for headings */
-	GNOME_MONTH_ITEM_HEAD_BOX   = 7,	/* 7 boxes for headings */
-	GNOME_MONTH_ITEM_HEAD_LABEL = 14,	/* 7 labels for headings */
-	GNOME_MONTH_ITEM_DAY_GROUP  = 21,	/* 42 groups for days */
-	GNOME_MONTH_ITEM_DAY_BOX    = 63,	/* 42 boxes for days */
-	GNOME_MONTH_ITEM_DAY_LABEL  = 105,	/* 42 labels for days */
-	GNOME_MONTH_ITEM_LAST       = 147	/* total number of items */
-} GnomeMonthItemChild;
-
-/* The MonthItem canvas item defines a simple monthly calendar.  It is made out of a number of
- * canvas items, which can be accessed using the functions provided.  The monthly calendar is
- * anchored with respect to a point.  The following arguments are available:
- *
- * name			type		read/write	description
- * ------------------------------------------------------------------------------------------
- * year			uint		RW		Full year (1-9999)
- * month		uint		RW		Number of month (0-11)
- * x			double		RW		X position of anchor point
- * y			double		RW		Y position of anchor point
- * width		double		RW		Width of calendar in canvas units
- * height		double		RW		Height of calendar in canvas units
- * anchor		GtkAnchorType	RW		Anchor side for calendar
- * heading_padding	double		RW		Padding inside heading boxes
- * day_padding		double		RW		Padding inside day boxes
- * day_names		char **		W		Array of strings corresponding to the day names (sun-sat)
- * heading_height	double		RW		Height of headings bar in canvas units
- * heading_anchor	GtkAnchorType	RW		Anchor side for headings inside heading boxes
- * day_anchor		GtkAnchorType	RW		Anchor side for day numbers inside day boxes
- * start_on_monday	boolean		RW		Specifies whether the week starts on Monday or Sunday
- * heading_font		string		W		X logical font descriptor for the headings
- * heading_fontset     	string		W		X logical fontset descriptor for the headings
- * heading_font_gdk	GdkFont *	RW		Pointer to GdkFont for the headings
- * day_font		string		W		X logical font descriptor for the day numbers
- * day_fontset 		string		W		X logical fontset descriptor for the day numbers
- * day_font_gdk		GdkFont *	RW		Pointer to GdkFont for the day numbers
- * heading_color	string		W		X color specification for heading labels
- * heading_color_gdk	GdkColor *	RW		Pointer to an allocated GdkColor for heading labels
- * outline_color	string		W		X color specification for outline (lines and fill of heading boxes)
- * outline_color_gdk	GdkColor *	RW		Pointer to an allocated GdkColor for outline
- * day_box_color	string		W		X color specification for day boxes
- * day_box_color_gdk	GdkColor *	RW		Pointer to an allocated GdkColor for day boxes
- * day_color		string		W		X color specification for day number labels
- * day_color_gdk	GdkColor *	RW		Pointer to an allocated GdkColor for day number labels
- */
-
-#define GNOME_TYPE_MONTH_ITEM            (gnome_month_item_get_type ())
-#define GNOME_MONTH_ITEM(obj)            (GTK_CHECK_CAST ((obj), GNOME_TYPE_MONTH_ITEM, GnomeMonthItem))
-#define GNOME_MONTH_ITEM_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_MONTH_ITEM, GnomeMonthItemClass))
-#define GNOME_IS_MONTH_ITEM(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_MONTH_ITEM))
-#define GNOME_IS_MONTH_ITEM_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_MONTH_ITEM))
-
-
-typedef struct _GnomeMonthItem GnomeMonthItem;
-typedef struct _GnomeMonthItemClass GnomeMonthItemClass;
-
-struct _GnomeMonthItem {
-	GnomeCanvasGroup group;
-
-	int year;			/* Year to show (full, no two-digit crap) */
-	int month;			/* Month to show (0-11) */
-
-	double x, y;			/* Position at anchor */
-	double width, height;		/* Size of calendar */
-	GtkAnchorType anchor;		/* Anchor side for calendar */
-
-	double head_padding;		/* Padding to use between heading lines and text */
-	double day_padding;		/* Padding to use between day number lines and text */
-
-	char *day_names[7];		/* Names to use for the day labels, starting from Sunday */
-
-	double head_height;		/* Height of the headings row */
-	GtkAnchorType head_anchor;	/* Anchor side for the heading labels */
-	GtkAnchorType day_anchor;	/* Anchor side for the day number labels */
-
-	GnomeCanvasItem **items;	/* All the items that make up the calendar */
-	int day_numbers[42];		/* The numbers of the days, as they are shown in the display */
-
-	GdkFont *head_font;		/* Font for the headings */
-	GdkFont *day_font;		/* Font for the day numbers */
-
-	gulong head_pixel;		/* Color for heading labels */
-	gulong outline_pixel;		/* Color for the outline (lines and heading boxes) */
-	gulong day_box_pixel;		/* Color for the day boxes */
-	gulong day_pixel;		/* Color for day number labels */
-
-	int start_on_monday : 1;	/* Start the week on Monday?  If false, then start from Sunday */
-};
-
-struct _GnomeMonthItemClass {
-	GnomeCanvasGroupClass parent_class;
-};
-
-
-/* Standard Gtk function */
-GtkType gnome_month_item_get_type (void);
-
-/* Creates a new month item with the specified group as parent */
-GnomeCanvasItem *gnome_month_item_new (GnomeCanvasGroup *parent);
-
-/* Constructor function useful for derived classes */
-void gnome_month_item_construct (GnomeMonthItem *mitem);
-
-/* Returns the child item defined by the child number (as specified on the GnomeMonthItemChild
- * enumeration above).
- */
-GnomeCanvasItem *gnome_month_item_num2child (GnomeMonthItem *mitem, int child_num);
-
-/* Returns the number of the specified child item, as defined on the GnomeMonthItemChild enumeration
- * above.  If the specified object is not found, it returns -1.
- */
-int gnome_month_item_child2num (GnomeMonthItem *mitem, GnomeCanvasItem *child);
-
-/* Returns the number of the day relevant to the specified child item.  Day numbers are 1-based.  If
- * the specified child is outside the range of displayed days, then it returns 0.
- */
-int gnome_month_item_num2day (GnomeMonthItem *mitem, int child_num);
-
-/* Returns the index (0-41) of the specified date within the table of days.  If the day number is
- * invalid for the current monthly calendar, then -1 is returned.
- */
-int gnome_month_item_day2index (GnomeMonthItem *mitem, int day_num);
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/gnomecal.oafinfo b/calendar/gui/gnomecal.oafinfo
deleted file mode 100644
index c4b91b9dd8..0000000000
--- a/calendar/gui/gnomecal.oafinfo
+++ /dev/null
@@ -1,27 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:IDL:GNOME:Calendar:Repository:1.0:56989bb6-65a1-430c-86a8-81bbe64bf7ab"
-            type="factory"
-            location="OAFIID:IDL:GNOME:Calendar:RepositoryLocator:1.0:83b25bb0-b68b-4c6b-86e7-c303e9897c21">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Gnome/Calendar/Repository:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Calendar Repository"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:IDL:GNOME:Calendar:RepositoryLocator:1.0:83b25bb0-b68b-4c6b-86e7-c303e9897c21"
-            type="exe"
-            location="gnomecal">
-
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/GenericFactory:1.0"/>
-	</oaf_attribute>
-
-	<oaf_attribute name="description" type="string"
-                       value="Calendar Server"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
deleted file mode 100644
index 07e75e5d3d..0000000000
--- a/calendar/gui/goto.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/* Go to date dialog for gnomecal
- *
- * Copyright (C) 1998 Red Hat Software, Inc.
- *
- * Author: Federico Mena <federico@nuclecu.unam.mx>
- */
-
-#include <config.h>
-#include <gnome.h>
-#include <cal-util/timeutil.h>
-#include "gnome-cal.h"
-#include "gnome-month-item.h"
-#include "calendar-commands.h"
-#include "mark.h"
-
-
-static GtkWidget *goto_win;		/* The goto dialog window */
-static GnomeMonthItem *month_item;	/* The month item in the dialog */
-static GnomeCalendar *gnome_calendar;	/* The gnome calendar the dialog refers to */
-static int current_index;		/* The index of the day marked as current, or -1 if none */
-
-
-/* Updates the specified month item by marking it appropriately from the calendar the dialog refers
- * to.  Also marks the current day if appropriate.
- */
-static void
-update (void)
-{
-	GnomeCanvasItem *item;
-	time_t t;
-	struct tm tm;
-
-	unmark_month_item (month_item);
-	mark_month_item (month_item, gnome_calendar);
-
-	if (current_index != -1) {
-		item = gnome_month_item_num2child (month_item,
-						   GNOME_MONTH_ITEM_DAY_LABEL + current_index);
-		gnome_canvas_item_set (item,
-				       "fill_color", color_spec_from_prop (COLOR_PROP_DAY_FG),
-				       "fontset", NORMAL_DAY_FONTSET,
-				       NULL);
-		current_index = -1;
-	}
-
-	t = time (NULL);
-	tm = *localtime (&t);
-
-	if (((tm.tm_year + 1900) == month_item->year) && (tm.tm_mon == month_item->month)) {
-		current_index = gnome_month_item_day2index (month_item, tm.tm_mday);
-		g_assert (current_index != -1);
-
-		item = gnome_month_item_num2child (month_item,
-						   GNOME_MONTH_ITEM_DAY_LABEL + current_index);
-		gnome_canvas_item_set (item,
-				       "fill_color", color_spec_from_prop (COLOR_PROP_CURRENT_DAY_FG),
-				       "fontset", CURRENT_DAY_FONTSET,
-				       NULL);
-	}
-}
-
-/* Callback used when the year adjustment is changed */
-static void
-year_changed (GtkAdjustment *adj, gpointer data)
-{
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (month_item),
-			       "year", (int) adj->value,
-			       NULL);
-	update ();
-}
-
-/* Creates the year control with its adjustment */
-static GtkWidget *
-create_year (int year)
-{
-	GtkWidget *hbox;
-	GtkAdjustment *adj;
-	GtkWidget *w;
-
-	hbox = gtk_hbox_new (FALSE, GNOME_PAD_SMALL);
-
-	w = gtk_label_new (_("Year:"));
-	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
-	gtk_widget_show (w);
-
-	adj = GTK_ADJUSTMENT (gtk_adjustment_new (year, 1900, 9999, 1, 10, 10));
-	gtk_signal_connect (GTK_OBJECT (adj), "value_changed",
-			    (GtkSignalFunc) year_changed,
-			    NULL);
-
-	w = gtk_spin_button_new (adj, 1.0, 0);
-	gtk_widget_set_usize (w, 60, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
-	gtk_widget_show (w);
-
-	return hbox;
-}
-
-/* Callback used when a month button is toggled */
-static void
-month_toggled (GtkToggleButton *toggle, gpointer data)
-{
-	if (!toggle->active)
-		return;
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (month_item),
-			       "month", GPOINTER_TO_INT (data),
-			       NULL);
-	update ();
-}
-
-/* Creates the months control */
-static GtkWidget *
-create_months (int month)
-{
-	time_t start_time;
-	GtkWidget *table;
-	GtkWidget *w;
-	GSList *group;
-	int i, row, col;
-	struct tm tm;
-	char buf[100];
-
-	gnome_calendar_get_selected_time_range (gnome_calendar, &start_time, NULL);
-
-	tm = *localtime (&start_time);
-
-	table = gtk_table_new (2, 6, TRUE);
-
-	group = NULL;
-
-	for (i = 0; i < 12; i++) {
-		row = i / 6;
-		col = i % 6;
-
-		tm.tm_mon = i;
-		strftime (buf, 100, "%b", &tm);
-
-		w = gtk_radio_button_new (group);
-		group = gtk_radio_button_group (GTK_RADIO_BUTTON (w));
-		gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (w), FALSE);
-
-		gtk_container_add (GTK_CONTAINER (w), gtk_label_new (buf));
-
-		if (i == month)
-			gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (w), TRUE);
-
-		gtk_signal_connect (GTK_OBJECT (w), "toggled",
-				    (GtkSignalFunc) month_toggled,
-				    GINT_TO_POINTER (i));
-		gtk_table_attach (GTK_TABLE (table), w,
-				  col, col + 1,
-				  row, row + 1,
-				  GTK_EXPAND | GTK_FILL,
-				  GTK_EXPAND | GTK_FILL,
-				  0, 0);
-		gtk_widget_show_all (w);
-	}
-
-	return table;
-}
-
-/* Sets the scrolling region of the canvas to the allocation size */
-static void
-set_scroll_region (GtkWidget *widget, GtkAllocation *allocation)
-{
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (month_item),
-			       "width", (double) (allocation->width - 1),
-			       "height", (double) (allocation->height - 1),
-			       NULL);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (widget),
-					0, 0,
-					allocation->width, allocation->height);
-}
-
-/* Event handler for day groups in the month item.  A button press makes the calendar jump to the
- * selected day and destroys the Go-to dialog box.
- */
-static gint
-day_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
-{
-	int child_num, day;
-
-	child_num = gnome_month_item_child2num (month_item, item);
-	day = gnome_month_item_num2day (month_item, child_num);
-
-	switch (event->type) {
-	case GDK_BUTTON_PRESS:
-		if ((event->button.button == 1) && (day != 0)) {
-			gnome_calendar_goto (gnome_calendar,
-					     time_from_day (month_item->year, month_item->month, day));
-			gtk_widget_destroy (goto_win);
-		}
-		break;
-
-	default:
-		break;
-	}
-
-	return FALSE;
-}
-
-/* Creates the canvas with the month item for selecting days */
-static GtkWidget *
-create_days (int day, int month, int year)
-{
-	GtkWidget *canvas;
-	int i;
-	GnomeCanvasItem *day_group;
-
-	canvas = gnome_canvas_new ();
-	gtk_widget_set_usize (canvas, 150, 120);
-
-	month_item = GNOME_MONTH_ITEM (gnome_month_item_new (gnome_canvas_root (GNOME_CANVAS (canvas))));
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (month_item),
-			       "month", month,
-			       "year", year,
-			       "start_on_monday", week_starts_on_monday,
-			       NULL);
-	colorify_month_item (month_item, default_color_func, NULL);
-	month_item_prepare_prelight (month_item, default_color_func, NULL);
-	update ();
-
-	/* Connect to size_allocate so that we can change the size of the month item and the
-	 * scrolling region appropriately.
-	 */
-
-	gtk_signal_connect (GTK_OBJECT (canvas), "size_allocate",
-			    (GtkSignalFunc) set_scroll_region,
-			    NULL);
-
-	/* Bind the day groups to our event handler */
-
-	for (i = 0; i < 42; i++) {
-		day_group = gnome_month_item_num2child (month_item, i + GNOME_MONTH_ITEM_DAY_GROUP);
-		gtk_signal_connect (GTK_OBJECT (day_group), "event",
-				    (GtkSignalFunc) day_event,
-				    NULL);
-	}
-
-	return canvas;
-}
-
-static void
-goto_today (GtkWidget *widget, gpointer data)
-{
-	gnome_calendar_goto_today (gnome_calendar);
-	gtk_widget_destroy (goto_win);
-}
-
-/* Creates a "goto date" dialog and runs it */
-void
-goto_dialog (GnomeCalendar *gcal)
-{
-	time_t start_time;
-	GtkWidget *vbox;
-	GtkWidget *hbox;
-	GtkWidget *w;
-	GtkWidget *days;
-	struct tm tm;
-
-	gnome_calendar = gcal;
-	current_index = -1;
-
-	gnome_calendar_get_selected_time_range (gnome_calendar, &start_time, NULL);
-
-	tm = *localtime (&start_time);
-
-	goto_win = gnome_dialog_new (_("Go to date"),
-				     GNOME_STOCK_BUTTON_CANCEL,
-				     NULL);
-	gnome_dialog_set_parent (GNOME_DIALOG (goto_win),
-		 GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
-
-	
-	vbox = GNOME_DIALOG (goto_win)->vbox;
-
-	/* Instructions */
-
-	w = gtk_label_new (_("Please select the date you want to go to.\n"
-			     "When you click on a day, you will be taken\n"
-			     "to that date."));
-	gtk_label_set_justify (GTK_LABEL (w), GTK_JUSTIFY_LEFT);
-	gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0);
-	gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);
-	gtk_widget_show (w);
-
-	/* Create month item before creating the year controls, since the
-	 * latter ones need the month_item to be created.
-	 */
-
-	days = create_days (tm.tm_mday, tm.tm_mon, tm.tm_year + 1900);
-
-	/* Year */
-
-	w = create_year (tm.tm_year + 1900);
-	gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);
-	gtk_widget_show (w);
-
-	/* Month */
-
-	w = create_months (tm.tm_mon);
-	gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);
-	gtk_widget_show (w);
-
-	/* Days (canvas with month item) */
-
-	gtk_box_pack_start (GTK_BOX (vbox), days, TRUE, TRUE, 0);
-	gtk_widget_show (days);
-
-	/* Today button */
-
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-	gtk_widget_show (hbox);
-
-	w = gtk_button_new_with_label (_("Go to today"));
-	gtk_signal_connect (GTK_OBJECT (w), "clicked",
-			    (GtkSignalFunc) goto_today,
-			    NULL);
-	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
-	gtk_widget_show (w);
-
-	/* Run! */
-
-	gtk_window_set_modal (GTK_WINDOW (goto_win), TRUE);
-	gnome_dialog_set_close (GNOME_DIALOG (goto_win), TRUE);
-	gnome_dialog_set_parent (GNOME_DIALOG (goto_win),
-	  GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gnome_calendar))));
-	gtk_widget_show (goto_win);
-}
diff --git a/calendar/gui/jump.xpm b/calendar/gui/jump.xpm
deleted file mode 100644
index d974142d9a..0000000000
--- a/calendar/gui/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/calendar/gui/main.c b/calendar/gui/main.c
deleted file mode 100644
index 2faba00781..0000000000
--- a/calendar/gui/main.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* control-factory.c
- *
- * Copyright (C) 2000  Helix Code, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gnome.h>
-#include <glade/glade.h>
-#include <bonobo.h>
-#include <bonobo/bonobo-control.h>
-#include <glade/glade.h>
-
-#include <liboaf/liboaf.h>
-
-#include <gal/widgets/e-cursors.h>
-#include <cal-util/timeutil.h>
-#include <gui/alarm.h>
-#include <gui/gnome-cal.h>
-#include <gui/calendar-commands.h>
-#include "component-factory.h"
-#include "control-factory.h"
-#include "e-itip-control.h"
-
-static void
-init_bonobo (int *argc, char **argv)
-{
-	/* FIXME: VERSION instead of "0.0".  */
-	gnome_init_with_popt_table ("evolution-calendar", "0.0",
-				    *argc, argv, oaf_popt_options,
-				    0, NULL);
-	oaf_init (*argc, argv);
-
-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error (_("Could not initialize Bonobo"));
-}
-
-
-int
-main (int argc, char **argv)
-{
-	init_bonobo (&argc, argv);
-	glade_gnome_init ();
-	alarm_init ();
-	e_cursors_init ();
-
-	init_calendar ();
-
-#if 0
-	//g_log_set_always_fatal ((GLogLevelFlags) 0xFFFF);
-	g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
-				G_LOG_LEVEL_CRITICAL |
-				G_LOG_LEVEL_WARNING);
-#endif
-
-	control_factory_init ();
-	component_factory_init ();
-	e_itip_control_factory_init ();
-
-	bonobo_main ();
-
-	calendar_config_write_on_exit ();
-
-	fprintf (stderr, "main(): Out of bonobo_main(), we are dying cleanly.  Have a nice day.\n");
-
-	return 0;
-}
diff --git a/calendar/gui/mark.c b/calendar/gui/mark.c
deleted file mode 100644
index 1b90d390dd..0000000000
--- a/calendar/gui/mark.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/* Evolution calendar - Functions to mark calendars
- *
- * Copyright (C) 1998 Red Hat Software, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <cal-util/timeutil.h>
-#include "gnome-cal.h"
-#include "calendar-commands.h"
-#include "mark.h"
-
-/* Closure data */
-struct minfo
-{
-	GnomeMonthItem *mitem;
-	time_t start;
-	time_t end;
-};
-
-
-
-/* Frees the specified data when an object is destroyed */
-static void
-free_data (GtkObject *object, gpointer data)
-{
-	g_free (data);
-}
-
-/* If the array of "marked" attributes for the days in a a month item has not been created yet, this
- * function creates the array and clears it.  Otherwise, it just returns the existing array.
- */
-static char *
-get_attributes (GnomeMonthItem *mitem)
-{
-	char *attrs;
-
-	attrs = gtk_object_get_data (GTK_OBJECT (mitem), "day_mark_attributes");
-
-	if (!attrs) {
-		attrs = g_new0 (char, 42);
-		gtk_object_set_data (GTK_OBJECT (mitem), "day_mark_attributes", attrs);
-		gtk_signal_connect (GTK_OBJECT (mitem), "destroy",
-				    (GtkSignalFunc) free_data,
-				    attrs);
-	}
-
-	return attrs;
-}
-
-void
-colorify_month_item (GnomeMonthItem *mitem, GetColorFunc func, gpointer func_data)
-{
-	g_return_if_fail (mitem != NULL);
-	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));
-	g_return_if_fail (func != NULL);
-
-	unmark_month_item (mitem);
-
-	/* We have to do this in several calls to gnome_canvas_item_set(), as color_spec_from_prop()
-	 * returns a pointer to a static string -- and we need several values.
-	 */
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),
-			       "heading_color", (* func) (COLOR_PROP_HEADING_COLOR, func_data),
-			       NULL);
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),
-			       "outline_color", (* func) (COLOR_PROP_OUTLINE_COLOR, func_data),
-			       NULL);
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),
-			       "day_box_color", (* func) (COLOR_PROP_EMPTY_DAY_BG, func_data),
-			       NULL);
-
-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (mitem),
-			       "day_color", (* func) (COLOR_PROP_DAY_FG, func_data),
-			       NULL);
-}
-
-/* In the month item, marks all the days that are touched by the specified time span.  Assumes that
- * the time span is completely contained within the month.  The array of day attributes is modified
- * accordingly.
- */
-static void
-mark_event_in_month (GnomeMonthItem *mitem, time_t start, time_t end)
-{
-	struct tm tm;
-	int day_index;
-
-	tm = *localtime (&start);
-
-	for (; start <= end; start += 60 * 60 * 24) {
-		mktime (&tm); /* normalize the time */
-
-		/* Figure out the day index that corresponds to this time */
-
-		day_index = gnome_month_item_day2index (mitem, tm.tm_mday);
-		g_assert (day_index >= 0);
-
-		/* Mark the day box */
-
-		mark_month_item_index (mitem, day_index, default_color_func, NULL);
-
-		/* Next day */
-
-		tm.tm_mday++;
-	}
-}
-
-static gboolean
-mark_month_item_cb (CalComponent *comp, time_t istart, time_t iend, gpointer data)
-{
-	struct minfo *mi = (struct minfo *)data;
-
-	mark_event_in_month (mi->mitem, MAX (istart, mi->start), MIN (iend, mi->end));
-
-	return TRUE;
-}
-
-void
-mark_month_item (GnomeMonthItem *mitem, GnomeCalendar *gcal)
-{
-	CalClient *client;
-	struct minfo mi;
-
-	g_return_if_fail (mitem != NULL);
-	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	client = gnome_calendar_get_cal_client (gcal);
-
-	mi.mitem = mitem;
-	mi.start = time_month_begin (time_from_day (mitem->year, mitem->month, 1));
-	mi.end = time_month_end (mi.start);
-	
-	cal_client_generate_instances (client, CALOBJ_TYPE_EVENT, mi.start, mi.end,
-				       mark_month_item_cb, &mi);
-}
-
-
-void
-mark_month_item_index (GnomeMonthItem *mitem, int index, GetColorFunc func, gpointer func_data)
-{
-	char *attrs;
-	GnomeCanvasItem *item;
-
-	g_return_if_fail (mitem != NULL);
-	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));
-	g_return_if_fail ((index >= 0) && (index < 42));
-	g_return_if_fail (func != NULL);
-
-	attrs = get_attributes (mitem);
-
-	attrs[index] = TRUE;
-
-	item = gnome_month_item_num2child (mitem, GNOME_MONTH_ITEM_DAY_BOX + index);
-	gnome_canvas_item_set (item,
-			       "fill_color", (* func) (COLOR_PROP_MARK_DAY_BG, func_data),
-			       NULL);
-}
-
-void
-unmark_month_item (GnomeMonthItem *mitem)
-{
-	int i;
-	char *attrs;
-	GnomeCanvasItem *item;
-
-	g_return_if_fail (mitem != NULL);
-	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));
-
-	attrs = get_attributes (mitem);
-
-	/* Find marked days and unmark them by turning off their marked attribute flag and changing
-	 * the color.
-	 */
-
-	for (i = 0; i < 42; i++)
-		if (attrs[i]) {
-			attrs[i] = FALSE;
-
-			item = gnome_month_item_num2child (mitem, GNOME_MONTH_ITEM_DAY_BOX + i);
-			gnome_canvas_item_set (item,
-					       "fill_color", color_spec_from_prop (COLOR_PROP_EMPTY_DAY_BG),
-					       NULL);
-		}
-}
-
-/* Handles EnterNotify and LeaveNotify events from the month item's day groups, and performs
- * appropriate prelighting.
- */
-static gint
-day_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
-{
-	GnomeMonthItem *mitem;
-	GnomeCanvasItem *box;
-	int child_num, day;
-	GetColorFunc func;
-	gpointer func_data;
-	char *color;
-	char *attrs;
-
-	/* We only accept enters and leaves */
-
-	if (!((event->type == GDK_ENTER_NOTIFY) || (event->type == GDK_LEAVE_NOTIFY)))
-		return FALSE;
-
-	/* Get index information */
-
-	mitem = GNOME_MONTH_ITEM (data);
-	child_num = gnome_month_item_child2num (mitem, item);
-	day = gnome_month_item_num2day (mitem, child_num);
-
-	if (day == 0)
-		return FALSE; /* it was a day outside the month's range */
-
-	child_num -= GNOME_MONTH_ITEM_DAY_GROUP;
-	box = gnome_month_item_num2child (mitem, GNOME_MONTH_ITEM_DAY_BOX + child_num);
-
-	/* Get colors */
-
-	func = gtk_object_get_data (GTK_OBJECT (mitem), "prelight_color_func");
-	func_data = gtk_object_get_data (GTK_OBJECT (mitem), "prelight_color_data");
-
-	/* Now actually set the proper color in the item */
-
-	switch (event->type) {
-	case GDK_ENTER_NOTIFY:
-		color = (* func) (COLOR_PROP_PRELIGHT_DAY_BG, func_data);
-		gnome_canvas_item_set (box,
-				       "fill_color", color,
-				       NULL);
-		break;
-
-	case GDK_LEAVE_NOTIFY:
-		attrs = get_attributes (mitem);
-		color = (* func) (attrs[child_num] ? COLOR_PROP_MARK_DAY_BG : COLOR_PROP_EMPTY_DAY_BG,
-				  func_data);
-		gnome_canvas_item_set (box,
-				       "fill_color", color,
-				       NULL);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	return TRUE;
-}
-
-void
-month_item_prepare_prelight (GnomeMonthItem *mitem, GetColorFunc func, gpointer func_data)
-{
-	GnomeCanvasItem *day_group;
-	int i;
-
-	g_return_if_fail (mitem != NULL);
-	g_return_if_fail (GNOME_IS_MONTH_ITEM (mitem));
-	g_return_if_fail (func != NULL);
-
-	/* Store the function in the object data */
-
-	gtk_object_set_data (GTK_OBJECT (mitem), "prelight_color_func", func);
-	gtk_object_set_data (GTK_OBJECT (mitem), "prelight_color_data", func_data);
-
-	/* Connect the appropriate signals to perform prelighting */
-
-	for (i = 0; i < 42; i++) {
-		day_group = gnome_month_item_num2child (GNOME_MONTH_ITEM (mitem), GNOME_MONTH_ITEM_DAY_GROUP + i);
-		gtk_signal_connect (GTK_OBJECT (day_group), "event",
-				    (GtkSignalFunc) day_event,
-				    mitem);
-	}
-}
-
-char *
-default_color_func (ColorProp propnum, gpointer data)
-{
-	return color_spec_from_prop (propnum);
-}
-
-
-
diff --git a/calendar/gui/mark.h b/calendar/gui/mark.h
deleted file mode 100644
index 76c82c580d..0000000000
--- a/calendar/gui/mark.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Evolution calendar - Functions to mark calendars
- *
- * Copyright (C) 1998 Red Hat Software, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef MARK_H
-#define MARK_H
-
-/*#include "calendar.h"*/
-#include "gnome-month-item.h"
-
-
-
-/* These are the fonts used for the montly calendars */
-
-#define HEADING_FONTSET         "-adobe-helvetica-medium-r-*-*-14-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-17-*-*-*-p-*-koi8-r,-*-*-medium-r-*-*-14-*-*-*-*-*-ksc5601.1987-0,*"
-#define TITLE_FONTSET           "-adobe-helvetica-bold-r-normal--12-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-14-*-*-*-p-*-koi8-r,-*-*-bold-r-normal--12-*-*-*-*-*-ksc5601.1987-0,*"
-#define DAY_HEADING_FONTSET     "-adobe-helvetica-medium-r-normal--10-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-11-*-*-*-p-*-koi8-r,-*-*-medium-r-normal--10-*-*-*-*-*-ksc5601.1987-0,*"
-#define NORMAL_DAY_FONTSET      "-adobe-helvetica-medium-r-normal--10-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-11-*-*-*-p-*-koi8-r,-*-*-medium-r-normal--10-*-*-*-*-*-ksc5601.1987-0,*"
-#define CURRENT_DAY_FONTSET     "-adobe-helvetica-bold-r-normal--12-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-14-*-*-*-p-*-koi8-r,-*-*-bold-r-normal--12-*-*-*-*-*-ksc5601.1987-0,*"
-#define BIG_DAY_HEADING_FONTSET "-adobe-helvetica-bold-r-normal--14-*-*-*-p-*-*-*,-cronyx-helvetica-bold-r-normal-*-17-*-*-*-p-*-koi8-r,-*-*-bold-r-normal--14-*-*-*-*-*-ksc5601.1987-0,*"
-#define BIG_NORMAL_DAY_FONTSET  "-adobe-helvetica-medium-r-normal--14-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-17-*-*-*-p-*-koi8-r,-*-*-medium-r-normal--14-*-*-*-*-*-ksc5601.1987-0,*"
-#define BIG_CURRENT_DAY_FONTSET "-adobe-helvetica-bold-r-normal--14-*-*-*-p-*-*-*,-cronyx-helvetica-bold-r-normal-*-17-*-*-*-p-*-koi8-r,-*-*-bold-r-normal--14-*-*-*-*-*-ksc5601.1987-0,*"
-#define EVENT_FONTSET           "-adobe-helvetica-medium-r-*-*-10-*-*-*-p-*-*-*,-cronyx-helvetica-medium-r-normal-*-11-*-*-*-p-*-koi8-r,-*-*-medium-r-normal--10-*-*-*-*-*-ksc5601.1987-0,*"
-
-
-/* Functions of this type are used by the marking functions to fetch color specifications.  Such
- * a function must return a color spec based on the property passed to it.
- */
-typedef char * (* GetColorFunc) (ColorProp propnum, gpointer data);
-
-
-/* Sets the user-configured colors and font for a month item.  It also tags the days as unmarked. */
-void colorify_month_item (GnomeMonthItem *month, GetColorFunc func, gpointer func_data);
-
-/* Takes a monthly calendar item and marks the days that have events
- * scheduled for them in the specified calendar.  It also highlights
- * the current day.
- */
-void mark_month_item (GnomeMonthItem *mitem, GnomeCalendar *cal);
-
-/* Marks a day specified by index, not by day number */
-void mark_month_item_index (GnomeMonthItem *mitem, int index, GetColorFunc func, gpointer func_data);
-
-/* Unmarks all the days in the specified month item */
-void unmark_month_item (GnomeMonthItem *mitem);
-
-/* Prepares a monthly calendar item to prelight when the mouse goes over the days. */
-
-void month_item_prepare_prelight (GnomeMonthItem *mitem, GetColorFunc func, gpointer func_data);
-
-/* This is the default prelight function you can use for most puposes.  You can use NULL as the
- * func_data.
- */
-char *default_color_func (ColorProp prop_num, gpointer data);
-
-
-
-#endif
diff --git a/calendar/gui/monthview.xpm b/calendar/gui/monthview.xpm
deleted file mode 100644
index 21c76151d5..0000000000
--- a/calendar/gui/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/calendar/gui/popup-menu.c b/calendar/gui/popup-menu.c
deleted file mode 100644
index 86821dcb4b..0000000000
--- a/calendar/gui/popup-menu.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Popup menu utilities for gncal
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <quartic@gimp.org>
- */
-
-#include <config.h>
-#include <gnome.h>
-#include "popup-menu.h"
-#include <gal/widgets/e-gui-utils.h>
-
-
-void
-popup_menu (struct menu_item *items, int nitems, GdkEventButton *event)
-{
-	GtkWidget *menu;
-	GtkWidget *item;
-	int i;
-
-	menu = gtk_menu_new ();
-
-	/* Make sure the menu is destroyed when it disappears. */
-	e_auto_kill_popup_menu_on_hide (GTK_MENU (menu));
-
-	for (i = 0; i < nitems; i++) {
-		if (items[i].text) {
-			item = gtk_menu_item_new_with_label (_(items[i].text));
-			gtk_signal_connect (GTK_OBJECT (item), "activate",
-					    items[i].callback,
-					    items[i].data);
-			gtk_widget_set_sensitive (item, items[i].sensitive);
-		} else
-			item = gtk_menu_item_new ();
-
-		gtk_widget_show (item);
-		gtk_menu_append (GTK_MENU (menu), item);
-	}
-
-	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, event->time);
-}
diff --git a/calendar/gui/popup-menu.h b/calendar/gui/popup-menu.h
deleted file mode 100644
index a4590dbb98..0000000000
--- a/calendar/gui/popup-menu.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Popup menu utilities for gncal
- *
- * Copyright (C) 1998 The Free Software Foundation
- *
- * Author: Federico Mena <quartic@gimp.org>
- */
-
-#ifndef POPUP_MENU_H
-#define POPUP_MENU_H
-
-#include <gdk/gdktypes.h>
-#include <gtk/gtksignal.h>
-
-
-struct menu_item {
-	char *text;
-	GtkSignalFunc callback;
-	gpointer data;
-	int sensitive;
-};
-
-void popup_menu (struct menu_item *items, int nitems, GdkEventButton *event);
-
-
-#endif
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
deleted file mode 100644
index 90d6161886..0000000000
--- a/calendar/gui/print.c
+++ /dev/null
@@ -1,1315 +0,0 @@
-/* Evolution calendar - Print support
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <sys/stat.h>
-#include <math.h>
-#include <gnome.h>
-#include <libgnomeprint/gnome-print.h>
-#include <libgnomeprint/gnome-print-copies.h>
-#include <libgnomeprint/gnome-print-master.h>
-#include <libgnomeprint/gnome-print-master-preview.h>
-#include <libgnomeprint/gnome-print-preview.h>
-#include <libgnomeprint/gnome-printer-dialog.h>
-#include <e-util/e-dialog-widgets.h>
-#include <gal/widgets/e-unicode.h>
-#include <cal-util/timeutil.h>
-#include "calendar-commands.h"
-#include "gnome-cal.h"
-#include "print.h"
-
-
-
-/* copied from gnome-month-item.c  this should be shared?? */
-
-/* Number of days in a month, for normal and leap years */
-static const int days_in_month[2][12] = {
-	{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
-	{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-};
-
-/* The weird month of September 1752, where 3 Sep through 13 Sep were eliminated due to the
- * Gregorian reformation.
- */
-static const int sept_1752[42] = {
-	 0,  0,  1,  2, 14, 15, 16,
-	17, 18, 19, 20, 21, 22, 23,
-	24, 25, 26, 27, 28, 29, 30,
-	 0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0,
-	 0,  0,  0,  0,  0,  0,  0
-};
-
-#define REFORMATION_DAY 639787		/* First day of the reformation, counted from 1 Jan 1 */
-#define MISSING_DAYS 11			/* They corrected out 11 days */
-#define THURSDAY 4			/* First day of reformation */
-#define SATURDAY 6			/* Offset value; 1 Jan 1 was a Saturday */
-#define SEPT_1752_START 2		/* Start day within month */
-#define SEPT_1752_END 20		/* End day within month */
-
-struct pdinfo
-{
-	GList *slots;
-};
-
-struct psinfo
-{
-	GList *events;
-};
-
-struct ptinfo
-{
-	GList *todos;
-};
-
-struct einfo
-{
-	char *text;
-	time_t start;
-	time_t end;
-	int count;
-};
-
-
-/* Returns the number of leap years since year 1 up to (but not including) the specified year */
-static int
-leap_years_up_to (int year)
-{
-	return (year / 4					/* trivial leapness */
-		- ((year > 1700) ? (year / 100 - 17) : 0)	/* minus centuries since 1700 */
-		+ ((year > 1600) ? ((year - 1600) / 400) : 0));	/* plus centuries since 1700 divisible by 400 */
-}
-
-/* Returns whether the specified year is a leap year */
-static int
-is_leap_year (int year)
-{
-	if (year <= 1752)
-		return !(year % 4);
-	else
-		return (!(year % 4) && (year % 100)) || !(year % 400);
-}
-
-/* Returns the 1-based day number within the year of the specified date */
-static int
-day_in_year (int day, int month, int year)
-{
-	int is_leap, i;
-
-	is_leap = is_leap_year (year);
-
-	for (i = 0; i < month; i++)
-		day += days_in_month [is_leap][i];
-
-	return day;
-}
-
-/* Returns the day of the week (zero-based, zero is Sunday) for the specified date.  For the days
- * that were removed on the Gregorian reformation, it returns Thursday.
- */
-static int
-day_in_week (int day, int month, int year)
-{
-	int n;
-
-	n = (year - 1) * 365 + leap_years_up_to (year - 1) + day_in_year (day, month, year);
-
-	if (n < REFORMATION_DAY)
-		return (n - 1 + SATURDAY) % 7;
-
-	if (n >= (REFORMATION_DAY + MISSING_DAYS))
-		return (n - 1 + SATURDAY - MISSING_DAYS) % 7;
-
-	return THURSDAY;
-}
-
-/* Fills the 42-element days array with the day numbers for the specified month.  Slots outside the
- * bounds of the month are filled with zeros.  The starting and ending indexes of the days are
- * returned in the start and end arguments.
- */
-static void
-build_month (int month, int year, int start_on_monday, int *days, int *start, int *end)
-{
-	int i;
-	int d_month, d_week;
-
-	/* Note that months are zero-based, so September is month 8 */
-
-	if ((year == 1752) && (month == 8)) {
-		memcpy (days, sept_1752, 42 * sizeof (int));
-
-		if (start)
-			*start = SEPT_1752_START;
-
-		if (end)
-			*end = SEPT_1752_END;
-
-		return;
-	}
-
-	for (i = 0; i < 42; i++)
-		days[i] = 0;
-
-	d_month = days_in_month[is_leap_year (year)][month];
-	d_week = day_in_week (1, month, year);
-
-	if (start_on_monday)
-		d_week = (d_week + 6) % 7;
-
-	for (i = 0; i < d_month; i++)
-		days[d_week + i] = i + 1;
-
-	if (start)
-		*start = d_week;
-
-	if (end)
-		*end = d_week + d_month - 1;
-}
-
-
-enum align_box {
-	ALIGN_LEFT=1,
-	ALIGN_RIGHT,
-	ALIGN_CENTRE,
-	ALIGN_BORDER= 1<<8
-};
-
-/* width = width of border, -'ve is no border
-   fillcolour = shade of fill, -'ve is no fill */
-static void
-print_border(GnomePrintContext *pc, double l, double r, double t, double b, double width, double fillcolour)
-{
-	int i;
-	gnome_print_gsave (pc);
-	if (fillcolour<0.0)
-		i=1;
-	else
-		i=0;
-	for (;i<2;i++) {
-		gnome_print_moveto(pc, l, t);
-		gnome_print_lineto(pc, l, b);
-		gnome_print_lineto(pc, r, b);
-		gnome_print_lineto(pc, r, t);
-		gnome_print_lineto(pc, l, t);
-		if (i==0) {
-			gnome_print_setrgbcolor(pc, fillcolour, fillcolour, fillcolour);
-			gnome_print_fill(pc);
-			if (width<0.0)
-				i=2;
-		} else {
-			gnome_print_setrgbcolor(pc, 0, 0, 0);
-			gnome_print_setlinewidth(pc, width);
-			gnome_print_stroke(pc);
-		}
-	}
-	gnome_print_grestore (pc);
-}
-
-/* outputs 1 line of aligned text in a box */
-static void
-print_text(GnomePrintContext *pc, GnomeFont *font, const char *text, enum align_box align, double l, double r, double t, double b)
-{
-	double w, x;
-	gnome_print_gsave (pc);
-	w = gnome_font_get_width_string(font, text);
-	switch (align&3) {
-	default:
-	case ALIGN_LEFT:
-		x = l;
-		break;
-	case ALIGN_RIGHT:
-		x = l+(r-l)-w-2;
-		break;
-	case ALIGN_CENTRE:
-		x = l+((r-l)-w)/2;
-		break;
-	}
-	gnome_print_moveto(pc, x, t - gnome_font_get_size (font));
-	gnome_print_setfont(pc, font);
-	gnome_print_setrgbcolor (pc, 0,0,0);
-	gnome_print_show(pc, text);
-	gnome_print_grestore (pc);
-}
-
-/* gets/frees the font for you, as a bold font */
-static void
-print_text_size(GnomePrintContext *pc, double size, const char *text, enum align_box align, double l, double r, double t, double b)
-{
-	GnomeFont *font;
-
-	font = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, size);
-	print_text(pc, font, text, align, l, r, t, b);
-	gtk_object_unref (GTK_OBJECT (font));
-}
-
-static void
-titled_box(GnomePrintContext *pc, const char *text, GnomeFont *font, enum align_box align, double *l, double *r, double *t, double *b, double linewidth)
-{
-	if (align&ALIGN_BORDER) {
-		gnome_print_gsave(pc);
-		print_border(pc, *l, *r, *t, *t-gnome_font_get_size(font)-gnome_font_get_size(font)*0.4, linewidth, 0.9);
-		print_border(pc, *l, *r, *t-gnome_font_get_size(font)-gnome_font_get_size(font)*0.4, *b, linewidth, -1.0);
-		gnome_print_grestore(pc);
-		*l+=2;
-		*r-=2;
-		*b+=2;
-	}
-	print_text(pc, font, text, align, *l, *r, *t, *b);
-	*t-=gnome_font_get_size(font)*1.4;
-}
-
-enum datefmt {
-	DATE_MONTH	= 1 << 0,
-	DATE_DAY	= 1 << 1,
-	DATE_DAYNAME	= 1 << 2,
-	DATE_YEAR	= 1 << 3
-};
-
-static char *days[] = {
-	N_("1st"), N_("2nd"), N_("3rd"), N_("4th"), N_("5th"),
-	N_("6th"), N_("7th"), N_("8th"), N_("9th"), N_("10th"),
-	N_("11th"), N_("12th"), N_("13th"), N_("14th"), N_("15th"),
-	N_("16th"), N_("17th"), N_("18th"), N_("19th"), N_("20th"),
-	N_("21st"), N_("22nd"), N_("23rd"), N_("24th"), N_("25th"),
-	N_("26th"), N_("27th"), N_("28th"), N_("29th"),	N_("30th"),
-	N_("31st")
-};
-
-/*
-  format the date 'nicely' and consistently for various headers
-*/
-static char *
-format_date(time_t time, int flags, char *buffer, int bufflen)
-{
-	char fmt[64];
-	struct tm tm;
-
-	tm = *localtime(&time);
-	fmt[0] = 0;
-	if (flags & DATE_DAYNAME) {
-		strcat(fmt, "%A");
-	}
-	if (flags & DATE_DAY) {
-		if (flags & DATE_DAYNAME)
-			strcat(fmt, " ");
-		strcat(fmt, gettext(days[tm.tm_mday-1]));
-	}
-	if (flags & DATE_MONTH) {
-		if (flags & (DATE_DAY|DATE_DAYNAME))
-			strcat(fmt, " ");
-		strcat(fmt, "%B");
-		if ((flags & (DATE_DAY|DATE_YEAR)) == (DATE_DAY|DATE_YEAR))
-			strcat(fmt, ",");
-	}
-	if (flags & DATE_YEAR) {
-		if (flags & (DATE_DAY|DATE_DAYNAME|DATE_MONTH))
-			strcat(fmt, " ");
-		strcat(fmt, "%Y");
-	}
-	strftime(buffer, bufflen, fmt, &tm);
-	return buffer;
-}
-
-
-/*
-  print out the month small, embolden any days with events.
-*/
-static void
-print_month_small (GnomePrintContext *pc, GnomeCalendar *gcal,
-		   time_t month, double left, double right, double top, double bottom,
-		   int titleflags, time_t greystart, time_t greyend, int bordertitle)
-{
-	CalClient *client;
-	GnomeFont *font, *font_bold, *font_normal;
-	time_t now, next;
-	int x, y;
-	int days[42];
-	int day;
-	char buf[100];
-	struct tm tm;
-	double xpad, ypad, size;
-	char *daynames[] = { _("Su"), _("Mo"), _("Tu"), _("We"), _("Th"), _("Fr"), _("Sa") };
-
-	client = gnome_calendar_get_cal_client (gcal);
-
-	xpad = (right-left)/7;
-	ypad = (top-bottom)/8.3;
-	if (xpad>ypad)
-		size=ypad;
-	else
-		size=xpad;
-
-	size = (xpad+ypad)/3.0;
-
-        tm = *localtime (&month);
-
-	/* get month days */
-	build_month(tm.tm_mon, tm.tm_year+1900, week_starts_on_monday, days, 0, 0);
-
-	/* build day-busy bits */
-	now = time_month_begin(month);
-
-	/* get title */
-	format_date(month, titleflags, buf, 100);
-	font = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 1, size*1.2); /* title font */
-	if (bordertitle)
-		print_border(pc,
-			     left, left+7*xpad, top, top-gnome_font_get_size(font)*1.3,
-			     1.0, 0.9);
-	print_text(pc, font, buf, ALIGN_CENTRE,
-		   left, left+7*xpad, top, top - gnome_font_get_size (font));
-	gtk_object_unref (GTK_OBJECT (font));
-
-	font_normal = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, size);
-	font_bold = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, size);
-
-	gnome_print_setrgbcolor (pc, 0,0,0);
-	for (x=0;x<7;x++) {
-		print_text(pc, font_bold, daynames[(week_starts_on_monday?x+1:x)%7], ALIGN_CENTRE,
-			   left+x*xpad, left+(x+1)*xpad, bottom+7*ypad, bottom+7*ypad-gnome_font_get_size(font_bold));
-	}
-
-	for (y=0;y<6;y++) {
-		for (x=0;x<7;x++) {
-			day = days[y*7+x];
-			if (day!=0) {
-				GList *uids;
-
-				sprintf(buf, "%d", day);
-
-				/* this is a slow messy way to do this ... but easy ... */
-				uids = cal_client_get_objects_in_range (client,
-									CALOBJ_TYPE_EVENT,
-									now, time_day_end (now));
-				font = uids ? font_bold : font_normal;
-				cal_obj_uid_list_free (uids);
-
-				next = time_add_day(now, 1);
-				if ((now>=greystart && now<greyend)
-				    || (greystart>=now && greystart<next)) {
-					print_border(pc,
-						     left+x*xpad+xpad*0.1,
-						     left+(x+1)*xpad+xpad*0.1,
-						     bottom+(5-y)*ypad+gnome_font_get_size(font)-ypad*0.15,
-						     bottom+(5-y)*ypad-ypad*0.15,
-						     -1.0, 0.75);
-				}
-				print_text(pc, font, buf, ALIGN_RIGHT,
-					   left+x*xpad, left+(x+1)*xpad, bottom+(5-y)*ypad+gnome_font_get_size(font), bottom+(5-y)*ypad);
-				now = next;
-			}
-		}
-	}
-	gtk_object_unref (GTK_OBJECT (font_normal));
-	gtk_object_unref (GTK_OBJECT (font_bold));
-}
-
-
-
-/* wraps text into the print context, not taking up more than its allowed space */
-static double
-bound_text(GnomePrintContext *pc, GnomeFont *font, const char *text,
-	   double left, double right, double top, double bottom, double indent)
-{
-	double maxwidth = right-left;
-	double width;
-	const char *p;
-	char *wordstart;
-	int c;
-	char *outbuffer, *o, *outbuffendmarker;
-	int outbufflen;
-	int dump=0;
-	int first=1;
-
-	g_return_val_if_fail(text!=NULL, top);
-
-	if (top<bottom) {
-		/* too much to fit in appointment printout */
-		return top;
-	}
-
-	outbufflen = 1024;
-	outbuffer = g_malloc(outbufflen);
-	outbuffendmarker = outbuffer+outbufflen-2;
-
-	top -= gnome_font_get_size (font);
-	gnome_print_setfont (pc, font);
-
-	width=0;
-	p = text;
-	wordstart = outbuffer;
-	o = outbuffer;
-	while ((c=*p)) {
-		if (c=='\n') {
-			wordstart=o;
-			dump=1;
-		} else {
-			/* grow output buffer if required */
-			if (o>=outbuffendmarker) {
-				char *newbuf;
-				outbufflen*=2;
-				newbuf = g_realloc(outbuffer, outbufflen);
-				o = newbuf+(o-outbuffer);
-				wordstart = newbuf+(o-outbuffer);
-				outbuffer = newbuf;
-				outbuffendmarker = outbuffer+outbufflen-2;
-			}
-			*o++=c;
-			if (c==' ')
-				wordstart = o;
-			width+=gnome_font_get_glyph_width(font, gnome_font_lookup_default (font, c));
-			if (width>maxwidth)
-				dump=1;
-			else
-				dump=0;
-		}
-		if (dump) {
-			if (wordstart==outbuffer)
-				wordstart=o;
-			c=*wordstart;
-			*wordstart=0;
-			gnome_print_moveto(pc, left, top);
-			gnome_print_show(pc, outbuffer);
-			*wordstart=c;
-			memcpy(outbuffer, wordstart, o-wordstart);
-			width = gnome_font_get_width_string_n(font, outbuffer, o-wordstart);
-			o=outbuffer+(o-wordstart);
-			wordstart = outbuffer;
-			top -= gnome_font_get_size (font);
-			if (top<bottom) {
-				/* too much to fit, drop the rest */
-				g_free(outbuffer);
-				return top;
-			}
-			if (first) {
-				left += indent;
-				maxwidth -= indent;
-				first=0;
-			}
-		}
-		p++;
-	}
-	if (dump==0) {
-		*o=0;
-		gnome_print_moveto(pc, left, top);
-		gnome_print_show(pc, outbuffer);
-		top -= gnome_font_get_size (font);
-	}
-	g_free(outbuffer);
-	return top;
-}
-
-/*
- * Print Day Details
- */
-static gboolean
-print_day_details_cb (CalComponent *comp, time_t istart, time_t iend, gpointer data)
-{
-	CalComponentText text;
-	GList *l, *col = NULL;
-	struct pdinfo *pdi = (struct pdinfo *)data;
-	struct einfo *ei;
-
-	ei = g_new (struct einfo, 1);
-
-	cal_component_get_summary (comp, &text);
-	ei->text = g_strdup (text.value);
-
-	ei->start = istart;
-	ei->end = iend;
-	ei->count = 0;
-
-	for (l = pdi->slots; l; l = l->next) {
-		struct einfo *testei;
-
-		col = (GList *)l->data;
-		testei = (struct einfo *)col->data;
-
-		if (ei->start >= testei->end) {
-			col = g_list_prepend (col, ei);
-			l->data = col;
-			return TRUE;
-		}
-
-		testei->count++;
-		ei->count++;
-	}
-
-	col = NULL;
-	col = g_list_prepend (col, ei);
-	pdi->slots = g_list_append (pdi->slots, col);
-
-	return TRUE;
-}
-
-static void
-print_day_details (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		   double left, double right, double top, double bottom)
-{
-	CalClient *client;
-	struct pdinfo pdi;
-	time_t start, end;
-	GList *l;
-	int num_slots, i;
-	GnomeFont *font_hour, *font_minute, *font_summary;
-	double yinc, y, yend, x, xend;
-	double width=40, slot_width;
-	char buf[20];
-
-	client = gnome_calendar_get_cal_client (gcal);
-
-	yinc = (top-bottom)/24;
-
-	/* fill static detail */
-	font_hour = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, yinc/2);
-	font_minute = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, yinc/3);
-	font_summary = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, yinc/3);
-
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-
-	/* internal lines */
-	gnome_print_setlinewidth(pc, 0.0);
-	gnome_print_moveto(pc, left+width, bottom);
-	gnome_print_lineto(pc, left+width, top);
-	gnome_print_stroke (pc);
-
-	for (i=0;i<24;i++) {
-		y = top - yinc*(i+1);
-		print_border(pc, left+1, left+width-1, y, y+yinc-1, -1.0, 0.9);
-		gnome_print_setrgbcolor (pc, 0, 0, 0);
-
-		/* the hour label/minute */
-		sprintf(buf, "%d", i);
-		print_text(pc, font_hour, buf, ALIGN_RIGHT, left, left+width/2, y+yinc, y);
-		switch(i) {
-		case 12: sprintf(buf, _("pm")); break;
-		case 0: sprintf(buf, _("am")); break;
-		default: sprintf(buf, "00"); break;
-		}
-		print_text(pc, font_minute, buf, ALIGN_LEFT, left+width/2, left+width/2, y+yinc, y);
-
-		/* internal lines */
-		gnome_print_moveto(pc, left+width, y);
-		gnome_print_lineto(pc, right, y);
-		gnome_print_stroke (pc);
-		gnome_print_moveto(pc, left+width/2, y+yinc/2);
-		gnome_print_lineto(pc, right, y+yinc/2);
-		gnome_print_stroke (pc);
-
-	}
-
-	start = time_day_begin(whence);
-	end = time_day_end(start);
-
-	pdi.slots = NULL;
-
-	cal_client_generate_instances (client, CALOBJ_TYPE_EVENT, start, end,
-				       print_day_details_cb, &pdi);
-
-	num_slots = g_list_length (pdi.slots);
-	slot_width = (right-left-width)/num_slots;
-
-	for (i = num_slots, l = pdi.slots; l; i--, l = l->next) {
-		GList *e = (GList *)l->data;
-
-		for (; e; e = e->next) {
-			struct einfo *ei = (struct einfo *)e->data;
-
-			y = top - (top - bottom) * (ei->start - start) / (end - start) - 1;
-			yend = top - (top - bottom) * (ei->end - start) / (end - start) + 1;
-			x = left + width + slot_width * (num_slots - i);
-
-			if (num_slots > 0)
-				x++;
-
-			if (i == 0)
-				xend = x + (num_slots - ei->count) * slot_width - 2;
-			else
-				xend = x + slot_width - 2;
-
-			print_border (pc, x, xend, y, yend, 0.0, 0.9);
-
-			bound_text (pc, font_summary, ei->text, x, xend, y, yend, 0);
-
-			g_free (ei);
-		}
-		g_list_free (e);
-	}
-	g_list_free (pdi.slots);
-
-	print_border (pc, left, right, top, bottom, 1.0, -1.0);
-
-	gtk_object_unref (GTK_OBJECT (font_hour));
-	gtk_object_unref (GTK_OBJECT (font_minute));
-	gtk_object_unref (GTK_OBJECT (font_summary));
-}
-
-/*
- * Print Day Summary
- */
-#if 0
-#define TIME_FMT "%X"
-#else
-#define TIME_FMT "%l:%M%p"
-#endif
-
-static gboolean
-print_day_summary_cb (CalComponent *comp, time_t istart, time_t iend, gpointer data)
-{
-	CalComponentText text;
-	struct psinfo *psi = (struct psinfo *)data;
-	struct einfo *ei;
-
-	ei = g_new (struct einfo, 1);
-
-	cal_component_get_summary (comp, &text);
-	ei->text = g_strdup (text.value);
-
-	ei->start = istart;
-	ei->end = iend;
-	ei->count = 0;
-
-	psi->events = g_list_append (psi->events, ei);
-
-	return TRUE;
-}
-
-static void
-print_day_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		   double left, double right, double top, double bottom,
-		   double size, int totime, int titleformat)
-{
-	CalClient *client;
-	struct psinfo psi;
-	time_t start, end;
-	GList *l;
-	GnomeFont *font_summary;
-	double y, yend, x, xend, inc, incsmall;
-	char buf[100];
-	double margin;
-	struct tm tm;
-
-	client = gnome_calendar_get_cal_client (gcal);
-
-	/* fill static detail */
-	font_summary = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, size);
-
-	gnome_print_setfont (pc, font_summary);
-
-	start = time_day_begin(whence);
-	end = time_day_end(start);
-
-	tm = *localtime(&start);
-
-	format_date(start, titleformat, buf, 100);
-	titled_box (pc, buf, font_summary, ALIGN_RIGHT | ALIGN_BORDER,
-		    &left, &right, &top, &bottom, 0.0);
-
-	psi.events = NULL;
-
-	cal_client_generate_instances (client, CALOBJ_TYPE_EVENT, start, end,
-				       print_day_summary_cb, &psi);
-	inc = size*0.3;
-	incsmall = size*0.2;
-
-	y = top-inc;
-	yend = bottom-incsmall;
-
-	/* do a good rough approximation of the 'widest' time */
-	tm.tm_year = 2000;
-	tm.tm_mon = 12;
-	tm.tm_mday = 22;
-	tm.tm_sec = 22;
-	tm.tm_min = 22;
-	tm.tm_hour = 23;
-	strftime(buf, 100, TIME_FMT, &tm);
-	margin = gnome_font_get_width_string(font_summary, buf);
-
-	for (l = psi.events; l; l = l->next) {
-		struct einfo *ei = (struct einfo *)l->data;
-
-		x = left + incsmall;
-		xend = right - inc;
-
-		if (y - gnome_font_get_size (font_summary) < bottom)
-			break;
-
-		tm = *localtime (&ei->start);
-		strftime (buf, 100, TIME_FMT, &tm);
-		gnome_print_moveto (pc, x + (margin
-					     - gnome_font_get_width_string (font_summary, buf)),
-				    y - gnome_font_get_size (font_summary));
-		gnome_print_show (pc, buf);
-
-		if (totime) {
-			tm = *localtime (&ei->end);
-			strftime (buf, 100, TIME_FMT, &tm);
-			gnome_print_moveto (pc,
-					    (x + margin + inc
-					     + (margin
-						- gnome_font_get_width_string (font_summary, buf))),
-					    y - gnome_font_get_size (font_summary));
-			gnome_print_show (pc, buf);
-
-			y = bound_text (pc, font_summary, ei->text,
-					x + margin * 2 + inc * 2, xend,
-					y, yend, 0);
-		} else {
-			/* we also indent back after each time is printed */
-			y = bound_text (pc, font_summary, ei->text,
-					x + margin + inc, xend,
-					y, yend, -margin + inc);
-		}
-
-		y += gnome_font_get_size (font_summary) - inc;
-
-		g_free (ei);
-	}
-	g_list_free (psi.events);
-
-	gtk_object_unref (GTK_OBJECT (font_summary));
-}
-
-static void
-print_week_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		    double left, double right, double top, double bottom)
-{
-	double y, l, r, t, b;
-	time_t now;
-	int i;
-
-	l = left;
-	r = (right-left)/2+left;
-	t = top;
-	y = (top-bottom)/3;
-	b = top-y;
-	now = time_week_begin(whence); /* returns sunday, we need monday */
-	now = time_add_day(now, 1);
-	for (i = 0; i < 7; i++) {
-		print_day_summary (pc, gcal, now, l, r, t, b,
-				   10, TRUE, DATE_DAY | DATE_DAYNAME | DATE_MONTH);
-		now = time_add_day (now, 1);
-		switch (i) {
-		case 5:
-			y /= 2.0;
-			b += y;
-		case 0:
-		case 1:
-		case 3:
-		case 4:
-			t -= y;
-			b -= y;
-			break;
-		case 2:
-			l = r;
-			r = right;
-			t = top;
-			b = t-y;
-			break;
-		case 6:
-			break;
-		}
-	}
-}
-
-static void
-print_year_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		    double left, double right, double top, double bottom, int morerows)
-{
-	double y, x, l, r, t, b;
-	time_t now;
-	int xx, yy, rows, cols;
-
-	l = left;
-	t = top;
-	if (morerows) {
-		rows=4;
-		cols=3;
-	} else {
-		rows=3;
-		cols=4;
-	}
-	y = (top-bottom)/rows;
-	x = (right-left)/cols;
-	r = l+x;
-	b = top-y;
-	now = time_year_begin(whence);
-	for (yy = 0; yy < rows; yy++) {
-		t = top - y * yy;
-		b = t - y;
-		for (xx = 0; xx < cols; xx++) {
-			l = left + x * xx;
-			r = l + x;
-			print_month_small (pc, gcal, now,
-					   l + 8, r - 8, t - 8, b + 8, DATE_MONTH, 0, 0, TRUE);
-			now = time_add_month (now, 1);
-		}
-	}
-}
-
-static void
-print_month_summary (GnomePrintContext *pc, GnomeCalendar *gcal, time_t whence,
-		     double left, double right, double top, double bottom)
-{
-	time_t now, today;
-	int days[42];
-	int day;
-	struct tm tm;
-	int x, y;
-	char buf[100];
-	GnomeFont *font_days;
-
-	now = time_month_begin(whence);
-        tm = *localtime (&now);
-
-	/* get month days */
-	build_month(tm.tm_mon, tm.tm_year+1900, week_starts_on_monday, days, 0, 0);
-
-	/* a little margin */
-	top -= 4;
-
-	/* do day names ... */
-	font_days = gnome_font_new_closest ("Times", GNOME_FONT_BOLD, 0, 10);
-	gnome_print_setfont(pc, font_days);
-	for (x=0;x<7;x++) {
-		today = time_add_day(now, days[6+x]);
-		format_date(today, DATE_DAYNAME, buf, 100);
-		print_text(pc, font_days, buf, ALIGN_CENTRE,
-			   (right-left)*x/7+left, (right-left)*(x+1)/7+left,
-			   top, top-gnome_font_get_size(font_days));
-	}
-	top -= gnome_font_get_size(font_days)*1.5;
-	gtk_object_unref (GTK_OBJECT (font_days));
-
-	for (y=0;y<6;y++) {
-		for (x=0;x<7;x++) {
-			day = days[y*7+x];
-			if (day!=0) {
-				print_day_summary (pc, gcal, now,
-						   (right-left)*x/7+left,
-						   (right-left)*(x+1)/7+left,
-						   top - (top-bottom)*y/6,
-						   top - (top-bottom)*(y+1)/6, 6, FALSE,
-						   day==1?(DATE_DAY|DATE_MONTH):DATE_DAY);
-				now = time_add_day(now, 1);
-			}
-		}
-	}
-}
-
-static void
-print_todo_details (GnomePrintContext *pc, GnomeCalendar *gcal, time_t start, time_t end,
-		    double left, double right, double top, double bottom)
-{
-	CalClient *client;
-	GList *uids;
-	GList *l;
-	GnomeFont *font_summary;
-	double y, yend, x, xend;
-
-	client = gnome_calendar_get_cal_client (gcal);
-
-	font_summary = gnome_font_new_closest ("Times", GNOME_FONT_BOOK, 0, 10);
-
-	gnome_print_setrgbcolor (pc, 0, 0, 0);
-	gnome_print_setlinewidth (pc, 0.0);
-
-	titled_box (pc, _("Tasks"), font_summary,
-		    ALIGN_CENTRE | ALIGN_BORDER, &left, &right, &top, &bottom, 1.0);
-
-	y = top - 3;
-	yend = bottom - 2;
-
-	uids = cal_client_get_uids (client, CALOBJ_TYPE_TODO);
-
-	for (l = uids; l; l = l->next) {
-		char *uid;
-		CalComponent *comp;
-		CalClientGetStatus status;
-		CalComponentText summary;
-
-		uid = l->data;
-
-		status = cal_client_get_object (client, uid, &comp);
-
-		switch (status) {
-		case CAL_CLIENT_GET_SUCCESS:
-			break;
-
-		case CAL_CLIENT_GET_NOT_FOUND:
-			/* Nothing: the object may have been removed from the server */
-			continue;
-
-		case CAL_CLIENT_GET_SYNTAX_ERROR:
-			g_message ("print_todo_details(): Syntax error while getting object `%s'",
-				   uid);
-			continue;
-
-		default:
-			g_assert_not_reached ();
-		}
-
-		cal_component_get_summary (comp, &summary);
-
-		if (!summary.value)
-			continue;
-
-		x = left;
-		xend = right - 2;
-
-		if (y < bottom)
-			break;
-
-		y = bound_text (pc, font_summary, summary.value, x + 2, xend, y, yend, 0);
-		y += gnome_font_get_size (font_summary);
-		gnome_print_moveto (pc, x, y - 3);
-		gnome_print_lineto (pc, xend, y - 3);
-		gnome_print_stroke (pc);
-		y -= 3;
-	}
-
-	cal_obj_uid_list_free (uids);
-
-	gtk_object_unref (GTK_OBJECT (font_summary));
-}
-
-#if 0
-
-static GnomePrintContext *
-print_context (int preview, char *paper)
-{
-	GtkWidget *toplevel, *canvas, *sw;
-	GnomePrinter *printer;
-	GnomePrintContext *pc;
-
-	if (preview) {
-		gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-		gtk_widget_push_visual (gdk_rgb_get_visual ());
-
-		toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-		gtk_widget_set_usize (toplevel, 700, 700);
-		sw = gtk_scrolled_window_new (NULL, NULL);
-		canvas = gnome_canvas_new_aa ();
-		gtk_container_add (GTK_CONTAINER (toplevel), sw);
-		gtk_container_add (GTK_CONTAINER (sw), canvas);
-
-		gnome_canvas_set_pixels_per_unit((GnomeCanvas *)canvas, 1);
-
-		pc = gnome_print_preview_new ((GnomeCanvas *)canvas, paper);
-
-		gtk_widget_show_all (toplevel);
-
-		gtk_widget_pop_visual ();
-		gtk_widget_pop_colormap ();
-	} else {
-		printer = gnome_printer_dialog_new_modal ();
-
-		if (!printer)
-			return NULL;
-
-		pc = gnome_print_context_new_with_paper_size (printer, paper);
-	}
-
-	return pc;
-}
-
-#endif
-
-/* Value for the PrintView enum */
-static const int print_view_map[] = {
-	PRINT_VIEW_DAY,
-	PRINT_VIEW_WEEK,
-	PRINT_VIEW_MONTH,
-	PRINT_VIEW_YEAR,
-	-1
-};
-
-/* Creates the range selector widget for printing a calendar */
-static GtkWidget *
-range_selector_new (GtkWidget *dialog, time_t at, int *view)
-{
-	GtkWidget *box;
-	GtkWidget *radio;
-	GSList *group;
-	char text[1024];
-	char str1[512];
-	char str2[512];
-	struct tm tm;
-	time_t week_begin, week_end;
-	struct tm week_begin_tm, week_end_tm;
-
-	box = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
-
-	tm = *localtime (&at);
-
-	/* Day */
-
-	strftime (text, sizeof (text), _("Current day (%a %b %d %Y)"), &tm);
-	radio = gtk_radio_button_new_with_label (NULL, text);
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
-
-	/* Week */
-
-	week_begin = time_week_begin (at);
-	week_end = time_add_day (time_week_end (at), -1);
-
-	week_begin_tm = *localtime (&week_begin);
-	week_end_tm = *localtime (&week_end);
-
-	if (week_begin_tm.tm_mon == week_end_tm.tm_mon) {
-		strftime (str1, sizeof (str1), _("%a %b %d"), &week_begin_tm);
-		strftime (str2, sizeof (str2), _("%a %d %Y"), &week_end_tm);
-	} else {
-		if (week_begin_tm.tm_year == week_end_tm.tm_year) {
-			strftime (str1, sizeof (str1), _("%a %b %d"), &week_begin_tm);
-			strftime (str2, sizeof (str2), _("%a %b %d %Y"), &week_end_tm);
-		} else {
-			strftime (str1, sizeof (str1), _("%a %b %d %Y"), &week_begin_tm);
-			strftime (str2, sizeof (str2), _("%a %b %d %Y"), &week_end_tm);
-		}
-	}
-
-	g_snprintf (text, sizeof (text), _("Current week (%s - %s)"), str1, str2);
-
-	radio = gtk_radio_button_new_with_label (group, text);
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
-
-	/* Month */
-
-	strftime (text, sizeof (text), _("Current month (%b %Y)"), &tm);
-	radio = gtk_radio_button_new_with_label (group, text);
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
-
-	/* Year */
-
-	strftime (text, sizeof (text), _("Current year (%Y)"), &tm);
-	radio = gtk_radio_button_new_with_label (group, text);
-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));
-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);
-
-	/* Select default */
-
-	e_dialog_widget_hook_value (dialog, radio, view, (gpointer) print_view_map);
-
-	gtk_widget_show_all (box);
-	return box;
-}
-
-void
-print_calendar (GnomeCalendar *gcal, gboolean preview, time_t at, PrintView default_view)
-{
-	GnomePrinter *printer;
-	GnomePrintMaster *gpm;
-	GnomePrintContext *pc;
-	int copies, collate;
-	const GnomePaper *paper_info;
-	double l, r, t, b, todo, header;
-	char buf[100];
-	time_t when;
-
-	g_return_if_fail (gcal != NULL);
-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	printer = NULL;
-	copies = 1;
-	collate = FALSE;
-
-	if (!preview) {
-		GtkWidget *gpd;
-		GtkWidget *range;
-		int view;
-
-		gpd = gnome_print_dialog_new (_("Print Calendar"),
-					      GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);
-
-		view = (int) default_view;
-		range = range_selector_new (gpd, at, &view);
-		gnome_print_dialog_construct_range_custom (GNOME_PRINT_DIALOG (gpd), range);
-
-		gnome_dialog_set_default (GNOME_DIALOG (gpd), GNOME_PRINT_PRINT);
-
-		/* Run dialog */
-
-		switch (gnome_dialog_run (GNOME_DIALOG (gpd))) {
-		case GNOME_PRINT_PRINT:
-			break;
-
-		case GNOME_PRINT_PREVIEW:
-			preview = TRUE;
-			break;
-
-		case -1:
-			return;
-
-		default:
-			gnome_dialog_close (GNOME_DIALOG (gpd));
-			return;
-		}
-
-		e_dialog_get_values (gpd);
-		default_view = (PrintView) view;
-
-		gnome_print_dialog_get_copies (GNOME_PRINT_DIALOG (gpd), &copies, &collate);
-		printer = gnome_print_dialog_get_printer (GNOME_PRINT_DIALOG (gpd));
-
-		gnome_dialog_close (GNOME_DIALOG (gpd));
-	}
-
-	/* FIXME: allow configuration of paper size */
-
-	gpm = gnome_print_master_new ();
-
-	paper_info = gnome_paper_with_name (gnome_paper_name_default ());
-	gnome_print_master_set_paper (gpm, paper_info);
-
-	if (printer)
-		gnome_print_master_set_printer (gpm, printer);
-
-	gnome_print_master_set_copies (gpm, copies, collate);
-
-	pc = gnome_print_master_get_context (gpm);
-
-	l = gnome_paper_lmargin (paper_info);
-	r = gnome_paper_pswidth (paper_info) - gnome_paper_rmargin (paper_info);
-	t = gnome_paper_psheight (paper_info) - gnome_paper_tmargin (paper_info);
-	b = gnome_paper_bmargin (paper_info);
-
-	/* depending on the view, do a different output */
-	switch (default_view) {
-	case PRINT_VIEW_DAY: {
-		int i, days = 1;
-
-		for (i = 0; i < days; i++) {
-			todo = ((r - l) / 5) * 4 + l;
-			header = t - 70;
-			print_todo_details (pc, gcal, 0, INT_MAX, todo, r, header, b);
-			print_day_details (pc, gcal, at, l, todo - 2.0, header, b);
-
-			print_border (pc, l, r, t, header + 2.0, 1.0, 0.9);
-
-			print_month_small (pc, gcal, at, r - 190, r - 104, t - 4,
-					   header + 8, DATE_MONTH | DATE_YEAR, at, at, FALSE);
-			print_month_small (pc, gcal, time_add_month (at, 1), r - 90, r - 4, t - 4,
-					   header + 8, DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
-
-			format_date (at, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);
-			print_text_size (pc, 24, buf, ALIGN_LEFT, l + 3, todo, t - 3, header);
-
-			format_date (at, DATE_DAYNAME, buf, 100);
-			print_text_size (pc, 18, buf, ALIGN_LEFT, l + 3, todo, t - 27 - 4, header);
-			gnome_print_showpage (pc);
-			at = time_add_day (at, 1);
-		}
-		break;
-	}
-
-	case PRINT_VIEW_WEEK:
-		header = t - 70;
-		print_week_summary (pc, gcal, at, l, r, header, b);
-
-		/* more solid total outline */
-		print_border (pc, l, r, header, b, 1.0, -1.0);
-
-		/* header border */
-		print_border (pc, l, r, t, header + 2.0, 1.0, 0.9);
-
-		when = time_week_begin (at);
-		when = time_add_day (when, 1);
-
-		print_month_small (pc, gcal, at, r - 90, r - 4, t - 4,
-				   header + 8, DATE_MONTH | DATE_YEAR, when, time_add_week (when, 1),
-				   FALSE);
-		print_month_small (pc, gcal, time_add_month (at, -1), r - 190, r - 104, t - 4,
-				   header + 8, DATE_MONTH | DATE_YEAR, when, time_add_week (when, 1),
-				   FALSE);
-
-		format_date (when, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);
-		print_text_size (pc, 24, buf, ALIGN_LEFT, l + 3, r, t - 4, header);
-
-		when = time_add_day (when, 6);
-		format_date (when, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);
-		print_text_size (pc, 24, buf, ALIGN_LEFT, l + 3, r, t - 24 - 3, header);
-		gnome_print_showpage (pc);
-		break;
-
-	case PRINT_VIEW_MONTH:
-		header = t - 70;
-		gnome_print_rotate (pc, 90);
-		gnome_print_translate (pc, 0, -gnome_paper_pswidth (paper_info));
-		/*print_month_summary(pc, cal, at, l, r, header, b);*/
-		print_month_summary (pc, gcal, at, b, t, r - 70, l);
-
-		print_border (pc, b, t, r, r - 72.0, 1.0, 0.9);
-
-		print_month_small (pc, gcal, time_add_month (at, 1),
-				   t - (t - b) / 7 + 2, t - 8, r - 4, r - 68,
-				   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
-		print_month_small (pc, gcal, time_add_month (at, -1),
-				   b + 8, b + (t - b) / 7 - 2, r - 4, r - 68,
-				   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
-
-		/* centered title */
-		format_date (at, DATE_MONTH | DATE_YEAR, buf, 100);
-		print_text_size (pc, 24, buf, ALIGN_CENTRE, b + 3, t, r - 3, l);
-		gnome_print_showpage (pc);
-		break;
-
-	case PRINT_VIEW_YEAR:
-#if 0
-		/* landscape */
-		gnome_print_rotate(pc, 90);
-		gnome_print_translate(pc, 0, -gnome_paper_pswidth(paper_info));
-		print_year_summary(pc, gcal, at, b, t, r-50, l, FALSE);
-
-		/* centered title */
-		format_date(at, DATE_YEAR, buf, 100);
-		print_text_size(pc, 24, buf, ALIGN_CENTRE, b+3, t, r-3, l);
-#else
-		/* portrait */
-		print_year_summary(pc, gcal, at, l, r, t-50, b, TRUE);
-
-		/* centered title */
-		format_date(at, DATE_YEAR, buf, 100);
-		print_text_size(pc, 24, buf, ALIGN_CENTRE, l+3, r, t-3, b);
-#endif
-		gnome_print_showpage(pc);
-		break;
-
-	default:
-		g_assert_not_reached ();
-	}
-
-	gnome_print_master_close (gpm);
-
-	if (preview) {
-		GnomePrintMasterPreview *gpmp;
-
-		gpmp = gnome_print_master_preview_new (gpm, _("Print Preview"));
-		gtk_widget_show (GTK_WIDGET (gpmp));
-	} else
-		gnome_print_master_print (gpm);
-
-	gtk_object_unref (GTK_OBJECT (gpm));
-}
diff --git a/calendar/gui/print.h b/calendar/gui/print.h
deleted file mode 100644
index e88c4a8e01..0000000000
--- a/calendar/gui/print.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Evolution calendar - Print support
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Michael Zucchi <notzed@helixcode.com>
- *          Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef PRINT_H
-#define PRINT_H
-
-#include "gnome-cal.h"
-
-
-
-typedef enum {
-	PRINT_VIEW_DAY,
-	PRINT_VIEW_WEEK,
-	PRINT_VIEW_MONTH,
-	PRINT_VIEW_YEAR
-} PrintView;
-
-void print_calendar (GnomeCalendar *gcal, gboolean preview, time_t at, PrintView default_view);
-
-
-
-#endif
diff --git a/calendar/gui/prop.c b/calendar/gui/prop.c
deleted file mode 100644
index e7e75c6c9b..0000000000
--- a/calendar/gui/prop.c
+++ /dev/null
@@ -1,941 +0,0 @@
-/* Calendar properties dialog box
- *
- * Copyright (C) 1998 the Free Software Foundation
- *
- * Authors: Miguel de Icaza <miguel@kernel.org>
- *          Federico Mena <federico@nuclecu.unam.mx>
- */
-#include <config.h>
-#ifdef HAVE_LANGINGO_H
-#include <langinfo.h>
-#else
-#include <locale.h>
-#endif
-#include <gnome.h>
-#include "gnome-cal.h"
-#include "gnome-month-item.h"
-#include "calendar-commands.h"
-#include "mark.h"
-
-/* These specify the page numbers in the preferences notebook */
-enum {
-	PROP_TIME_DISPLAY,
-	PROP_COLORS,
-	PROP_TODO,
-	PROP_ALARMS
-};
-
-static GtkWidget *prop_win;		/* The preferences dialog */
-
-/* Widgets for the time display page */
-
-static GtkWidget *time_format_12;	/* Radio button for 12-hour format */
-static GtkWidget *time_format_24;	/* Radio button for 24-hour format */
-static GtkWidget *start_on_sunday;	/* Check button for weeks starting on Sunday */
-static GtkWidget *start_on_monday;	/* Check button for weeks starting on Monday */
-static GtkWidget *start_omenu;		/* Option menu for start of day */
-static GtkWidget *end_omenu;		/* Option menu for end of day */
-static GtkWidget *start_items[24];	/* Menu items for start of day menu */
-static GtkWidget *end_items[24];	/* Menu items for end of day menu */
-
-/* Widgets for the colors page */
-
-static GtkWidget *color_pickers[COLOR_PROP_LAST];
-static GnomeCanvasItem *month_item;
-
-/* Widgets for the todo page */
-static GtkWidget *due_date_show_button;
-
-static GtkWidget *todo_item_time_remaining_show_button;
-
-static GtkWidget *todo_item_highlight_overdue;
-static GtkWidget *todo_item_highlight_not_due_yet;
-static GtkWidget *todo_item_highlight_due_today;
-
-static GtkWidget *priority_show_button;
-
-/* Widgets for the alarm page */
-static GtkWidget *enable_display_beep;
-static GtkWidget *to_cb;
-static GtkWidget *to_spin;
-static GtkWidget *snooze_cb;
-static GtkWidget *snooze_spin;
-
-/* prototypes */
-#if 0
-static void prop_apply_alarms (void);
-#endif
-static void create_alarm_page (void);
-static void to_cb_changed (GtkWidget* object, gpointer data);
-static void snooze_cb_changed (GtkWidget* object, gpointer data);
-
-GtkWidget* make_spin_button (int val, int low, int high);
-#if 0
-void ee_create_ae (GtkTable *table, char *str, CalendarAlarm *alarm,
-		   enum AlarmType type, int y, gboolean sens,
-		   GtkSignalFunc dirty_func);
-void ee_store_alarm (CalendarAlarm *alarm, enum AlarmType type);
-#endif
-
-/* Callback used when the property box is closed -- just sets the prop_win variable to null. */
-static int
-prop_cancel (void)
-{
-	prop_win = NULL;
-	return FALSE;
-}
-
-/* Returns the index of the active item in a menu */
-static int
-get_active_index (GtkWidget *menu)
-{
-	GtkWidget *active;
-
-	active = gtk_menu_get_active (GTK_MENU (menu));
-	return GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (active)));
-}
-
-/* Applies the settings in the time display page */
-static void
-prop_apply_time_display (void)
-{
-	/* Day begin/end */
-
-	day_begin = get_active_index (gtk_option_menu_get_menu (GTK_OPTION_MENU (start_omenu)));
-	day_end   = get_active_index (gtk_option_menu_get_menu (GTK_OPTION_MENU (end_omenu)));
-	gnome_config_set_int ("/calendar/Calendar/Day start", day_begin);
-	gnome_config_set_int ("/calendar/Calendar/Day end", day_end);
-
-	/* Time format */
-
-	am_pm_flag = GTK_TOGGLE_BUTTON (time_format_12)->active;
-	gnome_config_set_bool ("/calendar/Calendar/AM PM flag", am_pm_flag);
-
-	/* Week start */
-
-	week_starts_on_monday = GTK_TOGGLE_BUTTON (start_on_monday)->active;
-	gnome_config_set_bool ("/calendar/Calendar/Week starts on Monday", week_starts_on_monday);
-
-	gnome_config_sync ();
-	time_format_changed ();
-}
-
-/* Applies the settings in the colors page */
-static void
-prop_apply_colors (void)
-{
-	int i;
-	char *cspec;
-	gushort r, g, b;
-
-	for (i = 0; i < COLOR_PROP_LAST; i++) {
-		gnome_color_picker_get_i16 (GNOME_COLOR_PICKER (color_pickers[i]), &r, &g, &b, NULL);
-		color_props[i].r = r;
-		color_props[i].g = g;
-		color_props[i].b = b;
-		
-		cspec = build_color_spec (color_props[i].r, color_props[i].g, color_props[i].b);
-		gnome_config_set_string (color_props[i].key, cspec);
-	}
-
-	gnome_config_sync ();
-	colors_changed ();
-}
-/* Applies the settings in the todo page (FIX THIS IF ITS NOT WRITTEN) */
-static void
-prop_apply_todo(void) 
-{
-	todo_show_due_date = GTK_TOGGLE_BUTTON (due_date_show_button)->active;
-	
-	todo_item_dstatus_highlight_overdue = GTK_TOGGLE_BUTTON(todo_item_highlight_overdue)->active;
-	todo_item_dstatus_highlight_not_due_yet = GTK_TOGGLE_BUTTON(todo_item_highlight_not_due_yet)->active;
-	todo_item_dstatus_highlight_due_today = GTK_TOGGLE_BUTTON(todo_item_highlight_due_today)->active;
-
-	todo_show_priority = GTK_TOGGLE_BUTTON (priority_show_button)->active;
-
-	todo_show_time_remaining = GTK_TOGGLE_BUTTON (todo_item_time_remaining_show_button)->active;
-
-	/* storing the values */
-
-	gnome_config_set_bool("/calendar/Todo/show_time_remain", todo_show_time_remaining);
-	gnome_config_set_bool("/calendar/Todo/highlight_overdue", todo_item_dstatus_highlight_overdue);
-	
-	gnome_config_set_bool("/calendar/Todo/highlight_due_today", todo_item_dstatus_highlight_due_today);
-	
-        gnome_config_set_bool("/calendar/Todo/highlight_not_due_yet", todo_item_dstatus_highlight_not_due_yet);
-	gnome_config_set_bool("/calendar/Todo/show_due_date", todo_show_due_date);
-	gnome_config_set_bool("/calendar/Todo/show_priority", todo_show_priority);
-	/* need to sync our config changes. */
-	gnome_config_sync ();
-
-	/* apply the current changes */
-	todo_properties_changed();
-}
-
-
-/* Callback used when the Apply button is clicked. */
-static void
-prop_apply (GtkWidget *w, int page)
-{
-	switch (page) {
-	case PROP_TIME_DISPLAY:
-		prop_apply_time_display ();
-		break;
-
-	case PROP_COLORS:
-		prop_apply_colors ();
-		break;
-
-	case PROP_TODO:
-	        prop_apply_todo ();
-		break;
-		
-	case PROP_ALARMS:
-#if 0
-		prop_apply_alarms ();
-#endif
-		break;
-
-	case -1:
-		break;
-
-	default:
-		g_warning ("We have a loose penguin!");
-		g_assert_not_reached ();
-	}
-}
-
-/* Notifies the property box that the data has changed */
-static void
-prop_changed (void)
-{
-	gnome_property_box_changed (GNOME_PROPERTY_BOX (prop_win));
-}
-
-/* Builds and returns a two-element radio button group surrounded by a frame.  The radio buttons are
- * stored in the specified variables, and the first radio button's state is set according to the
- * specified flag value.  The buttons are connected to the prop_changed() function to update the property
- * box's dirty state.
- */
-static GtkWidget *
-build_two_radio_group (char *title,
-		       char *radio_1_title, GtkWidget **radio_1_widget,
-		       char *radio_2_title, GtkWidget **radio_2_widget,
-		       int radio_1_value)
-{
-	GtkWidget *frame;
-	GtkWidget *vbox;
-
-	frame = gtk_frame_new (title);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-
-	*radio_1_widget = gtk_radio_button_new_with_label (NULL, radio_1_title);
-	gtk_box_pack_start (GTK_BOX (vbox), *radio_1_widget, FALSE, FALSE, 0);
-	
-	*radio_2_widget = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (*radio_1_widget),
-								       radio_2_title);
-	gtk_box_pack_start (GTK_BOX (vbox), *radio_2_widget, FALSE, FALSE, 0);
-
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (*radio_1_widget), radio_1_value);
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (*radio_2_widget), !radio_1_value);
-
-	gtk_signal_connect (GTK_OBJECT (*radio_1_widget), "toggled",
-			    (GtkSignalFunc) prop_changed,
-			    NULL);
-
-	return frame;
-}
-
-/* Callback invoked when a menu item from the start/end time option menus is selected.  It adjusts
- * the other menu to the proper time, if needed.
- */
-static void
-hour_activated (GtkWidget *widget, gpointer data)
-{
-	int start, end;
-
-	if (data == start_omenu) {
-		/* Adjust the end menu */
-
-		start = GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (widget)));
-		end = get_active_index (gtk_option_menu_get_menu (GTK_OPTION_MENU (end_omenu)));
-
-		if (end < start)
-			gtk_option_menu_set_history (GTK_OPTION_MENU (end_omenu), start);
-	} else if (data == end_omenu) {
-		/* Adjust the start menu */
-
-		end = GPOINTER_TO_INT (gtk_object_get_user_data (GTK_OBJECT (widget)));
-		start = get_active_index (gtk_option_menu_get_menu (GTK_OPTION_MENU (start_omenu)));
-
-		if (start > end)
-			gtk_option_menu_set_history (GTK_OPTION_MENU (start_omenu), end);
-	} else
-		g_assert_not_reached ();
-
-	gnome_property_box_changed (GNOME_PROPERTY_BOX (prop_win));
-}
-
-/* Builds an option menu of 24 hours */
-static GtkWidget *
-build_hours_menu (GtkWidget **items, int active)
-{
-	GtkWidget *omenu;
-	GtkWidget *menu;
-	int i;
-	char buf[100];
-	struct tm tm;
-	int am_pm_flag;
-
-	omenu = gtk_option_menu_new ();
-	menu = gtk_menu_new ();
-	am_pm_flag = GTK_TOGGLE_BUTTON (time_format_12)->active;
-
-	memset (&tm, 0, sizeof (tm));
-
-	for (i = 0; i < 24; i++) {
-		tm.tm_hour = i;
-		if (am_pm_flag)
-			strftime (buf, 100, "%I:%M %p", &tm);
-		else
-			strftime (buf, 100, "%H:%M", &tm);
-
-		items[i] = gtk_menu_item_new_with_label (buf);
-		gtk_object_set_user_data (GTK_OBJECT (items[i]), GINT_TO_POINTER (i));
-		gtk_signal_connect (GTK_OBJECT (items[i]), "activate",
-				    (GtkSignalFunc) hour_activated,
-				    omenu);
-
-		gtk_menu_append (GTK_MENU (menu), items[i]);
-		gtk_widget_show (items[i]);
-	}
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-	gtk_option_menu_set_history (GTK_OPTION_MENU (omenu), active);
-	return omenu;
-}
-
-/* Creates the time display page in the preferences dialog */
-static void
-create_time_display_page (void)
-{
-	GtkWidget *table;
-	GtkWidget *vbox;
-	GtkWidget *frame;
-	GtkWidget *hbox2;
-	GtkWidget *hbox3;
-	GtkWidget *w;
-
-	table = gtk_table_new (2, 2, FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (table), GNOME_PAD_SMALL);
-	gtk_table_set_row_spacings (GTK_TABLE (table), GNOME_PAD_SMALL);
-	gtk_table_set_col_spacings (GTK_TABLE (table), GNOME_PAD_SMALL);
-	gnome_property_box_append_page (GNOME_PROPERTY_BOX (prop_win), table,
-					gtk_label_new (_("Time display")));
-
-	/* Time format */
-
-	w = build_two_radio_group (_("Time format"),
-				   _("12-hour (AM/PM)"), &time_format_12,
-				   _("24-hour"), &time_format_24,
-				   am_pm_flag);
-	gtk_table_attach (GTK_TABLE (table), w,
-			  0, 1, 0, 1,
-			  GTK_EXPAND | GTK_FILL,
-			  GTK_EXPAND | GTK_FILL,
-			  0, 0);
-
-	/* Weeks start on */
-
-	w = build_two_radio_group (_("Weeks start on"),
-				   _("Sunday"), &start_on_sunday,
-				   _("Monday"), &start_on_monday,
-				   !week_starts_on_monday);
-	gtk_table_attach (GTK_TABLE (table), w,
-			  0, 1, 1, 2,
-			  GTK_EXPAND | GTK_FILL,
-			  GTK_EXPAND | GTK_FILL,
-			  0, 0);
-
-	/* Day range */
-
-	frame = gtk_frame_new (_("Day range"));
-	gtk_table_attach (GTK_TABLE (table), frame,
-			  1, 2, 0, 2,
-			  GTK_EXPAND | GTK_FILL,
-			  GTK_EXPAND | GTK_FILL,
-			  0, 0);
-
-	vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), GNOME_PAD_SMALL);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-
-	w = gtk_label_new (_("Please select the start and end hours you want\n"
-			     "to be displayed in the day view and week view.\n"
-			     "Times outside this range will not be displayed\n"
-			     "by default."));
-	gtk_label_set_justify (GTK_LABEL (w), GTK_JUSTIFY_LEFT);
-	gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0);
-	gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);
-
-	hbox2 = gtk_hbox_new (FALSE, GNOME_PAD);
-	gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 0);
-
-	/* Day start */
-
-	hbox3 = gtk_hbox_new (FALSE, GNOME_PAD_SMALL);
-	gtk_box_pack_start (GTK_BOX (hbox2), hbox3, FALSE, FALSE, 0);
-
-	w = gtk_label_new (_("Day start:"));
-	gtk_box_pack_start (GTK_BOX (hbox3), w, FALSE, FALSE, 0);
-
-	start_omenu = build_hours_menu (start_items, day_begin);
-	gtk_box_pack_start (GTK_BOX (hbox3), start_omenu, FALSE, FALSE, 0);
-
-	/* Day end */
-
-	hbox3 = gtk_hbox_new (FALSE, GNOME_PAD_SMALL);
-	gtk_box_pack_start (GTK_BOX (hbox2), hbox3, FALSE, FALSE, 0);
-
-	w = gtk_label_new (_("Day end:"));
-	gtk_box_pack_start (GTK_BOX (hbox3), w, FALSE, FALSE, 0);
-
-	end_omenu = build_hours_menu (end_items, day_end);
-	gtk_box_pack_start (GTK_BOX (hbox3), end_omenu, FALSE, FALSE, 0);
-}
-
-/* Called when the canvas for the month item is size allocated.  We use this to change the canvas'
- * scrolling region and the month item's size.
- */
-static void
-canvas_size_allocate (GtkWidget *widget, GtkAllocation *allocation, gpointer data)
-{
-	gnome_canvas_item_set (month_item,
-			       "width", (double) (allocation->width - 1),
-			       "height", (double) (allocation->height - 1),
-			       NULL);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (widget),
-					0, 0,
-					allocation->width, allocation->height);
-}
-
-/* Returns a color spec based on the color pickers */
-static char *
-color_spec_from_picker (int num)
-{
-	gushort r, g, b;
-
-	gnome_color_picker_get_i16 (GNOME_COLOR_PICKER (color_pickers[num]), &r, &g, &b, NULL);
-
-	return build_color_spec (r, g, b);
-}
-
-/* Callback used to query color information for the properties box */
-static char *
-fetch_color_spec (ColorProp propnum, gpointer data)
-{
-	return color_spec_from_picker (propnum);
-}
-
-/* Marks fake event days in the month item sample */
-static void
-fake_mark_days (void)
-{
-	static int day_nums[] = { 1, 4, 8, 16, 17, 18, 20, 25, 28 }; /* some random days */
-	int first_day_index;
-	int i;
-
-	first_day_index = gnome_month_item_day2index (GNOME_MONTH_ITEM (month_item), 1);
-
-	for (i = 0; i < (sizeof (day_nums) / sizeof (day_nums[0])); i++)
-		mark_month_item_index (GNOME_MONTH_ITEM (month_item), first_day_index + day_nums[i] - 1,
-				       fetch_color_spec, NULL);
-}
-
-/* Switches the month item to the current date and highlights the current day's number */
-static void
-set_current_day (void)
-{
-	struct tm tm;
-	time_t t;
-	GnomeCanvasItem *item;
-	int day_index;
-
-	/* Set the date */
-
-	t = time (NULL);
-	tm = *localtime (&t);
-
-	gnome_canvas_item_set (month_item,
-			       "year", tm.tm_year + 1900,
-			       "month", tm.tm_mon,
-			       NULL);
-
-	/* Highlight current day */
-
-	day_index = gnome_month_item_day2index (GNOME_MONTH_ITEM (month_item), tm.tm_mday);
-	item = gnome_month_item_num2child (GNOME_MONTH_ITEM (month_item), GNOME_MONTH_ITEM_DAY_LABEL + day_index);
-	gnome_canvas_item_set (item,
-			       "fill_color", color_spec_from_picker (COLOR_PROP_CURRENT_DAY_FG),
-			       "fontset", CURRENT_DAY_FONTSET,
-			       NULL);
-}
-
-/* This is the version of a color spec query function that is appropriate for the preferences dialog */
-static char *
-prop_color_func (ColorProp propnum, gpointer data)
-{
-	return color_spec_from_picker (propnum);
-}
-
-/* Sets the colors of the month item to the current prerences */
-static void
-reconfigure_month (void)
-{
-	colorify_month_item (GNOME_MONTH_ITEM (month_item), prop_color_func, NULL);
-	fake_mark_days ();
-	set_current_day ();
-
-	/* Reset prelighting information */
-
-	month_item_prepare_prelight (GNOME_MONTH_ITEM (month_item), fetch_color_spec, NULL);
-}
-
-/* Callback used when a color is changed */
-static void
-color_set (void)
-{
-	reconfigure_month ();
-	prop_changed ();
-}
-
-/* Creates the colors page in the preferences dialog */
-static void
-create_colors_page (void)
-{
-	GtkWidget *frame;
-	GtkWidget *hbox;
-	GtkWidget *table;
-	GtkWidget *w;
-	int i;
-
-	frame = gtk_frame_new (_("Colors for display"));
-	gtk_container_set_border_width (GTK_CONTAINER (frame), GNOME_PAD_SMALL);
-	gnome_property_box_append_page (GNOME_PROPERTY_BOX (prop_win), frame,
-					gtk_label_new (_("Colors")));
-
-	hbox = gtk_hbox_new (FALSE, GNOME_PAD);
-	gtk_container_set_border_width (GTK_CONTAINER (hbox), GNOME_PAD_SMALL);
-	gtk_container_add (GTK_CONTAINER (frame), hbox);
-
-	table = gtk_table_new (COLOR_PROP_LAST, 2, FALSE);
-	gtk_table_set_col_spacings (GTK_TABLE (table), GNOME_PAD_SMALL);
-	gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE, 0);
-
-	/* Create the color pickers */
-
-	for (i = 0; i < COLOR_PROP_LAST; i++) {
-		/* Label */
-
-		w = gtk_label_new (_(color_props[i].label));
-		gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.5);
-		gtk_table_attach (GTK_TABLE (table), w,
-				  0, 1, i, i + 1,
-				  GTK_FILL, 0,
-				  0, 0);
-
-		/* Color picker */
-
-		color_pickers[i] = gnome_color_picker_new ();
-		gnome_color_picker_set_title (GNOME_COLOR_PICKER (color_pickers[i]), _(color_props[i].label));
-		gnome_color_picker_set_i16 (GNOME_COLOR_PICKER (color_pickers[i]),
-					    color_props[i].r, color_props[i].g, color_props[i].b, 0);
-		gtk_table_attach (GTK_TABLE (table), color_pickers[i],
-				  1, 2, i, i + 1,
-				  0, 0,
-				  0, 0);
-		gtk_signal_connect (GTK_OBJECT (color_pickers[i]), "color_set",
-				    (GtkSignalFunc) color_set,
-				    NULL);
-	}
-
-	/* Create the sample calendar */
-
-	w = gnome_canvas_new ();
-	gtk_box_pack_start (GTK_BOX (hbox), w, TRUE, TRUE, 0);
-
-	month_item = gnome_month_item_new (gnome_canvas_root (GNOME_CANVAS (w)));
-	gnome_canvas_item_set (month_item,
-			       "start_on_monday", week_starts_on_monday,
-			       NULL);
-	reconfigure_month ();
-	
-	gtk_signal_connect (GTK_OBJECT (w), "size_allocate",
-			    canvas_size_allocate,
-			    NULL);
-
-}
-
-
-static void
-set_todo_page_options(void)
-{
-  
-  
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-}
-
-static void
-todo_option_set (void)
-{
-	prop_changed ();
-	set_todo_page_options ();
-}
-
-/* Creates the colors page in the preferences dialog */
-static GtkWidget *
-build_list_options_frame(void) 
-{
-	GtkWidget *frame;
-	GtkWidget *vbox;
-	frame = gtk_frame_new (_("Show on TODO List:"));
-	
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-	
-	due_date_show_button = gtk_check_button_new_with_label (_("Due Date"));
-	priority_show_button = gtk_check_button_new_with_label (_("Priority"));
-	todo_item_time_remaining_show_button = gtk_check_button_new_with_label (_("Time Until Due"));
-
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(due_date_show_button), todo_show_due_date);
-	gtk_signal_connect (GTK_OBJECT(due_date_show_button),
-			    "clicked",
-			    (GtkSignalFunc) todo_option_set,
-			    NULL);
-	gtk_box_pack_start (GTK_BOX (vbox), due_date_show_button, FALSE, FALSE, 0);
-
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(todo_item_time_remaining_show_button), todo_show_time_remaining);
-	gtk_signal_connect (GTK_OBJECT(todo_item_time_remaining_show_button),
-			    "clicked",
-			    (GtkSignalFunc) todo_option_set,
-			    NULL);
-	gtk_box_pack_start (GTK_BOX (vbox), todo_item_time_remaining_show_button, FALSE, FALSE, 0);
-
-
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(priority_show_button), todo_show_priority);
-	gtk_signal_connect (GTK_OBJECT(priority_show_button), 
-			    "clicked",
-			    (GtkSignalFunc) todo_option_set,
-			    NULL);
-	gtk_box_pack_start (GTK_BOX (vbox), priority_show_button, FALSE, FALSE, 0);
-	return frame;
-}
-static GtkWidget *
-build_style_list_options_frame(void) 
-{
-	GtkWidget *frame;
-	GtkWidget *vbox;
-
-	frame = gtk_frame_new (_("To Do List style options:"));
-	
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
-	
-	todo_item_highlight_overdue = gtk_check_button_new_with_label (_("Highlight overdue items"));
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(todo_item_highlight_overdue),
-				     todo_item_dstatus_highlight_overdue);
-	todo_item_highlight_not_due_yet = gtk_check_button_new_with_label (_("Highlight not yet due items"));
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(todo_item_highlight_not_due_yet),
-				     todo_item_dstatus_highlight_overdue);
-	todo_item_highlight_due_today = gtk_check_button_new_with_label (_("Highlight items due today"));
-	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON(todo_item_highlight_due_today),
-				     todo_item_dstatus_highlight_overdue);
-		
-	gtk_signal_connect (GTK_OBJECT(todo_item_highlight_overdue),
-			    "clicked",
-			    (GtkSignalFunc) todo_option_set,
-			    NULL);
-	gtk_signal_connect (GTK_OBJECT(todo_item_highlight_not_due_yet),
-			    "clicked",
-			    (GtkSignalFunc) todo_option_set,
-			    NULL);
-	gtk_signal_connect (GTK_OBJECT(todo_item_highlight_due_today),
-			    "clicked",
-			    (GtkSignalFunc) todo_option_set,
-			    NULL);
-	
-	gtk_box_pack_start (GTK_BOX (vbox), todo_item_highlight_overdue, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), todo_item_highlight_due_today, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (vbox), todo_item_highlight_not_due_yet, FALSE, FALSE, 0);
-	return frame;
-}
-static void
-create_todo_page (void)
-{
-	GtkWidget *frame;
-	GtkWidget *main_box;
-	GtkWidget *hbox;
-
-
-	frame = gtk_frame_new (_("To Do List Properties"));
-	gtk_container_set_border_width (GTK_CONTAINER (frame), GNOME_PAD_SMALL);
-	gnome_property_box_append_page (GNOME_PROPERTY_BOX (prop_win), frame,
-					gtk_label_new (_("To Do List")));
-
-	/* first vbox*/
-	main_box = gtk_vbox_new(FALSE, GNOME_PAD);
-	gtk_container_set_border_width (GTK_CONTAINER (main_box), GNOME_PAD_SMALL);
-	gtk_container_add (GTK_CONTAINER (frame), main_box);
-
-	
-	/* first hbox*/
-	hbox = gtk_hbox_new (FALSE, GNOME_PAD);
-	gtk_container_set_border_width (GTK_CONTAINER (hbox), GNOME_PAD_SMALL);
-	gtk_container_add (GTK_CONTAINER (main_box), hbox);
-	
-	gtk_box_pack_start (GTK_BOX(hbox), build_list_options_frame(), FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX(hbox), build_style_list_options_frame(), FALSE, FALSE, 0);
-	
- 	set_todo_page_options(); 
-}
-
-/* Creates and displays the preferences dialog for the whole application */
-void
-properties (GtkWidget *toplevel)
-{
-        static GnomeHelpMenuEntry help_entry = { NULL, "properties" };
-
-	help_entry.name = gnome_app_id;
-
-	if (prop_win)
-		return;
-
-	prop_win = gnome_property_box_new ();
-	gtk_window_set_title (GTK_WINDOW (prop_win), _("Preferences"));
-	gnome_dialog_set_parent (GNOME_DIALOG (prop_win),
-			 GTK_WINDOW (gtk_widget_get_toplevel (toplevel)));
-
-	create_time_display_page ();
-	create_colors_page ();
-	create_todo_page ();
-	create_alarm_page ();
-
-	gtk_signal_connect (GTK_OBJECT (prop_win), "destroy",
-			    (GtkSignalFunc) prop_cancel, NULL);
-
-	gtk_signal_connect (GTK_OBJECT (prop_win), "delete_event",
-			    (GtkSignalFunc) prop_cancel, NULL);
-
-	gtk_signal_connect (GTK_OBJECT (prop_win), "apply",
-			    (GtkSignalFunc) prop_apply, NULL);
-
-	gtk_signal_connect (GTK_OBJECT (prop_win), "help",
-			    GTK_SIGNAL_FUNC (gnome_help_pbox_display),
-			    &help_entry);
-
-	gtk_widget_show_all (prop_win);
-}
-
-char *
-build_color_spec (int r, int g, int b)
-{
-	static char spec[100];
-
-	sprintf (spec, "#%04x%04x%04x", r, g, b);
-	return spec;
-}
-
-void
-parse_color_spec (char *spec, int *r, int *g, int *b)
-{
-	g_return_if_fail (spec != NULL);
-	g_return_if_fail (r != NULL);
-	g_return_if_fail (r != NULL);
-	g_return_if_fail (r != NULL);
-
-	if (sscanf (spec, "#%04x%04x%04x", r, g, b) != 3) {
-		g_warning ("Invalid color specification %s, returning black", spec);
-
-		*r = *g = *b = 0;
-	}
-}
-
-char *
-color_spec_from_prop (ColorProp propnum)
-{
-	return build_color_spec (color_props[propnum].r, color_props[propnum].g, color_props[propnum].b);
-}
-
-static void
-create_alarm_page (void)
-{
-	GtkWidget *main_box;
-	GtkWidget *default_frame;
-	GtkWidget *default_table;
-	GtkWidget *misc_frame;
-	GtkWidget *misc_box;
-	GtkWidget *box, *l;
-
-	main_box = gtk_vbox_new (FALSE, GNOME_PAD);
-	gtk_container_set_border_width (GTK_CONTAINER (main_box), GNOME_PAD_SMALL);
-	gnome_property_box_append_page (GNOME_PROPERTY_BOX (prop_win), 
-					main_box, gtk_label_new (_("Alarms")));
-
-	/* build miscellaneous box */
-	misc_frame = gtk_frame_new (_("Alarm Properties"));
-	gtk_container_set_border_width (GTK_CONTAINER (misc_frame), 
-					GNOME_PAD_SMALL);
-	misc_box = gtk_vbox_new (FALSE, GNOME_PAD);
-
-	gtk_container_set_border_width (GTK_CONTAINER (misc_frame), GNOME_PAD_SMALL);
-	gtk_container_add (GTK_CONTAINER (misc_frame), misc_box);
-
-	gtk_box_pack_start (GTK_BOX (main_box), misc_frame, FALSE, FALSE, 0);
-
-	enable_display_beep = gtk_check_button_new_with_label (_("Beep on display alarms"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (enable_display_beep),
-				      beep_on_display);
-	gtk_box_pack_start (GTK_BOX (misc_box), enable_display_beep, FALSE, FALSE, 0);
-	gtk_signal_connect (GTK_OBJECT (enable_display_beep), "toggled",
-			    (GtkSignalFunc) prop_changed,
-			    NULL);
-
-	/* audio timeout widgets */
-	box = gtk_hbox_new (FALSE, GNOME_PAD);
-	to_cb = gtk_check_button_new_with_label (_("Audio alarms timeout after"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (to_cb), 
-				      enable_aalarm_timeout);
-	gtk_signal_connect (GTK_OBJECT (to_cb), "toggled",
-			    (GtkSignalFunc) to_cb_changed, NULL);
-	gtk_box_pack_start (GTK_BOX (box), to_cb, FALSE, FALSE, 0);
-	to_spin = make_spin_button (audio_alarm_timeout, 1, MAX_AALARM_TIMEOUT);
-	gtk_widget_set_sensitive (to_spin, enable_aalarm_timeout);
-	gtk_signal_connect (GTK_OBJECT (to_spin), "changed",
-			    (GtkSignalFunc) prop_changed, NULL);
-	gtk_box_pack_start (GTK_BOX (box), to_spin, FALSE, FALSE, 0);
-	l = gtk_label_new (_(" seconds"));
-	gtk_box_pack_start (GTK_BOX (box), l, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (misc_box), box, FALSE, FALSE, 0);
-	
-	/* snooze widgets */
-	box = gtk_hbox_new (FALSE, GNOME_PAD);
-	snooze_cb = gtk_check_button_new_with_label (_("Enable snoozing for "));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (snooze_cb), 
-				      enable_snooze);
-	gtk_signal_connect (GTK_OBJECT (snooze_cb), "toggled",
-			    (GtkSignalFunc) snooze_cb_changed, NULL);
-	gtk_box_pack_start (GTK_BOX (box), snooze_cb, FALSE, FALSE, 0);
-	snooze_spin = make_spin_button (snooze_secs, 1, MAX_SNOOZE_SECS);
-	gtk_widget_set_sensitive (snooze_spin, enable_snooze);
-	gtk_signal_connect (GTK_OBJECT (snooze_spin), "changed",
-			    (GtkSignalFunc) prop_changed, NULL);
-	gtk_box_pack_start (GTK_BOX (box), snooze_spin, FALSE, FALSE, 0);
-	l = gtk_label_new (_(" seconds"));
-	gtk_box_pack_start (GTK_BOX (box), l, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (misc_box), box, FALSE, FALSE, 0);
-	
-	/* populate default frame/box */
-	default_frame = gtk_frame_new (_("Defaults"));
-	gtk_container_set_border_width (GTK_CONTAINER (default_frame), GNOME_PAD_SMALL);
-	gtk_box_pack_start (GTK_BOX (main_box), default_frame, FALSE, FALSE, 0);
-	default_table = gtk_table_new (1, 1, 0);
-	gtk_container_set_border_width (GTK_CONTAINER (default_table), 4);
-	gtk_table_set_row_spacings (GTK_TABLE (default_table), 4);
-	gtk_table_set_col_spacings (GTK_TABLE (default_table), 4);
-	gtk_container_add (GTK_CONTAINER (default_frame), default_table);
-
-#ifndef NO_WARNINGS
-#warning "FIX ME"
-#endif
-	/*
-	ee_create_ae (GTK_TABLE (default_table), _("Display"), 
-		      &alarm_defaults [ALARM_DISPLAY], ALARM_DISPLAY, 1, 
-		      FALSE, prop_changed);
-	ee_create_ae (GTK_TABLE (default_table), _("Audio"), 
-		      &alarm_defaults [ALARM_AUDIO], ALARM_AUDIO, 2, 
-		      FALSE, prop_changed);
-	ee_create_ae (GTK_TABLE (default_table), _("Program"), 
-		      &alarm_defaults [ALARM_PROGRAM], ALARM_PROGRAM, 3, 
-		      FALSE, prop_changed);
-	ee_create_ae (GTK_TABLE (default_table), _("Mail"), 
-		      &alarm_defaults [ALARM_MAIL], ALARM_MAIL, 4, 
-		      FALSE, prop_changed);
-	*/
-}
-	
-#if 0
-
-static void
-prop_store_alarm_default_values (CalendarAlarm* alarm)
-{
-  //	ee_store_alarm (alarm, alarm->type);
-
-	switch (alarm->type) {
-	case ALARM_DISPLAY:
-		gnome_config_push_prefix ("/calendar/alarms/def_disp_");
-		break;
-	case ALARM_AUDIO:
-		gnome_config_push_prefix ("/calendar/alarms/def_audio_");
-		break;
-	case ALARM_PROGRAM:
-		gnome_config_push_prefix ("/calendar/alarms/def_prog_");
-		break;
-	case ALARM_MAIL:
-		gnome_config_push_prefix ("/calendar/alarms/def_mail_");
-		break;
-	}
-	
-	gnome_config_set_int ("enabled", alarm->enabled);
-	gnome_config_set_int ("count", alarm->count);
-	gnome_config_set_int ("units", alarm->units);
-	if (alarm->data)
-		gnome_config_set_string ("data", alarm->data);
-	gnome_config_pop_prefix ();
-	gnome_config_sync ();
-}
-
-static void
-prop_apply_alarms ()
-{
-	int i;
-	for (i=0; i < 4; i++)
-		prop_store_alarm_default_values (&alarm_defaults [i]);
-
-	beep_on_display = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (enable_display_beep));
-	gnome_config_set_bool ("/calendar/alarms/beep_on_display", beep_on_display);
-	enable_aalarm_timeout = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (to_cb));
-	gnome_config_set_bool ("/calendar/alarms/enable_audio_timeout", enable_aalarm_timeout);
-	audio_alarm_timeout = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (to_spin));
-	gnome_config_set_int ("/calendar/alarms/audio_alarm_timeout", audio_alarm_timeout);
-	enable_snooze = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (snooze_cb));
-	gnome_config_set_bool ("/calendar/alarms/enable_snooze", enable_snooze);
-	snooze_secs = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (snooze_spin));
-	gnome_config_set_int ("/calendar/alarms/snooze_secs", snooze_secs);
-
-	gnome_config_sync();
-}
-#endif
-
-static void
-to_cb_changed (GtkWidget *object, gpointer data)
-{
-	gboolean active = 
-		gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (to_cb));
-	gtk_widget_set_sensitive (to_spin, active);
-	prop_changed ();
-}
-	
-static void
-snooze_cb_changed (GtkWidget *object, gpointer data)
-{
-	gboolean active =
-		gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (snooze_cb));
-	gtk_widget_set_sensitive (snooze_spin, active);
-	prop_changed ();
-}
-
-
diff --git a/calendar/gui/recur.xpm b/calendar/gui/recur.xpm
deleted file mode 100644
index bb34fa4568..0000000000
--- a/calendar/gui/recur.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * recur_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #333366",
-"                ",
-"                ",
-"    ..   .....  ",
-"  ...    ....   ",
-"  ..     ....   ",
-" ..      .....  ",
-" ..      .  ..  ",
-" ..         ..  ",
-" ..  .      ..  ",
-" .....      ..  ",
-"  ....     ..   ",
-"  ....    ...   ",
-" .....   ..     ",
-"                ",
-"                ",
-"                "};
diff --git a/calendar/gui/task-assigned-to.xpm b/calendar/gui/task-assigned-to.xpm
deleted file mode 100644
index 082be648bb..0000000000
--- a/calendar/gui/task-assigned-to.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * task_assigned_to_xpm[] = {
-"16 16 11 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F3F3F3",
-"#	c #CCCCCC",
-"$	c #B2B2B2",
-"%	c #ECECEC",
-"&	c #ABCCAB",
-"*	c #768E76",
-"=	c #5E705E",
-"-	c #EEEEEE",
-"                ",
-"  ...........   ",
-" .++++++++++@.  ",
-" .+#########$.  ",
-" .+%%%%%%%..$.  ",
-" .+#######.&..  ",
-" .+%%......&&.  ",
-" .+##.&&&&&&&&. ",
-" .+%%.&*&*&*&*&.",
-" .+##.========. ",
-" .+%%......==.  ",
-" .+#######.=..  ",
-" .+%%%%%%%..$.  ",
-" .-$$$$$$$$$$.  ",
-"  ...........   ",
-"                "};
diff --git a/calendar/gui/task-assigned.xpm b/calendar/gui/task-assigned.xpm
deleted file mode 100644
index 9a66304103..0000000000
--- a/calendar/gui/task-assigned.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * task_assigned_xpm[] = {
-"16 16 11 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F3F3F3",
-"#	c #CCCCCC",
-"$	c #B2B2B2",
-"%	c #ECECEC",
-"&	c #FFCC66",
-"*	c #CC9933",
-"=	c #996600",
-"-	c #EEEEEE",
-"                ",
-"  ...........   ",
-" .++++++++++@.  ",
-" .+##..#####$.  ",
-" .+%%.&.%%%%$.  ",
-"......&&.###$.  ",
-".&&&&&&&&.%%$.  ",
-".&*&*&*&*&.#$.  ",
-".========.#%$.  ",
-"......==.###$.  ",
-" .###.=.#%%%$.  ",
-" .+##..#####$.  ",
-" .+%%##%%%%%$.  ",
-" .-$$$$$$$$$$.  ",
-"  ...........   ",
-"                "};
diff --git a/calendar/gui/task-recurring.xpm b/calendar/gui/task-recurring.xpm
deleted file mode 100644
index 29b78d84c7..0000000000
--- a/calendar/gui/task-recurring.xpm
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPM */
-static char * task_recurring_xpm[] = {
-"16 16 2 1",
-" 	c None",
-".	c #333366",
-"                ",
-"                ",
-"    ..   .....  ",
-"  ...    ....   ",
-"  ..     ....   ",
-" ..      .....  ",
-" ..      .  ..  ",
-" ..         ..  ",
-" ..  .      ..  ",
-" .....      ..  ",
-"  ....     ..   ",
-"  ....    ...   ",
-" .....   ..     ",
-"                ",
-"                ",
-"                "};
diff --git a/calendar/gui/task.xpm b/calendar/gui/task.xpm
deleted file mode 100644
index 84f5cf5e65..0000000000
--- a/calendar/gui/task.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * task_xpm[] = {
-"16 16 13 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F3F3F3",
-"#	c #CCCCCC",
-"$	c #B2B2B2",
-"%	c #ECECEC",
-"&	c #993333",
-"*	c #660000",
-"=	c #999999",
-"-	c #666666",
-";	c #663333",
-">	c #EEEEEE",
-"                ",
-"  ...........   ",
-" .++++++++++@.  ",
-" .+#########$.  ",
-" .+%%%%%%%%%$.  ",
-" .+#######&*$.  ",
-" .+%%%%%%&*=$.  ",
-" .+#&=##&*-#$.  ",
-" .+%&&%&*=#%$.  ",
-" .+#;&&*-=##$.  ",
-" .+%-&*-=%%%$.  ",
-" .+#=--=####$.  ",
-" .+%%%%%%%%%$.  ",
-" .>$$$$$$$$$$.  ",
-"  ...........   ",
-"                "};
diff --git a/calendar/gui/test.vcf b/calendar/gui/test.vcf
deleted file mode 100644
index bfe93b3c14..0000000000
--- a/calendar/gui/test.vcf
+++ /dev/null
@@ -1,133 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//GNOME//NONSGML GnomeCalendar//EN
-TZ:MST
-VERSION:0.13
-BEGIN:VEVENT
-UID:KOrganizer - 846930886
-SEQUENCE:1
-DTSTART:19980601T150000 
-DTEND:19980601T150000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980402T023558 
-SUMMARY:Cada dos dias de 06/01 al 07/01
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D2 19980701T140000  
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 846930886
-SEQUENCE:1
-DTSTART:19980501T140000 
-DTEND:19980501T140000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980402T023558 
-SUMMARY:5 dias.
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 #5 
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 846930886
-SEQUENCE:1
-DTSTART:19980501T140000 
-DTEND:19980501T150000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980429T004635 
-SUMMARY:Diariamente de 05/01 al 06/01
-STATUS:NEEDS ACTION
-CLASS:PRIVATE
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 19980601T000000  
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 1804289383
-SEQUENCE:1
-DTSTART:19980415T010000 
-DTEND:19980415T013000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Diario durante 5 dias
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 #5 
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 1804289383
-SEQUENCE:1
-DTSTART:19980415T010000 
-DTEND:19980415T013000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Diario durante 5 dias
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 #5 
-END:VEVENT
-
-BEGIN:VTODO
-UID:KOrganizer - 846930886
-SEQUENCE:1
-DTSTART:19980415T140000 
-DUE:19691231T180000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980402T023558 
-SUMMARY:Normal
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-END:VTODO
-
-BEGIN:VTODO
-UID:KOrganizer - 1804289383
-SEQUENCE:1
-DTSTART:19980415T120000 
-DUE:19691231T180000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Semanal -- 4 semanas
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:W1 WE #4 
-END:VTODO
-
-BEGIN:VTODO
-UID:KOrganizer - 1804289383
-SEQUENCE:1
-DTSTART:19980415T003000 
-DUE:19691231T180000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Semana: Mi, Ju, Vi, Dom (10 veces)
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:W1 SU WE TH FR #10 
-END:VTODO
-
-END:VCALENDAR
-
diff --git a/calendar/gui/test2.vcf b/calendar/gui/test2.vcf
deleted file mode 100644
index 6446507989..0000000000
--- a/calendar/gui/test2.vcf
+++ /dev/null
@@ -1,133 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//GNOME//NONSGML GnomeCalendar//EN
-TZ:MST
-VERSION:0.13
-BEGIN:VEVENT
-UID:KOrganizer - 8469308861
-SEQUENCE:1
-DTSTART:19980601T150000 
-DTEND:19980601T150000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980402T023558 
-SUMMARY:Cada dos dias de 06/01 al 07/01
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D2 19980701T140000  
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 8469308862
-SEQUENCE:1
-DTSTART:19980501T140000 
-DTEND:19980501T140000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980402T023558 
-SUMMARY:5 dias.
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 #5 
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 8469308863
-SEQUENCE:1
-DTSTART:19980501T140000 
-DTEND:19980501T150000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980429T004635 
-SUMMARY:Diariamente de 05/01 al 06/01
-STATUS:NEEDS ACTION
-CLASS:PRIVATE
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 19980601T000000  
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 18042893834
-SEQUENCE:1
-DTSTART:19980415T010000 
-DTEND:19980415T013000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Diario durante 5 dias
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 #5 
-END:VEVENT
-
-BEGIN:VEVENT
-UID:KOrganizer - 18042893835
-SEQUENCE:1
-DTSTART:19980415T010000 
-DTEND:19980415T013000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Diario durante 5 dias
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:D1 #5 
-END:VEVENT
-
-BEGIN:VTODO
-UID:KOrganizer - 8469308866
-SEQUENCE:1
-DTSTART:19980415T140000 
-DUE:19691231T180000 
-DCREATED:19980402T023558 
-LAST-MODIFIED:19980402T023558 
-SUMMARY:Normal
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-END:VTODO
-
-BEGIN:VTODO
-UID:KOrganizer - 18042893837
-SEQUENCE:1
-DTSTART:19980415T120000 
-DUE:19691231T180000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Semanal -- 4 semanas
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:W1 WE #4 
-END:VTODO
-
-BEGIN:VTODO
-UID:KOrganizer - 18042893838
-SEQUENCE:1
-DTSTART:19980415T003000 
-DUE:19691231T180000 
-DCREATED:19980402T023552 
-LAST-MODIFIED:19980330T225948 
-SUMMARY:Semana: Mi, Ju, Vi, Dom (10 veces)
-STATUS:NEEDS ACTION
-CLASS:PUBLIC
-PRIORITY:0
-TRANSP:0
-RELATED-TO:0
-RRULE:W1 SU WE TH FR #10 
-END:VTODO
-
-END:VCALENDAR
-
diff --git a/calendar/gui/topic.dat b/calendar/gui/topic.dat
deleted file mode 100644
index edc7813b26..0000000000
--- a/calendar/gui/topic.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-gnome-cal.html		Manual
-gnome-cal.html#cmdline  Command line options 
-\ No newline at end of file
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
deleted file mode 100644
index 1898ebc2b8..0000000000
--- a/calendar/gui/weekday-picker.c
+++ /dev/null
@@ -1,536 +0,0 @@
-/* Evolution calendar - Week day picker widget
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtksignal.h>
-#include <libgnomeui/gnome-canvas-rect-ellipse.h>
-#include <libgnomeui/gnome-canvas-text.h>
-#include <libgnome/gnome-i18n.h>
-#include "weekday-picker.h"
-
-
-
-#define PADDING 2
-
-/* Private part of the WeekdayPicker structure */
-struct _WeekdayPickerPrivate {
-	/* Selected days; see weekday_picker_set_days() */
-	guint8 day_mask;
-
-	/* Metrics */
-	int font_ascent, font_descent;
-	int max_letter_width;
-
-	/* Components */
-	GnomeCanvasItem *boxes[7];
-	GnomeCanvasItem *labels[7];
-
-	/* Whether the week starts on Monday or Sunday */
-	guint week_starts_on_monday : 1;
-};
-
-
-
-static void weekday_picker_class_init (WeekdayPickerClass *class);
-static void weekday_picker_init (WeekdayPicker *wp);
-static void weekday_picker_finalize (GtkObject *object);
-
-static void weekday_picker_realize (GtkWidget *widget);
-static void weekday_picker_size_request (GtkWidget *widget, GtkRequisition *requisition);
-static void weekday_picker_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
-static void weekday_picker_style_set (GtkWidget *widget, GtkStyle *previous_style);
-
-static GnomeCanvasClass *parent_class;
-
-
-
-/**
- * weekday_picker_get_type:
- * 
- * Registers the #WeekdayPicker class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #WeekdayPicker class.
- **/
-GtkType
-weekday_picker_get_type (void)
-{
-	static GtkType weekday_picker_type = 0;
-
-	if (!weekday_picker_type) {
-		static const GtkTypeInfo weekday_picker_info = {
-			"WeekdayPicker",
-			sizeof (WeekdayPicker),
-			sizeof (WeekdayPickerClass),
-			(GtkClassInitFunc) weekday_picker_class_init,
-			(GtkObjectInitFunc) weekday_picker_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		weekday_picker_type = gtk_type_unique (GNOME_TYPE_CANVAS, &weekday_picker_info);
-	}
-
-	return weekday_picker_type;
-}
-
-/* Class initialization function for the weekday picker */
-static void
-weekday_picker_class_init (WeekdayPickerClass *class)
-{
-	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
-
-	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
-
-	parent_class = gtk_type_class (GNOME_TYPE_CANVAS);
-
-	object_class->finalize = weekday_picker_finalize;
-
-	widget_class->realize = weekday_picker_realize;
-	widget_class->size_request = weekday_picker_size_request;
-	widget_class->size_allocate = weekday_picker_size_allocate;
-	widget_class->style_set = weekday_picker_style_set;
-}
-
-/* Event handler for the day items */
-static gint
-day_event_cb (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
-{
-	WeekdayPicker *wp;
-	WeekdayPickerPrivate *priv;
-	int i;
-	guint8 day_mask;
-
-	wp = WEEKDAY_PICKER (data);
-	priv = wp->priv;
-
-	if (!(event->type == GDK_BUTTON_PRESS && event->button.button == 1))
-		return FALSE;
-
-	/* Find which box was clicked */
-
-	for (i = 0; i < 7; i++)
-		if (priv->boxes[i] == item || priv->labels[i] == item)
-			break;
-
-	g_assert (i != 7);
-
-	/* Turn on that day */
-
-	if (priv->week_starts_on_monday) {
-		if (i == 6)
-			i = 0;
-		else
-			i++;
-	}
-
-	if (priv->day_mask & (0x1 << i))
-		day_mask = priv->day_mask & ~(0x1 << i);
-	else
-		day_mask = priv->day_mask | (0x1 << i);
-
-	weekday_picker_set_days (wp, day_mask);
-
-	return TRUE;
-}
-
-
-/* Creates the canvas items for the weekday picker.  The items are empty until
- * they are configured elsewhere.
- */
-static void
-create_items (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-	GnomeCanvasGroup *parent;
-	int i;
-
-	priv = wp->priv;
-
-	parent = gnome_canvas_root (GNOME_CANVAS (wp));
-
-	for (i = 0; i < 7; i++) {
-		priv->boxes[i] = gnome_canvas_item_new (parent,
-							GNOME_TYPE_CANVAS_RECT,
-							NULL);
-		gtk_signal_connect (GTK_OBJECT (priv->boxes[i]), "event",
-				    GTK_SIGNAL_FUNC (day_event_cb),
-				    wp);
-
-		priv->labels[i] = gnome_canvas_item_new (parent,
-							 GNOME_TYPE_CANVAS_TEXT,
-							 NULL);
-		gtk_signal_connect (GTK_OBJECT (priv->labels[i]), "event",
-				    GTK_SIGNAL_FUNC (day_event_cb),
-				    wp);
-
-	}
-}
-
-/* Object initialization function for the weekday picker */
-static void
-weekday_picker_init (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-
-	priv = g_new0 (WeekdayPickerPrivate, 1);
-
-	wp->priv = priv;
-
-	create_items (wp);
-}
-
-/* Finalize handler for the weekday picker */
-static void
-weekday_picker_finalize (GtkObject *object)
-{
-	WeekdayPicker *wp;
-	WeekdayPickerPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_WEEKDAY_PICKER (object));
-
-	wp = WEEKDAY_PICKER (object);
-	priv = wp->priv;
-
-	g_free (priv);
-	wp->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->finalize)
-		(* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-static void
-colorize_items (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-	GdkColor *outline;
-	GdkColor *fill, *sel_fill;
-	GdkColor *text_fill, *sel_text_fill;
-	int i;
-
-	priv = wp->priv;
-
-	outline = &GTK_WIDGET (wp)->style->fg[GTK_WIDGET_STATE (wp)];
-
-	fill = &GTK_WIDGET (wp)->style->base[GTK_WIDGET_STATE (wp)];
-	text_fill = &GTK_WIDGET (wp)->style->fg_gc[GTK_WIDGET_STATE (wp)];
-
-	sel_fill = &GTK_WIDGET (wp)->style->bg[GTK_STATE_SELECTED];
-	sel_text_fill = &GTK_WIDGET (wp)->style->fg_gc[GTK_STATE_SELECTED];
-
-	if (priv->week_starts_on_monday) {
-		GdkColor *f, *t;
-
-		for (i = 1; i < 7; i++) {
-			if (priv->day_mask & (0x1 << i)) {
-				f = sel_fill;
-				t = sel_text_fill;
-			} else {
-				f = fill;
-				t = text_fill;
-			}
-
-			gnome_canvas_item_set (priv->boxes[i - 1],
-					       "fill_color_gdk", f,
-					       "outline_color_gdk", outline,
-					       NULL);
-
-			gnome_canvas_item_set (priv->labels[i - 1],
-					       "fill_color_gdk", t,
-					       NULL);
-		}
-
-		if (priv->day_mask & (0x1 << 0)) {
-			f = sel_fill;
-			t = sel_text_fill;
-		} else {
-			f = fill;
-			t = text_fill;
-		}
-		
-		gnome_canvas_item_set (priv->boxes[6],
-				       "fill_color_gdk", f,
-				       "outline_color_gdk", outline,
-				       NULL);
-
-		gnome_canvas_item_set (priv->labels[6],
-				       "fill_color_gdk", t,
-				       NULL);
-	} else {
-		GdkColor *f, *t;
-
-		for (i = 0; i < 7; i++) {
-			if (priv->day_mask & (0x1 << i)) {
-				f = sel_fill;
-				t = sel_text_fill;
-			} else {
-				f = fill;
-				t = text_fill;
-			}
-
-			gnome_canvas_item_set (priv->boxes[i],
-					       "fill_color_gdk", f,
-					       "outline_color_gdk", outline,
-					       NULL);
-
-			gnome_canvas_item_set (priv->labels[i],
-					       "fill_color_gdk", t,
-					       NULL);
-		}
-	}
-}
-
-/* Configures the items in the weekday picker by setting their attributes. */
-static void
-configure_items (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-	int width, height;
-	int box_width;
-	const char *str;
-	int i;
-
-	priv = wp->priv;
-
-	width = GTK_WIDGET (wp)->allocation.width;
-	height = GTK_WIDGET (wp)->allocation.height;
-
-	box_width = (width - 1) / 7;
-
-	if (priv->week_starts_on_monday)
-		str = _("MTWTFSS");
-	else
-		str = _("SMTWTFS");
-
-	for (i = 0; i < 7; i++) {
-		char *c;
-
-		gnome_canvas_item_set (priv->boxes[i],
-				       "x1", (double) (i * box_width),
-				       "y1", (double) 0,
-				       "x2", (double) ((i + 1) * box_width),
-				       "y2", (double) (height - 1),
-				       "width_pixels", 0,
-				       NULL);
-
-		c = g_strndup (str + i, 1);
-		gnome_canvas_item_set (priv->labels[i],
-				       "text", c,
-				       "font_gdk", GTK_WIDGET (wp)->style->font,
-				       "x", (double) (i * box_width) + box_width / 2.0,
-				       "y", (double) (1 + PADDING),
-				       "anchor", GTK_ANCHOR_N,
-				       NULL);
-		g_free (c);
-	}
-
-	colorize_items (wp);
-}
-
-/* Realize handler for the weekday picker */
-static void
-weekday_picker_realize (GtkWidget *widget)
-{
-	WeekdayPicker *wp;
-
-	wp = WEEKDAY_PICKER (widget);
-
-	if (GTK_WIDGET_CLASS (parent_class)->realize)
-		(* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
-
-	configure_items (wp);
-}
-
-/* Size_request handler for the weekday picker */
-static void
-weekday_picker_size_request (GtkWidget *widget, GtkRequisition *requisition)
-{
-	WeekdayPicker *wp;
-	WeekdayPickerPrivate *priv;
-
-	wp = WEEKDAY_PICKER (widget);
-	priv = wp->priv;
-
-	requisition->width = (priv->max_letter_width + 2 * PADDING + 1) * 7 + 1;
-	requisition->height = (priv->font_ascent + priv->font_descent + 2 * PADDING + 2);
-}
-
-/* Size_allocate handler for the weekday picker */
-static void
-weekday_picker_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
-{
-	WeekdayPicker *wp;
-
-	wp = WEEKDAY_PICKER (widget);
-
-	if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
-		(* GTK_WIDGET_CLASS (parent_class)->size_allocate) (widget, allocation);
-
-	gnome_canvas_set_scroll_region (GNOME_CANVAS (wp),
-					0, 0, allocation->width, allocation->height);
-
-	configure_items (wp);
-}
-
-/* Style_set handler for the weekday picker */
-static void
-weekday_picker_style_set (GtkWidget *widget, GtkStyle *previous_style)
-{
-	WeekdayPicker *wp;
-	WeekdayPickerPrivate *priv;
-	int max_width;
-	const char *str;
-	int i, len;
-
-	wp = WEEKDAY_PICKER (widget);
-	priv = wp->priv;
-
-	priv->font_ascent = widget->style->font->ascent;
-	priv->font_descent = widget->style->font->descent;
-
-	max_width = 0;
-
-	str = _("SMTWTFS");
-	len = strlen (str);
-
-	for (i = 0; i < len; i++) {
-		int w;
-
-		w = gdk_char_measure (widget->style->font, str[i]);
-		if (w > max_width)
-			max_width = w;
-	}
-
-	priv->max_letter_width = max_width;
-
-	configure_items (wp);
-
-	if (GTK_WIDGET_CLASS (parent_class)->style_set)
-		(* GTK_WIDGET_CLASS (parent_class)->style_set) (widget, previous_style);
-}
-
-
-
-/**
- * weekday_picker_new:
- * @void: 
- * 
- * Creates a new weekday picker widget.
- * 
- * Return value: A newly-created weekday picker.
- **/
-GtkWidget *
-weekday_picker_new (void)
-{
-	return gtk_type_new (TYPE_WEEKDAY_PICKER);
-}
-
-/**
- * weekday_picker_set_days:
- * @wp: A weekday picker.
- * @day_mask: Bitmask with the days to be selected.
- * 
- * Sets the days that are selected in a weekday picker.  In the @day_mask,
- * Sunday is bit 0, Monday is bit 1, etc.
- **/
-void
-weekday_picker_set_days (WeekdayPicker *wp, guint8 day_mask)
-{
-	WeekdayPickerPrivate *priv;
-
-	g_return_if_fail (wp != NULL);
-	g_return_if_fail (IS_WEEKDAY_PICKER (wp));
-
-	priv = wp->priv;
-
-	priv->day_mask = day_mask;
-	colorize_items (wp);
-}
-
-/**
- * weekday_picker_get_days:
- * @wp: A weekday picker.
- * 
- * Queries the days that are selected in a weekday picker.
- * 
- * Return value: Bit mask of selected days.  Sunday is bit 0, Monday is bit 1,
- * etc.
- **/
-guint8
-weekday_picker_get_days (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-
-	g_return_val_if_fail (wp != NULL, 0);
-	g_return_val_if_fail (IS_WEEKDAY_PICKER (wp), 0);
-
-	priv = wp->priv;
-	return priv->day_mask;
-}
-
-/**
- * weekday_picker_set_week_starts_on_monday:
- * @wp: A weekday picker.
- * @on_monday: Whether weeks start on Monday.
- * 
- * Sets whether a weekday picker should display weeks as starting on monday.
- * The default setting is to make Sunday the first day of the week.
- **/
-void
-weekday_picker_set_week_starts_on_monday (WeekdayPicker *wp, gboolean on_monday)
-{
-	WeekdayPickerPrivate *priv;
-
-	g_return_if_fail (wp != NULL);
-	g_return_if_fail (IS_WEEKDAY_PICKER (wp));
-
-	priv = wp->priv;
-	priv->week_starts_on_monday = on_monday ? TRUE : FALSE;
-
-	configure_items (wp);
-}
-
-/**
- * weekday_picker_get_week_starts_on_monday:
- * @wp: A weekday picker.
- * 
- * Queries whether a weekday picker is set to show weeks as starting on Monday.
- * 
- * Return value: TRUE if weeks start on monday, FALSE if on Sunday.
- **/
-gboolean
-weekday_picker_get_week_starts_on_monday (WeekdayPicker *wp)
-{
-	WeekdayPickerPrivate *priv;
-
-	g_return_val_if_fail (wp != NULL, FALSE);
-	g_return_val_if_fail (IS_WEEKDAY_PICKER (wp), FALSE);
-
-	priv = wp->priv;
-	return priv->week_starts_on_monday;
-}
diff --git a/calendar/gui/weekday-picker.h b/calendar/gui/weekday-picker.h
deleted file mode 100644
index df053a1f6f..0000000000
--- a/calendar/gui/weekday-picker.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Evolution calendar - Week day picker widget
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef WEEKDAY_PICKER_H
-#define WEEKDAY_PICKER_H
-
-#include <libgnome/gnome-defs.h>
-#include <libgnomeui/gnome-canvas.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-#define TYPE_WEEKDAY_PICKER            (weekday_picker_get_type ())
-#define WEEKDAY_PICKER(obj)            (GTK_CHECK_CAST ((obj), TYPE_WEEKDAY_PICKER, WeekdayPicker))
-#define WEEKDAY_PICKER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_WEEKDAY_PICKER,	\
-					WeekdayPickerClass))
-#define IS_WEEKDAY_PICKER(obj)         (GTK_CHECK_TYPE ((obj), TYPE_WEEKDAY_PICKER))
-#define IS_WEEKDAY_PICKER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_WEEKDAY_PICKER))
-
-typedef struct _WeekdayPicker WeekdayPicker;
-typedef struct _WeekdayPickerClass WeekdayPickerClass;
-typedef struct _WeekdayPickerPrivate WeekdayPickerPrivate;
-
-struct _WeekdayPicker {
-	GnomeCanvas canvas;
-
-	/* Private data */
-	WeekdayPickerPrivate *priv;
-};
-
-struct _WeekdayPickerClass {
-	GnomeCanvasClass parent_class;
-};
-
-GtkType weekday_picker_get_type (void);
-
-GtkWidget *weekday_picker_new (void);
-
-void weekday_picker_set_days (WeekdayPicker *wp, guint8 day_mask);
-guint8 weekday_picker_get_days (WeekdayPicker *wp);
-
-void weekday_picker_set_week_starts_on_monday (WeekdayPicker *wp, gboolean on_monday);
-gboolean weekday_picker_get_week_starts_on_monday (WeekdayPicker *wp);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/gui/weekview.xpm b/calendar/gui/weekview.xpm
deleted file mode 100644
index 869b9e722a..0000000000
--- a/calendar/gui/weekview.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * weekview_xpm[] = {
-"24 24 7 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #D8D8D4",
-"#	c #F2F1ED",
-"$	c #919191",
-"%	c #666666",
-"....................... ",
-".++++++++++@++++++++++. ",
-".+#..$.$###$#..$.$###$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+$$$$$$$$$$$$$$$$$$$$. ",
-".+#..$.$###$#..$.$###$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+$$$$$$$$$$$$$$$$$$$$. ",
-".+#..$.$###$#..$.$###$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".+#########$$$$$$$$$$$. ",
-".+#########$#..$.$###$. ",
-".+#########$#########$. ",
-".+#########$#########$. ",
-".@$$$$$$$$$%$$$$$$$$$%. ",
-"....................... ",
-"                        "};
diff --git a/calendar/gui/workweekview.xpm b/calendar/gui/workweekview.xpm
deleted file mode 100644
index 35cceedbdc..0000000000
--- a/calendar/gui/workweekview.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * workweekview_xpm[] = {
-"24 24 7 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #D8D8D4",
-"#	c #B5B4AF",
-"$	c #666666",
-"%	c #F2F1ED",
-"....................... ",
-".++++@+++@+++@+++@++++. ",
-".+###$###$###$###$###$. ",
-".+###$###$###$###$###$. ",
-".@$$$$$$$$$$$$$$$$$$$$. ",
-".++++#+++#+++#+++#+++#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".+%%%#%%%#%%%#%%%#%%%#. ",
-".@###$###$###$###$####. ",
-"....................... ",
-"                        "};
diff --git a/calendar/gui/yearview.xpm b/calendar/gui/yearview.xpm
deleted file mode 100644
index 0d4fa4135b..0000000000
--- a/calendar/gui/yearview.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char * yearview_xpm[] = {
-"24 24 17 1",
-" 	c None",
-".	c #000000",
-"+	c #FFFFFF",
-"@	c #F2F1ED",
-"#	c #AAA9A6",
-"$	c #D7D6D2",
-"%	c #92918E",
-"&	c #B7B6B3",
-"*	c #CBCAC6",
-"=	c #919191",
-"-	c #888785",
-";	c #B6B6B2",
-">	c #888884",
-",	c #C1C1BD",
-"'	c #A7A6A3",
-")	c #D8D8D4",
-"!	c #666666",
-"....................... ",
-".+++++++++++++++++++++. ",
-".+@@@@@@@#$%&*@@@@@@@=. ",
-".+@@@@@@@-;>,'@@@@@@@=. ",
-".+====================. ",
-".+@@@@@@@@@@@@@@@@@@@=. ",
-".+===@===@===@===@====. ",
-".+)=)@)=)@)=)@)=)@)=)=. ",
-".+=)=@=)=@=)=@=)=@=)==. ",
-".+@@@@@@@@@@@@@@@@@@@=. ",
-".+===@===@===@===@====. ",
-".+)=)@)=)@)=)@)=)@)=)=. ",
-".+=)=@=)=@=)=@=)=@=)==. ",
-".+@@@@@@@@@@@@@@@@@@@=. ",
-".+===@===@===@===@====. ",
-".+)=)@)=)@)=)@)=)@)=)=. ",
-".+=)=@=)=@=)=@=)=@=)==. ",
-".+@@@@@@@@@@@@@@@@@@@=. ",
-".+===@===@===@===@====. ",
-".+)=)@)=)@)=)@)=)@)=)=. ",
-".+=)=@=)=@=)=@=)=@=)==. ",
-".)===================!. ",
-"....................... ",
-"                        "};
diff --git a/calendar/idl/.cvsignore b/calendar/idl/.cvsignore
deleted file mode 100644
index b840c21800..0000000000
--- a/calendar/idl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
-\ No newline at end of file
diff --git a/calendar/idl/Makefile.am b/calendar/idl/Makefile.am
deleted file mode 100644
index ec6b4e45f0..0000000000
--- a/calendar/idl/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-idldir = $(datadir)/idl
-
-idl_DATA = 			\
-	evolution-calendar.idl
-
-EXTRA_DIST =		\
-	$(idl_DATA)
diff --git a/calendar/idl/evolution-calendar.idl b/calendar/idl/evolution-calendar.idl
deleted file mode 100644
index ab80ff8702..0000000000
--- a/calendar/idl/evolution-calendar.idl
+++ /dev/null
@@ -1,178 +0,0 @@
-/* Evolution calendar interface
- *
- * Copyright (C) 2000 Eskil Heyn Olsen
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Authors: Eskil Heyn Olsen <deity@eskil.dk>
- *          Federico Mena-Quintero <federico@helixcode.com>
- */
-
-#ifndef _EVOLUTION_CALENDAR_IDL_
-#define _EVOLUTION_CALENDAR_IDL_
-
-#include <Bonobo.idl>
-
-module Evolution {
-
-module Calendar {
-	/* A calendar object (event/todo/journal/etc), represented as an
-	 * iCalendar string.
-	 */
-	typedef string CalObj;
-
-	/* An unique identifier for a calendar object */
-	typedef string CalObjUID;
-
-	/* Sequence of unique identifiers */
-	typedef sequence<CalObjUID> CalObjUIDSeq;
-
-	/* Flags for getting UID sequences */
-	typedef long CalObjType;
-	const CalObjType TYPE_EVENT   = 1 << 0;
-	const CalObjType TYPE_TODO    = 1 << 1;
-	const CalObjType TYPE_JOURNAL = 1 << 2;
-	const CalObjType TYPE_ANY     = 0x07;
-
-	/* Types of object changes made */
-	typedef long CalObjChangeType;
-	const CalObjChangeType UPDATED = 1 << 0;
-	const CalObjChangeType REMOVED = 1 << 1;
-	
-	/* Types of alarms */
-	enum AlarmType {
-		MAIL,
-		PROGRAM,
-		DISPLAY,
-		AUDIO
-	};
-
-	/* Used to store a time_t */
-	typedef unsigned long Time_t;
-
-	/* An instance of a calendar object that actually occurs.  These are
-	 * "virtual" objects in that they are used to represent instances of
-	 * recurring events and alarms.  "Real" objects just contain the
-	 * information required to figure out the times at which they recur or
-	 * trigger.
-	 */
-	struct CalObjInstance {
-		CalObjUID uid;
-		Time_t start;
-		Time_t end;
-	};
-
-	typedef sequence<CalObjInstance> CalObjInstanceSeq;
-
-	/* An object change */
-	struct CalObjChange {
-		CalObjUID uid;
-		CalObjChangeType type;
-	};
-
-	/* An alarm trigger instance */
-	struct CalAlarmInstance {
-		CalObjUID uid;
-		AlarmType type;
-		Time_t trigger;
-		Time_t occur;
-	};
-
-	typedef sequence<CalAlarmInstance> CalAlarmInstanceSeq;
-
-	typedef sequence<CalObjChange> CalObjChangeSeq;
-
-	interface Listener;
-
-	/* Calendar client interface */
-	interface Cal : Bonobo::Unknown {
-		exception NotFound {};
-		exception InvalidRange {};
-		exception InvalidObject {};
-
-		/* A calendar is identified by its URI */
-		readonly attribute string uri;
-
-		/* Gets the number of objects of the specified types */
-		long get_n_objects (in CalObjType type);
-
-		/* Gets an object based on its URI */
-		CalObj get_object (in CalObjUID uid)
-			raises (NotFound);
-
-		/* Gets a list of UIDs based on object type */
-		CalObjUIDSeq get_uids (in CalObjType type);
-
-		/* Gets a list of UIDs that changed based on object type */
-		CalObjChangeSeq get_changed_uids (in CalObjType type, in Time_t since);
-
-		/* Gets a list of objects that occur or recur in the specified time range */
-		CalObjUIDSeq get_objects_in_range (in CalObjType type, 
-						   in Time_t start, in Time_t end)
-			raises (InvalidRange);
-
-		/* Gets the objects whose alarms trigger in the specified time
-		 * range.
-		 */
-		CalAlarmInstanceSeq get_alarms_in_range (in Time_t start, in Time_t end)
-			raises (InvalidRange);
-
-		/* Gets the alarms for the specified object that trigger in the
-		 * specified time range.
-		 */
-		CalAlarmInstanceSeq get_alarms_for_object (in CalObjUID uid,
-							   in Time_t start, in Time_t end)
-			raises (NotFound, InvalidRange);
-
-
-		/* Updates an object by adding it if it does not exist or by
-		 * changing an existing one.
-		 */
-		void update_object (in CalObjUID uid, in CalObj calobj)
-			raises (InvalidObject);
-
-		/* Removes an object */
-		void remove_object (in CalObjUID uid)
-			raises (NotFound);
-	};
-
-	/* Listener for changes in a calendar */
-	interface Listener : Bonobo::Unknown {
-		/* Return status when loading a calendar; we need better error reporting */
-		enum LoadStatus {
-			SUCCESS,		/* All OK */
-			ERROR,			/* Generic error */
-			IN_USE,			/* Requested create while a calendar
-						 * with the same URI was in use.
-						 */
-			METHOD_NOT_SUPPORTED	/* A method handler is not registered */
-		};
-
-		/* Called from a CalFactory when a calendar is initially loaded
-		 * or created.  The listener must remember the cal object.
-		 */
-		void cal_loaded (in LoadStatus status, in Cal cal);
-
-		/* Called from a Calendar when an object is added or changed */
-		void obj_updated (in CalObjUID uid);
-
-		/* Called from a Calendar when an object is removed */
-		void obj_removed (in CalObjUID uid);
-	};
-
-	/* A calendar factory, can load and create calendars */
-	interface CalFactory : Bonobo::Unknown {
-		exception NilListener {};
-
-		/* Load a calendar from an URI */
-		void load (in string uri, in Listener listener)
-			raises (NilListener);
-
-		/* Create a new calendar at the specified URI */
-		void create (in string uri, in Listener listener)
-			raises (NilListener);
-	};
-};
-
-};
-
-#endif
diff --git a/calendar/pcs/.cvsignore b/calendar/pcs/.cvsignore
deleted file mode 100644
index 7250bfdff6..0000000000
--- a/calendar/pcs/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-.pure
-*.la
-*.lo
-evolution-calendar-stubs.c
-evolution-calendar-skels.c
-evolution-calendar-common.c
-evolution-calendar.h
-icalendar-test
diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am
deleted file mode 100644
index b435b90229..0000000000
--- a/calendar/pcs/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-INCLUDES =						\
-	-DG_LOG_DOMAIN=\"wombat-pcs\"			\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/libical/src/libical		\
-	-I$(top_builddir)/libical/src/libical		\
-	$(BONOBO_VFS_GNOME_CFLAGS)			\
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
-
-CORBA_GENERATED =				\
-	evolution-calendar.h			\
-	evolution-calendar-common.c		\
-	evolution-calendar-skels.c		\
-	evolution-calendar-stubs.c
-
-idls =						\
-	$(srcdir)/../idl/evolution-calendar.idl
-
-idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
-
-$(CORBA_GENERATED): $(idls)
-	$(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl
-
-noinst_LIBRARIES = libpcs.a
-
-libpcs_a_SOURCES =		\
-	$(CORBA_GENERATED)	\
-	cal.c			\
-	cal.h			\
-	cal-backend.c		\
-	cal-backend.h		\
-	cal-backend-file.c	\
-	cal-backend-file.h	\
-	cal-common.h		\
-	cal-factory.c		\
-	cal-factory.h		\
-	job.c			\
-	job.h
-
-
-BUILT_SOURCES = $(CORBA_GENERATED)
-CLEANFILES += $(BUILT_SOURCES)
diff --git a/calendar/pcs/cal-backend-file.c b/calendar/pcs/cal-backend-file.c
deleted file mode 100644
index 97e96d3d44..0000000000
--- a/calendar/pcs/cal-backend-file.c
+++ /dev/null
@@ -1,1110 +0,0 @@
-/* Evolution calendar - iCalendar file backend
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gtk/gtksignal.h>
-#include "cal-util/cal-recur.h"
-#include "cal-backend-file.h"
-
-
-
-/* Private part of the CalBackendFile structure */
-struct _CalBackendFilePrivate {
-	/* URI where the calendar data is stored */
-	GnomeVFSURI *uri;
-
-	/* List of Cal objects with their listeners */
-	GList *clients;
-
-	/* Toplevel VCALENDAR component */
-	icalcomponent *icalcomp;
-
-	/* All the CalComponent objects in the calendar, hashed by UID.  The
-	 * hash key *is* the uid returned by cal_component_get_uid(); it is not
-	 * copied, so don't free it when you remove an object from the hash
-	 * table.
-	 */
-	GHashTable *comp_uid_hash;
-
-	/* All event, to-do, and journal components in the calendar; they are
-	 * here just for easy access (i.e. so that you don't have to iterate
-	 * over the comp_uid_hash).  If you need *all* the components in the
-	 * calendar, iterate over the hash instead.
-	 */
-	GList *events;
-	GList *todos;
-	GList *journals;
-
-	/* Idle handler for saving the calendar when it is dirty */
-	guint idle_id;
-};
-
-
-
-static void cal_backend_file_class_init (CalBackendFileClass *class);
-static void cal_backend_file_init (CalBackendFile *cbfile);
-static void cal_backend_file_destroy (GtkObject *object);
-
-static GnomeVFSURI *cal_backend_file_get_uri (CalBackend *backend);
-static void cal_backend_file_add_cal (CalBackend *backend, Cal *cal);
-static CalBackendLoadStatus cal_backend_file_load (CalBackend *backend, GnomeVFSURI *uri);
-static void cal_backend_file_create (CalBackend *backend, GnomeVFSURI *uri);
-
-static int cal_backend_file_get_n_objects (CalBackend *backend, CalObjType type);
-static char *cal_backend_file_get_object (CalBackend *backend, const char *uid);
-static CalObjType cal_backend_file_get_type_by_uid (CalBackend *backend, const char *uid);
-static GList *cal_backend_file_get_uids (CalBackend *backend, CalObjType type);
-static GList *cal_backend_file_get_objects_in_range (CalBackend *backend, CalObjType type,
-						     time_t start, time_t end);
-static GList *cal_backend_file_get_alarms_in_range (CalBackend *backend, time_t start, time_t end);
-static gboolean cal_backend_file_get_alarms_for_object (CalBackend *backend, const char *uid,
-							time_t start, time_t end,
-							GList **alarms);
-static gboolean cal_backend_file_update_object (CalBackend *backend, const char *uid,
-					       const char *calobj);
-static gboolean cal_backend_file_remove_object (CalBackend *backend, const char *uid);
-
-static CalBackendClass *parent_class;
-
-
-
-/**
- * cal_backend_file_get_type:
- * @void: 
- * 
- * Registers the #CalBackendFile class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #CalBackendFile class.
- **/
-GtkType
-cal_backend_file_get_type (void)
-{
-	static GtkType cal_backend_file_type = 0;
-
-	if (!cal_backend_file_type) {
-		static const GtkTypeInfo cal_backend_file_info = {
-			"CalBackendFile",
-			sizeof (CalBackendFile),
-			sizeof (CalBackendFileClass),
-			(GtkClassInitFunc) cal_backend_file_class_init,
-			(GtkObjectInitFunc) cal_backend_file_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_backend_file_type = gtk_type_unique (CAL_BACKEND_TYPE, &cal_backend_file_info);
-	}
-
-	return cal_backend_file_type;
-}
-
-/* Class initialization function for the file backend */
-static void
-cal_backend_file_class_init (CalBackendFileClass *class)
-{
-	GtkObjectClass *object_class;
-	CalBackendClass *backend_class;
-
-	object_class = (GtkObjectClass *) class;
-	backend_class = (CalBackendClass *) class;
-
-	parent_class = gtk_type_class (CAL_BACKEND_TYPE);
-
-	object_class->destroy = cal_backend_file_destroy;
-
-	backend_class->get_uri = cal_backend_file_get_uri;
-	backend_class->add_cal = cal_backend_file_add_cal;
-	backend_class->load = cal_backend_file_load;
-	backend_class->create = cal_backend_file_create;
-	backend_class->get_n_objects = cal_backend_file_get_n_objects;
-	backend_class->get_object = cal_backend_file_get_object;
-	backend_class->get_type_by_uid = cal_backend_file_get_type_by_uid;
-	backend_class->get_uids = cal_backend_file_get_uids;
-	backend_class->get_objects_in_range = cal_backend_file_get_objects_in_range;
-	backend_class->get_alarms_in_range = cal_backend_file_get_alarms_in_range;
-	backend_class->get_alarms_for_object = cal_backend_file_get_alarms_for_object;
-	backend_class->update_object = cal_backend_file_update_object;
-	backend_class->remove_object = cal_backend_file_remove_object;
-}
-
-/* Object initialization function for the file backend */
-static void
-cal_backend_file_init (CalBackendFile *cbfile)
-{
-	CalBackendFilePrivate *priv;
-
-	priv = g_new0 (CalBackendFilePrivate, 1);
-	cbfile->priv = priv;
-}
-
-/* g_hash_table_foreach() callback to destroy a CalComponent */
-static void
-free_cal_component (gpointer key, gpointer value, gpointer data)
-{
-	CalComponent *comp;
-
-	comp = CAL_COMPONENT (value);
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-/* Saves the calendar data */
-static void
-save (CalBackendFile *cbfile)
-{
-	CalBackendFilePrivate *priv;
-	GnomeVFSHandle *handle = NULL;
-	GnomeVFSResult result;
-	GnomeVFSFileSize out;
-	gchar *tmp;
-	char *buf;
-	
-	priv = cbfile->priv;
-	g_assert (priv->uri != NULL);
-	g_assert (priv->icalcomp != NULL);
-
-	/* Make a backup copy of the file if it exists */
-	if (gnome_vfs_uri_exists (priv->uri)) {
-		tmp = gnome_vfs_uri_to_string (priv->uri, GNOME_VFS_URI_HIDE_NONE);
-		if (tmp) {
-			GnomeVFSURI *backup_uri;
-			gchar *backup_uristr;
-			
-			backup_uristr = g_strconcat (tmp, "~", NULL);
-			backup_uri = gnome_vfs_uri_new (backup_uristr);
-			
-			result = gnome_vfs_move_uri (priv->uri, backup_uri, TRUE);
-			gnome_vfs_uri_unref (backup_uri);
-			
-			g_free (tmp);
-			g_free (backup_uristr);
-		}
-	} else {
-		result = GNOME_VFS_OK;
-	}
-	
-
-	if (result != GNOME_VFS_OK)
-		goto error;
-	
-	/* Now write the new file out */
-	result = gnome_vfs_create_uri (&handle, priv->uri, 
-				       GNOME_VFS_OPEN_WRITE,
-				       FALSE, 0666);
-	
-	if (result != GNOME_VFS_OK)
-		goto error;
-	
-	buf = icalcomponent_as_ical_string (priv->icalcomp);
-	result = gnome_vfs_write (handle, buf, strlen (buf) * sizeof (char), &out);
-
-	if (result != GNOME_VFS_OK)
-		goto error;
-
-	gnome_vfs_close (handle);
-
-	return;
-	
- error:
-	g_warning ("Error writing calendar file.");
-	return;
-}
-
-/* Destroy handler for the file backend */
-static void
-cal_backend_file_destroy (GtkObject *object)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_BACKEND_FILE (object));
-
-	cbfile = CAL_BACKEND_FILE (object);
-	priv = cbfile->priv;
-
-	g_assert (priv->clients == NULL);
-
-	/* Save if necessary */
-
-	if (priv->idle_id != 0) {
-		save (cbfile);
-		g_source_remove (priv->idle_id);
-		priv->idle_id = 0;
-	}
-
-	/* Clean up */
-
-	if (priv->uri) {
-		gnome_vfs_uri_unref (priv->uri);
-		priv->uri = NULL;
-	}
-
-	if (priv->comp_uid_hash) {
-		g_hash_table_foreach (priv->comp_uid_hash, 
-				      free_cal_component, NULL);
-		g_hash_table_destroy (priv->comp_uid_hash);
-		priv->comp_uid_hash = NULL;
-	}
-
-	g_list_free (priv->events);
-	g_list_free (priv->todos);
-	g_list_free (priv->journals);
-
-	priv->events = NULL;
-	priv->todos = NULL;
-	priv->journals = NULL;
-
-	if (priv->icalcomp) {
-		icalcomponent_free (priv->icalcomp);
-		priv->icalcomp = NULL;
-	}
-
-	g_free (priv);
-	cbfile->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* Looks up a component by its UID on the backend's component hash table */
-static CalComponent *
-lookup_component (CalBackendFile *cbfile, const char *uid)
-{
-	CalBackendFilePrivate *priv;
-	CalComponent *comp;
-
-	priv = cbfile->priv;
-
-	comp = g_hash_table_lookup (priv->comp_uid_hash, uid);
-
-	return comp;
-}
-
-
-
-/* Calendar backend methods */
-
-/* Get_uri handler for the file backend */
-static GnomeVFSURI *
-cal_backend_file_get_uri (CalBackend *backend)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-	g_assert (priv->uri != NULL);
-
-	return priv->uri;
-}
-
-/* Callback used when a Cal is destroyed */
-static void
-cal_destroy_cb (GtkObject *object, gpointer data)
-{
-	Cal *cal;
-	Cal *lcal;
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	GList *l;
-
-	cal = CAL (object);
-
-	cbfile = CAL_BACKEND_FILE (data);
-	priv = cbfile->priv;
-
-	/* Find the cal in the list of clients */
-
-	for (l = priv->clients; l; l = l->next) {
-		lcal = CAL (l->data);
-
-		if (lcal == cal)
-			break;
-	}
-
-	g_assert (l != NULL);
-
-	/* Disconnect */
-
-	priv->clients = g_list_remove_link (priv->clients, l);
-	g_list_free_1 (l);
-
-	/* When all clients go away, notify the parent factory about it so that
-	 * it may decide whether to kill the backend or not.
-	 */
-	if (!priv->clients)
-		cal_backend_last_client_gone (CAL_BACKEND (cbfile));
-}
-
-/* Add_cal handler for the file backend */
-static void
-cal_backend_file_add_cal (CalBackend *backend, Cal *cal)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_if_fail (priv->icalcomp != NULL);
-	g_return_if_fail (cal != NULL);
-	g_return_if_fail (IS_CAL (cal));
-
-	/* We do not keep a reference to the Cal since the calendar user agent
-	 * owns it.
-	 */
-
-	gtk_signal_connect (GTK_OBJECT (cal), "destroy",
-			    GTK_SIGNAL_FUNC (cal_destroy_cb),
-			    backend);
-
-	priv->clients = g_list_prepend (priv->clients, cal);
-}
-
-/* Idle handler; we save the calendar since it is dirty */
-static gboolean
-save_idle (gpointer data)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (data);
-	priv = cbfile->priv;
-
-	g_assert (priv->icalcomp != NULL);
-
-	save (cbfile);
-
-	priv->idle_id = 0;
-	return FALSE;
-}
-
-/* Marks the file backend as dirty and queues a save operation */
-static void
-mark_dirty (CalBackendFile *cbfile)
-{
-	CalBackendFilePrivate *priv;
-
-	priv = cbfile->priv;
-
-	if (priv->idle_id != 0)
-		return;
-
-	priv->idle_id = g_idle_add (save_idle, cbfile);
-}
-
-/* Checks if the specified component has a duplicated UID and if so changes it */
-static void
-check_dup_uid (CalBackendFile *cbfile, CalComponent *comp)
-{
-	CalBackendFilePrivate *priv;
-	CalComponent *old_comp;
-	const char *uid;
-	char *new_uid;
-
-	priv = cbfile->priv;
-
-	cal_component_get_uid (comp, &uid);
-
-	old_comp = g_hash_table_lookup (priv->comp_uid_hash, uid);
-	if (!old_comp)
-		return; /* Everything is fine */
-
-	g_message ("check_dup_uid(): Got object with duplicated UID `%s', changing it...", uid);
-
-	new_uid = cal_component_gen_uid ();
-	cal_component_set_uid (comp, new_uid);
-	g_free (new_uid);
-
-	/* FIXME: I think we need to reset the SEQUENCE property and reset the
-	 * CREATED/DTSTAMP/LAST-MODIFIED.
-	 */
-
-	mark_dirty (cbfile);
-}
-
-/* Tries to add an icalcomponent to the file backend.  We only store the objects
- * of the types we support; all others just remain in the toplevel component so
- * that we don't lose them.
- */
-static void
-add_component (CalBackendFile *cbfile, CalComponent *comp, gboolean add_to_toplevel)
-{
-	CalBackendFilePrivate *priv;
-	GList **list;
-	const char *uid;
-	
-	priv = cbfile->priv;
-
-	switch (cal_component_get_vtype (comp)) {
-	case CAL_COMPONENT_EVENT:
-		list = &priv->events;
-		break;
-
-	case CAL_COMPONENT_TODO:
-		list = &priv->todos;
-		break;
-
-	case CAL_COMPONENT_JOURNAL:
-		list = &priv->journals;
-		break;
-
-	default:
-		g_assert_not_reached ();
-		return;
-	}
-
-	/* Ensure that the UID is unique; some broken implementations spit
-	 * components with duplicated UIDs.
-	 */
-	check_dup_uid (cbfile, comp);
-	cal_component_get_uid (comp, &uid);
-	g_hash_table_insert (priv->comp_uid_hash, (char *)uid, comp);
-
-	*list = g_list_prepend (*list, comp);
-
-	/* Put the object in the toplevel component if required */
-
-	if (add_to_toplevel) {
-		icalcomponent *icalcomp;
-
-		icalcomp = cal_component_get_icalcomponent (comp);
-		g_assert (icalcomp != NULL);
-
-		icalcomponent_add_component (priv->icalcomp, icalcomp);
-	}
-}
-
-/* Removes a component from the backend's hash and lists.  Does not perform
- * notification on the clients.  Also removes the component from the toplevel
- * icalcomponent.
- */
-static void
-remove_component (CalBackendFile *cbfile, CalComponent *comp)
-{
-	CalBackendFilePrivate *priv;
-	icalcomponent *icalcomp;
-	const char *uid;
-	GList **list, *l;
-
-	priv = cbfile->priv;
-
-	/* Remove the icalcomp from the toplevel */
-
-	icalcomp = cal_component_get_icalcomponent (comp);
-	g_assert (icalcomp != NULL);
-
-	icalcomponent_remove_component (priv->icalcomp, icalcomp);
-
-	/* Remove it from our mapping */
-
-	cal_component_get_uid (comp, &uid);
-	g_hash_table_remove (priv->comp_uid_hash, uid);
-	
-	switch (cal_component_get_vtype (comp)) {
-	case CAL_COMPONENT_EVENT:
-		list = &priv->events;
-		break;
-
-	case CAL_COMPONENT_TODO:
-		list = &priv->todos;
-		break;
-
-	case CAL_COMPONENT_JOURNAL:
-		list = &priv->journals;
-		break;
-
-	default:
-                /* Make the compiler shut up. */
-	        list = NULL;
-		g_assert_not_reached ();
-	}
-
-	l = g_list_find (*list, comp);
-	g_assert (l != NULL);
-
-	*list = g_list_remove_link (*list, l);
-	g_list_free_1 (l);
-
-	gtk_object_unref (GTK_OBJECT (comp));
-}
-
-/* Scans the toplevel VCALENDAR component and stores the objects it finds */
-static void
-scan_vcalendar (CalBackendFile *cbfile)
-{
-	CalBackendFilePrivate *priv;
-	icalcomponent *icalcomp;
-
-	priv = cbfile->priv;
-	g_assert (priv->icalcomp != NULL);
-	g_assert (priv->comp_uid_hash != NULL);
-
-	for (icalcomp = icalcomponent_get_first_component (priv->icalcomp, ICAL_ANY_COMPONENT);
-	     icalcomp;
-	     icalcomp = icalcomponent_get_next_component (priv->icalcomp, ICAL_ANY_COMPONENT)) {
-		icalcomponent_kind kind;
-		CalComponent *comp;
-
-		kind = icalcomponent_isa (icalcomp);
-
-		if (!(kind == ICAL_VEVENT_COMPONENT
-		      || kind == ICAL_VTODO_COMPONENT
-		      || kind == ICAL_VJOURNAL_COMPONENT))
-			continue;
-
-		comp = cal_component_new ();
-
-		if (!cal_component_set_icalcomponent (comp, icalcomp))
-			continue;
-
-		add_component (cbfile, comp, FALSE);
-	}
-}
-
-/* Callback used from icalparser_parse() */
-static char *
-get_line (char *s, size_t size, void *data)
-{
-	FILE *file;
-
-	file = data;
-	return fgets (s, size, file);
-}
-
-/* Load handler for the file backend */
-static CalBackendLoadStatus
-cal_backend_file_load (CalBackend *backend, GnomeVFSURI *uri)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	char *str_uri;
-	FILE *file;
-	icalparser *parser;
-	icalcomponent *icalcomp;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp == NULL, CAL_BACKEND_LOAD_ERROR);
-	g_return_val_if_fail (uri != NULL, CAL_BACKEND_LOAD_ERROR);
-
-	if (!gnome_vfs_uri_is_local (uri))
-		return CAL_BACKEND_LOAD_ERROR;
-
-	if (!gnome_vfs_uri_exists (uri))
-		return CAL_BACKEND_LOAD_ERROR;;
-
-	str_uri = gnome_vfs_uri_to_string (uri,
-					   (GNOME_VFS_URI_HIDE_USER_NAME
-					    | GNOME_VFS_URI_HIDE_PASSWORD
-					    | GNOME_VFS_URI_HIDE_HOST_NAME
-					    | GNOME_VFS_URI_HIDE_HOST_PORT
-					    | GNOME_VFS_URI_HIDE_TOPLEVEL_METHOD));
-
-	/* Load! */
-	file = fopen (str_uri, "r");
-	g_free (str_uri);
-
-	if (!file)
-		return CAL_BACKEND_LOAD_ERROR;
-
-	parser = icalparser_new ();
-	icalparser_set_gen_data (parser, file);
-
-	icalcomp = icalparser_parse (parser, get_line);
-	icalparser_free (parser);
-
-	if (fclose (file) != 0)
-		return CAL_BACKEND_LOAD_ERROR;
-
-	if (!icalcomp)
-		return CAL_BACKEND_LOAD_ERROR;
-
-	/* FIXME: should we try to demangle XROOT components and individual
-         * components as well?
-	 */
-
-	if (icalcomponent_isa (icalcomp) != ICAL_VCALENDAR_COMPONENT)
-		return CAL_BACKEND_LOAD_ERROR;
-
-	priv->icalcomp = icalcomp;
-
-	priv->comp_uid_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	scan_vcalendar (cbfile);
-
-	/* Clean up */
-	if (priv->uri)
-		gnome_vfs_uri_unref (uri);
-	
-	gnome_vfs_uri_ref (uri);
-	priv->uri = uri;
-
-	return CAL_BACKEND_LOAD_SUCCESS;
-}
-
-/* Create handler for the file backend */
-static void
-cal_backend_file_create (CalBackend *backend, GnomeVFSURI *uri)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	icalproperty *prop;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_if_fail (priv->icalcomp == NULL);
-	g_return_if_fail (uri != NULL);
-
-	/* Create the new calendar information */
-
-	g_assert (priv->icalcomp == NULL);
-	priv->icalcomp = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);
-
-	/* RFC 2445, section 4.7.1 */
-	prop = icalproperty_new_calscale ("GREGORIAN");
-	icalcomponent_add_property (priv->icalcomp, prop);
-
-	/* RFC 2445, section 4.7.3 */
-	prop = icalproperty_new_prodid ("-//Helix Code//NONSGML Evolution Calendar//EN");
-	icalcomponent_add_property (priv->icalcomp, prop);
-
-	/* RFC 2445, section 4.7.4 */
-	prop = icalproperty_new_version ("2.0");
-	icalcomponent_add_property (priv->icalcomp, prop);
-
-	/* Create our internal data */
-
-	g_assert (priv->comp_uid_hash == NULL);
-	priv->comp_uid_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	/* Clean up */
-	if (priv->uri)
-		gnome_vfs_uri_unref (priv->uri);
-	
-	gnome_vfs_uri_ref (uri);
-	priv->uri = uri;
-
-	mark_dirty (cbfile);
-}
-
-/* Get_n_objects handler for the file backend */
-static int
-cal_backend_file_get_n_objects (CalBackend *backend, CalObjType type)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	int n;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, -1);
-
-	n = 0;
-
-	if (type & CALOBJ_TYPE_EVENT)
-		n += g_list_length (priv->events);
-
-	if (type & CALOBJ_TYPE_TODO)
-		n += g_list_length (priv->todos);
-
-	if (type & CALOBJ_TYPE_JOURNAL)
-		n += g_list_length (priv->journals);
-
-	return n;
-}
-
-/* Get_object handler for the file backend */
-static char *
-cal_backend_file_get_object (CalBackend *backend, const char *uid)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	CalComponent *comp;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (uid != NULL, NULL);
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-	g_assert (priv->comp_uid_hash != NULL);
-
-	comp = lookup_component (cbfile, uid);
-
-	if (!comp)
-		return NULL;
-
-	return cal_component_get_as_string (comp);
-}
-
-static CalObjType
-cal_backend_file_get_type_by_uid (CalBackend *backend, const char *uid)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	CalComponent *comp;
-	CalComponentVType type;
-	
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	comp = lookup_component (cbfile, uid);
-	if (!comp)
-		return CAL_COMPONENT_NO_TYPE;
-	
-	type = cal_component_get_vtype (comp);
-	switch (type) {
-	case CAL_COMPONENT_EVENT:
-		return CALOBJ_TYPE_EVENT;
-	case CAL_COMPONENT_TODO:
-		return CALOBJ_TYPE_TODO;
-	case CAL_COMPONENT_JOURNAL:
-		return CALOBJ_TYPE_JOURNAL;
-	default:
-		return CAL_COMPONENT_NO_TYPE;
-	}
-}
-
-/* Builds a list of UIDs from a list of CalComponent objects */
-static void
-build_uids_list (GList **list, GList *components)
-{
-	GList *l;
-
-	for (l = components; l; l = l->next) {
-		CalComponent *comp;
-		const char *uid;
-
-		comp = CAL_COMPONENT (l->data);
-		cal_component_get_uid (comp, &uid);
-		*list = g_list_prepend (*list, g_strdup (uid));
-	}
-}
-
-/* Get_uids handler for the file backend */
-static GList *
-cal_backend_file_get_uids (CalBackend *backend, CalObjType type)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	GList *list;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	list = NULL;
-
-	if (type & CALOBJ_TYPE_EVENT)
-		build_uids_list (&list, priv->events);
-
-	if (type & CALOBJ_TYPE_TODO)
-		build_uids_list (&list, priv->todos);
-
-	if (type & CALOBJ_TYPE_JOURNAL)
-		build_uids_list (&list, priv->journals);
-
-	return list;
-}
-
-/* Callback used from cal_recur_generate_instances(); adds the component's UID
- * to our hash table.
- */
-static gboolean
-add_instance (CalComponent *comp, time_t start, time_t end, gpointer data)
-{
-	GHashTable *uid_hash;
-	const char *uid;
-	const char *old_uid;
-
-	uid_hash = data;
-
-	/* We only care that the component's UID is listed in the hash table;
-	 * that's why we only allow generation of one instance (i.e. return
-	 * FALSE every time).
-	 */
-
-	cal_component_get_uid (comp, &uid);
-
-	old_uid = g_hash_table_lookup (uid_hash, uid);
-	if (old_uid)
-		return FALSE;
-
-	g_hash_table_insert (uid_hash, (char *) uid, NULL);
-	return FALSE;
-}
-
-/* Populates a hash table with the UIDs of the components that occur or recur
- * within a specific time range.
- */
-static void
-get_instances_in_range (GHashTable *uid_hash, GList *components, time_t start, time_t end)
-{
-	GList *l;
-
-	for (l = components; l; l = l->next) {
-		CalComponent *comp;
-
-		comp = CAL_COMPONENT (l->data);
-		cal_recur_generate_instances (comp, start, end, add_instance, uid_hash);
-	}
-}
-
-/* Used from g_hash_table_foreach(), adds a UID from the hash table to our list */
-static void
-add_uid_to_list (gpointer key, gpointer value, gpointer data)
-{
-	GList **list;
-	const char *uid;
-	char *uid_copy;
-
-	list = data;
-
-	uid = key;
-	uid_copy = g_strdup (uid);
-
-	*list = g_list_prepend (*list, uid_copy);
-}
-
-/* Get_objects_in_range handler for the file backend */
-static GList *
-cal_backend_file_get_objects_in_range (CalBackend *backend, CalObjType type,
-				       time_t start, time_t end)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	GList *event_list;
-	GHashTable *uid_hash;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	uid_hash = g_hash_table_new (g_str_hash, g_str_equal);
-
-	if (type & CALOBJ_TYPE_EVENT)
-		get_instances_in_range (uid_hash, priv->events, start, end);
-
-	if (type & CALOBJ_TYPE_TODO)
-		get_instances_in_range (uid_hash, priv->todos, start, end);
-
-	if (type & CALOBJ_TYPE_JOURNAL)
-		get_instances_in_range (uid_hash, priv->journals, start, end);
-
-	event_list = NULL;
-	g_hash_table_foreach (uid_hash, add_uid_to_list, &event_list);
-	g_hash_table_destroy (uid_hash);
-
-	return event_list;
-}
-
-/* Get_alarms_in_range handler for the file backend */
-static GList *
-cal_backend_file_get_alarms_in_range (CalBackend *backend, time_t start, time_t end)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, NULL);
-
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	/* FIXME: have to deal with an unknown number of alarms; we can't just
-	 * do the same thing as in cal-backend-imc.
-	 */
-	return NULL;
-}
-
-/* Get_alarms_for_object handler for the file backend */
-static gboolean
-cal_backend_file_get_alarms_for_object (CalBackend *backend, const char *uid,
-					time_t start, time_t end,
-					GList **alarms)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	g_return_val_if_fail (uid != NULL, FALSE);
-	g_return_val_if_fail (start != -1 && end != -1, FALSE);
-	g_return_val_if_fail (start <= end, FALSE);
-	g_return_val_if_fail (alarms != NULL, FALSE);
-
-	/* FIXME */
-
-	*alarms = NULL;
-	return FALSE;
-}
-
-/* Notifies a backend's clients that an object was updated */
-static void
-notify_update (CalBackendFile *cbfile, const char *uid)
-{
-	CalBackendFilePrivate *priv;
-	GList *l;
-
-	priv = cbfile->priv;
-
-	for (l = priv->clients; l; l = l->next) {
-		Cal *cal;
-
-		cal = CAL (l->data);
-		cal_notify_update (cal, uid);
-	}
-}
-
-/* Notifies a backend's clients that an object was removed */
-static void
-notify_remove (CalBackendFile *cbfile, const char *uid)
-{
-	CalBackendFilePrivate *priv;
-	GList *l;
-
-	priv = cbfile->priv;
-
-	for (l = priv->clients; l; l = l->next) {
-		Cal *cal;
-
-		cal = CAL (l->data);
-		cal_notify_remove (cal, uid);
-	}
-}
-
-/* Update_object handler for the file backend */
-static gboolean
-cal_backend_file_update_object (CalBackend *backend, const char *uid, const char *calobj)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	icalcomponent *icalcomp;
-	icalcomponent_kind kind;
-	CalComponent *old_comp;
-	CalComponent *comp;
-	const char *comp_uid;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	g_return_val_if_fail (uid != NULL, FALSE);
-	g_return_val_if_fail (calobj != NULL, FALSE);
-
-	/* Pull the component from the string and ensure that it is sane */
-
-	icalcomp = icalparser_parse_string ((char *) calobj);
-
-	if (!icalcomp)
-		return FALSE;
-
-	kind = icalcomponent_isa (icalcomp);
-
-	if (!(kind == ICAL_VEVENT_COMPONENT
-	      || kind == ICAL_VTODO_COMPONENT
-	      || kind == ICAL_VJOURNAL_COMPONENT)) {
-		/* We don't support this type of component */
-		icalcomponent_free (icalcomp);
-		return FALSE;
-	}
-
-	comp = cal_component_new ();
-	if (!cal_component_set_icalcomponent (comp, icalcomp)) {
-		gtk_object_unref (GTK_OBJECT (comp));
-		icalcomponent_free (icalcomp);
-		return FALSE;
-	}
-
-	/* Check the UID for sanity's sake */
-
-	cal_component_get_uid (comp, &comp_uid);
-
-	if (strcmp (uid, comp_uid) != 0) {
-		gtk_object_unref (GTK_OBJECT (comp));
-		return FALSE;
-	}
-
-	/* Update the component */
-
-	old_comp = lookup_component (cbfile, uid);
-
-	if (old_comp)
-		remove_component (cbfile, old_comp);
-
-	add_component (cbfile, comp, TRUE);
-
-	mark_dirty (cbfile);
-
-	/* FIXME: do the notification asynchronously */
-	notify_update (cbfile, comp_uid);
-
-	return TRUE;
-}
-
-/* Remove_object handler for the file backend */
-static gboolean
-cal_backend_file_remove_object (CalBackend *backend, const char *uid)
-{
-	CalBackendFile *cbfile;
-	CalBackendFilePrivate *priv;
-	CalComponent *comp;
-
-	cbfile = CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
-	g_return_val_if_fail (priv->icalcomp != NULL, FALSE);
-
-	g_return_val_if_fail (uid != NULL, FALSE);
-
-	comp = lookup_component (cbfile, uid);
-	if (!comp)
-		return FALSE;
-
-	remove_component (cbfile, comp);
-	mark_dirty (cbfile);
-
-	/* FIXME: do the notification asynchronously */
-	notify_remove (cbfile, uid);
-
-	return TRUE;
-}
-
diff --git a/calendar/pcs/cal-backend-file.h b/calendar/pcs/cal-backend-file.h
deleted file mode 100644
index 376790751c..0000000000
--- a/calendar/pcs/cal-backend-file.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Evolution calendar - iCalendar file backend
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_BACKEND_FILE_H
-#define CAL_BACKEND_FILE_H
-
-#include <libgnome/gnome-defs.h>
-#include "cal-backend.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_BACKEND_FILE_TYPE            (cal_backend_file_get_type ())
-#define CAL_BACKEND_FILE(obj)            (GTK_CHECK_CAST ((obj), CAL_BACKEND_FILE_TYPE,		\
-					  CalBackendFile))
-#define CAL_BACKEND_FILE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_BACKEND_FILE_TYPE,	\
-					  CalBackendFileClass))
-#define IS_CAL_BACKEND_FILE(obj)         (GTK_CHECK_TYPE ((obj), CAL_BACKEND_FILE_TYPE))
-#define IS_CAL_BACKEND_FILE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_BACKEND_FILE_TYPE))
-
-typedef struct _CalBackendFile CalBackendFile;
-typedef struct _CalBackendFileClass CalBackendFileClass;
-
-typedef struct _CalBackendFilePrivate CalBackendFilePrivate;
-
-struct _CalBackendFile {
-	CalBackend backend;
-
-	/* Private data */
-	CalBackendFilePrivate *priv;
-};
-
-struct _CalBackendFileClass {
-	CalBackendClass parent_class;
-};
-
-GtkType cal_backend_file_get_type (void);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal-backend.c b/calendar/pcs/cal-backend.c
deleted file mode 100644
index beca760be1..0000000000
--- a/calendar/pcs/cal-backend.c
+++ /dev/null
@@ -1,743 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - generic backend class
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <gtk/gtk.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/parserInternals.h>
-#include <gnome-xml/xmlmemory.h>
-
-#include "cal-backend.h"
-#include "libversit/vcc.h"
-
-
-
-/* Signal IDs */
-enum {
-	LAST_CLIENT_GONE,
-	LAST_SIGNAL
-};
-
-static void cal_backend_class_init (CalBackendClass *class);
-static void cal_backend_init (CalBackend *backend);
-static gboolean cal_backend_log_sync (CalBackend *backend);
-static GHashTable *cal_backend_get_log_entries (CalBackend *backend, 
-						CalObjType type,
-						time_t since);
-
-static GtkObjectClass *parent_class;
-
-static guint cal_backend_signals[LAST_SIGNAL];
-
-#define CLASS(backend) (CAL_BACKEND_CLASS (GTK_OBJECT (backend)->klass))
-
-
-
-/**
- * cal_backend_get_type:
- * @void:
- *
- * Registers the #CalBackend class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #CalBackend class.
- **/
-GtkType
-cal_backend_get_type (void)
-{
-	static GtkType cal_backend_type = 0;
-
-	if (!cal_backend_type) {
-		static const GtkTypeInfo cal_backend_info = {
-			"CalBackend",
-			sizeof (CalBackend),
-			sizeof (CalBackendClass),
-			(GtkClassInitFunc) cal_backend_class_init,
-			(GtkObjectInitFunc) cal_backend_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_backend_type =
-			gtk_type_unique (GTK_TYPE_OBJECT, &cal_backend_info);
-	}
-
-	return cal_backend_type;
-}
-
-/* Class initialization function for the calendar backend */
-static void
-cal_backend_class_init (CalBackendClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-	cal_backend_signals[LAST_CLIENT_GONE] =
-		gtk_signal_new ("last_client_gone",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalBackendClass, last_client_gone),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, cal_backend_signals, LAST_SIGNAL);
-}
-
-/* Per instance initialization function */
-static void
-cal_backend_init (CalBackend *backend)
-{
-	backend->uri = NULL;
-	backend->entries = NULL;
-}
-
-
-
-/**
- * cal_backend_get_uri:
- * @backend: A calendar backend.
- *
- * Queries the URI of a calendar backend, which must already have a loaded
- * calendar.
- *
- * Return value: The URI where the calendar is stored.
- **/
-GnomeVFSURI *
-cal_backend_get_uri (CalBackend *backend)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	g_assert (CLASS (backend)->get_uri != NULL);
-	return (* CLASS (backend)->get_uri) (backend);
-}
-
-static void
-cal_backend_set_uri (CalBackend *backend, GnomeVFSURI *uri)
-{
-	if (backend->uri)
-		gnome_vfs_uri_unref (backend->uri);
-
-	if (backend->timer)
-		gtk_timeout_remove (backend->timer);
-
-
-	gnome_vfs_uri_ref (uri);
-	backend->uri = uri;
-	backend->timer = gtk_timeout_add (60000, 
-					  (GtkFunction)cal_backend_log_sync, 
-					  backend);
-}
-
-/**
- * cal_backend_add_cal:
- * @backend: A calendar backend.
- * @cal: A calendar client interface object.
- *
- * Adds a calendar client interface object to a calendar @backend.
- * The calendar backend must already have a loaded calendar.
- **/
-void
-cal_backend_add_cal (CalBackend *backend, Cal *cal)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (IS_CAL_BACKEND (backend));
-
-	g_assert (CLASS (backend)->add_cal != NULL);
-	(* CLASS (backend)->add_cal) (backend, cal);
-}
-
-/**
- * cal_backend_load:
- * @backend: A calendar backend.
- * @uri: URI that contains the calendar data.
- *
- * Loads a calendar backend with data from a calendar stored at the specified
- * URI.
- *
- * Return value: An operation status code.
- **/
-CalBackendLoadStatus
-cal_backend_load (CalBackend *backend, GnomeVFSURI *uri)
-{
-	CalBackendLoadStatus result;
-
-	g_return_val_if_fail (backend != NULL, CAL_BACKEND_LOAD_ERROR);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), CAL_BACKEND_LOAD_ERROR);
-	g_return_val_if_fail (uri != NULL, CAL_BACKEND_LOAD_ERROR);
-
-	g_assert (CLASS (backend)->load != NULL);
-	result =  (* CLASS (backend)->load) (backend, uri);
-
-	/* Remember the URI for saving the log file in the same dir and add
-	 * a timeout handler so for saving pending entries sometimes */
-	if (result == CAL_BACKEND_LOAD_SUCCESS)
-		cal_backend_set_uri (backend, uri);
-	
-	return result;
-}
-
-/**
- * cal_backend_create:
- * @backend: A calendar backend.
- * @uri: URI that will contain the calendar data.
- *
- * Creates a new empty calendar in a calendar backend.
- **/
-void
-cal_backend_create (CalBackend *backend, GnomeVFSURI *uri)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (IS_CAL_BACKEND (backend));
-	g_return_if_fail (uri != NULL);
-
-	g_assert (CLASS (backend)->create != NULL);
-	(* CLASS (backend)->create) (backend, uri);
-
-	/* Remember the URI for saving the log file in the same dir and add
-	 * a timeout handler so for saving pending entries sometimes */
-	cal_backend_set_uri (backend, uri);
-}
-
-/**
- * cal_backend_get_n_objects:
- * @backend: A calendar backend.
- * @type: Types of objects that will be included in the count.
- * 
- * Queries the number of calendar objects of a particular type.
- * 
- * Return value: Number of objects of the specified @type.
- **/
-int
-cal_backend_get_n_objects (CalBackend *backend, CalObjType type)
-{
-	g_return_val_if_fail (backend != NULL, -1);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), -1);
-
-	g_assert (CLASS (backend)->get_n_objects != NULL);
-	return (* CLASS (backend)->get_n_objects) (backend, type);
-}
-
-/**
- * cal_backend_get_object:
- * @backend: A calendar backend.
- * @uid: Unique identifier for a calendar object.
- *
- * Queries a calendar backend for a calendar object based on its unique
- * identifier.
- *
- * Return value: The string representation of a complete calendar wrapping the
- * the sought object, or NULL if no object had the specified UID.  A complete
- * calendar is returned because you also need the timezone data.
- **/
-char *
-cal_backend_get_object (CalBackend *backend, const char *uid)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-	g_return_val_if_fail (uid != NULL, NULL);
-
-	g_assert (CLASS (backend)->get_object != NULL);
-	return (* CLASS (backend)->get_object) (backend, uid);
-}
-
-/**
- * cal_backend_get_uids:
- * @backend: A calendar backend.
- * @type: Bitmask with types of objects to return.
- *
- * Builds a list of unique identifiers corresponding to calendar objects whose
- * type matches one of the types specified in the @type flags.
- *
- * Return value: A list of strings that are the sought UIDs.  The list should be
- * freed using the cal_obj_uid_list_free() function.
- **/
-GList *
-cal_backend_get_uids (CalBackend *backend, CalObjType type)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	g_assert (CLASS (backend)->get_uids != NULL);
-	return (* CLASS (backend)->get_uids) (backend, type);
-}
-
-
-static void
-cal_backend_foreach_changed (gpointer key, gpointer value, gpointer data) 
-{
-	GList **list = data;
-	
-	*list = g_list_append (*list, value);
-}
-
-/**
- * cal_backend_get_changed_uids:
- * @backend: 
- * @type: 
- * @since: 
- * 
- * 
- * 
- * Return value: 
- **/
-GList *
-cal_backend_get_changed_uids (CalBackend *backend, CalObjType type, time_t since) 
-{
-	GHashTable *hash;
-	GList *uids = NULL;
-	
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	hash = cal_backend_get_log_entries (backend, type, since);
-
-	if (hash)
-		g_hash_table_foreach (hash, cal_backend_foreach_changed, &uids);
-	
-	return uids;
-}
-
-
-/**
- * cal_backend_get_objects_in_range:
- * @backend: A calendar backend.
- * @type: Bitmask with types of objects to return.
- * @start: Start time for query.
- * @end: End time for query.
- * 
- * Builds a list of unique identifiers corresponding to calendar objects of the
- * specified type that occur or recur within the specified time range.
- * 
- * Return value: A list of UID strings.  The list should be freed using the
- * cal_obj_uid_list_free() function.
- **/
-GList *
-cal_backend_get_objects_in_range (CalBackend *backend, CalObjType type,
-				  time_t start, time_t end)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	g_assert (CLASS (backend)->get_objects_in_range != NULL);
-	return (* CLASS (backend)->get_objects_in_range) (backend, type, start, end);
-}
-
-/**
- * cal_backend_get_alarms_in_range:
- * @backend: A calendar backend.
- * @start: Start time for query.
- * @end: End time for query.
- * 
- * Builds a sorted list of the alarms that trigger in the specified time range.
- * 
- * Return value: A list of #CalAlarmInstance structures, sorted by trigger time.
- **/
-GList *
-cal_backend_get_alarms_in_range (CalBackend *backend, time_t start, time_t end)
-{
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-	g_return_val_if_fail (start != -1 && end != -1, NULL);
-	g_return_val_if_fail (start <= end, NULL);
-
-	g_assert (CLASS (backend)->get_alarms_in_range != NULL);
-	return (* CLASS (backend)->get_alarms_in_range) (backend, start, end);
-}
-
-/**
- * cal_backend_get_alarms_for_object:
- * @backend: A calendar backend.
- * @uid: Unique identifier for a calendar object.
- * @start: Start time for query.
- * @end: End time for query.
- * @alarms: Return value for the list of alarm instances.
- * 
- * Builds a sorted list of the alarms of the specified event that trigger in a
- * particular time range.
- * 
- * Return value: TRUE on success, FALSE if the object was not found.
- **/
-gboolean
-cal_backend_get_alarms_for_object (CalBackend *backend, const char *uid,
-				   time_t start, time_t end,
-				   GList **alarms)
-{
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);
-	g_return_val_if_fail (uid != NULL, FALSE);
-	g_return_val_if_fail (start != -1 && end != -1, FALSE);
-	g_return_val_if_fail (start <= end, FALSE);
-	g_return_val_if_fail (alarms != NULL, FALSE);
-
-	g_assert (CLASS (backend)->get_alarms_for_object != NULL);
-	return (* CLASS (backend)->get_alarms_for_object) (backend, uid, start, end, alarms);
-}
-
-/* Internal logging stuff */
-typedef enum {
-	CAL_BACKEND_UPDATED,
-	CAL_BACKEND_REMOVED
-} CalBackendLogEntryType;
-
-typedef struct {
-	char *uid;
-	CalObjType type;
-	
-	CalBackendLogEntryType event_type;
-
-	time_t time_stamp;
-} CalBackendLogEntry;
-
-typedef struct {
-	CalObjType type;
-	time_t since;
-
-	gboolean in_valid_timestamp;
-	
-	GHashTable *hash;
-} CalBackendParseState;
-
-static gchar *
-cal_backend_log_name (GnomeVFSURI *uri)
-{	
-	const gchar *path;
-	gchar *filename;
-	
-	path = gnome_vfs_uri_get_path (uri);
-	filename = g_strdup_printf ("%s.log.xml", path);
-
-	return filename;
-}
-
-static void
-cal_backend_set_node_timet (xmlNodePtr node, const char *name, time_t t)
-{
-	char *tstring;
-	
-	tstring = g_strdup_printf ("%ld", t);
-	xmlSetProp (node, name, tstring);
-}
-
-static void
-cal_backend_log_entry (CalBackend *backend, 
-		       const char *uid,
-		       CalObjType cot,
-		       CalBackendLogEntryType type)
-{
-	CalBackendLogEntry *entry = g_new0 (CalBackendLogEntry, 1);
-	
-	g_assert (CLASS (backend)->get_type_by_uid != NULL);
-
-	/* Only log todos and events */
-	if (cot != CALOBJ_TYPE_EVENT && cot != CALOBJ_TYPE_TODO)
-		return;
-
-	entry = g_new0 (CalBackendLogEntry, 1);
-	entry->uid = g_strdup (uid);
-	entry->type = cot;
-	entry->event_type = type;	
-	entry->time_stamp = time (NULL);
-
-	/* Append so they get stored in chronological order */
-	backend->entries = g_slist_append (backend->entries, entry);
-}
-
-static gboolean
-cal_backend_log_sync (CalBackend *backend)
-{	
-	xmlDocPtr doc;
-	xmlNodePtr tnode;
-	gchar *filename;
-	GSList *l;
-	int ret;
-	time_t start_time = (time_t) - 1;
-	time_t end_time = (time_t) - 1;
-
-	g_return_val_if_fail (backend->uri != NULL, FALSE);
-	
-	if (backend->entries == NULL)
-		return TRUE;
-	
-	filename = cal_backend_log_name (backend->uri);
-	
-	doc = xmlParseFile (filename);
-	if (doc == NULL) {
-		/* Create the document */
-		doc = xmlNewDoc ("1.0");
-		if (doc == NULL) {
-			g_warning ("Log file could not be created\n");
-			return FALSE;
-		}
-		
-		
-		doc->root = xmlNewDocNode(doc, NULL, "CalendarLog", NULL);
-	}
-
-	tnode = xmlNewChild (doc->root, NULL, "timestamp", NULL);
-	for (l = backend->entries; l != NULL; l = l->next) {
-		xmlNodePtr node;
-		CalBackendLogEntry *entry;
-		
-		entry = (CalBackendLogEntry *)l->data;
-		node = xmlNewChild (tnode, NULL, "status", NULL);
-
-		xmlSetProp (node, "uid", entry->uid);
-		
-		switch (entry->type) {
-		case CALOBJ_TYPE_EVENT:
-			xmlSetProp (node, "type", "event");
-			break;
-		case CALOBJ_TYPE_TODO:
-			xmlSetProp (node, "type", "todo");
-			break;
-		default:
-		}
-
-		switch (entry->event_type) {
-		case (CAL_BACKEND_UPDATED):
-			xmlSetProp (node, "operation", "updated");
-			break;
-		case (CAL_BACKEND_REMOVED):
-			xmlSetProp (node, "operation", "removed");
-			break;
-		}
-
-		if (start_time == (time_t) - 1 
-		    || entry->time_stamp < start_time)
-			start_time = entry->time_stamp;
-
-		if (end_time == (time_t) - 1 
-		    || entry->time_stamp > end_time)
-			end_time = entry->time_stamp;
-
-		g_free (entry);
-	}
-	cal_backend_set_node_timet (tnode, "start", start_time);
-	cal_backend_set_node_timet (tnode, "end", end_time);
-
-	g_slist_free (backend->entries);
-	backend->entries = NULL;
-	
-	/* Write the file */
-	xmlSetDocCompressMode (doc, 0);
-	ret = xmlSaveFile (filename, doc);
-	if (ret < 0) {
-		g_warning ("Log file could not be saved\n");
-		return FALSE;
-	}
-	
-	xmlFreeDoc (doc);
-
-	g_free (filename);
-
-	return TRUE;
-}
-
-static void
-cal_backend_log_sax_start_element (CalBackendParseState *state, const CHAR *name, 
-				   const CHAR **attrs)
-{
-	if (!strcmp (name, "timestamp")) {
-		while (attrs && *attrs != NULL) {
-			const xmlChar **val = attrs;
-			
-			val++;
-			if (!strcmp (*attrs, "start")) {
-				time_t start = (time_t)strtoul (*val, NULL, 0);
-				
-				if (start >= state->since) 
-					state->in_valid_timestamp = TRUE;
-				break;
-			}	
-			attrs = ++val;
-		}		
-	}
-
-	if (state->in_valid_timestamp && !strcmp (name, "status")) {
-		CalObjChange *coc = g_new0 (CalObjChange, 1);
-		CalObjType cot = 0;
-
-		while (attrs && *attrs != NULL) {
-			const xmlChar **val = attrs;
-
-			
-			val++;
-			if (!strcmp (*attrs, "uid")) 
-				coc->uid = g_strdup (*val);
-			
-			if (!strcmp (*attrs, "type")) {
-				if (!strcmp (*val, "event"))
-					cot = CALOBJ_TYPE_EVENT;
-				else if (!strcmp (*val, "todo"))
-					cot = CALOBJ_TYPE_TODO;
-			}
-
-			if (!strcmp (*attrs, "operation")) {
-				if (!strcmp (*val, "updated"))
-					coc->type = CALOBJ_UPDATED;
-				else if (!strcmp (*val, "removed"))
-					coc->type = CALOBJ_REMOVED;
-			}
-			
-			attrs = ++val;
-		}
-
-		if (state->type == CALOBJ_TYPE_ANY || state->type == cot)
-			g_hash_table_insert (state->hash, coc->uid, coc);
-	}
-}
-
-static void
-cal_backend_log_sax_end_element (CalBackendParseState *state, const CHAR *name)
-{
-	if (!strcmp (name, "timestamp")) {
-		state->in_valid_timestamp = FALSE;
-	}
-}
-
-static GHashTable *
-cal_backend_get_log_entries (CalBackend *backend, CalObjType type, time_t since)
-{
-	xmlSAXHandler handler;
-	CalBackendParseState state;
-	GHashTable *hash;
-	char *filename;
-
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (backend->uri != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	if (!cal_backend_log_sync (backend))
-		return NULL;
-
-	memset (&handler, 0, sizeof (xmlSAXHandler));
-	handler.startElement = (startElementSAXFunc)cal_backend_log_sax_start_element;
-	handler.endElement = (endElementSAXFunc)cal_backend_log_sax_end_element;
-
-	hash = g_hash_table_new (g_str_hash, g_str_equal);
-	
-	state.type = type;
-	state.since = since;
-	state.in_valid_timestamp = FALSE;
-	state.hash = hash;
-
-	filename = cal_backend_log_name (backend->uri);	
-	if (xmlSAXUserParseFile (&handler, &state, filename) < 0)
-		return NULL;
-	
-	return hash;
-}
-
-/**
- * cal_backend_update_object:
- * @backend: A calendar backend.
- * @uid: Unique identifier of the object to update.
- * @calobj: String representation of the new calendar object.
- * 
- * Updates an object in a calendar backend.  It will replace any existing
- * object that has the same UID as the specified one.  The backend will in
- * turn notify all of its clients about the change.
- * 
- * Return value: TRUE on success, FALSE on being passed an invalid object or one
- * with an unsupported type.
- **/
-gboolean
-cal_backend_update_object (CalBackend *backend, const char *uid, const char *calobj)
-{
-	CalObjType cot;
-	gboolean result;
-	
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);
-	g_return_val_if_fail (uid != NULL, FALSE);
-	g_return_val_if_fail (calobj != NULL, FALSE);
-
-	g_assert (CLASS (backend)->update_object != NULL);
-	result =  (* CLASS (backend)->update_object) (backend, uid, calobj);
-
-	if (result) {
-		cot = (* CLASS (backend)->get_type_by_uid) (backend, uid);
-		cal_backend_log_entry (backend, uid, cot, CAL_BACKEND_UPDATED);
-	}
-	
-	return result;
-}
-
-/**
- * cal_backend_remove_object:
- * @backend: A calendar backend.
- * @uid: Unique identifier of the object to remove.
- * 
- * Removes an object in a calendar backend.  The backend will notify all of its
- * clients about the change.
- * 
- * Return value: TRUE on success, FALSE on being passed an UID for an object
- * that does not exist in the backend.
- **/
-gboolean
-cal_backend_remove_object (CalBackend *backend, const char *uid)
-{
-	CalObjType cot;
-	gboolean result;
-
-	g_return_val_if_fail (backend != NULL, FALSE);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);
-	g_return_val_if_fail (uid != NULL, FALSE);
-
-	g_assert (CLASS (backend)->remove_object != NULL);
-	cot = (* CLASS (backend)->get_type_by_uid) (backend, uid);
-	result = (* CLASS (backend)->remove_object) (backend, uid);
-
-	if (result)
-		cal_backend_log_entry (backend, uid, cot, CAL_BACKEND_REMOVED);
-
-	return result;
-}
-
-/**
- * cal_backend_last_client_gone:
- * @backend: A calendar backend.
- * 
- * Emits the "last_client_gone" signal of a calendar backend.  This function is
- * to be used only by backend implementations.
- **/
-void
-cal_backend_last_client_gone (CalBackend *backend)
-{
-	g_return_if_fail (backend != NULL);
-	g_return_if_fail (IS_CAL_BACKEND (backend));
-
-	cal_backend_log_sync (backend);
-
-	gtk_signal_emit (GTK_OBJECT (backend), cal_backend_signals[LAST_CLIENT_GONE]);
-}
-
-
-
-
diff --git a/calendar/pcs/cal-backend.h b/calendar/pcs/cal-backend.h
deleted file mode 100644
index 44262c10ca..0000000000
--- a/calendar/pcs/cal-backend.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - generic backend class
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_BACKEND_H
-#define CAL_BACKEND_H
-
-#include <libgnome/gnome-defs.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include <cal-util/cal-util.h>
-#include <cal-util/cal-component.h>
-#include "calendar/pcs/evolution-calendar.h"
-#include "cal-common.h"
-#include "cal.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_BACKEND_TYPE            (cal_backend_get_type ())
-#define CAL_BACKEND(obj)            (GTK_CHECK_CAST ((obj), CAL_BACKEND_TYPE, CalBackend))
-#define CAL_BACKEND_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_BACKEND_TYPE,		\
-				     CalBackendClass))
-#define IS_CAL_BACKEND(obj)         (GTK_CHECK_TYPE ((obj), CAL_BACKEND_TYPE))
-#define IS_CAL_BACKEND_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_BACKEND_TYPE))
-
-/* Load status values */
-typedef enum {
-	CAL_BACKEND_LOAD_SUCCESS,	/* Loading OK */
-	CAL_BACKEND_LOAD_ERROR		/* We need better error reporting in libversit */
-} CalBackendLoadStatus;
-
-struct _CalBackend {
-	GtkObject object;
-
-	GnomeVFSURI *uri;
-	GSList *entries;
-	guint timer;
-};
-
-struct _CalBackendClass {
-	GtkObjectClass parent_class;
-
-	/* Notification signals */
-	void (* last_client_gone) (CalBackend *backend);
-
-	/* Virtual methods */
-	GnomeVFSURI *(* get_uri) (CalBackend *backend);
-	void (* add_cal) (CalBackend *backend, Cal *cal);
-	CalBackendLoadStatus (* load) (CalBackend *backend, GnomeVFSURI *uri);
-	void (* create) (CalBackend *backend, GnomeVFSURI *uri);
-
-	int (* get_n_objects) (CalBackend *backend, CalObjType type);
-	char *(* get_object) (CalBackend *backend, const char *uid);
-	CalObjType(* get_type_by_uid) (CalBackend *backend, const char *uid);
-	GList *(* get_uids) (CalBackend *backend, CalObjType type);
-	GList *(* get_objects_in_range) (CalBackend *backend, CalObjType type,
-					 time_t start, time_t end);
-	GList *(* get_alarms_in_range) (CalBackend *backend, time_t start, time_t end);
-	gboolean (* get_alarms_for_object) (CalBackend *backend, const char *uid,
-					    time_t start, time_t end,
-					    GList **alarms);
-	gboolean (* update_object) (CalBackend *backend, const char *uid, const char *calobj);
-	gboolean (* remove_object) (CalBackend *backend, const char *uid);
-};
-
-GtkType cal_backend_get_type (void);
-
-GnomeVFSURI *cal_backend_get_uri (CalBackend *backend);
-
-void cal_backend_add_cal (CalBackend *backend, Cal *cal);
-
-CalBackendLoadStatus cal_backend_load (CalBackend *backend, GnomeVFSURI *uri);
-
-void cal_backend_create (CalBackend *backend, GnomeVFSURI *uri);
-
-int cal_backend_get_n_objects (CalBackend *backend, CalObjType type);
-
-char *cal_backend_get_object (CalBackend *backend, const char *uid);
-
-GList *cal_backend_get_uids (CalBackend *backend, CalObjType type);
-
-GList *cal_backend_get_changed_uids (CalBackend *backend, CalObjType type, time_t since);
-
-GList *cal_backend_get_objects_in_range (CalBackend *backend, CalObjType type,
-					 time_t start, time_t end);
-
-GList *cal_backend_get_alarms_in_range (CalBackend *backend, time_t start, time_t end);
-
-gboolean cal_backend_get_alarms_for_object (CalBackend *backend, const char *uid,
-					    time_t start, time_t end,
-					    GList **alarms);
-
-
-gboolean cal_backend_update_object (CalBackend *backend, const char *uid, const char *calobj);
-
-gboolean cal_backend_remove_object (CalBackend *backend, const char *uid);
-
-void cal_backend_last_client_gone (CalBackend *backend);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal-common.h b/calendar/pcs/cal-common.h
deleted file mode 100644
index e51ddf1bdd..0000000000
--- a/calendar/pcs/cal-common.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Evolution calendar server - common declarations
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_COMMON_H
-#define CAL_COMMON_H
-
-#include <libgnome/gnome-defs.h>
-
-BEGIN_GNOME_DECLS
-
-
-
-typedef struct _CalBackend CalBackend;
-typedef struct _CalBackendClass CalBackendClass;
-
-typedef struct _Cal Cal;
-typedef struct _CalClass CalClass;
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal-factory.c b/calendar/pcs/cal-factory.c
deleted file mode 100644
index a89f2fe9f4..0000000000
--- a/calendar/pcs/cal-factory.c
+++ /dev/null
@@ -1,858 +0,0 @@
-/* Evolution calendar factory
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <gtk/gtksignal.h>
-#include "cal.h"
-#include "cal-backend.h"
-#include "cal-factory.h"
-#include "job.h"
-
-
-
-/* Private part of the CalFactory structure */
-struct _CalFactoryPrivate {
-	/* Hash table from URI method strings to GtkType * for backend class types */
-	GHashTable *methods;
-
-	/* Hash table from GnomeVFSURI structures to CalBackend objects */
-	GHashTable *backends;
-};
-
-
-
-/* Signal IDs */
-enum {
-	LAST_CALENDAR_GONE,
-	LAST_SIGNAL
-};
-
-static void cal_factory_class_init (CalFactoryClass *class);
-static void cal_factory_init (CalFactory *factory);
-static void cal_factory_destroy (GtkObject *object);
-
-static POA_Evolution_Calendar_CalFactory__vepv cal_factory_vepv;
-
-static BonoboObjectClass *parent_class;
-
-static guint cal_factory_signals[LAST_SIGNAL];
-
-
-
-/**
- * cal_factory_get_type:
- * @void:
- *
- * Registers the #CalFactory class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the #CalFactory class.
- **/
-GtkType
-cal_factory_get_type (void)
-{
-	static GtkType cal_factory_type = 0;
-
-	if (!cal_factory_type) {
-		static const GtkTypeInfo cal_factory_info = {
-			"CalFactory",
-			sizeof (CalFactory),
-			sizeof (CalFactoryClass),
-			(GtkClassInitFunc) cal_factory_class_init,
-			(GtkObjectInitFunc) cal_factory_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_factory_type = gtk_type_unique (bonobo_object_get_type (), &cal_factory_info);
-	}
-
-	return cal_factory_type;
-}
-
-/* CORBA class initialization function for the calendar factory */
-static void
-init_cal_factory_corba_class (void)
-{
-	cal_factory_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	cal_factory_vepv.Evolution_Calendar_CalFactory_epv = cal_factory_get_epv ();
-}
-
-/* Class initialization function for the calendar factory */
-static void
-cal_factory_class_init (CalFactoryClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (bonobo_object_get_type ());
-
-	cal_factory_signals[LAST_CALENDAR_GONE] =
-		gtk_signal_new ("last_calendar_gone",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CalFactoryClass, last_calendar_gone),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
-
-	gtk_object_class_add_signals (object_class, cal_factory_signals, LAST_SIGNAL);
-
-	object_class->destroy = cal_factory_destroy;
-
-	init_cal_factory_corba_class ();
-}
-
-/* Object initialization function for the calendar factory */
-static void
-cal_factory_init (CalFactory *factory)
-{
-	CalFactoryPrivate *priv;
-
-	priv = g_new0 (CalFactoryPrivate, 1);
-	factory->priv = priv;
-
-	priv->methods = g_hash_table_new (g_str_hash, g_str_equal);
-	priv->backends = g_hash_table_new (gnome_vfs_uri_hash, gnome_vfs_uri_hequal);
-}
-
-/* Frees a method/GtkType * pair from the methods hash table */
-static void
-free_method (gpointer key, gpointer value, gpointer data)
-{
-	char *method;
-	GtkType *type;
-
-	method = key;
-	type = value;
-
-	g_free (method);
-	g_free (type);
-}
-
-/* Frees a uri/backend pair from the backends hash table */
-static void
-free_backend (gpointer key, gpointer value, gpointer data)
-{
-	GnomeVFSURI *uri;
-	CalBackend *backend;
-
-	uri = key;
-	backend = value;
-
-	gnome_vfs_uri_unref (uri);
-	gtk_object_unref (GTK_OBJECT (backend));
-}
-
-/* Destroy handler for the calendar */
-static void
-cal_factory_destroy (GtkObject *object)
-{
-	CalFactory *factory;
-	CalFactoryPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL_FACTORY (object));
-
-	factory = CAL_FACTORY (object);
-	priv = factory->priv;
-
-	g_hash_table_foreach (priv->methods, free_method, NULL);
-	g_hash_table_destroy (priv->methods);
-	priv->methods = NULL;
-
-	/* Should we assert that there are no more backends? */
-
-	g_hash_table_foreach (priv->backends, free_backend, NULL);
-	g_hash_table_destroy (priv->backends);
-	priv->backends = NULL;
-
-	g_free (priv);
-	factory->priv = NULL;
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* Loading and creating calendars */
-
-/* Job data */
-typedef struct {
-	CalFactory *factory;
-	char *uri;
-	Evolution_Calendar_Listener listener;
-} LoadCreateJobData;
-
-/* Queues a load or create request */
-static void
-queue_load_create_job (CalFactory *factory, const char *uri, Evolution_Calendar_Listener listener,
-		       JobFunc func)
-{
-	LoadCreateJobData *jd;
-	CORBA_Environment ev;
-	Evolution_Calendar_Listener listener_copy;
-	gboolean result;
-
-	g_assert (uri != NULL);
-
-	CORBA_exception_init (&ev);
-	result = CORBA_Object_is_nil (listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("queue_load_create_job(): could not see if the listener was NIL");
-		CORBA_exception_free (&ev);
-		return;
-	}
-	CORBA_exception_free (&ev);
-
-	if (result) {
-		g_message ("queue_load_create_job(): cannot operate on a NIL listener!");
-		return;
-	}
-
-	listener_copy = CORBA_Object_duplicate (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("queue_load_create_job(): could not duplicate the listener");
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	CORBA_exception_free (&ev);
-
-	jd = g_new (LoadCreateJobData, 1);
-	jd->factory = factory;
-	jd->uri = g_strdup (uri);
-	jd->listener = listener_copy;
-
-	job_add (func, jd);
-}
-
-/* Looks up a calendar backend in a factory's hash table of uri->cal */
-static CalBackend *
-lookup_backend (CalFactory *factory, GnomeVFSURI *uri)
-{
-	CalFactoryPrivate *priv;
-	CalBackend *backend;
-
-	priv = factory->priv;
-
-	backend = g_hash_table_lookup (priv->backends, uri);
-	return backend;
-}
-
-/* Callback used when a backend loses its last connected client */
-static void
-backend_last_client_gone_cb (CalBackend *backend, gpointer data)
-{
-	CalFactory *factory;
-	CalFactoryPrivate *priv;
-	GnomeVFSURI *uri;
-	gpointer orig_key;
-	gboolean result;
-	GnomeVFSURI *orig_uri;
-
-	fprintf (stderr, "backend_last_client_gone_cb() called!\n");
-
-	factory = CAL_FACTORY (data);
-	priv = factory->priv;
-
-	/* Remove the backend from the hash table */
-
-	uri = cal_backend_get_uri (backend);
-	g_assert (uri != NULL);
-
-	result = g_hash_table_lookup_extended (priv->backends, uri, &orig_key, NULL);
-	g_assert (result != FALSE);
-
-	orig_uri = orig_key;
-
-	g_hash_table_remove (priv->backends, orig_uri);
-	gnome_vfs_uri_unref (orig_uri);
-
-	gtk_object_unref (GTK_OBJECT (backend));
-
-	/* Notify upstream if there are no more backends */
-
-	if (g_hash_table_size (priv->backends) == 0)
-		gtk_signal_emit (GTK_OBJECT (factory), cal_factory_signals[LAST_CALENDAR_GONE]);
-}
-
-/* Adds a backend to the calendar factory's hash table */
-static void
-add_backend (CalFactory *factory, GnomeVFSURI *uri, CalBackend *backend)
-{
-	CalFactoryPrivate *priv;
-
-	priv = factory->priv;
-
-	gnome_vfs_uri_ref (uri);
-	g_hash_table_insert (priv->backends, uri, backend);
-
-	gtk_signal_connect (GTK_OBJECT (backend), "last_client_gone",
-			    GTK_SIGNAL_FUNC (backend_last_client_gone_cb),
-			    factory);
-}
-
-/* Tries to launch a backend for the method of the specified URI.  If there is
- * no such method registered in the factory, it sends the listener the
- * MethodNotSupported error code.
- */
-static CalBackend *
-launch_backend_for_uri (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener listener)
-{
-	CalFactoryPrivate *priv;
-	char *method;
-	GtkType *type;
-	CalBackend *backend;
-
-	priv = factory->priv;
-
-	/* FIXME: add an accessor function to gnome-vfs */
-	method = uri->method_string;
-
-	type = g_hash_table_lookup (priv->methods, method);
-
-	if (!type) {
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (
-			listener,
-			Evolution_Calendar_Listener_METHOD_NOT_SUPPORTED,
-			CORBA_OBJECT_NIL,
-			&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("launch_backend_for_uri(): could not notify the listener");
-
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	backend = gtk_type_new (*type);
-	if (!backend)
-		g_message ("launch_backend_for_uri(): could not launch the backend");
-
-	return backend;
-}
-
-/* Loads a calendar backend and puts it in the factory's backend hash table */
-static CalBackend *
-load_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener listener)
-{
-	CalFactoryPrivate *priv;
-	CalBackend *backend;
-	CalBackendLoadStatus status;
-	CORBA_Environment ev;
-
-	priv = factory->priv;
-
-	backend = launch_backend_for_uri (factory, uri, listener);
-	if (!backend)
-		return NULL;
-
-	status = cal_backend_load (backend, uri);
-
-	switch (status) {
-	case CAL_BACKEND_LOAD_SUCCESS:
-		add_backend (factory, uri, backend);
-		return backend;
-
-	case CAL_BACKEND_LOAD_ERROR:
-		gtk_object_unref (GTK_OBJECT (backend));
-
-		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (listener,
-							Evolution_Calendar_Listener_ERROR,
-							CORBA_OBJECT_NIL,
-							&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("load_backend(): could not notify the listener");
-
-		CORBA_exception_free (&ev);
-		return NULL;
-
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-/* Creates a calendar backend and puts it in the factory's backend hash table */
-static CalBackend *
-create_backend (CalFactory *factory, GnomeVFSURI *uri, Evolution_Calendar_Listener listener)
-{
-	CalFactoryPrivate *priv;
-	CalBackend *backend;
-
-	priv = factory->priv;
-
-	backend = launch_backend_for_uri (factory, uri, listener);
-	if (!backend)
-		return NULL;
-
-	cal_backend_create (backend, uri);
-
-	/* FIXME: add error reporting to cal_backend_create() */
-#if 0
-	{
-		CORBA_Environment ev;
-
-		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (listener,
-							Evolution_Calendar_Listener_ERROR,
-							CORBA_OBJECT_NIL,
-							&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("create_fn(): could not notify the listener");
-
-		CORBA_exception_free (&ev);
-	}
-#endif
-
-	add_backend (factory, uri, backend);
-
-	return backend;
-}
-
-/* Adds a listener to a calendar backend by creating a calendar client interface
- * object.
- */
-static void
-add_calendar_client (CalFactory *factory, CalBackend *backend, Evolution_Calendar_Listener listener)
-{
-	Cal *cal;
-	CORBA_Environment ev;
-
-	cal = cal_new (backend, listener);
-	if (!cal) {
-		g_message ("add_calendar_client(): could not create the calendar client interface");
-
-		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (listener,
-							Evolution_Calendar_Listener_ERROR,
-							CORBA_OBJECT_NIL,
-							&ev);
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("add_calendar_client(): could not notify the listener");
-
-		CORBA_exception_free (&ev);
-		return;
-	}
-
-	cal_backend_add_cal (backend, cal);
-
-	CORBA_exception_init (&ev);
-	Evolution_Calendar_Listener_cal_loaded (listener,
-						Evolution_Calendar_Listener_SUCCESS,
-						bonobo_object_corba_objref (BONOBO_OBJECT (cal)),
-						&ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("add_calendar_client(): could not notify the listener");
-		bonobo_object_unref (BONOBO_OBJECT (cal));
-	}
-
-	CORBA_exception_free (&ev);
-}
-
-/* Job handler for the load calendar command */
-static void
-load_fn (gpointer data)
-{
-	LoadCreateJobData *jd;
-	CalFactory *factory;
-	GnomeVFSURI *uri;
-	Evolution_Calendar_Listener listener;
-	CalBackend *backend;
-	CORBA_Environment ev;
-
-	jd = data;
-	g_assert (jd->uri != NULL);
-
-	/* Check the URI */
-
-	uri = gnome_vfs_uri_new (jd->uri);
-	g_free (jd->uri);
-
-	factory = jd->factory;
-	listener = jd->listener;
-	g_free (jd);
-
-	if (!uri) {
-		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (listener,
-							Evolution_Calendar_Listener_ERROR,
-							CORBA_OBJECT_NIL,
-							&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("load_fn(): Could not notify the listener!");
-
-		CORBA_exception_free (&ev);
-		goto out;
-	}
-
-	/* Look up the backend and create it if needed */
-
-	backend = lookup_backend (factory, uri);
-
-	if (!backend)
-		backend = load_backend (factory, uri, listener);
-
-	gnome_vfs_uri_unref (uri);
-
-	if (backend)
-		add_calendar_client (factory, backend, listener);
-
- out:
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("load_fn(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-}
-
-/* Job handler for the create calendar command */
-static void
-create_fn (gpointer data)
-{
-	LoadCreateJobData *jd;
-	CalFactory *factory;
-	GnomeVFSURI *uri;
-	Evolution_Calendar_Listener listener;
-	CalBackend *backend;
-	CORBA_Environment ev;
-
-	jd = data;
-	g_assert (jd->uri != NULL);
-
-	/* Check the URI */
-
-	uri = gnome_vfs_uri_new (jd->uri);
-	g_free (jd->uri);
-
-	factory = jd->factory;
-	listener = jd->listener;
-	g_free (jd);
-
-	if (!uri) {
-		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (listener,
-							Evolution_Calendar_Listener_ERROR,
-							CORBA_OBJECT_NIL,
-							&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("create_fn(): Could not notify the listener!");
-
-		CORBA_exception_free (&ev);
-		goto out;
-	}
-
-	/* Check that the backend is not in use */
-
-	backend = lookup_backend (factory, uri);
-
-	if (backend) {
-		CORBA_exception_init (&ev);
-		Evolution_Calendar_Listener_cal_loaded (listener,
-							Evolution_Calendar_Listener_IN_USE,
-							CORBA_OBJECT_NIL,
-							&ev);
-
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_message ("create_fn(): could not notify the listener");
-
-		CORBA_exception_free (&ev);
-		goto out;
-	}
-
-	/* Create the backend */
-
-	backend = create_backend (factory, uri, listener);
-
-	if (backend)
-		add_calendar_client (factory, backend, listener);
-
-	gnome_vfs_uri_unref (uri);
-
- out:
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (listener, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("create_fn(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-}
-
-
-
-/* CORBA servant implementation */
-
-/* CalFactory::load method */
-static void
-CalFactory_load (PortableServer_Servant servant,
-		 const CORBA_char *uri,
-		 Evolution_Calendar_Listener listener,
-		 CORBA_Environment *ev)
-{
-	CalFactory *factory;
-	CalFactoryPrivate *priv;
-	CORBA_Environment ev2;
-	gboolean result;
-
-	factory = CAL_FACTORY (bonobo_object_from_servant (servant));
-	priv = factory->priv;
-
-	CORBA_exception_init (&ev2);
-	result = CORBA_Object_is_nil (listener, &ev2);
-
-	if (ev2._major != CORBA_NO_EXCEPTION || result) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_CalFactory_NilListener,
-				     NULL);
-
-		CORBA_exception_free (&ev2);
-		return;
-	}
-	CORBA_exception_free (&ev2);
-
-	queue_load_create_job (factory, uri, listener, load_fn);
-}
-
-/* CalFactory::create method */
-static void
-CalFactory_create (PortableServer_Servant servant,
-		   const CORBA_char *uri,
-		   Evolution_Calendar_Listener listener,
-		   CORBA_Environment *ev)
-{
-	CalFactory *factory;
-	CalFactoryPrivate *priv;
-
-	factory = CAL_FACTORY (bonobo_object_from_servant (servant));
-	priv = factory->priv;
-
-	queue_load_create_job (factory, uri, listener, create_fn);
-}
-
-/**
- * cal_factory_get_epv:
- * @void:
- *
- * Creates an EPV for the CalFactory CORBA class.
- *
- * Return value: A newly-allocated EPV.
- **/
-POA_Evolution_Calendar_CalFactory__epv *
-cal_factory_get_epv (void)
-{
-	POA_Evolution_Calendar_CalFactory__epv *epv;
-
-	epv = g_new0 (POA_Evolution_Calendar_CalFactory__epv, 1);
-	epv->load = CalFactory_load;
-	epv->create = CalFactory_create;
-
-	return epv;
-}
-
-
-
-/**
- * cal_factory_construct:
- * @factory: A calendar factory.
- * @corba_factory: CORBA object for the calendar factory.
- *
- * Constructs a calendar factory by binding the corresponding CORBA object to
- * it.
- *
- * Return value: The same object as the @factory argument.
- **/
-CalFactory *
-cal_factory_construct (CalFactory *factory, Evolution_Calendar_CalFactory corba_factory)
-{
-	g_return_val_if_fail (factory != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_FACTORY (factory), NULL);
-
-	bonobo_object_construct (BONOBO_OBJECT (factory), corba_factory);
-	return factory;
-}
-
-/**
- * cal_factory_corba_object_create:
- * @object: #BonoboObject that will wrap the CORBA object.
- *
- * Creates and activates the CORBA object that is wrapped by the specified
- * calendar factory @object.
- *
- * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of
- * failure.
- **/
-Evolution_Calendar_CalFactory
-cal_factory_corba_object_create (BonoboObject *object)
-{
-	POA_Evolution_Calendar_CalFactory *servant;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);
-	g_return_val_if_fail (IS_CAL_FACTORY (object), CORBA_OBJECT_NIL);
-
-	servant = (POA_Evolution_Calendar_CalFactory *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &cal_factory_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_Evolution_Calendar_CalFactory__init ((PortableServer_Servant) servant, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_factory_corba_object_create(): could not init the servant");
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-	return (Evolution_Calendar_CalFactory) bonobo_object_activate_servant (object, servant);
-}
-
-/**
- * cal_factory_new:
- * @void:
- *
- * Creates a new #CalFactory object.
- *
- * Return value: A newly-created #CalFactory, or NULL if its corresponding CORBA
- * object could not be created.
- **/
-CalFactory *
-cal_factory_new (void)
-{
-	CalFactory *factory;
-	CORBA_Environment ev;
-	Evolution_Calendar_CalFactory corba_factory;
-	gboolean retval;
-
-	factory = gtk_type_new (CAL_FACTORY_TYPE);
-
-	corba_factory = cal_factory_corba_object_create (BONOBO_OBJECT (factory));
-
-	CORBA_exception_init (&ev);
-	retval = CORBA_Object_is_nil (corba_factory, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION || retval) {
-		g_message ("cal_factory_new(): could not create the CORBA factory");
-		bonobo_object_unref (BONOBO_OBJECT (factory));
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	CORBA_exception_free (&ev);
-
-	return cal_factory_construct (factory, corba_factory);
-}
-
-/* Returns the lowercase version of a string */
-static char *
-str_tolower (const char *s)
-{
-	char *str;
-	char *p;
-
-	str = g_strdup (s);
-	for (p = str; *p; p++)
-		if (isalpha (*p))
-			*p = tolower (*p);
-
-	return str;
-}
-
-/**
- * cal_factory_register_method:
- * @factory: A calendar factory.
- * @method: Method for the URI, i.e. "http", "file", etc.
- * @backend_type: Class type of the backend to create for this @method.
- * 
- * Registers the type of a #CalBackend subclass that will be used to handle URIs
- * with a particular method.  When the factory is asked to load a particular
- * URI, it will look in its list of registered methods and create a backend of
- * the appropriate type.
- **/
-void
-cal_factory_register_method (CalFactory *factory, const char *method, GtkType backend_type)
-{
-	CalFactoryPrivate *priv;
-	GtkType *type;
-	char *method_str;
-
-	g_return_if_fail (factory != NULL);
-	g_return_if_fail (IS_CAL_FACTORY (factory));
-	g_return_if_fail (method != NULL);
-	g_return_if_fail (backend_type != 0);
-	g_return_if_fail (gtk_type_is_a (backend_type, CAL_BACKEND_TYPE));
-
-	priv = factory->priv;
-
-	method_str = str_tolower (method);
-
-	type = g_hash_table_lookup (priv->methods, method_str);
-	if (type) {
-		g_message ("cal_factory_register_method(): Method `%s' already registered!",
-			   method_str);
-		g_free (method_str);
-		return;
-	}
-
-	type = g_new (GtkType, 1);
-	*type = backend_type;
-
-	g_hash_table_insert (priv->methods, method_str, type);
-}
-
-/**
- * cal_factory_get_n_backends:
- * @factory: A calendar factory.
- * 
- * Queries the number of running calendar backends in a calendar factory.
- * 
- * Return value: Number of running backends.
- **/
-int
-cal_factory_get_n_backends (CalFactory *factory)
-{
-	CalFactoryPrivate *priv;
-
-	g_return_val_if_fail (factory != NULL, -1);
-	g_return_val_if_fail (IS_CAL_FACTORY (factory), -1);
-
-	priv = factory->priv;
-	return g_hash_table_size (priv->backends);
-}
diff --git a/calendar/pcs/cal-factory.h b/calendar/pcs/cal-factory.h
deleted file mode 100644
index 9405a05ef8..0000000000
--- a/calendar/pcs/cal-factory.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Evolution calendar factory
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_FACTORY_H
-#define CAL_FACTORY_H
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-
-#include "calendar/pcs/evolution-calendar.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_FACTORY_TYPE            (cal_factory_get_type ())
-#define CAL_FACTORY(obj)            (GTK_CHECK_CAST ((obj), CAL_FACTORY_TYPE, CalFactory))
-#define CAL_FACTORY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_FACTORY_TYPE,		\
-				     CalFactoryClass))
-#define IS_CAL_FACTORY(obj)         (GTK_CHECK_TYPE ((obj), CAL_FACTORY_TYPE))
-#define IS_CAL_FACTORY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_FACTORY_TYPE))
-
-typedef struct _CalFactory CalFactory;
-typedef struct _CalFactoryClass CalFactoryClass;
-
-typedef struct _CalFactoryPrivate CalFactoryPrivate;
-
-struct _CalFactory {
-	BonoboObject object;
-
-	/* Private data */
-	CalFactoryPrivate *priv;
-};
-
-struct _CalFactoryClass {
-	BonoboObjectClass parent_class;
-
-	/* Notification signals */
-	void (* last_calendar_gone) (CalFactory *factory);
-};
-
-GtkType cal_factory_get_type (void);
-
-CalFactory *cal_factory_construct (CalFactory *factory, Evolution_Calendar_CalFactory corba_factory);
-Evolution_Calendar_CalFactory cal_factory_corba_object_create (BonoboObject *object);
-
-CalFactory *cal_factory_new (void);
-
-void cal_factory_register_method (CalFactory *factory, const char *method, GtkType backend_type);
-
-int cal_factory_get_n_backends (CalFactory *factory);
-
-POA_Evolution_Calendar_CalFactory__epv *cal_factory_get_epv (void);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c
deleted file mode 100644
index 35d98abd64..0000000000
--- a/calendar/pcs/cal.c
+++ /dev/null
@@ -1,766 +0,0 @@
-/* Evolution calendar client interface object
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include "cal.h"
-#include "cal-backend.h"
-
-
-
-/* Private part of the Cal structure */
-struct _CalPrivate {
-	/* Our backend */
-	CalBackend *backend;
-
-	/* Listener on the client we notify */
-	Evolution_Calendar_Listener listener;
-};
-
-
-
-static void cal_class_init (CalClass *class);
-static void cal_init (Cal *cal);
-static void cal_destroy (GtkObject *object);
-
-static POA_Evolution_Calendar_Cal__vepv cal_vepv;
-
-static BonoboObjectClass *parent_class;
-
-
-
-/**
- * cal_get_type:
- * @void:
- *
- * Registers the #Cal class if necessary, and returns the type ID associated to
- * it.
- *
- * Return value: The type ID of the #Cal class.
- **/
-GtkType
-cal_get_type (void)
-{
-	static GtkType cal_type = 0;
-
-	if (!cal_type) {
-		static const GtkTypeInfo cal_info = {
-			"Cal",
-			sizeof (Cal),
-			sizeof (CalClass),
-			(GtkClassInitFunc) cal_class_init,
-			(GtkObjectInitFunc) cal_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		cal_type = gtk_type_unique (BONOBO_OBJECT_TYPE, &cal_info);
-	}
-
-	return cal_type;
-}
-
-/* CORBA class initialzation function for the calendar */
-static void
-init_cal_corba_class (void)
-{
-	cal_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
-	cal_vepv.Evolution_Calendar_Cal_epv = cal_get_epv ();
-}
-
-/* Class initialization function for the calendar */
-static void
-cal_class_init (CalClass *class)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) class;
-
-	parent_class = gtk_type_class (BONOBO_OBJECT_TYPE);
-
-	object_class->destroy = cal_destroy;
-
-	init_cal_corba_class ();
-}
-
-/* Object initialization function for the calendar */
-static void
-cal_init (Cal *cal)
-{
-	CalPrivate *priv;
-
-	priv = g_new0 (CalPrivate, 1);
-	cal->priv = priv;
-
-	priv->listener = CORBA_OBJECT_NIL;
-}
-
-/* Destroy handler for the calendar */
-static void
-cal_destroy (GtkObject *object)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (IS_CAL (object));
-
-	cal = CAL (object);
-	priv = cal->priv;
-
-	priv->backend = NULL;
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (priv->listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("cal_destroy(): could not release the listener");
-
-	CORBA_exception_free (&ev);
-
-	g_free (priv);
-
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
-
-
-/* CORBA servant implementation */
-
-/* Cal::get_uri method */
-static CORBA_char *
-Cal_get_uri (PortableServer_Servant servant,
-	     CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	GnomeVFSURI *uri;
-	char *str_uri;
-	CORBA_char *str_uri_copy;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	uri = cal_backend_get_uri (priv->backend);
-	str_uri = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_NONE);
-	str_uri_copy = CORBA_string_dup (str_uri);
-	g_free (str_uri);
-
-	return str_uri_copy;
-}
-
-/* Converts a calendar object type from its CORBA representation to our own
- * representation.
- */
-static CalObjType
-uncorba_obj_type (Evolution_Calendar_CalObjType type)
-{
-	return (((type & Evolution_Calendar_TYPE_EVENT) ? CALOBJ_TYPE_EVENT : 0)
-		| ((type & Evolution_Calendar_TYPE_TODO) ? CALOBJ_TYPE_TODO : 0)
-		| ((type & Evolution_Calendar_TYPE_JOURNAL) ? CALOBJ_TYPE_JOURNAL : 0));
-}
-
-/* Cal::get_n_objects method */
-static CORBA_long
-Cal_get_n_objects (PortableServer_Servant servant,
-		   Evolution_Calendar_CalObjType type,
-		   CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	int t;
-	int n;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t = uncorba_obj_type (type);
-	n = cal_backend_get_n_objects (priv->backend, t);
-	return n;
-}
-
-/* Cal::get_object method */
-static Evolution_Calendar_CalObj
-Cal_get_object (PortableServer_Servant servant,
-		const Evolution_Calendar_CalObjUID uid,
-		CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	char *calobj;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	calobj = cal_backend_get_object (priv->backend, uid);
-
-	if (calobj) {
-		CORBA_char *calobj_copy;
-
-		calobj_copy = CORBA_string_dup (calobj);
-		g_free (calobj);
-		return calobj_copy;
-	} else {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_NotFound,
-				     NULL);
-		return NULL;
-	}
-}
-
-static Evolution_Calendar_CalObjUIDSeq *
-build_uid_seq (GList *uids)
-{
-	Evolution_Calendar_CalObjUIDSeq *seq;
-	GList *l;
-	int n, i;
-
-	n = g_list_length (uids);
-
-	seq = Evolution_Calendar_CalObjUIDSeq__alloc ();
-	CORBA_sequence_set_release (seq, TRUE);
-	seq->_length = n;
-	seq->_buffer = CORBA_sequence_Evolution_Calendar_CalObjUID_allocbuf (n);
-
-	/* Fill the sequence */
-
-	for (i = 0, l = uids; l; i++, l = l->next) {
-		char *uid;
-
-		uid = l->data;
-		seq->_buffer[i] = CORBA_string_dup (uid);
-	}
-
-	return seq;
-}
-
-/* Cal::get_uids method */
-static Evolution_Calendar_CalObjUIDSeq *
-Cal_get_uids (PortableServer_Servant servant,
-	      Evolution_Calendar_CalObjType type,
-	      CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	GList *uids;
-	Evolution_Calendar_CalObjUIDSeq *seq;
-	int t;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t = uncorba_obj_type (type);
-
-	uids = cal_backend_get_uids (priv->backend, t);
-	seq = build_uid_seq (uids);
-
-	cal_obj_uid_list_free (uids);
-
-	return seq;
-}
-
-static Evolution_Calendar_CalObjChangeSeq *
-build_change_seq (GList *changes)
-{
-	GList *l;
-	int n, i;
-	Evolution_Calendar_CalObjChangeSeq *seq;
-
-	n = g_list_length (changes);
-
-	seq = Evolution_Calendar_CalObjChangeSeq__alloc ();
-	CORBA_sequence_set_release (seq, TRUE);
-	seq->_length = n;
-	seq->_buffer = CORBA_sequence_Evolution_Calendar_CalObjChange_allocbuf (n);
-
-	/* Fill the sequence */
-	for (i = 0, l = changes; l; i++, l = l->next) {
-		CalObjChange *c;
-		Evolution_Calendar_CalObjChange *corba_c;
-
-		c = l->data;
-		corba_c = &seq->_buffer[i];
-
-		corba_c->uid = CORBA_string_dup (c->uid);
-		corba_c->type = c->type;
-	}
-
-	return seq;
-}
-
-/* Cal::get_changed_uids method */
-static Evolution_Calendar_CalObjChangeSeq *
-Cal_get_changed_uids (PortableServer_Servant servant,
-		      Evolution_Calendar_CalObjType type,
-		      Evolution_Calendar_Time_t since,
-		      CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	GList *changes;
-	Evolution_Calendar_CalObjChangeSeq *seq;
-	int t;
-	time_t s;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t = uncorba_obj_type (type);
-	s = (time_t) since;
-	
-	changes = cal_backend_get_changed_uids (priv->backend, t, s);
-	seq = build_change_seq (changes);
-
-	cal_obj_change_list_free (changes);
-
-	return seq;
-}
-
-/* Cal::get_objects_in_range method */
-static Evolution_Calendar_CalObjUIDSeq *
-Cal_get_objects_in_range (PortableServer_Servant servant,
-			  Evolution_Calendar_CalObjType type,
-			  Evolution_Calendar_Time_t start,
-			  Evolution_Calendar_Time_t end,
-			  CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	int t;
-	time_t t_start, t_end;
-	Evolution_Calendar_CalObjUIDSeq *seq;
-	GList *uids;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t = uncorba_obj_type (type);
-	t_start = (time_t) start;
-	t_end = (time_t) end;
-
-	if (t_start > t_end || t_start == -1 || t_end == -1) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_InvalidRange,
-				     NULL);
-		return NULL;
-	}
-
-	uids = cal_backend_get_objects_in_range (priv->backend, t, t_start, t_end);
-	seq = build_uid_seq (uids);
-
-	cal_obj_uid_list_free (uids);
-
-	return seq;
-}
-
-#if 0
-/* Translates an enum AlarmType to its CORBA representation */
-static Evolution_Calendar_AlarmType
-corba_alarm_type (enum AlarmType type)
-{
-	switch (type) {
-	case ALARM_MAIL:
-		return Evolution_Calendar_MAIL;
-
-	case ALARM_PROGRAM:
-		return Evolution_Calendar_PROGRAM;
-
-	case ALARM_DISPLAY:
-		return Evolution_Calendar_DISPLAY;
-
-	case ALARM_AUDIO:
-		return Evolution_Calendar_AUDIO;
-
-	default:
-		g_assert_not_reached ();
-		return Evolution_Calendar_DISPLAY;
-	}
-}
-#endif
-
-/* Builds a CORBA sequence of alarm instances from a CalAlarmInstance list. */
-static Evolution_Calendar_CalAlarmInstanceSeq *
-build_alarm_instance_seq (GList *alarms)
-{
-	GList *l;
-	int n, i;
-	Evolution_Calendar_CalAlarmInstanceSeq *seq;
-
-	n = g_list_length (alarms);
-
-	seq = Evolution_Calendar_CalAlarmInstanceSeq__alloc ();
-	CORBA_sequence_set_release (seq, TRUE);
-	seq->_length = n;
-	seq->_buffer = CORBA_sequence_Evolution_Calendar_CalAlarmInstance_allocbuf (n);
-
-	/* Fill the sequence */
-
-	for (i = 0, l = alarms; l; i++, l = l->next) {
-		CalAlarmInstance *ai;
-		Evolution_Calendar_CalAlarmInstance *corba_ai;
-
-		ai = l->data;
-		corba_ai = &seq->_buffer[i];
-
-		corba_ai->uid = CORBA_string_dup (ai->uid);
-#if 0
-		corba_ai->type = corba_alarm_type (ai->type);
-#endif
-		corba_ai->trigger = ai->trigger;
-		corba_ai->occur = ai->occur;
-	}
-
-	return seq;
-}
-
-/* Cal::get_alarms_in_range method */
-static Evolution_Calendar_CalAlarmInstanceSeq *
-Cal_get_alarms_in_range (PortableServer_Servant servant,
-			 Evolution_Calendar_Time_t start,
-			 Evolution_Calendar_Time_t end,
-			 CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	time_t t_start, t_end;
-	Evolution_Calendar_CalAlarmInstanceSeq *seq;
-	GList *alarms;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t_start = (time_t) start;
-	t_end = (time_t) end;
-
-	if (t_start > t_end || t_start == -1 || t_end == -1) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_InvalidRange,
-				     NULL);
-		return NULL;
-	}
-
-	/* Figure out the list and allocate the sequence */
-
-	alarms = cal_backend_get_alarms_in_range (priv->backend, t_start, t_end);
-	seq = build_alarm_instance_seq (alarms);
-	cal_alarm_instance_list_free (alarms);
-
-	return seq;
-}
-
-/* Cal::get_alarms_for_object method */
-static Evolution_Calendar_CalAlarmInstanceSeq *
-Cal_get_alarms_for_object (PortableServer_Servant servant,
-			   const Evolution_Calendar_CalObjUID uid,
-			   Evolution_Calendar_Time_t start,
-			   Evolution_Calendar_Time_t end,
-			   CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-	time_t t_start, t_end;
-	Evolution_Calendar_CalAlarmInstanceSeq *seq;
-	GList *alarms;
-	gboolean result;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	t_start = (time_t) start;
-	t_end = (time_t) end;
-
-	if (t_start > t_end || t_start == -1 || t_end == -1) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_InvalidRange,
-				     NULL);
-		return NULL;
-	}
-
-	result = cal_backend_get_alarms_for_object (priv->backend, uid, t_start, t_end, &alarms);
-	if (!result) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_NotFound,
-				     NULL);
-		return NULL;
-	}
-
-	seq = build_alarm_instance_seq (alarms);
-	cal_alarm_instance_list_free (alarms);
-
-	return seq;
-}
-
-/* Cal::update_object method */
-static void
-Cal_update_object (PortableServer_Servant servant,
-		   const Evolution_Calendar_CalObjUID uid,
-		   const Evolution_Calendar_CalObj calobj,
-		   CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	if (!cal_backend_update_object (priv->backend, uid, calobj))
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_InvalidObject,
-				     NULL);
-}
-
-/* Cal::remove_object method */
-static void
-Cal_remove_object (PortableServer_Servant servant,
-		   const Evolution_Calendar_CalObjUID uid,
-		   CORBA_Environment *ev)
-{
-	Cal *cal;
-	CalPrivate *priv;
-
-	cal = CAL (bonobo_object_from_servant (servant));
-	priv = cal->priv;
-
-	if (!cal_backend_remove_object (priv->backend, uid))
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Evolution_Calendar_Cal_NotFound,
-				     NULL);
-}
-
-/**
- * cal_get_epv:
- * @void:
- *
- * Creates an EPV for the Cal CORBA class.
- *
- * Return value: A newly-allocated EPV.
- **/
-POA_Evolution_Calendar_Cal__epv *
-cal_get_epv (void)
-{
-	POA_Evolution_Calendar_Cal__epv *epv;
-
-	epv = g_new0 (POA_Evolution_Calendar_Cal__epv, 1);
-	epv->_get_uri = Cal_get_uri;
-	epv->get_n_objects = Cal_get_n_objects;
-	epv->get_object = Cal_get_object;
-	epv->get_uids = Cal_get_uids;
-	epv->get_changed_uids = Cal_get_changed_uids;
-	epv->get_objects_in_range = Cal_get_objects_in_range;
-	epv->get_alarms_in_range = Cal_get_alarms_in_range;
-	epv->get_alarms_for_object = Cal_get_alarms_for_object;
-	epv->update_object = Cal_update_object;
-	epv->remove_object = Cal_remove_object;
-
-	return epv;
-}
-
-
-
-/**
- * cal_construct:
- * @cal: A calendar client interface.
- * @corba_cal: CORBA object for the calendar.
- * @backend: Calendar backend that this @cal presents an interface to.
- * @listener: Calendar listener for notification.
- *
- * Constructs a calendar client interface object by binding the corresponding
- * CORBA object to it.  The calendar interface is bound to the specified
- * @backend, and will notify the @listener about changes to the calendar.
- *
- * Return value: The same object as the @cal argument.
- **/
-Cal *
-cal_construct (Cal *cal,
-	       Evolution_Calendar_Cal corba_cal,
-	       CalBackend *backend,
-	       Evolution_Calendar_Listener listener)
-{
-	CalPrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (cal != NULL, NULL);
-	g_return_val_if_fail (IS_CAL (cal), NULL);
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	priv = cal->priv;
-
-	CORBA_exception_init (&ev);
-	priv->listener = CORBA_Object_duplicate (listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_construct: could not duplicate the listener");
-		priv->listener = CORBA_OBJECT_NIL;
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	priv->backend = backend;
-
-	bonobo_object_construct (BONOBO_OBJECT (cal), corba_cal);
-	return cal;
-}
-
-/**
- * cal_corba_object_create:
- * @object: #BonoboObject that will wrap the CORBA object.
- *
- * Creates and activates the CORBA object that is wrapped by the specified
- * calendar client interface @object.
- *
- * Return value: An activated object reference or #CORBA_OBJECT_NIL in case of
- * failure.
- **/
-Evolution_Calendar_Cal
-cal_corba_object_create (BonoboObject *object)
-{
-	POA_Evolution_Calendar_Cal *servant;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (object != NULL, CORBA_OBJECT_NIL);
-	g_return_val_if_fail (IS_CAL (object), CORBA_OBJECT_NIL);
-
-	servant = (POA_Evolution_Calendar_Cal *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &cal_vepv;
-
-	CORBA_exception_init (&ev);
-	POA_Evolution_Calendar_Cal__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_message ("cal_corba_object_create(): could not init the servant");
-		g_free (servant);
-		CORBA_exception_free (&ev);
-		return CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-	return (Evolution_Calendar_Cal) bonobo_object_activate_servant (object, servant);
-}
-
-/**
- * cal_new:
- * @backend: A calendar backend.
- * @listener: A calendar listener.
- *
- * Creates a new calendar client interface object and binds it to the specified
- * @backend and @listener objects.
- *
- * Return value: A newly-created #Cal calendar client interface object, or NULL
- * if its corresponding CORBA object could not be created.
- **/
-Cal *
-cal_new (CalBackend *backend, Evolution_Calendar_Listener listener)
-{
-	Cal *cal, *retval;
-	Evolution_Calendar_Cal corba_cal;
-	CORBA_Environment ev;
-	gboolean ret;
-
-	g_return_val_if_fail (backend != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);
-
-	cal = CAL (gtk_type_new (CAL_TYPE));
-	corba_cal = cal_corba_object_create (BONOBO_OBJECT (cal));
-
-	CORBA_exception_init (&ev);
-	ret = CORBA_Object_is_nil ((CORBA_Object) corba_cal, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION || ret) {
-		g_message ("cal_new(): could not create the CORBA object");
-		bonobo_object_unref (BONOBO_OBJECT (cal));
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	retval = cal_construct (cal, corba_cal, backend, listener);
-	if (!retval) {
-		g_message ("cal_new(): could not construct the calendar client interface");
-		bonobo_object_unref (BONOBO_OBJECT (cal));
-		return NULL;
-	}
-
-	return retval;
-}
-
-/**
- * cal_notify_update:
- * @cal: A calendar client interface.
- * @uid: UID of object that was updated.
- * 
- * Notifies a listener attached to a calendar client interface object about an
- * update to a calendar object.
- **/
-void
-cal_notify_update (Cal *cal, const char *uid)
-{
-	CalPrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_if_fail (cal != NULL);
-	g_return_if_fail (IS_CAL (cal));
-	g_return_if_fail (uid != NULL);
-
-	priv = cal->priv;
-	g_return_if_fail (priv->listener != CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-	Evolution_Calendar_Listener_obj_updated (priv->listener, (char *) uid, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("cal_notify_update(): could not notify the listener "
-			   "about an updated object");
-
-	CORBA_exception_free (&ev);
-}
-
-/**
- * cal_notify_remove:
- * @cal: A calendar client interface.
- * @uid: UID of object that was removed.
- * 
- * Notifies a listener attached to a calendar client interface object about a
- * calendar object that was removed.
- **/
-void
-cal_notify_remove (Cal *cal, const char *uid)
-{
-	CalPrivate *priv;
-	CORBA_Environment ev;
-
-	g_return_if_fail (cal != NULL);
-	g_return_if_fail (IS_CAL (cal));
-	g_return_if_fail (uid != NULL);
-
-	priv = cal->priv;
-	g_return_if_fail (priv->listener != CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-	Evolution_Calendar_Listener_obj_removed (priv->listener, (char *) uid, &ev);
-
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_message ("cal_notify_remove(): could not notify the listener "
-			   "about a removed object");
-
-	CORBA_exception_free (&ev);
-}
diff --git a/calendar/pcs/cal.h b/calendar/pcs/cal.h
deleted file mode 100644
index 2b17278573..0000000000
--- a/calendar/pcs/cal.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Evolution calendar client interface object
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef CAL_H
-#define CAL_H
-
-#include <libgnome/gnome-defs.h>
-#include <bonobo/bonobo-object.h>
-#include "calendar/pcs/evolution-calendar.h"
-#include "cal-common.h"
-
-BEGIN_GNOME_DECLS
-
-
-
-#define CAL_TYPE            (cal_get_type ())
-#define CAL(obj)            (GTK_CHECK_CAST ((obj), CAL_TYPE, Cal))
-#define CAL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_TYPE, CalClass))
-#define IS_CAL(obj)         (GTK_CHECK_TYPE ((obj), CAL_TYPE))
-#define IS_CAL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_TYPE))
-
-typedef struct _CalPrivate CalPrivate;
-
-struct _Cal {
-	BonoboObject object;
-
-	/* Private data */
-	CalPrivate *priv;
-};
-
-struct _CalClass {
-	BonoboObjectClass parent_class;
-};
-
-GtkType cal_get_type (void);
-
-Cal *cal_construct (Cal *cal,
-		    Evolution_Calendar_Cal corba_cal,
-		    CalBackend *backend,
-		    Evolution_Calendar_Listener listener);
-Evolution_Calendar_Cal cal_corba_object_create (BonoboObject *object);
-
-Cal *cal_new (CalBackend *backend, Evolution_Calendar_Listener listener);
-
-void cal_notify_update (Cal *cal, const char *uid);
-void cal_notify_remove (Cal *cal, const char *uid);
-
-POA_Evolution_Calendar_Cal__epv *cal_get_epv (void);
-
-
-
-END_GNOME_DECLS
-
-#endif
diff --git a/calendar/pcs/job.c b/calendar/pcs/job.c
deleted file mode 100644
index d97df6d883..0000000000
--- a/calendar/pcs/job.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* GNOME personal calendar server - job manager
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-#include "job.h"
-
-
-
-/* The job list */
-
-typedef struct {
-	JobFunc func;
-	gpointer data;
-} Job;
-
-static GSList *jobs_head;
-static GSList *jobs_tail;
-
-static guint jobs_idle_id;
-
-
-
-/* Runs a job and dequeues it */
-static gboolean
-run_job (gpointer data)
-{
-	Job *job;
-	GSList *l;
-
-	g_assert (jobs_head != NULL);
-
-	job = jobs_head->data;
-	(* job->func) (job->data);
-	g_free (job);
-
-	l = jobs_head;
-	jobs_head = g_slist_remove_link (jobs_head, jobs_head);
-	g_slist_free_1 (l);
-
-	if (!jobs_head) {
-		jobs_tail = NULL;
-		jobs_idle_id = 0;
-		return FALSE;
-	} else
-		return TRUE;
-}
-
-/**
- * job_add:
- * @func: Function to run the job.
- * @data: Data to pass to @function.
- * 
- * Adds a job to the queue.  The job will automatically be run asynchronously.
- **/
-void
-job_add (JobFunc func, gpointer data)
-{
-	Job *job;
-
-	g_return_if_fail (func != NULL);
-
-	job = g_new (Job, 1);
-	job->func = func;
-	job->data = data;
-
-	if (!jobs_head) {
-		g_assert (jobs_tail == NULL);
-		g_assert (jobs_idle_id == 0);
-
-		jobs_head = g_slist_append (NULL, job);
-		jobs_tail = jobs_head;
-
-		jobs_idle_id = g_idle_add (run_job, NULL);
-	} else {
-		g_assert (jobs_tail != NULL);
-		g_assert (jobs_idle_id != 0);
-
-		jobs_tail = g_slist_append (jobs_tail, job)->next;
-	}
-}
diff --git a/calendar/pcs/job.h b/calendar/pcs/job.h
deleted file mode 100644
index c9bce24dd4..0000000000
--- a/calendar/pcs/job.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* GNOME personal calendar server - job manager
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef JOB_H
-#define JOB_H
-
-#include <glib.h>
-
-
-
-typedef void (* JobFunc) (gpointer data);
-
-void job_add (JobFunc func, gpointer data);
-
-
-
-#endif
diff --git a/camel/.cvsignore b/camel/.cvsignore
deleted file mode 100644
index 521f6065df..0000000000
--- a/camel/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-temp-test
diff --git a/camel/CODING.STYLE b/camel/CODING.STYLE
deleted file mode 100644
index 58e9c68bbe..0000000000
--- a/camel/CODING.STYLE
+++ /dev/null
@@ -1,19 +0,0 @@
-Note to hackers
----------------
-
-When hacking on camel (and on the gnome mailer in general), 
-be sure to follow the same coding style as the initial authors.
-Please read the file HACKING in gnumeric and follow the
-general guidelines explained in it.
-
-Please take a look at camel source files and try to exactly
-imitate the coding style. We are perfectly aware that this
-is not the best and unique style, but it is absolutely
-mandatory that Camel is homogeneous.  If you find the current
-coding style to have some weaknesses, please contact the
-authors to discuss this matter.
-
-Thanks.
-
-	Bertrand.
-
diff --git a/camel/ChangeLog b/camel/ChangeLog
deleted file mode 100644
index 638fd4611d..0000000000
--- a/camel/ChangeLog
+++ /dev/null
@@ -1,6682 +0,0 @@
-2000-10-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-part.c (camel_mime_part_set_description): The correct
-	fix this time - the description should be encoded here and not in
-	the camel-medium layer.
-
-2000-10-18  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* camel-mime-filter-charset.c (complete): Put a zero at the start
-	of the outbuf.
-
-2000-10-18  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c (add_header): No, we must not encode the
-	headers here.  These interfaces ARE raw interfaces as they are
-	defined in camel_medium.  Also removed a bogus/meaningless FIXME.
-	(set_header): Likewise here, we must not.
-	(process_header): Removed another bogus comment.
-
-	* camel-object.c (shared_is_of_type): Comment out the spitting of
-	a big warning when we're trying to determine types from code.
-
-	* providers/mbox/camel-mbox-summary.c
-	(message_info_new_from_parser): Only call ibex funcitons if we
-	have an index.
-
-	* providers/mh/camel-mh-summary.c (camel_mh_summary_add): Only
-	call ibex functions if we have an index.
-	(remove_summary): Likewise.
-	(camel_mh_summary_check): Likewise.
-
-	* providers/nntp/camel-nntp-store.c (nntp_store_get_folder):
-	get_folder -> flags argument.
-
-	* providers/vee/camel-vee-store.c (vee_get_folder): create->flags.
-
-	* providers/pop3/camel-pop3-store.c (get_folder): Changed create
-	-> flags.
-
-	* providers/imap/camel-imap-store.c (get_folder): Added flags
-	argument.
-
-	* providers/mh/camel-mh-folder.c (camel_mh_folder_new): Added
-	flags argument, and fixed code appropriately.
-
-	* providers/mh/camel-mh-store.c (get_folder): Added flags argument.
-
-	* camel-folder-search.c (message_body_contains): Perform a regex
-	match on the contents of messages.  This wont quite work yet as
-	message contents are encoded when written to a stream.
-	(build_match_regex): Converts a number of strings into a regex
-	matching pattern, escaping special chars.
-	(match_message): match a single message from a folder, by uid.
-	Slow.
-	(search_body_contains): Changed to support matching where no index
-	is supplied.  Matches are performed by retrieving message
-	contents, etc.
-	() WTF?  camel should not be including any widget headers.
-	
-	* providers/mbox/camel-mbox-folder.c (camel_mbox_folder_new):
-	Added flags argument.
-	(mbox_refresh_info): Changed into a NOP, the refresh info code
-	moved into the new function.
-	(camel_mbox_folder_new): If we have an index requested, build one,
-	otherwise, remove an old one, or just dont do anything.
-
-	* providers/mbox/camel-mbox-store.c (get_folder): Changed create
-	to flags, changed code to suit.
-
-	* camel-store.c (camel_store_get_folder): Changed create to flags.
-	(get_folder_internal): And here.
-	(get_folder): And here too.
-
-	* camel-store.h (camel_store_get_folder): Change the create
-	argument to be a flags argument.
-
-2000-10-17  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_refresh_info): Remove
-	cached info at the end of the summary when the folder shrinks
-	between sessions. Also remove an untrue comment.
-	(camel_imap_folder_new): Move the summary creation to after the
-	folder selection again, since it depends on the uidvalidity
-	having been set.
-
-	* providers/imap/camel-imap-store.c (get_folder): Fix up
-	summary_file to not include the namespace twice.
-
-2000-10-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-part.c (set_header): Encode the header value.
-	(add_header): Same.
-
-2000-10-17  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-filter.c: Added some malloc check debugging stuff.
-
-	* camel-mime-parser.c
-	(struct _header_scan_state): Removed top_part, top_start, and
-	pending.  I can't even remember why they were there, and they're
-	not used anymore.
-
-	* camel-mime-filter-basic.c (filter): Forgot to up the space here
-	too.
-
-2000-10-14  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-filter-basic.c (complete): Ok, so we hit a fixme, 3x
-	just wasn't enough for some sequences.
-
-2000-10-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-command.c
-	(imap_read_response): Don't imap_next_word(respbuf + 2), instead
-	use imap_next_word(respbuf) or else we'll skip over the second
-	token.
-
-2000-10-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-command.c
-	(camel_imap_response_extract): Don't free 'resp' as it doesn't
-	point to the beginning of the allocated data, instead free
-	response->untagged->pdata[i]. Also, if '*resp' is equal to a space
-	character, then set resp = imap_next_word (resp) rather than
-	expecting resp++ to work (there's a list broken IMAP daemons that
-	like to put extra spaces between tokens).
-	(imap_read_response): Don't expect 'respbuf+2' to be where the
-	untagged number response to start (see above fix for an
-	explanation).
-
-2000-10-16  Chris Toshok  <toshok@helixcode.com>
-
-	* camel-service.c (get_path): when using the construct (flags &
-	CAMEL_SERVICE_URL_NEED_*) make sure to do ((flags &
-	CAMEL_SERVICE_URL_NEED_*) == CAMEL_SERVICE_URL_NEED_*)
-	(check_url): same.
-
-2000-10-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_disconnect): Only send
-	the LOGOUT command if the store is connected.
-	(imap_connect): Set the 'connected' state to TRUE when we
-	successfully connect.
-	(get_folder_info): if (!topfi), 'topfi' was allocated but then
-	'fi' was set. I think Dan meant to set topfi since fi is an
-	uninitialized value at this point.
-
-	* providers/imap/camel-imap-command.c (imap_read_response): Check
-	for the untagged BYE response and set the 'connected' state to
-	FALSE if we receive the BYE response. Return NULL if we get a BYE
-	response.
-
-2000-10-16  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_info): Deal with
-	the possibility of not getting a LIST response back for the top
-	level.
-
-2000-10-12  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-summary.c: Simple subclass of
-	CamelFolderSummary that also keeps a UIDVALIDITY value (and
-	doesn't, for the moment, build content info).
-
-	* providers/imap/camel-imap-folder.c:
-	(various): Use a CamelImapSummary to store/fetch summary info.
-	(camel_imap_folder_new): Take a path to a file to use for the
-	summary. Set the folder's permanent_flags correctly according to
-	the server response. Read in the summary (checking the
-	UIDVALIDITY) and update it if it's out of date.
-	(imap_refresh_info): Just fetch UIDs and flags. If the UIDs all
-	match, update the flags as needed and be done with it. Otherwise,
-	delete messages that have been expunged from the server and fetch
-	full summary info for any new messages.
-	(imap_sync): Save the summary to disk.
-	(imap_update_summary): Renamed from imap_get_summary_internal. Can
-	now be told to get summary for only a subset of messages. Use
-	camel-mime-utils functions rather than rolling our own header
-	parsing.
-	(imap_get_message_info_internal): Merged into imap_update_summary.
-	(imap_set_message_flags): Don't marked the message FOLDER_FLAGGED
-	if we're not actually changing the value of any of the flags.
-	(camel_imap_folder_changed): Deal with EXISTS rather than RECENT.
-	
-	* providers/imap/camel-imap-store.c (imap_connect): Call
-	camel_session_get_storage_path and save the value.
-	(get_folder): Create a local directory to store summary
-	information and pass a summary file name to camel_imap_folder_new.
-	Don't call camel_folder_refresh_info from here any more since
-	camel_imap_folder_new does it again.
-
-	* providers/imap/camel-imap-command.c (camel_imap_command): Add a
-	special case to this to make it possible to get the repsonses from
-	a SELECT and still have store->current_folder be updated
-	correctly.
-	(imap_read_response): parse EXISTS rather than RECENT
-
-	* camel-session.c (camel_session_get_storage_path): Use
-	e_mkdir_hier.
-
-	* camel-folder-summary.c (camel_folder_summary_remove_index): New
-	function.
-
-	* camel-mime-utils.c (header_raw_append_parse): fix this.
-	(camel-mime-parser.c doesn't use this code because of the MEMPOOL
-	optimization, so nothing was ever actually calling it before.)
-
-2000-10-11  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.h (struct _CamelMimePart): Removed
-	temp_message_buffer, and content_input_stream fields which seem to
-	have come from nowhere, and are unused.
-
-	* camel-mime-utils.c: Added a note about touching this file.
-	Nobody is to touch it without asking me first.  That goes for you
-	too Jeff.
-	(header_decode_text): In what way is this broken?
-
-2000-10-10  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary_internal):
-	Fix camel_summary_* function rename
-	(imap_get_message_info_internal): Likewise.
-
-	* camel-mime-parser.c (camel_mime_parser_finalise): Fixed a spelling mistake.
-
-	* camel-folder-summary.c (camel_summary_format_address): Uh, why
-	do we encode and then decode here ... sigh.  This is not the way
-	to fix this.
-	(camel_folder_summary_format_address): Renamed to a proper name,
-	this was only supposed to be a private function.
-	(camel_folder_summary_format_string): Likewise.  Oh i see why it
-	was made public, code reuse by cut & paste.  Joy.
-
-2000-10-11  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (nntp_store_unsubscribe_folder): remove the leading '/'.
-	(nntp_store_subscribe_folder): same.
-	(nntp_store_folder_subscribed): same.
-
-2000-10-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_move_message_to): Quote
-	the mailbox name as it may contain spaces.
-	(imap_copy_message_to): Same.
-
-2000-10-10  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c
-	(build_folder_info_from_grouplist): fill in message_count and
-	unread_message_count properly.
-
-	* providers/nntp/camel-nntp-newsrc.h: reformat.
-
-	* providers/nntp/camel-nntp-grouplist.c
-	(camel_nntp_get_grouplist_from_file): remove spew.
-
-	* providers/nntp/camel-nntp-newsrc.c
-	(camel_nntp_newsrc_group_get_num_articles_read): new function.
-	(camel_nntp_newsrc_group_get_highest_article_read): robustification.
-
-2000-10-10  Joe Shaw  <joe@helixcode.com>
-
-	* providers/imap/camel-imap-store.c 
-	(parse_list_response_as_folder_info): Check before dereferencing the
-	sep pointer.
-
-2000-10-10  Jacob "Ulysses" Berkman  <jacob@helixcode.com>
-
-	* camel-*.c: teach camel about "its" vs. "it's"
-
-2000-10-09  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (finalize): write out the
-	newsrc.
-	(nntp_store_get_name): if @brief, just return host.
-
-	* providers/nntp/camel-nntp-newsrc.c: robustification and bug
-	fixes.
-
-2000-10-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder-summary.c (camel_summary_format_address): Decode
-	the resulting string.
-
-2000-10-06  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-grouplist.c: new file.
-
-	* providers/nntp/camel-nntp-grouplist.h: new file.
-
-	* providers/nntp/camel-nntp-types.h: new file.
-
-2000-10-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-utils.c (quoted_encode): Fix so that we don't encode
-	every single char in the word. Also, do we need a safemask? I
-	don't see why we would.
-	(header_encode_string): Don't strip off the last char!!
-
-2000-10-06  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/Makefile.am (libcamelnntpinclude_HEADERS): add
-	camel-nntp-grouplist.h
-	(libcamelnntp_la_SOURCES): add camel-nntp-grouplist.c
-
-	* providers/nntp/camel-nntp-provider.c: add our own hash functions
-	for nntp urls.
-
-	* providers/nntp/camel-nntp-newsrc.c
-	(camel_nntp_newsrc_group_is_subscribed): new function.
-	(camel_nntp_newsrc_subscribe_group): new function.
-	(camel_nntp_newsrc_unsubscribe_group): new function.
-
-	* providers/nntp/camel-nntp-newsrc.h: add prototypes for
-	_group_is_subscribed, _subscribe_group, and _unsubscribe_group.
-
-	* providers/nntp/camel-nntp-store.c
-	(build_folder_info_from_grouplist): new function.
-	(nntp_store_get_folder_info): add subscribed_only_parameter.  if
-	it's FALSE, load the grouplist and call
-	build_folder_info_from_grouplist.
-	(nntp_store_folder_subscribed): implement.
-	(nntp_store_subscribe_folder): implement.
-	(nntp_store_unsubscribe_folder): implement.
-	(camel_nntp_store_init): add CAMEL_STORE_SUBSCRIPTIONS to the
-	store's flags.
-
-	* providers/mh/camel-mh-store.c (get_folder_info): add
-	subscribed_only parameter.
-
-	* providers/mbox/camel-mbox-store.c (get_folder_info): add
-	subscribed_only parameter.
-
-	* providers/imap/camel-imap-store.c (get_folder_info): add
-	subscribed_only parameter.
-
-	* camel-store.c (camel_store_supports_subscriptions): new function.
-	(camel_store_folder_subscribed): new function.
-	(camel_store_subscribe_folder): new function.
-	(camel_store_unsubscribe_folder): new function.
-
-	* camel-store.h: add prototypes and virtual functions for the
-	subscribe implementation.  also, add a subscribed_only argument to
-	camel_store_get_folder_info.
-
-2000-10-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-utils.c (header_address_list_format_append): Encode
-	the name part of the address and don't quote the name.
-	(header_decode_text): Rewrote from scratch, the old code was badly
-	broken.
-
-2000-10-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-message.c (camel_mime_message_set_reply_to): Use the
-	camel_address_encode function again.
-	(camel_mime_message_set_from): Same.
-
-2000-10-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-utils.c (quoted_encode_step): Modified to not encode
-	space chars in the middle of a line.
-	(isblank): New macro if we're not on a system with the GNU isblank
-	extension.
-
-	* camel-mime-message.c (camel_mime_message_set_from): Reversed my
-	changes, don't header_encode_phrase - it generates broken headers.
-	(camel_mime_message_set_reply_to): Same.
-
-2000-10-04  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-utils.c (camel_nntp_get_headers):
-	revert to old method (only use XOVER if OVER is supported.)
-
-	* providers/nntp/camel-nntp-store.c
-	(camel_nntp_store_get_overview_fmt): handle the case where the
-	OVER extension isn't listed but LIST OVERVIEW.FMT works (again,
-	INN 2.2).  enable the OVER extension in this case.
-
-2000-10-04  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): return a
-	gboolean so we can tell if this command worked.  we can't key off
-	the OVER extension being present because at least one server (INN
-	2.2) doesn't report the OVER extension but implements the XOVER
-	command.  This could of course just be because I'm a loser for
-	thinking they were related in the first place.
-	(camel_nntp_get_headers): always try XOVER first, and if it fails
-	revert to the slow method.
-
-2000-10-04  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-store.c (get_folder): Fix a case where
-	a variable was free'd and then possibly used in an error message.
-
-2000-10-04  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-provider.c
-	(camel_provider_module_init): news: -> nntp:.
-
-2000-10-04  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (nntp_store_get_folder_info):
-	use "nntp:" instead of "news:" since "news:" urls aren't supposed
-	to have host/user/port info in them.  also, if there's a user
-	defined in the url, put it in the urls for our folders.
-
-2000-10-04  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-auth.c (camel_nntp_auth_authenticate):
-	borrow some code from the imap provider to query the user for
-	their password, and pass the user/passwd to nntp.  be extra
-	paranoid and zero out the password before freeing it.
-
-	* providers/nntp/camel-nntp-store.c (camel_nntp_store_init): add
-	ALLOW_USER/ALLOW_PASSWORD/ALLOW_AUTH to the url flags.
-	(nntp_store_query_auth_types_generic): return our list of
-	auth_types.
-	(nntp_store_query_auth_types_connected): broken, return same as in
-	query_auth_types_generic.
-
-2000-10-04  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_connect): IMAP4
-	(pre-rev1) doesn't support the 'LIST "" ""' idiom, so don't use
-	it. Just assume the dir_sep is '/'. Shrug.
-
-2000-10-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-message.c (camel_mime_message_set_reply_to): Use
-	header_encode_phrase instead.
-	(camel_mime_message_set_from): Same.
-
-2000-10-04  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (header_content_type_is): Handle the case
-	where ct != NULL, but type and subtype are, and also match that
-	against text/plain.
-
-	* camel-folder-summary.c: Bump summary file version.
-	(message_info_save): Save the size from the messageinfo.
-	(message_info_load): Load the size from the summary file.
-	(message_info_load): Fixed up the time_t saving/loading.  There
-	was a reason the warning was left there ... obviously nobody could
-	read the comment "/* warnings, leave them here */", why do i even
-	bother.
-	(camel_folder_summary_decode_time_t): Decode a time_t value from
-	the summary file.
-	(camel_folder_summary_encode_time_t): Encode a time_t value to the
-	summary file.
-
-2000-10-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-command.c (camel_imap_command): Quote
-	the mailbox name when sending a SELECT request otherwise mailboxes
-	with spaces in their names will cause problems.
-
-	* camel-mime-message.c (camel_mime_message_set_reply_to): encode
-	before setting.
-	(camel_mime_message_set_from): Same.
-
-2000-10-03  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-command.c: New file containing
-	camel_imap_command and friends. Major camel_imap_command rewrite
-	to remove duplicated code, make the parsing of literals be
-	more safe/correct, deal with RECENT/EXPUNGE responses more
-	consistently, and make it possible to implement the AUTHENTICATE
-	command.
-
-	* providers/imap/camel-imap-utils.c (imap_parse_nstring): New
-	function, to parse an IMAP "nstring".
-
-	* providers/imap/camel-imap-store.c: Move command stuff to
-	camel-imap-command.c. Update for camel_imap_command changes.
-
-	* providers/imap/camel-imap-folder.c: Update for
-	camel_imap_command changes.
-	(imap_append_message): CRLF filter the message before sending it.
-
-	* providers/imap/Makefile.am: Add camel-imap-command.[ch], remove
-	camel-imap-stream.[ch] for now.
-
-2000-10-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-message.c (camel_mime_message_has_8bit_parts): New
-	convenience function to determine if there are any 8bit mime parts
-	in a mime message.
-	(camel_mime_message_encode_8bit_parts): New convenience function
-	to recursively reencode all 8bit mime parts to either
-	quoted-printable or base64 depending on which would be the best
-	encoding for that part.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): If the mime
-	message contains 8bit parts and the server doesn't support 8bit
-	transfers, reencode those parts before proceding with the send.
-	(smtp_mail): If the mime message contains 8bit parts and the
-	server supports the 8BITMIME extension to SMTP, notify the server
-	that we'll be sending it 8bit mime parts.
-	(_send_to): Find out if the message contains 8bit parts.
-
-2000-10-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (_send_to): Use the
-	CamelInternetAddress parser.
-	(smtp_get_email_addr_from_text): deprecated.
-
-2000-10-02  Dan Winship  <danw@helixcode.com>
-
-	* camel-provider.h: Remove default_ports.
-
-	* camel-remote-store.c (remote_connect): Get default_port from
-	CamelRemoteStore rather than CamelProvider.
-
-	* providers/{imap,nntp,pop3}/camel-*-store.c: Initialize
-	CamelRemoteStore::default_port
-
-	* providers/*/camel-*-provider.c: Remove default_ports.
-
-2000-10-02  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.[ch]: Remove
-	camel_folder_{get,free}_subfolder_info, as we want to be able to
-	scan the whole subfolder tree without having to open any folders,
-	so this needs to be in CamelStore. Remove can_hold_folders and
-	can_hold_messages flags; things that don't hold messages are no
-	longer considered CamelFolders.
-
-	* camel-folder-summary.[ch]: Remove CamelFolderInfo stuff.
-
-	* camel-store.[ch]: Add camel_store_{get,free}_folder_info, as
-	well as camel_store_free_folder_info_full and ..._nop for default
-	implementations, and camel_folder_info_free and
-	camel_folder_info_build as convenience functions. Turn
-	CamelFolderInfo into a tree structure and also add an "url"
-	member.
-
-	* providers/*/camel-*-folder.c: Remove subfolder_info and can_hold
-	stuff.
-	* providers/*/camel-*-store.c: Add folder_info stuff.
-
-	* providers/imap/camel-imap-folder.c (imap_summary_free): Free the
-	summary elements with camel_message_info_free, not
-	camel_folder_info_free. Oops.
-
-	* providers/imap/camel-imap-utils.c: const poison
-
-2000-09-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c: Fixed some memory leaks.
-	(camel_smtp_transport_init): Initialize supports_8bit to FALSE.
-	(smtp_helo): If server supports 8bit, set supports_8bit to TRUE.
-
-	* camel-transport.h (struct _CamelTransport): Added variable
-	gboolean supports_8bit (we'll need this eventually? - see bugzilla
-	bug #53)
-
-	* providers/smtp/camel-smtp-transport.c
-	(smtp_get_email_addr_from_text): Ugh, no wonder people were
-	getting illegal seek warnings *sigh*. I guess I can only blame
-	myself for this one though :-(
-
-2000-09-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (_send_to): Don't send the
-	recipient data through smtp_get_email_addr_from_text - this is a
-	complete waste. In fact, we don't want to have to use that
-	function ever.
-
-	* camel-internet-address.c, camel-address.c: Added some gtk-doc
-	comments.
-	
-2000-09-28  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* camel-mime-utils.c (header_encode_string): Make sure to add the
-	space char after an encoded word when the encoding is iso-8859-1.
-
-2000-09-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): When
-	getting a literal string response, don't include the \r\n after
-	the closing } (as in: "... {798}\r\n...")
-	
-	* providers/imap/camel-imap-stream.c (stream_read): Same.
-
-2000-09-28  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (header_fold): New function to fold headers.
-
-2000-09-27  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-parser.c (folder_scan_header): If we had an empty
-	header, then it must be end of the headers too.
-	(folder_scan_init): No we dont need to init the outbuf with a nul
-	terminator.
-
-	* camel-folder-summary.c (camel_folder_summary_set_uid): New
-	function to reset the uid to a higher value.
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):
-	"something failed (yo!)" what sort of crap is this?  Fixed all the
-	indenting again, what wanker keeps running stuff through indent?
-	(message_info_new): Check the uid we loaded off the disk, if it
-	existed already, assign a new one.  If it didn't then make sure
-	the nextuid is higher.
-
-	* camel-charset-map.c: New file, used to build a large unicode
-	decoding mapping table, and use it to determine what is the
-	lowest charset a given word can be encoded with.  Uses tables from
-	libunicode's source.
-
-	* camel-internet-address.c (internet_encode): Use
-	header_phrase_encode to properly encode the fullname, as required.
-	refixed indenting.  Who keeps doing that?
-	(camel_internet_address_find_address): Changed fatal return/warnings
-	into assertions.
-
-	* camel-mime-utils.c (header_raw_append_parse): Check : explicitly
-	(removed from is_fieldname() macro).
-	(camel_mime_special_table): Changed to short, so we can represent
-	more bit types.
-	(quoted_encode): Take a mask of the safe chars for this encoding.
-	(header_address_decode): Removed a #warning that makes no sense
-	anymore.
-	(header_decode_date): Fixed the 'broken date' parser code, if it
-	ever decoded it it just threw away the result.
-	(header_encode_string): Use better charset matching for encoding
-	strings as well.
-
-2000-08-31  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-summary.c (camel_mh_summary_sync): Save
-	the index if we do a sync.
-	(camel_mh_summary_check): Save the index here too.  Probably.
-
-2000-09-27  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):
-	Return untagged data in a GPtrArray rather than a string, since it
-	saves processing time and is much easier to deal with for several
-	commands. Update for camel_imap_folder_changed change.
-	(camel_imap_fetch_command): Update for camel_imap_folder_changed
-	change.
-	(imap_connect, imap_folder_exists): Update for
-	camel_imap_command_extended change.
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_message_count_internal,
-	imap_get_subfolder_info_internal, imap_search_by_expression):
-	Update for camel_imap_command_extended change.
-
-	(imap_get_summary_internal, imap_get_message_info_internal): Use
-	camel_imap_fetch_command here now to get around the
-	camel_imap_command_extended change.
-
-	(camel_imap_folder_changed): turn expunged into a GArray of ints
-	rather than a GPtrArray of strings representing ints.
-
-2000-09-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_message_count_internal): Quote the folder name as it may
-	contain spaces.
-	(imap_get_subfolder_info_internal): Same.
-
-	* providers/imap/camel-imap-utils.c (imap_parse_list_response): Do
-	proper unquoting for folder names.
-	(func_get_current_date): Implemented.
-
-	* providers/imap/camel-imap-store.c
-	(imap_folder_exists): Quote the folder name as it may have spaces.
-	(imap_create): Same.
-	(check_current_folder): Same.
-
-2000-09-22  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_subfolder_info_internal): The root folder's name is "",
-	not the namespace.
-	(camel_imap_folder_new): constify folder_name.
-
-	* providers/imap/camel-imap-store.c (get_folder): Create the
-	folder with folder_name, not folder_path.
-	(camel_imap_command_preliminary): Don't free cmdid here.
-
-2000-09-21  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c (imap_create_flag_list): New
-	function to convert Camel flags to an IMAP flag_list.
-	(imap_parse_flag_list): Contrariwise.
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_*): Make
-	the @ret arg actually optional, as (mostly) documented.
-	(various): Don't pass "&result" to camel_imap_command_* if we're
-	just going to immediately free it. Don't record status if we're
-	not going to look at it.
-
-	* providers/imap/camel-imap-folder.c: Likewise.
-	(imap_summary_free): Use camel_folder_info_free.
-	(imap_sync): Use imap_create_flag_list. Clear
-	CAMEL_MESSAGE_FOLDER_FLAGGED after syncing so we don't keep
-	re-syncing.
-	(imap_append_message): Use imap_create_flag_list. Don't leak the
-	memstream if the append fails.
-	(imap_move_message_to): Use camel_folder_delete_message rather
-	than doing it by hand.
-	(imap_get_summary_internal, imap_get_message_info_internal): Use
-	imap_parse_flag_list and header_raw_clear.
-	(camel_imap_folder_changed): Use camel_message_info_free.
-
-2000-09-21  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder_name): INBOX is
-	case-insensitive.
-	(get_root_folder_name): Make the root folder "" rather than "/".
-	(get_folder): Update for root folder name change.
-	(camel_imap_store_get_toplevel_dir): Removed. (Unused, unneeded.)
-	(camel_imap_store_folder_path): New function to turn a Camel
-	folder name into the corresponding namespaced IMAP path.
-	(imap_folder_exists): Make this take a store and a path rather
-	than a folder.
-	(imap_create): Likewise
-	(get_folder): Update for camel_imap_store_folder_path and other
-	changes.
-	(check_current_folder): Likewise.
-
-	* providers/imap/camel-imap-folder.c: Change a bunch of CamelStore
-	variables to CamelImapStore (and add a few more) to prevent excess
-	gratuitous casting. Use camel_imap_store_folder_path where
-	appropriate.
-	(camel_imap_folder_new): Update for root folder name change.
-
-2000-09-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): Use the
-	linewrap filter to achieve full RFC0821 compliance.
-
-	* camel-mime-filter-linewrap.[c,h]: New mime-filter to word-wrap.
-
-2000-09-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-internet-address.c (internet_encode): When encoding the
-	internet address, quote the name as the name may have commas or
-	any other token which may later confuse our address parser.
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_subfolder_info_internal): Fix the case where INBOX
-	isn't returned in the folder listing.
-
-2000-09-19  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: (init): Removed
-	(camel_folder_init, camel_folder_construct): New object init
-	function and public object constructor to replace the old init
-	method in a more Gtk-like fashion.
-
-	(get_parent_folder, camel_folder_get_parent_folder): Removed. No
-	CamelFolder subclass was ever setting the parent_folder member, no
-	code has ever needed to look at it, and fixing it would actually
-	be pretty hard.
-
-	(get_subfolder_info, camel_folder_get_subfolder_info): Renamed
-	from ..._names. Deals in CamelFolderInfo now.
-	(free_subfolder_info, camel_folder_free_subfolder_info): Likewise.
-
-	(get_subfolder, camel_folder_get_subfolder): Removed.
-	CamelFolderInfo contains the subfolder's full name, so this is
-	unnecessary now, and removing it lets us get rid of the
-	CamelFolder separator member, which is needed for the default
-	implementation of this function, but not otherwise needed for most
-	providers.
-
-	Also, lots of code style fixes.
-
-	* providers/*: Update CamelFolder subclasses for changes, although
-	none of them fill in the message counts in the CamelFolderInfo
-	yet.
-
-2000-09-18  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-folder-search.c, camel-folder-search.h,
-	camel-remote-store.c, providers/imap/camel-imap-folder.c,
-	providers/imap/camel-imap-store.c: Fixed the #include lines to
-	deal properly with gal.
-
-2000-09-17  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-summary.h: update CamelFolderInfo
-	* camel-folder-summary.c (camel_folder_info_free): New function to
-	free the contents of a CamelFolderInfo
-
-2000-09-15  Dan Winship  <danw@helixcode.com>
-
-	* camel.c (camel_init): Set camel_verbose_debug to TRUE if
-	CAMEL_VERBOSE_DEBUG is set in the environment.
-
-	* camel-remote-store.c (remote_send_line, remote_recv_line): only
-	log if camel_verbose_debug is TRUE.
-
-2000-09-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder): Don't use
-	dir_sep as top-level directory, use "/".
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Get rid of
-	unused variable.
-
-2000-09-13  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Don't look at
-	the response of the command. camel_imap_command_extended()
-	processes EXPUNGE responses itself, so if we do it here too we
-	remove twice as many summary items as we should.
-
-2000-09-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_folder_exists): Rewrote
-	to take a third argument (gboolean *selectable) so that we can
-	find out if the folder is selectable or not as we look to see if
-	it exists. Also, don't use EXAMINE because that will not work on
-	non-selectable folders, so use LIST instead.
-	(get_folder): Check to see if the folder exists even vefore
-	calling imap_create as this will save time. If the folder does
-	exist, find out if it's selectable. Moved the call to refresh_info
-	here.
-
-	* providers/imap/camel-imap-folder.c (imap_get_uids): Check for a
-	NULL summary.
-	(camel_imap_folder_new): Don't call refresh_info here - call it in
-	get_folder() because we don't know if this folder even exists on
-	the server yet! And even if it does, we don't know if it can hold
-	messages or not yet.
-
-2000-09-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-parser.c (folder_scan_step): Make sure *datalength is
-	> 0 before calling camel_mime_filter_filter otherwise we will get
-	a segfault if the filter calls iconv().
-
-2000-09-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/nntp/camel-nntp-auth.c,
-	providers/nntp/camel-nntp-auth.h: Fixed a warning.
-
-2000-09-07  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.c (camel_session_get_storage_path): Make this not
-	leak.
-	
-2000-09-07  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.c (camel_session_new): Make this take a path to a
-	directory that Camel can use for its own nefarious purposes.
-	(camel_session_get_storage_path): New function to return a path
-	that a service can use for its own nefarious sub-purposes.
-
-	* camel-service.c (camel_service_get_path): New method (and
-	useful default implementation) to get a (relative) pathname
-	corresponding to the service.
-
-2000-09-06  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (connect_to_server): Make KPOP
-	work again.
-
-2000-09-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-message.c (camel_mime_message_get_received_date):
-	Implemented (someone added these to camel-mime-message.h but never
-	implemented them!!) - though it may not be right.
-	(camel_mime_message_get_sent_date): Same.
-
-2000-09-05  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part.c (camel_mime_part_get_filename): If a MIME part
-	has no Content-Disposition, but does have a "name" on the
-	Content-Type, return that as the filename.
-	(process_header): strstrip the Content-Description
-
-2000-09-05  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-utils.c (get_OVER_headers): care about
-	response code.
-	(get_HEAD_headers): same.
-	(camel_nntp_get_headers): same.
-
-	* providers/nntp/camel-nntp-store.h: get rid of
-	CAMEL_NNTP_OK/ERR/FAIL.
-
-	* providers/nntp/camel-nntp-store.c
-	(camel_nntp_store_get_extensions): take CamelException arg and
-	pass along to camel_nntp_command.
-	(camel_nntp_store_get_overview_fmt): same.
-	(nntp_store_connect): convert to using constants in
-	camel-nntp-resp-codes.h
-	(nntp_store_get_folder): make use of camel_nntp_folder_new.
-	(camel_nntp_command_send_recv): new function to deal with auth
-	challenge.
-	(camel_nntp_command): split out most of this function into
-	camel_nntp_command_send_recv.  also, return the actual response
-	code instead of CAMEL_NNTP_OK/ERR/FAIL.
-
-	* providers/nntp/camel-nntp-resp-codes.h: new file.
-
-	* providers/nntp/camel-nntp-folder.h: prototype for
-	camel_nntp_folder_new.
-
-	* providers/nntp/camel-nntp-folder.c (camel_nntp_folder_new): new
-	convenience function.
-	(nntp_folder_get_message): care more about the actual response
-	code.
-
-	* providers/nntp/Makefile.am (libcamelnntp_la_SOURCES): add
-	camel-nntp-auth.c.
-	(libcamelnntpinclude_HEADERS): add camel-nntp-auth.h.
-
-	* providers/nntp/camel-nntp-auth.h: new file.
-
-	* providers/nntp/camel-nntp-auth.c: new file.
-
-2000-09-05  Peter Williams  <peterw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_folder_exists): Don't free the
-	result on error; the exception will have the relevant info.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Check for
-	exceptions here.
-
-	* providers/imap/camel-imap-store.c (imap_connect): Check the exception
-	on the refresh_folders call.
-
-	* providers/imap/camel-imap-store.h: Clean up some now-unused fields.
-
-	* camel.c (camel_init): Call unicode_init again, now that libunicode
-	will not initialize itself twice.
-
-2000-09-02  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* camel-folder-search (search_header_contains): Use e_utf8_strstrcase
-
-2000-09-01  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c: Removed some unused
-	functions.
-
-2000-09-01  Peter Williams  <peterw@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (camel_nntp_command): Initialize
-	the statically-allocated CamelException so that it doesn't contain
-	junk data that camel_exception_set() may try to free.
-	(camel_nntp_store_get_extensions): Same.
-	(camel_nntp_store_get_overview_fmt): Same.
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_command): Typo
-	fix (if (*ret) -> if (ret)).
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Set the
-	port # back to what was specified ASAP, so that the hash of
-	the URL doesn't change (which causes a failure in
-	service_cache_remove that leads to a segfault).
-
-	* providers/imap/camel-imap-store.c (imap_connect): Clear the 
-	exception after a failed LOGIN so that it doesn't pass through
-	to the upper level and make mail think that the login failed.
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): As above.
-
-2000-08-31  Peter Williams  <peterw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_get_type):
-	Implement POP3 with the CamelRemoteStore now.
-	(connect_to_server): Hack this a bit to get KPOP to work. Obey
-	the new connection semantics of the remote store (implicitly).
-	(query_auth_types_connected): Clear exceptions after attempts
-	to connect; the code at the bottom will catch hard errors.
-	Use camel_service_connect.
-	(camel_pop3_command): Take a CamelException; now, when an error
-	occurs, ret is set to NULL and the exception passes back the
-	appropriate information.
-	(pop3_get_response): Same as above.
-	(pop3_try_authenticate): Give camel_pop3_command its exception
-	and handle it properly.
-	(pop3_connect): Call the parent classfuncs. Don't disconnect
-	on error (done for us).
-
-	* providers/pop3/camel-pop3-folder.c: Obey the camel_pop3_command
-	semantics.
-
-	* camel-remote-store.c (remote_query_auth_types_connected): Don't
-	warn; just return NULL.
-	(remote_query_auth_types_generic): Same.
-	(remote_send_string): Filter out passwords in debugging output.
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_init): Also
-	set the ALLOW_AUTH flag.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Same.
-
-2000-08-31  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (camel_nntp_store_class_init):
-	remove get_folder_name.
-	(nntp_store_get_folder_name): remove.
-
-2000-08-31  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* camel-mime-part.c (write_to-stream): Use filter only if we have one
-	
-2000-08-31  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-utils.c (get_OVER_headers): use
-	camel_remote_store_recv_line.
-
-	* providers/nntp/camel-nntp-folder.c (nntp_folder_get_message):
-	use camel_remote_store_recv_line to build message.  also, free our
-	buffer so we don't leak like mad.
-
-	* providers/nntp/camel-nntp-store.c:
-	(camel_nntp_store_get_additional_data) remove.
-	(camel_nntp_store_get_extensions): use
-	camel_remote_store_recv_line.
-	(camel_nntp_store_get_overview_fmt): same.  also, don't rely on
-	_get_additional_data anymore since it's easier to parse without.
-	(camel_nntp_command): use camel_remote_store_send_string and
-	camel_remote_store_recv_line.
-
-	* providers/nntp/camel-nntp-store.h: CamelRemoteStore is the
-	parent class now.  remove istream/ostream since CamelRemoteStore
-	takes care of that for us.  also remove the prototype for
-	camel_nntp_store_get_additional_data.
-
-	* providers/nntp/camel-nntp-newsrc.c (camel_nntp_newsrc_write):
-	make sure to clear dirty bit.
-	(camel_nntp_newsrc_read_for_server): don't worry about continually
-	trying to open the file - if it fails we just return an
-	unpopulated .newsrc file.
-
-2000-08-31  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-newsrc.c
-	(camel_nntp_newsrc_read_for_server): make this a bit more robust.
-	try to create an empty .newsrc file for the server if we can't
-	open it for reading.  also, don't allocate everything until we've
-	opened the file.
-
-	* providers/nntp/camel-nntp-utils.c (get_OVER_headers): make use
-	of our overview field indices.
-	(camel_nntp_get_headers): only call get_OVER_headers if the
-	extension is present.  warn if it's not - since get_HEAD_headers
-	needs work before it works.
-
-	* providers/nntp/camel-nntp-store.c
-	(camel_nntp_store_get_extensions): new function - query the server
-	for it's extensions.
-	(camel_nntp_store_get_overview_fmt): new function - query the
-	server for the overview format and build our table of the indices
-	we care about.  support the "full" suffix on fields.
-	(nntp_store_connect): call camel_nntp_store_get_extensions and
-	camel_nntp_store_get_overview_fmt.
-
-	* providers/nntp/camel-nntp-store.h: add codes for extensions
-	found on news.mozilla.org.  only one that we care about is OVER.
-	also, add CamelNNTPOverField and an enum of the overview fields
-	that we care about.
-
-2000-08-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c (imap_translate_sexp):
-	Reimplemented. It should now work correctly for most possible
-	VFolder rules.
-
-2000-08-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):
-	Don't save any exceptions caused by camel_imap_folder_changed
-	(camel_imap_fetch_command): Same.
-	
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	Using a new way of calculating the first recent message that seems
-	more accurate. Also added code to make sure we don't accidently
-	add a duplicate summary.
-
-2000-08-31  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c (write_to_stream): Use the proper type
-	checking function to check for text types.
-	(write_to_stream): If we have a charset on a text type that
-	isn't us-ascii or utf-8, then we need to reencode it, so add a
-	filter to do that too.
-	(write_to_stream): Fix some warnings/use the right constructor,
-	oops.
-	(write_to_stream): Rearrange the logic so it always does charset
-	conversion, and not just if we have a qp/base64 block.
-
-	* camel-mime-utils.c (append_latin1): New function - even though
-	its broken, we'll assume mailers send latin1 headers instead of
-	us-ascii.  We just have to encode high chars into utf-8.
-	(header_decode_text): Call append_latin1 for appending unencoded
-	text segments.
-	(append_latin1): Do an additional mask for account for c's
-	undefined behaviour for sign extension whilst shifting right.
-
-2000-08-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_fetch_command):
-	Rewrote to ignore strings that look like server responses until it
-	is sure that it has finished reading the literal string response.
-
-2000-08-30  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* camel-remote-store.c (remote_send_string): Don't wrap printed
-	strings in quotes, makes things messy
-	
-	* providers/imap/camel-imap-folder.c (imap_get_message): Updated
-	to use the camel_imap_fetch_command
-	
-	* providers/imap/camel-imap-stream.c (stream_read): Updated to use
-	camel_imap_fetch_command
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):
-	No longer handles FETCH requests so no longer needs to be
-	concerned with checking to make sure that server responses are
-	valid (they have to be).
-	(camel_imap_fetch_command): New convenience function that handles
-	all FETCH requests
-
-2000-08-30  Peter Williams  <peterw@helixcode.com>
-
-	* camel-remote-store.c (remote_connect): Unify with remote_post_connect.
-	(remote_disconnect): Unify with remote_pre_disconnect.
-	(camel_remote_store_class_init): Don't use the post_connect and
-	pre_disconnect classfuncs anymore ; they weren't especially useful.
-
-	* providers/imap/camel-imap-store.c (imap_connect): Use this again
-	instead of implementing post_connect.
-	(imap_disconnect): Analogous to above.
-
-	* camel-session.c (camel_session_get_service_connected): New function.
-	Like camel_session_get_service() but also connects to the service
-	if needed. camel_session_get_{store,transport} (defined in the header)
-	used this now, preventing annoying when-to-connect problems.
-
-	* camel-service.c (camel_service_new): Revert to the old behavior
-	of not connecting until told to do so. Otherwise doing auth
-	testing correctly is really hard.
-	(camel_service_connect): Fix behavior here (set the connected
-	flag).
-	(camel_service_disconnect): Unset the connected flag.
-
-2000-08-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c: General cleanup / moving
-	stuff around to make things easier to follow.
-
-2000-08-30  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* camel-remote-store.c: Prevent exceptions from being overwritten
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Beautified
-	(imap_get_subfolder_names_internal): Removed old code as the
-	replacement code has now been tested and proven to work
-
-2000-08-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c: Removed old code that will
-	never be needed again
-
-	* providers/imap/camel-imap-store.c: Removed old code for
-	try_connect - will never need this code
-	(slurp_response): Update to make sure we aren't falsely detecting
-	EXPUNGE flags
-
-2000-08-29  Peter Williams  <peterw@helixcode.com>
-
-	* camel-service.c (camel_service_connect): Uncomment this.
-	(camel_service_disconnect): Same.
-
-	* camel-remote-store.[ch]: New files. Abstract remote storages
-	(IMAP, POP3, NNTP) and hides the lower-level networky stuff.
-	
-	* camel-service.c (camel_service_new): Take an extra argument, the
-	provider that created us, cause it's useful.
-	(camel_service_finalize): Unref our new provider member.
-
-	* camel-session.c (camel_session_get_service): Pass the proper number of
-	arguments to camel_service_new().
-
-	* camel-imap-store.c: Massive update: 1) use the CamelRemoteService to
-	make our life Very Easy (TM). 2) Change the semantics of all 
-	camel_imap_command* functions to take exceptions, centralize tons of
-	duplicate code, and use the handy RemoteStore utility functions
-
-	* camel-imap-folder.c: Use the new semantics of camel_imap_command*
-
-	* camel-imap-stream.c: Same.
-	
-2000-08-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):
-	Updated to check for EXPUNGE notifications
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	Updated to account for messages which have been expunged (now
-	takes a new arg, a GPtrArray of message id's that have been
-	expunged)
-	(imap_expunge): Updated (we may want to just use the code in
-	folder_changed now instead of doing our own summary
-	expunging...but that can be fixed later)
-	(imap_append_message): Updated.
-	(imap_copy_message_to): Updated.
-	(imap_move_message_to): Updated.
-
-2000-08-28  Peter Williams  <peterw@helixcode.com>
-
-	* camel-folder.c (camel_folder_refresh_info): New member function,
-	refresh_info, used for rereading folder state after its state has
-	somehow become unknown. Tries to preserve last-known status of
-	messages.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_refresh_info): Implement
-	::refresh_info (split up ::init)
-
-	* providers/mbox/camel-mbox-store.c (get_folder): Call ::refresh_info.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Call
-	::refresh_info once initialized.
-	(imap_refresh_info): New member function; reads the summary from
-	the server (used to be in camel_imap_folder_new; split out).
-
-	* providers/imap/camel-imap-store.c (imap_connect): Set
-	CamelService::connected a little early so that 
-	camel_imap_command won't try to connect while already
-	connnecting.
-	(camel_imap_command*): Try to connect if not connected already.
-	
-	* providers/pop3/camel-pop3-folder.c (pop3_refresh_info): Same as above.
-
-	* providers/pop3/camel-pop3-folder.c (camel_pop3_folder_new): Same
-	as above.
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Set 
-	CamelService::connected a little early so that
-	camel_pop3_command won't try to connect while already
-	connecting
-	(connect_to_server): Same.
-
-	* providers/nntp/camel-nntp-folder.c (nntp_folder_refresh_info): Same
-	as above.
-
-2000-08-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): Fixed the
-	hack around quoted string responses - should now handle them
-	according to the specifications in the RFC
-	
-	* providers/imap/camel-imap-stream.c (stream_read): Updated to
-	match the code currently used in camel-imap-folder.c
-
-2000-08-28  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):
-	Never ever free `tmpname' as it comes from `alloca()'!
-
-2000-08-26  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* camel-mime-utils.c (header_decode_text): Use `g_free()', not
-	`free()', to free `decword'.
-
-2000-08-25  Peter Williams  <peterw@helixcode.com>
-
-	* camel.c (camel_init): Don't call unicode_init; code in e-util
-	will do it, and if unicode_init is called twice, you get an
-	infinite loop when looking up nonexistant encodings (patch
-	has been submitted to libunicode's maintainer).
-	
-	* camel-provider.h: Add a new field, default_ports, which
-	helps the configuration code guess about how to make CamelURL's
-	from providers.
-	
-	* providers/*/camel-*-provider.c: Specify default ports.
-
-2000-08-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_subfolder_names_internal): If the url path is "/" and
-	the folder path is "/", just LIST "" "*" (this should fix some
-	cyrus imapd problems). Also, INBOX is case insensitive so use
-	g_strcasecmp
-
-2000-08-24  Lauris Kaplinski  <lauris@helixcode.com>
-
-	* camel-folder-summary.c (summary_build_content_info):
-	Use UTF-8 as default
-	* camel-mime-part-utils.c (simple_data_wrapper_construct_from_parser):
-	Use UTF-8 as default
-	* camel-mime-utils.c (rfc2047_decode_word): Use UTF-8
-	
-2000-08-17  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-folder.c (mh_finalize): And here too.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_finalize): Close index
-	on exit.
-
-2000-08-23  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_address_list_format_append): put
-	commas between addresses.
-
-2000-08-22  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_protocol_get_summary_specifier): use BODY.PEEK, not BODY, so
-	we don't set the message \Seen.
-
-2000-08-22  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c: Fixed a small warning.
-
-2000-08-22  Peter Williams  <peterw@helixcode.com>
-
-	* camel-service.c (camel_service_new): Connect automatically if the
-	URL is not empty.
-	(finalize): Disconnect automatically if connected.
-	(camel_service_query_auth_types): Split	into two functions; one to
-	be called if we're connected to an actual server (_connected), one
-	to be called if we're just gauging the general authtypes supported
-	(_generic).
-	(is_connected): Remove.
-
-	* camel-store.c (camel_store_get_folder): Don't connect explicitly to
-	the service.
-
-	* providers/nntp/camel-nntp-store.c (query_auth_types_generic): Split
-	the query_auth_types function. Hook it up in _new.
-	(finalize): Don't try to disconnect here.
-	
-	* providers/pop3/camel-pop3-store.c (query_auth_types_generic): Same.
-	(finalize): Don't try to disconnect here.
-
-	* providers/imap/camel-imap-store.c (query_auth_types_generic): Same.
-	(finalize): Don't try to disconnect here.
-
-	* providers/smtp/camel-smtp-transport.c (query_auth_types_generic): Split
-	the query_auth_types (dummy, in this case) function. Hook it up in _new.
-	(finalize): Don't try to disconnect here.
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-	
-	* providers/nntp/camel-nntp-folder.c (nntp_folder_get_subfolder_names):
-	Make sure newsrc is not null
-	(nntp_folder_get_subfolder_names): ditto
-
-	* providers/nntp/camel-nntp-newsrc.c 
-	(camel_nntp_newsrc_get_subscribed_group_names): Programming check
-	for newsrc == NULL
-	(camel_nntp_newsrc_get_all_group_names): ditto
-	(camel_nntp_newsrc_write_to_file): ditto
-	(camel_nntp_newsrc_write): ditto
-
-2000-08-21  JP Rosevear  <jpr@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c (camel_nntp_command): 
-	Make sure respbuffer is not null before manipulating it.
-	If it is null, return CAMEL_NNTP_FAIL and a decent error
-	message.
-	
-2000-08-18  Peter Williams  <peterw@helixcode.com>
-
-	* camel-internet-address.c (internet_encode): If the name is "" we
-	weren't outputting anything; output the address at least.
-
-2000-08-16  Peter Williams  <peterw@helixcode.com>
-
-	* camel-internet-address.c (internet_encode): Fix a leak when
-	name = "". It's a single-byte leak, but it's the little things
-	that count.
-
-	* camel-object.c (camel_type_lock_up): Don't leave the type
-	system locked when a bad unlock happens.
-
-	* providers/mbox/camel-mbox-store.c (get_folder): Fix a leak.
-
-2000-08-15  Peter Williams  <peterw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_copy_message_to): Typo fix.
-
-2000-08-14  Peter Williams  <peterw@helixcode.com>
-
-	* camel-folder-search.c (search_get_sent_date): New search function;
-	returns the time_t when the message was sent.
-	(search_get_receive_date): Same for when it was received.
-	(search_get_current_date): Gets the current time for use with the
-	above two. Is this in the right place?
-
-	* camel-folder-search.h: Add the new functions above to the class.
-
-2000-08-13  Dan Winship  <danw@helixcode.com>
-
-	* providers/nntp/Makefile.am (libcamelnntpinclude_HEADERS): Add
-	camel-nntp-utils.h
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_subfolder_names_internal): do a strcasecmp rather than
-	just a strcmp when checking if a folder is "INBOX", since it is
-	a case-insensitive name.
-
-2000-08-12  Dan Winship  <danw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary_internal):
-	Don't assume the FETCH results will come back in the order they
-	were requested.
-	(imap_get_subfolder_names_internal): Add "INBOX" to the list as
-	g_malloc'ed memory, not a static string.
-
-2000-08-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c
-	(camel_imap_command_continuation): Now takes a char * parameter
-	rather than a stream
-	(camel_imap_command_continuation_with_stream): Same function as
-	above but takes a stream parameter instead
-
-	* providers/imap/camel-imap-folder.c (imap_append_message): Use
-	camel_imap_command_continuation_with_stream
-
-2000-08-12  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (pop3_try_authenticate): New
-	function to do one round of attempted authentication.
-	(pop3_connect): Move a bunch of code out into
-	pop3_try_authenticate and fix some bugs in the edge cases.
-
-2000-08-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (query_auth_types): No longer
-	calls try_connect() to get authtypes
-
-2000-08-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c
-	(camel_imap_command_continuation): Changed param order a bit and
-	fixed some logic
-
-	* providers/imap/camel-imap-folder.c (imap_append_message): Use
-	the new multi-transactional convenience functions
-
-2000-08-11  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* providers/imap/camel-imap-store.c
-	(camel_imap_command_preliminary): New convenience function for
-	multi-transactional commands (opening request)
-	(camel_imap_command_continuation): New convenience function for
-	multi-transactional commands (followup data)
-
-2000-08-11  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/mh/camel-mh-folder.c: Fixed a warning.
-
-2000-08-11  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-folder.c
-	(camel_nntp_folder_class_init): remove get_name and get_full_name
-	assignments, since the camel-folder.c implementation does what we
-	need.
-
-2000-08-11  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-store.c
-	(camel_nntp_store_get_toplevel_dir): use g_get_home_dir, since
-	evolution_dir isn't available in the providers.
-
-2000-08-11  Peter Williams  <peterw@helixcode.com>
-
-	* camel-folder.c (thaw): Fix a bug where the message_changed
-	signal wasn't being emitted.
-
-2000-08-11  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-folder.c (mh_set_message_user_tag):
-	Implement.
-	(mh_get_message_user_tag): Implement.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_user_tag):
-	(mbox_set_message_user_tag): Implement.
-
-	* camel-folder.c (move_message_to): Yay so lets fix an already
-	fixed fix, again.
-	(copy_message_to): and here too ... update for api change to append().
-	And removed another warning.
-	(camel_folder_set_message_user_tag): Routine to set message tags.
-	(camel_folder_get_message_user_tag): And accessor.
-
-2000-08-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-folder-search.c, camel-folder-summary.c, camel-medium.c,
-	camel-mime-filter-charset.c, camel-mime-filter.c,
-	camel-mime-filter.h, camel-mime-message.c, camel-mime-parser.c,
-	camel-mime-part-utils.c, camel-mime-part.c, camel-mime-utils.c,
-	camel-movemail.c, camel-multipart.c, camel-object.c,
-	camel-stream-mem.c, providers/mbox/camel-mbox-folder.c,
-	providers/mbox/camel-mbox-summary.c,
-	providers/mh/camel-mh-folder.c,
-	providers/smtp/camel-smtp-transport.c: Fixed some warnings.
-
-2000-08-11  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/vee/camel-vee-folder.c (vee_folder_build_folder): Free
-	the search properly.
-	(vee_folder_build): And here too.
-
-2000-08-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	If we go over the max number of messages, don't keep requesting
-	new message summaries, just break.
-
-2000-08-11  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-parser.c (folder_scan_header): A better way to
-	compress leading whitespace.  The code is probably invalid anyway,
-	I dont think it will work across buffer boundaries.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): And
-	write out proper format From lines here too.
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_build_from): New function to build a more
-	compatible mbox "From " line.
-	(camel_mbox_summary_sync): Write From lines in the proper format.
-
-2000-08-10  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-store.c (get_folder): Remove warnin g.
-
-	* providers/mbox/camel-mbox-store.c (xrename): Kill some warnings
-	with constification.
-
-	* providers/imap/camel-imap-folder.c (imap_append_message): Fixed
-	for append api change.  Eek this routine seriously wastes memory.
-
-	* providers/mh/camel-mh-folder.c (mh_search_free): Impelemnt.
-	(mh_append_message): Fix for api change, and include user flags
-	and tags in new message.
-
-	* providers/vee/camel-vee-folder.c (vee_search_by_expression): Fix
-	for search api change.
-
-	* camel-folder.c (camel_folder_search_free): New function for
-	freeing search results.
-	(search_free): Changed my mind, implement a default that actually
-	does something.  Free as to the old interface.
-	(camel_folder_append_message): Changed to accept a
-	camelmessageinfo rather than flags, which just doesn't have enough
-	info in it.
-	(copy_message_to): Change for append_message api change.
-	(move_message_to): Likewise.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_search_free):
-	Implement.
-	(mbox_append_message): Fix for api change, and also copy user
-	flags/tags across to new summary.
-
-	* camel-folder-search.c (search_user_tag): A search expression
-	that returns the current use flag by name.
-	(camel_folder_search_free_result): New function to free the result
-	of a search.
-
-	* camel-folder-summary.c: Bump summary version.
-	(message_info_new): 
-	(message_info_load): 
-	(message_info_save): 
-	(camel_message_info_dup_to): 
-	(camel_message_info_free): Added support for arbitrary tag/value
-	pairs (CamelTag's).
-	(camel_tag_get): 
-	(camel_tag_set):
-	(camel_tag_list_size):
-	(camel_tag_list_free): Operations for working with CamelTags.
-
-2000-08-09  Peter Williams  <peterw@helixcode.com>
-
-	* camel-store.c (camel_store_get_folder): Connect beforehand, if
-	necessary.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Default
-	the dir_sep to "/" so that certain functions can safely assume that
-	dir_sep is valid (at least, nonnull).
-
-2000-08-09  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* providers/nntp/camel-nntp-folder.c
-	(nntp_folder_set_message_flags): Get rid of an unused variable.
-
-	* providers/nntp/Makefile.am (INCLUDES): Fix includes so that we
-	don't use installed headers anymore.  [I copied this over from the
-	IMAP provider, that does not seem to have this problem.]
-
-2000-08-09  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-folder-search.c (camel_folder_search_execute_expression):
-	Reorder search result in summary order if we searched with a
-	summary.
-
-2000-08-08  Dan Winship  <danw@helixcode.com>
-
-	* camel-uid-cache.c: New code to keep an on-disk cache of what
-	UIDs have been seen in a folder.
-
-	* camel-provider.h: Add new flags CAMEL_PROVIDER_IS_SOURCE (mail
-	can arrive in it by non-Camel means) and CAMEL_PROVIDER_IS_STORAGE
-	(you can work with mail directly without needing to copy it local).
-
-	* providers/*/camel-*-provider.c: Add flags as needed: imap and
-	mbox are SOURCE and STORAGE. mh and nntp are just STORAGE, pop3 is
-	just SOURCE.
-
-	* camel-mime-message.c (process_header): Add another subject
-	g_strstrip that fejj's earlier commit missed.
-
-2000-08-08  Peter Williams  <peterw@helixcode.com>
-
-	* camel-provider.h: Remove some GTK stuff that I missed.
-
-	* providers/imap/camel-imap-store.c (imap_noop): Turn this
-	back on with the new timeout interface in CamelSession.
-
-	* camel-session.[ch] (camel_session_register_timeout): New
-	interface for Camel to register timeouts. Basically the
-	GTK timeout interface is copied. We do this because Camel isn't
-	allowed to use GTK anymore.
-	
-2000-08-07  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-folder.c (mh_append_message): Only retry
-	another uid if we had a name clash, otherwise fail.
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_subfolder_names_internal): If we are trying to get a
-	subfolder listing of the root folder, always make sure INBOX is
-	there...
-
-	* providers/imap/camel-imap-utils.c (imap_parse_list_response): 
-	Check for NIL as a directory separator.
-
-2000-08-07  Peter Williams  <peterw@helixcode.com>
-
-	* providers/nntp/Makefile.am: Reorder the INCLUDES to pull
-	in the camel headers from the local source tree before
-	the ones in $(includedir). This was causing compile problems
-	because the installed, Gtk-based camel-object.h was included
-	before the uninstall Camel-based one.
-
-2000-08-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c (imap_translate_sexp): Strip
-	all \n's from the expression
-
-	* string-utils.c (strip): New convenience function to strip
-	occurences of a single char from a string
-
-	* camel-mime-message.c (camel_mime_message_set_subject): Do a
-	g_strstrip on the subject so we can stop getting those annoying
-	leading spaces
-
-2000-08-07  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c (camel_folder_free_deep): Fix this to not require
-	NULL-termination of the array.
-
-2000-08-04  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_connect): If we fail to
-	get a dir_sep, then supply the default of "/".
-	(get_folder): Undo changes by Peter
-
-2000-08-04  Peter Williams  <peterw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder): Prevent a coredump
-	when get_folder()ing from a store with dir_sep = NULL.
-
-2000-08-04  Peter Williams  <peterw@helixcode.com>
-
-	* camel-store.h: Include camel-object.h. Ettore said this wasn't
-	compiling.
-
-2000-08-04  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-url.c (camel_url_set_protocol): 
-	(camel_url_set_host): 
-	(camel_url_set_path): 
-	(camel_url_set_port): Url editing functions.
-
-2000-08-04  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-folder.c (pop3_set_message_flags): 
-	(pop3_sync): Indexes into the flags array are message_number minus
-	1, not just message_number.
-
-	* providers/pop3/camel-pop3-store.c: add a debugging macro for
-	doing protocol tracing.
-
-2000-08-03  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Only
-	call imap_get_summary_internal if the folder can hold messages
-
-	* providers/nntp/camel-nntp-provider.c (camel_provider_module_init): 
-	Initialize the service_cache for the news/nntp providers
-
-2000-08-03  Peter Williams  <peterw@helixcode.com>
-
-	* providers/nntp/Makefile.am (INCLUDES): Add -I$(top_srcdir) to
-	pull in libibex/ibex.h
-
-2000-08-02  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh/camel-mh-summary.c (camel_mh_summary_sync): Expunge
-	from the end, so the index isn't messed up when you remove a
-	message.
-
-	* providers/mh/camel-mh-folder.c (mh_append_message): Fix a bug
-	where it would never open an output file/uid.
-
-	* providers/mbox/camel-mbox-store.c (rename_folder):
-	Implementation for mbox as well.
-
-	* camel-store.c (camel_store_rename_folder): New method to rename folders.
-	(rename_folder): Default implementation.
-
-	* providers/mh/camel-mh-store.c (delete_folder): Implement this.
-	(rename_folder): Implement a rename operation.
-
-2000-08-02  Dan Winship  <danw@helixcode.com>
-
-	* providers/MH: Kill this. It doesn't have any code to do anything
-	the new mh provider doesn't do better.
-
-	* providers/Makefile.am: Remove reference to MH subdir, and
-	promote nntp to fully-supported status, since it does compile and
-	all.
-
-	* camel-mime-message.c (camel_mime_message_set_subject): Trim
-	trailing space from the subject. I've now seen replies from two
-	different people that tricked the threading code by (a) not having
-	References/In-Reply-To, and (b) adding an extra space to the end
-	of the subject line so the subject-based threading fails too. Who
-	writes these broken mailers anyway?
-
-2000-08-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_helo): When forced
-	to use the IP, place it in square brackets.
-
-	* providers/imap/camel-imap-utils.c (imap_translate_sexp): New and
-	improved sexp parser. An honest try at using e-sexp is wrapped in
-	a #ifdef at the bottom of the file but is currently not used
-
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):
-	We want to do a UID SEARCH so we get UIDs back instead of sequence
-	numbers
-
-2000-08-01  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mh: New mh provider implementation.
-
-	* providers/Makefile.am (SUBDIRS): Added mh provider.
-
-2000-07-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message_info_internal): 
-	Some IMAP servers don't wrap the UID in ()'s so don't depend on that
-	(imap_get_summary_internal): Same
-
-	* providers/imap/camel-imap-utils.c (free_sexp_node): Oops, forgot to
-	free node->function - not good.
-
-2000-07-31  Peter Williams  <peterw@helixcode.com>
-
-	* providers/vee/camel-vee-folder.c (vee_search_by_expression): Add
-	a NULL to the matches pointer array so that g_strfreev knows where
-	the end is.
-
-2000-07-31  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-utils.c (imap_translate_sexp): New
-	convenience function to translate a Camel sexp into the equivalent
-	IMAP sexp.
-
-	* providers/imap/camel-imap-store.c: More places now use
-	imap_next_word
-
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):
-	Implemented initial version (this may or may not work quite right)
-
-2000-07-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Make sure
-	the third word/token (whatever) is "EXPUNGE" and not something
-	else like "EXISTS" or "RECENT". When removing the message from
-	the summary also make sure to free that data to avoid leakage.
-	Also make sure to subtract 1 from the 'id' since IMAP starts
-	at 1 and our summary starts at 0 :-)
-
-2000-07-28  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* providers/imap/camel-imap-store.c (camel_imap_status): Cleaned
-	up a bit, now uses imap_next_word()
-	(camel_imap_command_extended): Now uses imap_next_word(). When
-	checking for RECENT, allow the first digit of the recent-count
-	be between 0 and 9 inclusive instead of exclusive.
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Optimized.
-	No longer will it need to reload the summary as it now instead
-	removes the appropriate message summaries from the cache.
-	(camel_imap_folder_changed): If recent == 0 then return. If 
-	recent < 0 then just emit the folder_changed signal, don't reload
-	summaries.
-
-2000-07-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_message_count_internal): Get message count when STATUS
-	is not available.
-	(imap_init): folder->has_search_capability is required for IMAP so
-	should always be set to TRUE (is currently being set to FALSE as
-	I've not yet implemented SEARCH support).
-	(camel_imap_folder_changed): Seem to have fixed my optimization
-	hack
-
-2000-07-28  Jon K Hellan  <hellan@acm.org>
-
-	* providers/imap/camel-imap-store.h (CamelImapServerLevel): New
-	enum.
-	(CamelImapStore): Added server_level and has_status_capability
-	members.
-
-	* providers/imap/camel-imap-store.c (imap_connect): Detect
-	IMAP4REV1, IMAP4 and STATUS in capability response.
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_message_count_internal): Use STATUS only if server
-	supports it. TODO: Get message count when STATUS not supported.
-	(imap_get_message, imap_get_summary_internal,
-	imap_get_message_info_internal): Handle IMAP4 as well.
-	(imap_protocol_get_summary_specifier): New function: Make a data
-	item specifier for the header lines we need, appropriate to the
-	server level.
-
-2000-07-27  Peter Williams <peterw@helixcode.com>
-
-	* camel-mime-utils.c (header_decode_lwsp): More
-	checks for end of string.
-
-	* providers/imap/camel-imap-store.c:
-	(imap_command_extended): Free the elements of our
-	array (huge mem leak)
-
-	* providers/imap/camel-imap-folder.c:
-	(summary_get_internal): Same as above.
-	
-
-2000-07-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	Fixed my routine to only fetch new headers, my IDs were off by 1
-	on the high end, so when it would fetch the last newly arrived
-	message it would fail and end up fetching all of the summaries
-	because of the corruption.
-
-2000-07-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-url.c (camel_url_to_string): If the path doesn't begin
-	with a / and there is a host, prepend a / to the path.
-
-2000-07-27  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* providers/imap/Makefile.am: Added camel-imap-utils.[c,h]
-	
-	* providers/imap/camel-imap-utils.[c,h]: Utilities for parsing
-	server responses for use in both camel-imap-store.c and
-	camel-imap-folder.c
-	
-	* providers/imap/camel-imap-folder.c (imap_get_summary_internal):
-	Free all the pointers in the headers array.
-	(imap_get_subfolder_names_internal): Updated to use
-	imap_parse_list_response
-	(imap_parse_subfolder_list): Removed in favor of
-	imap_parse_list_response
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):
-	Free all the pointers in the data array.
-	(imap_connect): Updated to use imap_parse_list_response and fixed
-	a leak
-	(folder_is_selectable): Updated.
-
-2000-07-27  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* providers/imap/camel-imap-folder.c (imap_get_message_info): Now
-	uses a hash table for looking up message info rather than a linear
-	search :)
-
-2000-07-27  Peter Williams  <peterw@helixcode.com>
-
-	* providers/*/Makefile.am: Don't specify SUBDIRS =
-	[nothing]. Messes up distcheck.
-	
-2000-07-26  Peter Williams  <peterw@helixcode.com>
-	
-	* camel-mime-parser.c (folder_scan_init): Initialize
-	outbuf to be "" -- it's not guaranteed to be zeroed.
-	
-	* camel-mime-utils.c (header_references_decode): Return
-	if the header is NULL -> or "" <-. Don't do our stupid
-	mailer trick if we point to \0.
-	(header_decode_quoted_string): Don't rip past end of 
-	string!
-	
-2000-07-26  Dan Winship  <danw@helixcode.com>
-
-	* camel-movemail.c (movemail_external): routine to call an
-	external movemail program.
-	(camel_movemail): Nuke return value, use movemail_external when
-	available and useful, and don't delete "dest" on errors, since
-	it might have started non-empty.
-
-2000-07-26  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-url.c (camel_url_to_string): Should now always prepend a '/'
-	before the path if it doesn't already exist.
-
-	* providers/imap/camel-imap-folder.c: Fixed a few compiler warnings
-
-2000-07-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_summary_free): Fixed the
-	real problem that Peter was running into.
-
-2000-07-25  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-message.c (write_to_stream): Don't add a Mime-Version
-	header to a message that already has one.
-
-	* camel-internet-address.c (internet_encode): Don't put <>s around
-	addresses with no name part.
-
-2000-07-25  Peter Williams  <peterw@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Set 
-	imap_folder->summary to NULL after calling imap_summary_free,
-	so we don't get stuck with a junk summary pointer. Should
-	we free it at all?
-
-2000-07-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):
-	Optimized to try and get the new message headers without reloading
-	the entire summary from scratch.
-	(imap_get_summary_internal): Will now sync() before attempting to
-	reload the summary so that flags are set in the reloaded summary
-	as well.
-
-2000-07-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder): Updated to give
-	special attention to the root folder.
-
-	* providers/imap/camel-imap-folder.c
-	(imap_get_subfolder_names_internal): Updated to handle the root
-	folder
-	(imap_get_message_count_internal): return 0 if folder can't hold
-	messages
-	(camel_imap_folder_new): Change so that root folder gets special
-	attention and always gets can_hold_messages set to FALSE
-
-2000-07-24  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: Remove exceptions from a number of methods that
-	work on what ought to be static data: get_parent_folder,
-	get_parent_store, get_message_count, get_unread_message_count,
-	get_permanent_flags, get_message_flags, set_message_flags,
-	get_message_user_flag, set_message_user_flag, get_uids,
-	get_summary, get_subfolder_names. Turn camel_folder_delete_message
-	into a macro. (Mostly a pull-up from the camel-async branch.)
-
-	* providers/{imap,mbox,nntp,pop3,vee}: Update for CamelFolder
-	changes
-
-2000-07-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message_info): Updated
-	to port easily to the new Camel API
-	(imap_init): Don't SELECT INBOX, we don't need to do that
-
-2000-07-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): 
-	Initialize the summary and subfolder listing.
-	(imap_summary_free): Now takes a GPtrArray arg rather than a 
-	CamelImapFolder as it increases it's usefullness for free()'ing
-	temporary summaries.
-	(imap_get_message_count_internal): A new convenience function for
-	getting the actual message count on a server to be used by 
-	imap_get_summary_internal)
-	(imap_get_message_count): Since the Camel API is on the move again, 
-	the future version of this function will not be able to make a
-	call to the store, it must only access previously fetched data (thus 
-	the creation of the _internal function)
-	(imap_get_subfolder_names_internal): Again, because the future version
-	of imap_get_subfolder_names will not take an exception, we must rename
-	this function which will be called by camel_imap_folder_new()
-	(imap_get_subfolder_names): We now return the previously collected
-	subfolder listing that the _internal function fetched previously
-	(imap_get_summary_internal): Again, same idea as the previous _internal
-	functions...
-	(imap_get_summary): Again... now returns a previously aquired summary
-
-	* providers/imap/camel-imap-store.c (imap_noop): This will hopefully
-	prevent the imap store from disconnecting.
-	(imap_connect): Modified to add a gtk timeout event that will call
-	imap_noop() every 10 minutes (we may want to change this time value)
-	(imap_disconnect): Modified to remove the NOOP timeout event from the
-	store.
-	(camel_imap_command_extended): Commented out the code that would try
-	and detect if the store was disconnected and then reconnect if it was
-	needed.
-
-2000-07-24  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.[ch]: Remove camel_folder_get_message_uid, which
-	was not used, and not implemented by any provider.
-
-	* providers/nntp/camel-nntp-folder.c: Remove get_message_uid
-	non-implementation.
-
-	* camel-folder-pt-proxy.[ch], camel-arg-collector.c,
-	camel-marshal-utils.[ch]: Bye bye bye.
-
-	* Makefile.am: remove reference to camel-arg-collector.c
-
-2000-07-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_disconnect): Made it a
-	little more forgiving. Also set current_folder to NULL as there is
-	no selected folder after a disconnect.
-	(stream_is_alive): Detects whether or not a socket is "alive"
-	(camel_imap_command_extended): Use stream_is_alive() to aid in the
-	detection of a disconnected state.
-
-2000-07-22  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (get_folder): Clear
-	CamelExceptions when appropriate (eg when folder is marked as
-	\NoSelect). Still needs some cleanup and perhaps Dan will have a
-	better way of doing this as this seems like a messy way of
-	handling this.
-
-	* providers/imap/camel-imap-folder.c (imap_get_uids): Took out
-	some debug statements as they are no longer needed.
-
-2000-07-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_subfolder_names):
-	Updated to not strip out subfolders that are marked as \NoSelect
-	because this will be correctly handled in store->get_folder from
-	now on.
-
-	* providers/imap/camel-imap-store.c (folder_is_selectable): New
-	convenience function for use in get_folder().
-	(parse_list_response): Now takes a char **flags argument which is
-	needed by folder_is_selectable().
-	(imap_connect): Updated to reflect changes to
-	parse_list_response().
-
-2000-07-21  Jeffrey Stedfast  <fejj@helixcode.com>
-	
-	* providers/imap/camel-imap-stream.c (stream_read): Updated with
-	some of the same fixes I've made to camel-imap-folder.c like
-	recalculating message part lengths.
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):
-	Rewrote the code to check for "* %d RECENT". Still needs to be
-	modified, but should no longer cause an infinite loop by detecting
-	mis-detecting RECENT messages.
-
-2000-07-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary):
-	(imap_get_message_info): Oops. Fix UID parser to allow 0 and 9 to
-	be in the range of valid UID chars.
-
-2000-07-20  Peter Williams  <peterw@helixcode.com>
-
-	* camel-object.c (camel_object_unref): Add a new global mutex
-	'refcount' held when refcounting operations occur.
-
-2000-07-19  Peter Williams  <peterw@helixcode.com>
-
-	* camel-object.c (camel_type_lock_up): Correct the recursiveness;
-	the locklevel is stored as a private, so each thread has its own
-	idea of the locklevel. Thus one thread can relock, but a different
-	one will think that it's a level 0 and try to lock the type_system
-	mutex.
-
-2000-07-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c: General cleanup working
-	towards getting Actions->Expunge working correctly.
-
-	* providers/imap/camel-imap-store.c
-	(cammel_imap_command_extended): Added code to look for "* %d
-	RECENT" and to emit the folder_changed signal if there are any
-	recent messages. Note: this is a hack and needs to be rewritten
-	badly.
-
-2000-07-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): If the
-	folder's message count is not the same as the number of summaries,
-	free the old summary and create a new summary.
-
-2000-07-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c
-	(camel_imap_folder_class_init): Added in
-	imap_[g,s]et_message_user_flag() methods
-	(imap_get_message_info): Rewrote to use the more efficient way of
-	downloading summary information and also added a UID comparison so
-	that if the UID requested doesn't match the UID received, it
-	returns NULL.  FIXME: When the mailer gets NULL when it requested
-	message info, it seems that it displays a row for that message and
-	when you try and select the blank row, it segfaults.
-
-	* providers/imap/camel-imap-store.c (get_folder): Oops, this
-	should not be checking against "/", it should be checking against
-	dir_sep.
-
-	* providers/imap/camel-imap-folder.c (imap_parse_subfolder_line):
-	Updated to trim out the leading namespace.
-	(imap_get_subfolder_names): Let the subfolder parser trim the
-	namespace off the folder name.
-
-2000-07-17  Peter Williams  <peterw@helixcode.com>
-
-	* camel-object.c (camel_type_lock_up): New function; the
-	Camel type_system lock is now fakey-recursive, being controlled
-	by a semaphore that goes up and down and is protected by another
-	lock. Theoretically all we need is the lock on the semaphore,
-	but this we catch exceptions "better" (by deadlocking).
-	(camel_type_lock_down): Corresponding to above.
-	(all functions): s,G_LOCK,camel_type_lock_up, etc.
-
-2000-07-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_disconnect): Send a
-	"LOGOUT" command.
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): Hacks to
-	get IMAP code to work with CommunigatePro and MS Exchange (and any
-	other servers that send back a UID at the end of each FETCH inside
-	of the main body of the message part).
-	(imap_sync): Un-#if 0 the code that sets the flags on the IMAP
-	server for messages that have changed. Oops, don't mask with
-	DELETED to find out if the message has been answered ;-)
-	(imap_expunge): sync before expunging.
-
-2000-07-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c: All SELECT calls now pass
-	a NULL folder argument to camel_imap_command_extended() since it's
-	not needed.
-	(imap_connect): Moved service_class->connect() to the point right
-	after a connection is established with the server rather than
-	waiting until the end of the function.
-	(camel_imap_command): Updated the documentation comment
-	(camel_imap_command_extended): Before sending a command, first
-	check to make sure we are connected; if we aren't, then reconnect.
-	Don't strncmp() command with "SELECT" as it's redundant.
-
-	* providers/imap/camel-imap-folder.c: All SELECT calls now pass
-	a NULL folder argument to camel_imap_command_extended() since it's
-	not needed. Also s/camel_imap_command/camel_imap_command_extended as
-	I will probably be doing away with camel_imap_command() or at least
-	only using it for LOGIN and similar commands where the server won't
-	notify us of any recent messages.
-
-2000-07-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): 
-	One last fix to get rid of hard-coded "/" directory separators
-
-2000-07-14  Peter Williams  <peterw@helixcode.com>
-
-	* camel-object.c : Implement 'events', which are suspiciously
-	like signals except without all the marshalling baggage, and
-	with quasi-thread-safety.
-	(camel_object_class_declare_event): New func.
-	(camel_object_hook_event): Ditto.
-	(camel_object_trigger_event): Ditto.
-	(obj_class_init): Declare the "finalize" event.
-	(obj_class_finalize): Free the hashtable of events->preps
-	(obj_finalize): Free the hashtable of events->hooklists
-	(camel_object_unref): Trigger the finalize event (ourselves,
-	to prevent massively unpleasant looping things.)
-	
-2000-07-14  Peter Williams  <peterw@helixcode.com>
-	
-	* camel-object.c (make_global_classfuncs): Change to return
-	a CamelObjectClass. Change parents to a GSList and free it
-	when done.
-	(camel_object_new): Don't allocate a classfuncs for every object;
-	merely give it a reference to the global_classfuncs. Convert
-	parents to a GSList and free it when done.
-	(camel_object_unref): Don't free the classfuncs. Free the parents
-	list, which is changed to a GSList.
-
-2000-07-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* string-utils.c (string_unquote): New convenience function
-	to unquote a string if it's encapsulated by "'s
-	
-	* providers/imap/camel-imap-folder.c:
-	* providers/imap/camel-imap-store.c: Made the necessary changes
-	to stop using hard coded directory separators.
-
-2000-07-13  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_load):
-	If the summary is for a smaller mbox, and rebuilding from the
-	last-known end position fails, try rebuilding from the beginning.
-	Deals with the case where the user edits the mbox and makes it
-	bigger, without adding new messages.
-
-2000-07-13  Peter Williams  <peterw@helixcode.com>
-
-	* camel-object.c: Rewritten to not be based on GtkObject,
-	but a tiny threadsafe ripoff thereof. Objects still cannot
-	be shared across threads, but ref/unref/destroy/new/etc
-	will work. Signals are not implemented because doing it
-	robustly would be a major pain in the butt, but class
-	functions are. There's a small demonstration that it doesn't
-	crash in ./temp-test.c: build it with ./make-test.sh.
-	* camel-stream.c, camel-seekable-stream.c, camel-stream-mem.c:
-	moved over to CamelObject. Proof of concept: two levels of
-	subclass and class functions, all working without coredumps.
-	To port to CamelObject:
-	- s,GTK_,CAMEL_,g in the cast checks
-	- s,gtk_type_new,camel_object_new,g
-	- s,GtkType,CamelType,g
-	- Change get_type function over to camel_type_declare
-	- instead of hooking to finalize function, it goes into the
-	  type declaration.
-	- remove signals.
-	- instead of GTK_OBJECT(so)->klass, CAMEL_OBJECT_GET_CLASS(so)
-	- s,gtk_type_class,camel_type_get_global_classfuncs,g
-	- don't chain finalize handlers; it will be done for you
-	
-2000-07-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c: 
-	* providers/imap/camel-imap-store.c: If a SELECT fails, set
-	imap_store->current_folder to NULL so a SELECT is forced before
-	any message/folder operations are requested. Also, because some
-	users don't use a namespace, make sure that if the url->path is 
-	"/" we don't use it when creating the folder_path.
-	(camel_imap_command[_extended]): Since we allow the passing of
-	a NULL folder which we can use to bypass a forced SELECT, no need
-	to check for the individual commands that don't require a folder
-	to be selected.
-
-2000-07-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c: 
-	* providers/imap/camel-imap-store.c: Updated to use CAMEL_IMAP_OK, 
-	CAMEL_IMAP_NO, CAMEL_IMAP_BAD, and CAMEL_IMAP_FAIL rather than the 
-	ones copied from the POP3 provider. 
-
-2000-07-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): Oops.
-	If the number of messages in the folder is 0, don't fetch
-	summaries 1 thru 0, just return an empty summary.
-	(imap_copy_message_to): Fixed to use message UID and also send
-	the source folder as an arg to camel_imap_command rather than NULL.
-	(imap_move_message_to): Same.
-	(imap_init): If SELECT is successful, we need to set the current
-	folder to the one selected, this was causing problems with move/copy
-
-2000-07-13  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.h: define a set of CAMEL_SERVICE_URL_ALLOW_* flags
-	parallel to the _NEED_* flags, and make the _NEED_* flags imply
-	the _ALLOW_* ones.
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_init): imap
-	urls ALLOW_PATH
-
-2000-07-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): New
-	and improved approach to fetching an entire folder summary
-	that should be much much faster than the old way as it gets
-	the entire folder summary in 1 shot rather than requesting
-	message by message. As with the last update, this version
-	also only fetches the minimum number of header fields.
-	(imap_get_summary): Oops, forgot to free the temp 
-	GPtrArray *headers
-
-2000-07-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): Don't
-	fetch the entire RFC822 header, just fetch the fields we want.
-	(imap_get_message_info): Same.
-
-2000-07-13  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-filter-basic.c (camel_mime_filter_basic_new_type):
-	Reset filter on setup.
-	(reset): When resetting qp encoding, set the state to -1, instead
-	of 0.
-
-	* camel-mime-utils.c (quoted_encode_step): Actually count the
-	characters output sofar (it never counted any).  Bunch of other
-	fixes.
-	(quoted_encode_close): Also flush out final character, if there's
-	one.
-
-2000-07-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	Chris forgot to add #include <e-util/e-util.h> to the source files
-	
-	* providers/imap/camel-imap-store.c (imap_connect): Fixed Peter's 
-	fix, we don't want to send a string to a %d.
-
-2000-07-12  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-folder-search.c, providers/imap/camel-imap-store.c:
-	Changed from strstrcase to e_strstrcase.
-
-	* string-utils.c, string-utils.h: Removed strstrcase (in favor of
-	e_strstrcase in e-util/e-util.c.)
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-folder.c
-	(nntp_folder_set_message_flags): get the article num out of our
-	uid and mark it read in the newsrc.
-	(nntp_folder_get_message): get the message id out of the uid to
-	fetch the article.
-
-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): the uid
-	is now <article-num>,<messageid>
-	(get_HEAD_headers): same.
-
-	* camel-mime-parser.c (folder_scan_step): go to HSCAN_MESSAGE
-	state when ct->subtype is "news" as well as "rfc822".  this makes
-	attachments of type "message/news" display properly.
-
-2000-07-12  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c (camel_folder_free_deep,
-	camel_folder_free_shallow, camel_folder_free_nop): Useful default
-	implementations for free_{uids,subfolder_names,summary}.
-	(free_subfolder_names, free_uids): Make these g_warning-ing
-	default implementations.
-
-	* providers/*/camel-*-folder.c: Use the new functions where
-	appropriate, remove duplicated code.
-
-2000-07-12  Peter Williams  <peterw@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (query_auth_types): Check for
-	NULL parameters when setting the exception so as to not crash on
-	Solaris (can't handle a %s passed NULL).
-	(imap_connect): Same.
-	
-2000-07-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_delete_message): Use
-	mbox_set_message_flags () instead of setting the flags by hand. This
-	fixes the problem of the "message_changed" signal not being emitted
-	at the correct time.
-
-	* providers/imap/camel-imap-folder.c: "folder_changed" signals should
-	pass a third argument (which is ignored).
-
-	* camel-folder.c: Undo gtk signal emits done in set_flags and 
-	expunge.
-	(move_message_to): 
-	(copy_message_to): Create info as a const CamelMessageInfo
-
-2000-07-12  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/Makefile.am: don't add test-newsrc to the build
-	since it needs libcamel (which isn't built at the time test-newsrc
-	needs linking.)
-
-	* providers/nntp/camel-nntp-utils.c (get_HEAD_headers): fill in
-	MessageInfo->message_id.
-	(get_XOVER_headers): same.
-
-	* providers/nntp/camel-nntp-folder.c (nntp_folder_init): move
-	summary loading here.
-	(nntp_folder_sync): summary/newsrc changes should be stored here.
-	put a comment to that effect.
-	(nntp_folder_set_message_flags): don't save the newsrc here.
-	(nntp_folder_get_uids): use g_ptr_array_index instead of the
-	cast/addition.
-	(nntp_folder_get_summary): no need to check if we should generate
-	the summary here.  already done.
-	(nntp_folder_get_message_info): implement.
-
-	* providers/nntp/camel-nntp-store.c
-	(camel_nntp_store_get_toplevel_dir): use evolution_dir instead of
-	computing it ourselves.
-	(nntp_store_disconnect): call camel_nntp_newsrc_write.
-	(ensure_news_dir_exists): new function to create the news/<news
-	server> subdir.
-	(camel_nntp_store_class_init): hook up connect/disconnect and
-	finalize.
-	(nntp_store_connect): if ensure_news_dir_exists fails throw an
-	exception.
-
-2000-07-12  Peter Williams  <peterw@helixcode.com>
-
-	* camel-folder.c (camel_folder_set_message_flags): Emit a message_changed
-	signal once the flags are set on the message.
-	(camel_folder_set_user_flag): Ditto.
-	(camel_folder_expunge): Emit a folder_changed if no exception.
-
-2000-07-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-stream.c: Use size_t and ssize_t for read/write methods
-	
-	* providers/imap/camel-imap-folder.c (imap_set_message_flags): 
-	Updated to emit the message_changed signal.
-	(imap_delete_message): Updated to use imap_set_message_flags ().
-	(imap_move_message_to): Updated to use imap_set_message_flags ()
-	and to emit the folder_changed signal on the destination folder.
-	(imap_copy_message_to): Updated to emit the folder_changed signal 
-	on the destination folder.
-	(imap_append_message): Updated to emit the folder_changed signal 
-	on the destination folder.
-
-2000-07-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder.c (camel_folder_append_message): Now takes a
-	flags argument to specify the flags to be set on the message
-	since we might not necessarily want the flags to be wiped clean.
-	(move_message_to):
-	(copy_message_to): Updated to send a flags argument to 
-	append_message (); currently sends the original message's flags.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): 
-	* providers/imap/camel-imap-folder.c (imap_append_message): 
-	Updated.
-
-2000-07-11  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: Remove exceptions from a number of methods
-	that work on what ought to be static data: get_parent_folder,
-	get_parent_store, get_message_count, get_unread_message_count,
-	get_permanent_flags, get_message_flags, set_message_flags,
-	get_message_user_flag, set_message_user_flag, get_message_uid,
-	get_uids, get_summary, get_subfolder_names. Turn
-	camel_folder_delete_message into a macro.
-
-	* providers/{mbox,pop3,vee}: Update for CamelFolder changes
-
-	* providers/Makefile.am: Disable imap and nntp for now
-
-2000-07-11  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression): 
-	This shouldn't return NULL, it should return g_ptr_array_new ()
-	so the mailer gets what it expects.
-
-2000-07-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder-summary.c (camel_folder_summary_decode_string): 
-	Oops, an unsigned integer can never be < 0
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* providers/vee/camel-vee-folder.c (vee_search_by_expression):
-	Initialize a variable to make this not crash again. And fix a bug
-	so it actually does something.
-
-2000-07-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder-summary.c: Cleaned up a bunch of compile warnings
-
-2000-07-10  Dan Winship  <danw@helixcode.com>
-
-	* providers/vee: kill more debugging messages
-
-2000-07-10  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_get_unread_message_count): 
-	* providers/vee/camel-vee-folder.c (vee_get_unread_message_count): 
-	* providers/imap/camel-imap-folder.c (imap_get_unread_message_count):
-	Implemented.
-
-	* camel-folder.c (camel_folder_get_unread_message_count): New
-	convenience function to allow the mailer to query the number
-	of unread messages in a folder (for displaying message stats
-	in a folder tree?).
-
-2000-07-09  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_references_dup): New function to copy
-	a header_references structure.
-
-	* camel-folder-summary.c (camel_message_info_dup_to): New function
-	to (deep) copy the data from one CamelMessageInfo into another.
-	(camel_message_info_free): And free the data.
-
-	* providers/vee/camel-vee-folder.c (vee_sync): Implement. (empty).
-	(vee_search_by_expression): belatedly update for
-	camel_folder_search change.
-	(vee_folder_build): belatedly update for camel_folder_search
-	change. Use camel_message_info_dup_to and camel_message_info_free
-	(in particular, so that we get message_id and references info so
-	vfolders can be threaded).
-	(vee_folder_build_folder): Ditto.
-
-2000-07-08  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/nntp/camel-nntp-folder.c: 
-	* providers/nntp/camel-nntp-utils.c: 
-	* providers/nntp/camel-nntp-store.c: Update to reflect past changes
-	in the Camel API. Use gtk macro casts wherever possible and use glib's
-	memory functions instead of standard c's (since they are not 
-	compatable)
-
-	* providers/smtp/camel-smtp-transport.c: 
-	* providers/imap/camel-imap-store.c: Wrap debug print statements
-	in a macro
-
-	* providers/imap/camel-imap-stream.c (stream_read): Make sure
-	that we get up to and including the last \n of the mime part.
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): Make sure
-	that we get up to and including the last \n of the mime part.
-	Wrap debug print statements in a macro.
-
-	* providers/imap/camel-imap-stream.c (stream_read): Only cache
-	the important data (aka the mime part requested and no extra
-	server response stuff)
-
-2000-07-07  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_references_decode): Work around
-	In-Reply-To's with unquoted punctuation. So many broken mailers.
-
-	* camel-folder.c (camel_folder_search_by_expression): Make this
-	return a GPtrArray rather than a GList.
-
-	* camel-folder-search.c (camel_folder_search_execute_expression):
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):
-	* providers/mbox/camel-mbox-folder.c (mbox_search_by_expression):
-	* providers/nntp/camel-nntp-folder.c (nntp_search_by_expression):
-	Update to return a GPtrArray rather than a GList.
-
-2000-07-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (esmtp_get_authtypes): 
-	Fixed the parser to actually work
-
-2000-07-06  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_references_decode): Make this deal
-	with the full RFC822 References/In-Reply-To format rather than
-	just the more-nicely-behaved RFC1036 version. (Needed to parse
-	In-Reply-To headers with extra junk in them.)
-
-2000-07-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): Parse for
-	more header information to allow message threading in IMAP.
-	(imap_get_message_info): Same.
-
-	* camel-folder-summary.c: Renamed summary_format_* to
-	camel_summary_format_* and moved them into public scope.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Oops. Don't
-	pass port # as a string in the error code (if it fails to connect).
-
-	* providers/imap/camel-imap-folder.c (imap_append_message): Changed
-	over to camel_imap_command_extended as that was the source of the
-	problems - apparently appending replies with more than just 1 line.
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-search.c (search_header_contains): make header
-	matching case-insensitive
-
-	* camel-folder-summary.c:
-	* camel-session.c:
-	* providers/mbox/camel-mbox-folder.c:
-	* providers/mbox/camel-mbox-summary.c: Remove some non-error case
-	debugging-type messages.
-
-2000-07-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c (d): Define to empty so that
-	we get rid of a ton of debugging messages.
-
-2000-07-05  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-utils.h: Added prototype for uudecode_step
-
-	* camel-mime-utils.c (uudecode_step): Cleaned up some junk that
-	should have been cleaned up when debugging printf's were taken out.
-
-2000-07-05  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):
-	Update the X-Evolution: header even if the in-memory UID and the
-	saved UID are not the same.  Otherwise mboxes with clashing UIDs
-	can never be fixed.
-
-	* camel-folder-summary.c
-	(camel_folder_summary_add_from_parser): Add the message to the
-	summary before doing any ibex stuff.  In fact, this might also
-	have the side effect of reassigning the UID so it needs to be done
-	before we start using the UID.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Add
-	debugging message to keep track of the UIDs we add.
-
-2000-07-05  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-summary.c: Add "Cc" to summary and bump summary
-	version number.
-
-	* camel-folder-search.c (search_header_contains): make "Cc" a
-	searchable header.
-
-2000-07-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* camel-folder-summary.c (camel_folder_summary_next_uid_string):
-	New.
-	(camel_folder_summary_add): Use
-	`camel_folder_summary_next_uid_string()' instead of recomputing
-	the UID manually here.
-	(camel_folder_summary_add_from_parser): Likewise.
-
-2000-07-03  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* camel-folder-summary.c (camel_folder_summary_set_uid): Removed.
-
-2000-07-03  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-summary.c (message_info_new): Parse In-Reply-To
-	with header_references_decode, not header_msgid_decode.
-
-	* camel-mime-message.c (camel_mime_message_class_init): message
-	headers are case-insensitive.
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_command): Fix a
-	bug in error-setting code.
-	(pop3_connect): Don't re-prompt for password in the KPOP case.
-	(pop3_get_response): New function, split out from
-	camel_pop3_command.
-	(connect_to_server): Use pop3_get_response to parse the greeting
-	message, and error out appropriately if it's -ERR.
-
-2000-07-02  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c (camel_folder_freeze, camel_folder_thaw): New
-	functions to freeze and thaw a folder (to prevent message/folder
-	changed signals in the middle of a long series of operations).
-	(camel_folder_class_init): Change signals to GTK_RUN_FIRST.
-	(message_changed, folder_changed): Add default implementations
-	that stop the emission and record info for later if the folder is
-	frozen.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_sync): leftover fixes
-	from the close->sync change: don't destroy the ibex, summary, and
-	search when syncing.
-	(append_message): emit "folder_changed" on a successful append.
-
-2000-07-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-utils.c (uudecode_step): A rather complex uudecoder
-	written in the spirit of Zucchi-ness, is it up to par? Only the 
-	Z-man can tell us :-)
-
-2000-07-01  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (camel_service_get_name): New method, to return
-	an end-user-friendly name corresponding to a service. (eg, "POP
-	service for danw on trna.helixcode.com").
-
-	* providers/imap/camel-imap-store.c,
-	providers/mbox/camel-mbox-store.c,
-	providers/nntp/camel-nntp-store.c,
-	providers/pop3/camel-pop3-store.c,
-	providers/sendmail/camel-sendmail-transport.c,
-	providers/smtp/camel-smtp-transport.c: Implement.
-
-	* providers/imap/Makefile.am: remove unneeded
-	libcamelimap_la_LDADD.
-
-	* providers/pop3/camel-pop3-store.c (connect_to_server): fix the
-	CAPA-parsing code to not get into an infinite loop.
-
-2000-07-01  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message): Fixed
-	the bug that would sometimes leave part of the server response
-	tacked on to the end of the message.
-
-	* camel-folder.c: Renamed _by_uid methods. Since we no longer
-	have get-by-number methods, no need to have the _by_uid 
-	extensions. 
-	(get_message_by_uid): Renamed to get_message
-	(delete_message_by_uid): Renamed to delete_message
-	(summary_get_by_uid): Renamed to get_message_info
-
-	* providers/mbox/camel-mbox-folder.c: 
-	* providers/pop3/camel-pop3-folder.c:
-	* providers/imap/camel-imap-folder.c:
-	* providers/vee/camel-vee-folder.c: Updated to reflect
-	camel-folder changes.
-
-2000-06-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-folder.c (camel_folder_copy_message_to): New function, to
-	copy a message from one folder to another. The default
-	implementation just uses append_message, but providers can 
-	implement more efficient versions for use when both folders are on 
-	the same store.
-
-	* broken-date-parser.[c,h]: Utilities for parsing broken
-	date strings.
-	
-	* providers/imap/camel-imap-folder.c (imap_move_message_to): 
-	(imap_copy_message_to): Implemented.
-
-	* camel-mime-utils.c (header_decode_date): Wrote some code to try
-	and un-mangle broken date formats and then parse that new string 
-	instead.
-
-2000-06-30  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c (camel_folder_move_message_to): New function, to
-	move a message from one folder to another. The default
-	implementation just uses append_message and delete_message, but
-	providers can implement more efficient versions for use when both
-	folders are on the same store.
-
-2000-06-29  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_expunge): Should now
-	print a meaningful error message when it doesn't succeed
-
-2000-06-28  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_connect): Changed to
-	keep prompting user for a valid password until it either
-	authenticates or until Canceled by the user.
-	(camel_imap_command_extended): Improved speed (replaced the
-	g_strjoinv call with a faster implementation)
-
-	* providers/pop3/camel-pop3-store.c 
-	(camel_pop3_command_get_additional_data): Fixed.
-	(pop3_connect): Changed to keep prompting the user for a
-	password until it either works or until Canceled by the user.
-
-	* providers/mbox/camel-mbox-summary.c: General cleanup
-	(camel_mbox_summary_sync): Fixed a memory leak and added
-	CamelException handling.
-
-	* providers/mbox/camel-mbox-store.c (delete_folder): Fixed a 
-	memory leak
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): 
-	Default 'off_t seek' to -1 so as to make sure it's initialized
-	before it's used in the case of a bad stat() call.
-	(mbox_sync): Updated
-	(mbox_expunge): Updated
-
-2000-06-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_connect): Move the 
-	CAPABILITY command here so we don't have to keep checking
-	each time we open a folder.
-	(camel_imap_command_extended): If we are doing an EXAMINE,
-	don't bother doing a SELECT first.
-
-	* providers/imap/camel-imap-folder.c (imap_init): Update so
-	folder->has_search_capability depends on the parent IMAP store
-	(since this is really dependant on the IMAP implementation and
-	not the folder)
-
-2000-06-27  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c: Don't close the filter
-	stream when done with it (this causes the source stream to close);
-	Instead, just flush it when done.
-
-2000-06-27  Michael Zucchi  <zucchi@zedzone.mmc.com.au>
-
-	* camel-folder-search.c (search_header_contains): Make header
-	search 'to' match 'to', and not 'from', small typo, fixes #317.
-
-2000-06-26  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c: Added debugging
-	information.
-
-2000-06-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c: 
-	* providers/imap/camel-imap-folder.c: Improved folder parsing.
-	Not specifying a namespace should no longer list the entire
-	filesystem.
-
-2000-06-22  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/.cvsignore: ignore test-newsrc
-
-	* providers/nntp/camel-nntp-store.c,
-	providers/nntp/camel-nntp-store.h,
-	providers/nntp/camel-nntp-folder.c,
-	providers/nntp/camel-nntp-folder.h,
-	providers/nntp/camel-nntp-utils.c: Bring the nntp provider up to a
-	state where it builds and is usable with the current camel.  there
-	are still warts (semi-broken .newsrc file handling, and a lack of
-	a subscribe ui -- in fact no way to add a new server, really), but
-	it'll display news messages.
-
-	* providers/nntp/Makefile.am (libcamelnntp_la_SOURCES): add
-	camel-nntp-newsrc.c
-	(libcamelnntpinclude_HEADERS): add camel-nntp-newsrc.h
-	also, add test-newsrc stuff.
-	
-	* providers/nntp/test-newsrc.c: new file that tests the newsrc
-	stuff by parsing and regurgitating a .newsrc file for a particular
-	server.
-
-	* providers/nntp/camel-nntp-newsrc.c,
-	providers/nntp/camel-nntp-newsrc.h: new files, initial support for .newsrc files.
-
-2000-06-22  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message_count): 
-	Oops. Now appends the namespace to the folder before querying
-	for the number of messages.
-
-	* providers/imap/camel-imap-store.c (imap_folder_exists): New
-	convenience function for use by imap_create().
-	(get_folder): If folder is specified as "/", we really want
-	"INBOX".
-
-	* providers/sendmail/camel-sendmail-provider.c:
-	* providers/vee/camel-vee-provider.c:
-	* providers/smtp/camel-smtp-provider.c:
-	* providers/mbox/camel-mbox-provider.c:
-	* providers/pop3/camel-pop3-provider.c:
-	* providers/imap/camel-imap-provider.c: Updated
-	
-	* camel-session.c: Moved service_cache hash table into the
-	providers.
-	(service_cache_remove): Updated.
-	(camel_session_get_service): Updated.
-
-	* camel-url.c (camel_url_hash): Took out the hashing of
-	url->passwd. We don't want this anymore.
-
-	* providers/imap/camel-imap-folder.c (imap_init): Took out
-	references to 'namespace'
-	(camel_imap_folder_init): Same
-
-	* providers/imap/camel-imap-folder.h: No more namespace. We are
-	instead going to use url->path as the namespace.
-
-2000-06-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (imap_create): Modified to
-	use the "namespace" (url->path) if it exists.
-
-	* providers/imap/camel-imap-folder.c (imap_delete_message_by_uid):
-	Now just sets the deleted flag on the summary rather than speaking 
-	directly to the IMAP server. This is both faster and cleaner.
-
-2000-06-21  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (query_auth_types): Fix dumb
-	bug.
-
-2000-06-21  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message_by_uid): 
-	We are getting mail in IMAP now!! whoo-hoo!. Stripped out the 
-	filtering so messages may have some dot-stuffing, but the 
-	filtering can always be added back in later when we know it 
-	works and isn't the problem.
-
-2000-06-21  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_init): Use the basename
-	of the mailbox so we don't get pathnames like ~/evolution/inbox///movemail.ibex
-
-2000-06-21  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-summary.c (message_info_new): Set date_received
-	based on the first (most recent) "Received" header.
-
-2000-06-20  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part.c (write_to_stream): flush the filter stream
-	before unreffing it, so it will camel_mime_filter_complete.
-
-	* camel-stream-filter.c (camel_stream_filter_class_init): Fix a
-	braino so camel_stream_flush works here.
-
-	* camel-stream-mem.c (stream_seek): Fix a bug that resulted in
-	large attachments being silently dropped.
-
-	* providers/pop3/camel-pop3-store.c
-	(camel_pop3_command_get_additional_data): Don't use g_strjoinv
-	here, since it is O(n^2) on the length of the output string, and
-	we can do O(n).
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): add a CRLF decoder
-	after the QP/B64 decoder if it's text.
-
-2000-06-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): Only
-	fetch the summary if the folder summary doesn't already exist.
-	When the summary *does* exist, start fetching from 1, not 0.
-	(imap_free_summary): Don't do anything here.
-	(imap_finalize): Free the summary here instead of in
-	imap_free_summary().
-	(imap_set_message_flags): Implemented
-	(imap_sync): Added code to set flags on messages that have had
-	their flags changed (however I #if'd it out until we are more
-	confidant in the IMAP code :)
-	(imap_summary_get_by_uid): Now parese flags correctly.
-	(imap_get_summary): Now parese flags correctly. Also correctly
-	parses the UID correctly.
-
-	* camel-url.c (check_equal): No need to check s1 if s2 is NULL
-	(camel_url_equal): Don't check the passwd component of the url.
-
-2000-06-20  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-summary.c (camel_folder_summary_add): mark the
-	message info with CAMEL_MESSAGE_FOLDER_FLAGGED if we change the
-	uid, so the folder will know that it's dirty.
-
-2000-06-20  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_command_extended): 
-	Now returns the last line of data that the server sends back as
-	well. This is needed for commands like SELECT (like Peter pointed
-	out).
-	(camel_imap_command): No longer checks for SELECT (no need)
-
-	* providers/imap/camel-imap-folder.c: Added namespace stuff
-	which we will need later on...
-	(imap_parse_subfolder_line): Convenience function for use in
-	get_subfolder_names()
-	(imap_get_subfolder_names): Updated. Also changed it to use LIST
-	instead of LSUB (temporary change).
-
-2000-06-19  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_init): Set
-	summary equal to NULL.
-	(imap_get_summary): Store the summary in the ImapFolder
-	(imap_summary_get_by_uid): If we have a summary cache in the
-	ImapFolder, first check to see if that message info is in the
-	cached summary first, if not fetch it directly from the IMAP
-	server and append it to the summary cache.
-	(imap_get_message_flags): Don't free the message info that we get
-	back from summary_get_by_uid as we don't want to be corrupting our
-	cached summary.
-
-2000-06-19  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_command{,_extended}): When
-	SELECT'ing a folder for an IMAP command, use _extended to grab the entire
-	response (before we just used camel_imap_command and missed the OK codes)
-
-2000-06-18  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_summary_get_by_uid): 
-	Now gets the message flags as it should.
-	(imap_get_summary): Same as imap_summary_get_by_uid
-	(imap_get_permanent_flags): Return the permanent flags stored
-	on the folder.
-	(imap_get_message_flags): Return message flags associated with
-	given uid. Note: we may want to somehow cache summary info so
-	that we don't have to keep querying the IMAP provider in
-	imap_summary_get_by_uid().
-
-2000-06-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_free_summary): We were
-	leaking memory - but not anymore!
-	(imap_get_summary): We now get the UIDs and the beginnings of the
-	code to get the message flags as well.
-
-2000-06-17  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-parser.c (folder_scan_header): Don't copy newlines
-	into the parsed header text, and turn any number of tabs and
-	spaces after a newline into a single space.
-
-2000-06-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_init): Should now
-	correctly do CAPABILITY.
-
-2000-06-17  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c: Add some debugging printfs
-	when rebulding summary to help figure out why people's summaries
-	are always being rebuilt.
-
-2000-06-17  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):
-	Began to implement, need to get information on how to
-	deconstruct @expression into an IMAP search expression and
-	parse the results.
-	(imap_init): Now queries the IMAP provider for CAPABILITY to
-	determine if SEARCH is implemented or not.
-
-	* providers/imap/imap.c: Removed - no longer a need to have
-	this as an example for anyone interesting to help mecode IMAP
-	support.
-	
-2000-06-16  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_sync): Added code
-	to expunge if called for (still need to finish coding this).
-	(imap_get_uids): Implemented.
-	(imap_get_summary): Found a way to get the date
-	(imap_summary_get_by_uid): Same.
-	(imap_free_summary): Implemented.
-
-	* string-utils.c (strstrcase): Fixed a compile warning
-
-	* providers/imap/camel-imap-summary.c: Removed - we don't
-	need a CamelImapSummary structure.
-
-2000-06-16  Dan Winship  <danw@helixcode.com>
-
-	Move flag handling from CamelMimeMessage to CamelFolder. This
-	simplifies several flag-handling pieces of code in the mailer, and
-	lets you change a message's flags without having to fetch the
-	message body. It also means that fully-constructed
-	CamelMimeMessages are now essentially constant, which will help
-	simplify locking issues later since it means two threads
-	interested in the same message can just work with separate copies
-	of it.
-
-	* camel-mime-message.h (struct _CamelMimeMessage): Removed flags
-	and user_flags (moved to summary). Removed expunged and
-	message_number which were unused. Removed message_uid and folder
-	which are no longer needed in the new scheme.
-	(struct CamelMimeMessageClass): Removed message_changed signal and
-	get/set_message_number methods.
-
-	* camel-mime-message.c: Updates for CamelMimeMessage changes.
-	(camel_mime_message_get/set_flags,
-	camel_mime_message_get/set_user_flag): Replaced with methods in
-	CamelFolder.
-	(camel_flag_get, camel_flag_set, camel_flag_list_size,
-	camel_flag_list_free): Moved verbatim to camel-folder-summary.c
-	
-	* camel-folder.c (camel_folder_get/set_message_flags,
-	camel_folder_get/set_message_user_flag): New methods (and
-	corresponding useless default implementations)
-	(camel_folder_class_init): add a message_changed signal
-
-	* camel-folder-summary.c (camel_flag_get, camel_flag_set,
-	camel_flag_list_size, camel_flag_list_free): Moved here from
-	camel-mime-message.c
-
-	* providers/mbox/camel-mbox-folder.c (message_changed): Removed.
-	(mbox_get_message_flags, mbox_set_message_flags,
-	mbox_get_message_user_flag, mbox_set_message_user_flag): Tweak
-	summary bits as appropriate. (Functionality moved here from
-	message_changed.)
-	(mbox_get_message_by_uid): Update for CamelMimeMessage changes
-	(less stuff to initialize).
-
-	* providers/imap/camel-imap-folder.c (message_changed): Remove
-	this. It was just copied from the mbox provider and doesn't deal
-	with the real IMAP flag stuff anyway. (So there's currently no
-	flag support in the IMAP provider.)
-	(imap_get_message_by_uid): Update for CamelMimeMessage changes.
-
-	* providers/vee/camel-vee-folder.c: (message_changed): Remove old
-	one. Add a new one to listen for message_changed on each folder
-	and re-emit message_changed signals that correspond to messages in
-	the vfolder.
-	(vee_get/set_message_flags, vee_get/set_message_user_flag): Proxy
-	flag setting to the underlying real messages.
-	(vee_append_message): Removed for now; there's no way to translate
-	this into the new CamelMimeMessage/CamelFolder scheme, but (a)
-	there's also no code which would ever call it and (b) we're
-	probably going want a better interface than append_message for
-	message drag and drop to work anyway. To be revisited.
-
-2000-06-16  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (rfc2047_decode_word): 
-	* camel-mime-part-utils.c (simple_data_wrapper_construct_from_parser): 
-	* camel-folder-summary.c (summary_build_content_info): 
-	KLUDGE! Since neither ETable nor GtkHTML supports UTF-8 yet,
-	output ISO-8859-1 instead, so Ettore can read his Italian mail. :)
-	This will be reverted later.
-
-2000-06-15  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_summary): Started to 
-	implement - may want to use ENVELOPE instead of BODY.PEEK[HEADER]
-	(imap_summary_get_by_uid): Started to code, I've got to find a way to 
-	get the date in time_t format and also get the flags
-
-	* string-utils.c (strstrcase): Added this convenience function - I
-	know about strcasestr() but it's not portable.
-
-2000-06-15  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c: Remove camel_service_connect_with_url. (URLs
-	must be specified when the service is requested from the session,
-	so that there can only ever be one service for any URL.)
-
-	* camel-folder.c: (camel_folder_open, camel_folder_is_open,
-	camel_folder_get_mode): Kill. Folders are now always open, and
-	handle "closing" sorts of operations at sync or finalize time.
-	(camel_folder_sync): renamed from camel_folder_close. Syncs state
-	to the store but doesn't necessarily close/disconnect.
-
-	* providers/*/camel-*-folder.c: Merge "open" methods into "init"
-	methods. Rename close to sync and update appropriately.
-
-	* providers/imap/camel-imap-store.c: Remove camel_imap_store_open
-	and camel_imap_store_close, which should not have been copied from
-	the POP provider (where the exist to work around limitations of
-	the POP protocol).
-
-	* providers/mbox/camel-mbox-summary.c: fix a bug. (don't expunge
-	deleted messages if called with expunge == FALSE)
-	
-	* providers/pop3/camel-pop3-store.c (connect_to_server): Check
-	server for various interesting extensions.
-
-	* providers/pop3/camel-pop3-folder.c (get_uids): If the server
-	supports UIDL, use real UIDs rather than fake ones.
-	(etc): Map uids back to numbers appropriately
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Fix to
-	previous change: make sure the "seek" variable ends up with the
-	value it should.
-
-	* providers/mbox/camel-mbox-summary.c (summary_rebuild): Update
-	summary mtime as well as size.
-
-2000-06-14  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): if the
-	mbox doesn't end with a '\n', write one before appending the new
-	message.
-
-2000-06-14  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-filter-crlf.c (filter): Updated the encoder to allocate 
-	more memory (since we are also now adding dots). Also updated the
-	decoder as we have found that it sometimes passes the end of the 
-	buffer.
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_uid): Took out the
-	filter code (we already filter in 
-	camel_pop3_command_get_additional_data)
-
-	* camel-folder.c (init): Updated: a separator is now a char* rather 
-	than a single char because IMAP can have a string for a directory 
-	separator. Also, since IMAP does not begin with a directory separator,
-	there is a new argument (path_begins_with_sep) which decides if a 
-	directory should begin with a directory separator.
-
-	* providers/imap/camel-imap-store.c (imap_create): Since, on connect,
-	Camel tries to create INBOX (which already exists on every IMAP 
-	provider) we can return TRUE when the folder name is "INBOX".
-
-	* providers/vee/camel-vee-folder.c (vee_init): Updated.
-
-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Updated.
-
-	* providers/mbox/camel-mbox-store.c (get_folder): Updated.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_init): Updated.
-
-	* providers/pop3/camel-pop3-folder.c (camel_pop3_folder_new): Updated.
-
-2000-06-14  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):
-	Renamed from camel_mbox_summary_expunge. Takes a gboolean saying
-	whether to expunge or just sync the mbox file. Change some
-	g_errors to g_warning so we don't abort. Make the quick
-	X-Evolution updating code lseek around correctly. Update the
-	mbox mtime in the summary file even in the quick case.
-
-	* providers/mbox/camel-mbox-summary.h: make
-	CAMEL_MESSAGE_FOLDER_NOXEV not conflict with
-	CAMEL_MESSAGE_FOLDER_FLAGGED defined in camel-mime-message.h
-
-	* providers/mbox/camel-mbox-folder.c (mbox_close): call
-	camel_mbox_summary_sync to save flag state if not expunging.
-	(mbox_expunge): Update for camel_mbox_summary_expunge rename.
-
-2000-06-13  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (camel_imap_store_open): 
-	(camel_imap_store_close): Added.
-	(camel_imap_command_extended): Fixed a segfault and updated
-	to use camel_imap_status()
-	(camel_imap_command): Updated to use camel_imap_status()
-	(camel_imap_status): New convenience function for parsing
-	the return status of an IMAP command
-
-2000-06-12  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c (imap_get_message_by_uid): 
-	Works like the POP fetch code, should work temporarily until
-	we get around to coding it the way it "Should Be".
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_uid): Now uses
-	the camel-mime-filter-crlf decoder when retrieving messages.
-
-	* camel-mime-filter-smtp.c: Deprecated.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): Updated to use
-	camel-mime-filter-crlf with my 'dot' extension in place of
-	camel-mime-filter-smtp
-
-	* camel-mime-part.c (write_to_stream): Updated to reflect changes
-	made to camel-mime-filter-crlf.c
-
-	* camel-mime-filter-crlf.c (filter): Modified to be able to
-	encode/decode dots ("\n.\n"<->"\n..\n"). Also fixed the decoder
-	so that it should no longer get caught in an infinite loop.
-
-2000-06-12  Dan Winship  <danw@helixcode.com>
-
-	* providers/*/Makefile.am: don't pass a second (incorrect) -rpath
-	in addition to the (correct) one automatically provided by
-	automake.
-
-	* camel-mime-filter-crlf.c: New filter to do CRLF<->LF conversion.
-	(Currently only tested in the LF->CRLF direction.)
-
-	* camel-mime-part.c (write_to_stream): if content-type is text,
-	and it's QP or B64 encoded, pass through the CRLF filter before
-	the other filter to satisfy the "canonical encoding" rules in the
-	MIME spec.
-
-2000-06-09  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.c (camel_session_query_authenticator): Add another
-	argument, "mode", which can be CAMEL_AUTHENTICATOR_ASK or
-	CAMEL_AUTHENTICATOR_TELL, so callers can get the app to un-cache
-	bad info.
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): uncache the
-	password if it doesn't work.
-
-2000-06-09  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-stream.c (stream_read): Updated to reflect
-	changes made in camel-imap-store.c
-
-	* providers/imap/camel-imap-store.c (imap_create): No longer checks to
-	make sure a folder doesn't already exists (as this is no longer needed)
-	(camel_imap_command): Now takes a CamelFolder argument so it can detect
-	whether or not it needs to SELECT a folder or not
-	(camel_imap_command_extended): Same.
-
-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Will now always
-	send EHLO first, if that fails it will fall back on HELO.
-	(esmtp_get_authtypes): Should now correctly parse authtypes.
-
-2000-06-07  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-summary.c: Now builds (not that it's worth
-	much yet).
-	
-	* providers/imap/camel-imap-folder.c (imap_get_uids): Now uses the 
-	correct cast to a CamelImapMessageInfo structure (should get rid of 
-	compile warnings).
-
-	* providers/imap/Makefile.am: Added rules to build 
-	camel-imap-stream
-	
-	* providers/imap/camel-imap-store.c (get_folder): Update.
-	Moved imap_create here.
-
-	* providers/imap/camel-imap-folder.c (delete_messages): Remove.
-	(imap_create): Removed.
-	(imap_delete): Removed.
-	(imap_exists): Removed.
-
-	* providers/imap/camel-imap-stream.h: Added typedef's for the stream
-
-	* providers/imap/camel-imap-stream.c: Modified to build cleanly
-
-2000-06-07  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (header_msgid_decode_internal): Properly
-	dereference warning/debug messages.
-	(header_references_decode): Check we actually have msgid stuff
-	before trying to decode it ...
-
-2000-06-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-imap-stream.[c,h]: Removed
-
-	* providers/imap/camel-imap-stream.[c,h]: Relocated to this
-	location
-
-	* providers/imap/camel-imap-summary.c: Added
-
-2000-06-06  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: Remove exists, create, delete. A CamelFolder
-	now always references an existing folder. Remove delete_messages
-	too since it wasn't being used. Add a "create" flag to
-	get_subfolder saying whether or not to create the subfolder if it
-	doesn't yet exist.
-
-	* camel-store.c (camel_store_get_folder): Add a "create" flag to
-	say whether or not to create the folder if it doesn't yet exist.
-	(camel_store_delete_folder): New method, moved from CamelFolder.
-	(cache_folder, uncache_folder): Fix up a bit.
-	(get_folder_name): Explain what this is for.
-
-	* providers/mbox/camel-mbox-folder.c: 
-	* providers/mbox/camel-mbox-store.c: Update. Remove support for
-	hierarchical folders to simplify this for now, since we're not
-	using it, and it's not completely clear how they should work in an
-	ELocalStorage world. Needs to be revisited.
-
-	* providers/pop3/camel-pop3-folder.c (delete_messages): Remove.
-	* providers/pop3/camel-pop3-store.c (get_folder): Update.
-
-	* providers/vee/camel-vee-folder.c (exists): Remove.
-	* providers/vee/camel-vee-store.c (vee_get_folder): Update.
-
-2000-06-06  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-*.[c,h]: Started on getting 
-	imap to build cleanly (tho some work has not been completed
-	so it still won't build until camel-imap-summary is finished
-	along with a few methods in camel-imap-folder)
-
-	* camel-stream.[c,h]: Changed the read and write method prototypes
-	to return an ssize_t type rather than an int and also changed
-	the 'number of bytes' to read or write to a size_t type
-
-	* camel-stream-fs.c: same as above
-
-	* camel-stream-mem.c: again, same as above
-
-	* camel-stream-buffer.c: same
-
-	* camel-imap-stream.[c,h]: Added this new stream, cache's previously 
-	read data so each successive call will instead read from the cache
-	
-2000-06-05  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part.c (camel_mime_part_set_disposition): fix
-	typo/braino (set "Content-Disposition", not "Content-Description")
-	(camel_mime_part_set_filename): const poison
-
-2000-06-02  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (base64_encode_step): Ick, damn signs!  Fix a
-	bug with sign extended bytes.
-
-	* camel-mime-filter-smtp.c (filter): Changed layout/logic slightly
-	(to match From filter)
-
-2000-06-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* camel-mime-filter-smtp.c (filter): Fixed the filter so that it 
-	wouldn't insert garbage under certain conditions.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-session.c: Don't ref the services in the cache.
-
-2000-06-02  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c: Rearanged where debug
-	fprintf statements we placed so that any data the server sends 
-	back is printed out before an exception is set and the function
-	returns.
-
-2000-06-02  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (header_decode_date): If we get a funny
-	result, just throw it out.  Basically a fix for the one true
-	broken TradeClient.
-
-2000-06-01  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-folder-summary.c (message_info_free): Free
-	references/messsage id.
-	(message_info_save): Save them.
-	(message_info_load): Load them.
-	(message_info_new): And get them from the new message.
-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped for new changes.
-
-	* camel-folder-summary.h: Added references and messageid to
-	summary.
-
-2000-06-02  Christopher James Lahey  <clahey@helixcode.com>
-
-	* camel-session.c: Ref and unref objects in the service cache
-	properly.
-
-	* camel-store.c: Ref the folder when returning it using
-	lookup_folder.  Used the folder's full name for the key for the
-	folder cache since that's used to uncache it.
-
-2000-06-02  Dan Winship  <danw@helixcode.com>
-
-	Fun with purify.
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): free msg on
-	success as well as failure.
-	(camel_pop3_command_get_additional_data): free buf after reading
-	the last line (".").
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_uid): free
-	body data after creating the memstream from it (which will copy
-	the data).
-
-	* providers/mbox/camel-mbox-folder.c (mbox_finalize): free summary
-	and index paths.
-
-	* camel-data-wrapper.c (finalize): unref the stream, if it exists.
-
-2000-06-01  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c (construct_from_parser): For a message part,
-	set the default content-type to message/rfc822.  Maybe needs to be
-	done for multiparts too?
-
-2000-05-31  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.c (construct_from_parser): Typo in assersion.
-
-	* camel-mime-parser.c (folder_scan_step): Use a default type of
-	message/rfc822 for multipart/digest.  Bug Z192.
-	(folder_scan_drop_step): Remove warning.
-
-2000-05-30  Not Zed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Init
-	filter_from to NULL, for exception case.
-	(mbox_get_message_by_uid): Cast off_t to long int for diagnostics.
-
-	* camel-url.c (camel_url_hash): Hash funciton for using camel
-	url's as hash keys.
-	(camel_url_equal): equal function for same.
-
-	* camel-session.c (camel_session_finalise): Free cached services.
-	(camel_session_init): Init service cache.
-	(service_cache_remove): destroy callback to remove a service from
-	the cache.
-
-	* camel-store.c (get_folder_internal): Remove the extra ref of the
-	folder.  That seems the right behaviour ...?
-	(camel_store_get_type): Doh, actually call store init, so the
-	cache works.
-	(cache_folder): strdup the folder name!  no wonder it never found
-	it again.
-
-2000-05-30  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-folder.c: Implemented a few more
-	methods like imap_append and 1 or 2 others
-
-2000-05-29  Not Zed  <NotZed@HelixCode.com>
-
-	* camel-store.c (camel_store_init): Move it to here.  If this
-	level is going to maintain it, it should set it up.  Lets see what
-	caching folders breaks :(
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_init): Dont
-	init folder cache here.
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_expunge): Make sure we copy messages which are
-	still intact to the new folder.
-	(camel_mbox_summary_expunge): Update the frompos as well when
-	moving the content.
-	(camel_mbox_summary_expunge): Remove some debug, and dont offset
-	frompos?
-
-	* providers/vee/camel-vee-folder.c (vee_folder_build): Check the
-	searched folder is open before trying to search it.
-	(message_changed): Track changes to the source message in the
-	summary.
-	(folder_changed): Track folder changes, re-query the folder that
-	changed, and cascade the changed event as well.
-	(camel_vee_folder_finalise): Free subfolder and subfolder summary.
-
-2000-05-29  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (camel_service_new): Fix up some glib
-	precondition stuff. Try to set the URL in camel_service_new before
-	checking whether or not it's "empty" so that you can successfully
-	set "sendmail:" as a URL.
-
-2000-05-28  Dan Winship  <danw@helixcode.com>
-
-	* camel-provider.h: Add a domain field to CamelProvider, to say
-	what kind of data it provides.
-
-	* providers/imap/camel-imap-provider.c: 
-	* providers/mbox/camel-mbox-provider.c: 
-	* providers/pop3/camel-pop3-provider.c: 
-	* providers/sendmail/camel-sendmail-provider.c: 
-	* providers/smtp/camel-smtp-provider.c: Set domain to "mail".
-
-	* providers/nntp/camel-nntp-provider.c: Set domain to "news".
-
-	* providers/vee/camel-vee-provider.c: Set domain to "vfolder". (So
-	it doesn't end up being listed as a potential mail source in the
-	mail config wizard.)
-
-	* providers/pop3/camel-pop3-store.c: Split apart password and APOP
-	auth, since some servers seem to do both, but don't really.
-	(connect_to_server): Renamed from try_connect. Now actually does
-	the connection up to the point of checking the greeting for APOP
-	support.
-	(query_auth_types): Return APOP, if appropriate. Call
-	pop3_disconnect after connect_to_server since we don't really want
-	to be connected.
-	(pop3_connect): Use connect_to_server rather than duplicating
-	code. Fix a one-byte buffer overrun in the APOP code.
-	(pop3_disconnect): Make this able to clean up after a partial
-	connect.
-	(connect_to_server): Remove port number from error message since
-	it's not terribly useful and we were getting it from the wrong
-	place anyway.
-
-	* camel-mime-utils.c (header_address_list_format_append): Use
-	`foo@bar' rather than `"" <foo@bar>' for email addresses with no
-	name component.
-
-2000-05-27  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c: Removed 
-	camel_imap_command_get_additional_data() as it was
-	completely useless, replaced with 
-	camel_imap_command_extended() which may eventually replace
-	camel_imap_command() as well.
-
-	* providers/imap/camel-imap-store.h: Modified to reflect
-	changes made to camel-imap-store.c
-
-	* providers/imap/camel-imap-folder.c: Wrote the first of many
-	methods: camel_imap_init(), imap_open(), imap_expunge(), 
-	imap_get_message_count(), and imap_get_subfolder_names()
-
-2000-05-26  Dan Winship  <danw@helixcode.com>
-
-	* camel-multipart.c (camel_multipart_init): Don't set a default
-	boundary. Require the caller to do that.
-	(set_boundary): if boundary is NULL, generate a "random" boundary.
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Add a call to
-	camel_multipart_set_boundary after creating a new multipart.
-
-2000-05-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap/camel-imap-store.c (try_connect): Removed
-	Exception code - Pop doesn't seem to set exceptions
-
-	* providers/imap/camel-imap-folder.c: Initial code, mostly
-	just a template for future code
-
-	* providers/imap/imap.[c,h]: Source code from my personal
-	mailer - for reference only!
-
-2000-05-25  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Replace simple
-	data wrapper here too, oops.
-
-	* Makefile.am (libcamel_la_SOURCES): Removed
-	camel-simple-data-wrapper again.  Less code to maintain == better
-	code.
-	
-	* camel-data-wrapper.c (construct_from_stream): Fixes for bug
-	where text attachments dont work.  Made data-wrapper concrete for
-	the second time.
-
-2000-05-23  NotZed  <NotZed@HelixCode.com>
-
-	* providers/vee/camel-vee-folder.c (vee_folder_build_folder):
-	Update the vfolder details for a single folder.
-
-2000-05-25  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (_send_to): Took out code
-	that had been there to reconnect to the server if it was not
-	already connected - Mailer code was fixed so that this should not
-	be needed.
-
-	* providers/imap/camel-imap-store.[c,h]: Initial code.
-
-2000-05-24  Dan Winship  <danw@helixcode.com>
-
-	* camel.h: Re-add camel-simple-data-wrapper.h, which was removed
-	for some reason.
-
-2000-05-24  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.[c,h]: Moved global
-	variables into struct CamelSmtpTransport to make SMTP
-	thread-safe
-
-	* providers/imap/camel-imap-*.h: Stolen from Mbox. Rough structure
-	for Imap.
-	
-2000-05-23  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/imap: Added some initial code to the camel tree
-	for IMAPv4
-
-	* providers/imap/.cvsignore: Added to repository
-
-	* providers/smtp/camel-smtp-transport.c: Added debug fprintf's
-	so that testers can provide more information. Tested with simple
-	messages and a reply to the hello@helixcode.com default message
-	but should really be tested more.
-	(smtp_data): Fixed to use data_wrapper_write_to_stream.
-
-	* camel-mime-filter-smtp.c (filter): Modified to escape all lines
-	beginning with a '.' and to place a \r before each \n if one did
-	not previously exist. Removed code to escape "From " as it was
-	found to not be needed for SMTP.
-
-2000-05-22  Jeffrey Stedfast  <fejj@helixcode.com>
-
-	* providers/smtp/camel-smtp-transport.c (smtp_data): Fixed the 
-	filtered stream. Fixes for stream changes, updated to use 
-	camel-mime-filter-smtp.
-
-	* Makefile.am: Added camel-mime-filter-smtp.c
-	
-	* camel-mime-filter-smtp.[c,h]: Added to camel tree
-	Smtp filter used to change \n into \r\n, escape lone dots,
-	and escape "From "'s.
-
-2000-05-19  NotZed  <NotZed@HelixCode.com>
-
-	* camel-simple-data-wrapper.c (construct_from_stream): If we
-	already have been constructed, unref our content.
-	(write_to_stream): Check we've been constructued, and change for
-	stream api changes.
-
-	* camel-mime-parser.c: Removed exception stuff.
-
-	* md5-utils.c (md5_get_digest_from_stream): repaired.
-
-	* camel-mime-message.c: Remove exception from write_to_stream, and
-	fix, and fix formatting.
-
-	* providers/sendmail/camel-sendmail-transport.c (_send_internal):
-	Fix for stream changes.
-
-	* providers/pop3/camel-pop3-store.c (camel_pop3_command): Fixes
-	for stream changes.
-
-	* providers/mbox/camel-mbox-folder.c, and elsewhere, fix all
-	stream api changes.
-	(mbox_append_message): Use stream_close() now its back.
-	(mbox_append_message): unref the from filter.
-
-	* camel-stream-mem.c: And here.
-
-	* camel-stream-fs.[ch]: Here too.
-
-	* camel-stream-filter.c: Likewise.  This is getting tedious.
-
-	* camel-stream-buffer.c (stream_write): Fix a few little problems.
-	(stream_close): Reimplement.
-	(camel_stream_buffer_read_line): Slightly more efficient version,
-	that also only allocates the right amount of memory for strings.
-
-	* camel-seekable-substream.c: Likewise.
-
-	* camel-seekable-stream.[ch]: Remove exceptions, fix formatting,
-	changes for stream (re)fixes.  set_bounds returns an error.
-
-	* camel-stream.[ch]: Remove exceptions.  Make flush and reset return
-	an error code, repair all the screwed up formatting, and put back
-	close.
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): And here.
-
-	* camel-mime-part.c (camel_mime_part_set_content): And this too.
-	(write_to_stream): Fixed for stream changes.
-
-	* camel.h: Fixed.
-
-	* providers/vee/camel-vee-folder.c (vee_search_by_expression):
-	Implement.  Performs an intersection of the two searches.
-	(camel_vee_folder_finalise): Unref search folders.
-	(vee_append_message): Implement append.
-
-2000-05-18  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: remove message_number_capability and require uid
-	capatibility.
-	(camel_folder_list_subfolders, camel_folder_get_uid_list,
-	camel_folder_get_subfolder_info, camel_folder_get_message_info):
-	removed
-	(camel_folder_get_subfolder_names,
-	camel_folder_free_subfolder_names): new subfolder interfaces.
-	(camel_folder_get_uids, camel_folder_free_uids): new uid
-	interfaces
-	(camel_folder_get_summary, camel_folder_free_summary): new summary
-	interfaces
-
-	* providers/mbox/camel-mbox-folder.c,
-	* providers/nntp/camel-nntp-folder.c:
-	* providers/vee/camel-vee-folder.c: Update for changes
-
-	* providers/pop3/camel-pop3-folder.c: Implement get_uids, update
-	for other changes.
-
-2000-05-18  NotZed  <NotZed@HelixCode.com>
-
-	* providers/vee/camel-vee-folder.c: Guess!
-
-	* camel-folder-search.c (search_user_flag): Implement user_flag
-	search term.
-
-	* camel-folder-search.h: Added user_flag search capability
-	(user-flag "blah")
-
-	* providers/mbox/camel-mbox-folder.c (mbox_init): Set USER flag in
-	permanent flags for the folder.
-
-2000-05-17  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: Remove unused async open/close and
-	copy_message_to functions.
-	Rename functions without initial _. Fix glib preconditions and
-	gtk-doc comments.
-
-2000-05-17  Dan Winship  <danw@helixcode.com>
-
-	* camel-data-wrapper.c: remove get/set_output_stream operations.
-	They're redundant with write_to_stream, and CamelMimePart and
-	CamelMimeMessage only implement the latter, meaning that trying to
-	get_output_stream on a CamelMimeMessage that was built from pieces
-	rather than being parsed from a stream doesn't work. Anything that
-	uses get_output_stream can be rewritten to use write_to_stream, so
-	we'll standardize on that.
-	(camel_data_wrapper_new): remove this: CamelDataWrapper is
-	supposed to be an abstract class.
-	(write_to_stream): remove default implementation. (Moved to
-	CamelSimpleDataWrapper)
-	
-	* camel-simple-data-wrapper.c: resurrect, although it's not really
-	the same thing it was before. A simple data wrapper, which is
-	backed by a CamelStream.
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): Use
-	construct_from_stream rather than set_output_stream.
-	(camel_mime_part_construct_content_from_parser): Change
-	camel_data_wrapper_new to camel_simple_data_wrapper_new.
-
-	* camel-mime-part.c (camel_mime_part_set_content): Change
-	camel_data_wrapper_new to camel_simple_data_wrapper_new.
-	
-
-2000-05-17  Darin Adler  <darin@eazel.com>
-
-	* camel-folder-summary.c: (message_info_load):
-	Quick fix to get it to compile. I hope I don't get into trouble.
-
-2000-05-17  Dan Winship  <danw@helixcode.com>
-
-	* camel.h: Don't include the no-longer-distributed
-	possibly-to-be-removed headers.
-
-	* providers/smtp/camel-smtp-transport.c
-	(smtp_get_email_addr_from_text): fix an off-by-one error in
-	address parsing
-	(smtp_data): use camel_data_wrapper_get_output_stream rather than
-	data_wrapper->output_stream
-
-2000-05-17  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (message_changed): Snoop
-	changes to user flags on the message into the summary as well.
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_init):
-	Changed version init to include the parent class version info
-	(i.e. add it not overwrite it).
-
-	* camel-folder-summary.c (message_info_new): Initialise user_flags
-	to empty.
-	(message_info_load): And load user flags.
-	(message_info_save): And save user flags.
-	(message_info_free): And free them.
-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped file revision.
-
-	* camel-folder-summary.h: Added user-flags to summary.
-
-	* camel-mime-message.c (camel_mime_message_set_user_flag): Dont
-	use a hashtable for user flags.
-	(camel_mime_message_get_user_flag): And changed here too.
-	(camel_flag_get): New interface to get a flag from a flag
-	list.  Flag lists are easier to work with than hash tables, and
-	save memory too.
-	(camel_flag_set): And set.
-	(camel_flag_list_free): And free.
-	(free_key_only): Discard.
-	(finalize): Remove the flag list.
-
-2000-05-17  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: (smtp_helo): Error
-	checking on gethostbyaddr() eliminating a possible segfault.
-
-2000-05-16  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_delete_message_by_uid):
-	Implement.
-
-2000-05-12  NotZed  <NotZed@HelixCode.com>
-
-	* camel-movemail.c (camel_movemail): Open the destination with
-	O_APPEND, so we dont blow away a partially transferred mbox.
-	(camel_movemail): Loop if we get errno=INTR, and not fail.
-
-2000-05-11  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c (summary_rebuild): Update
-	the summarised file size, if everything went ok.
-	(camel_mbox_summary_expunge): Clear header flags after updating.
-
-2000-05-16  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-folder.c:
-	* providers/nntp/camel-nntp-folder.h:
-	* providers/nntp/camel-nntp-provider.c: 
-	* providers/nntp/camel-nntp-store.c: 
-	* providers/nntp/camel-nntp-utils.c: 
-	* providers/nntp/camel-nntp-utils.h: 
-	get things working with new camel summary stuff.
-
-	* providers/nntp/camel-nntp-summary.c: 
-	* providers/nntp/camel-nntp-summary.h: 
-	removed files since camel-folder-summary does all we need.
-
-2000-05-15  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: Added some preliminary
-	AUTH support.
-
-2000-05-15  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.h: Remove camel_folder_get_summary, which no longer
-	exists.
-
-2000-05-11  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: remove some cruft that we're not currently using.
-
-	* camel-stream-mem.c (camel_stream_mem_new_with_buffer): Change
-	to match prototype (size_t vs unsigned int) so it works on 64-bit
-	machines. Noted by msw.
-
-2000-05-11  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (message_changed): Indicate
-	the summary changed also.
-
-2000-05-11  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: (smtp_helo): 
-	Updated to more closely comply with RFC 821 standards
-
-2000-05-11  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c (write_to_stream): Unref the filter after
-	adding it to the filtering stream.
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_finalise): Free the folder path.
-	(camel_mbox_summary_update): Also save summary when done.
-	(camel_mbox_summary_expunge): Unindex items when deleting them.
-	(camel_mbox_summary_expunge): Save the index as well as the
-	summary.
-
-	* camel-folder-summary.c (camel_folder_summary_finalise): Free the
-	summary path.
-	(camel_folder_summary_touch): New function, indicate the summary
-	info changed.
-	(camel_folder_summary_remove): Dirty here.
-
-	* camel-internet-address.c (internet_decode): Free multiple entry
-	addresses properly.
-
-	* camel-mime-utils.c (header_decode_mailbox): Plugged another
-	memleak, free text after converting it.
-	(header_decode_addrspec): More leaks plugged.
-
-	* camel-mime-message.c (finalize): Free message_uid.
-	(finalize): Free the recipients hashtable.
-
-2000-05-11    <notzed@helixcode.com>
-
-	* camel-folder-summary.c (camel_folder_summary_finalise): Free
-	summary items and charset filters.
-
-2000-05-10    <notzed@helixcode.com>
-
-	* camel-folder-summary.c (camel_folder_summary_finalise): Don't
-	free stuff in p, after we've free'd p.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Unref
-	the stream we created for appending.
-
-2000-05-10  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: (camel_smtp_transport_class_init):
-	Added initialization for service_class
-
-2000-05-10  Dan Winship  <danw@helixcode.com>
-
-	* camel-multipart.c (write_to_stream): fix a stupid typo. Thank
-	you, C.
-
-	* camel-mime-part.c (write_to_stream): don't ref the stream before
-	wrapper a filter around it, since nothing will ever unref it.
-
-2000-05-10  Christopher James Lahey  <clahey@helixcode.com>
-
-	* Makefile.am: Added camel-types.h, camel-folder-pt-proxy.h, and
-	camel-thread-proxy.h.
-
-2000-05-09  Dan Winship  <danw@helixcode.com>
-
-	* providers/sendmail/camel-sendmail-transport.c (_send_internal):
-	Bleah. Can't fsync a pipe. As a quick kludge, just don't
-	stream_flush it. The right fix will require bringing back
-	stream_close though.
-
-2000-05-09  Jeffrey Stedfast  <fejj@stampede.org>
-	* camel-internet-address.[c,h]: Undid my changes (moved
-	struct _address back into came-internet-address.c)
-	* providers/smtp/camel-smtp-transport.c: (_send): changed
-	from using it's own address manipulation (using struct _address)
-	to using camel_internet_address_get(). Also some format changes
-	to keep consistant with the rest of Camel
-
-2000-05-09  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* camel-internet-address.[c,h]: Moved struct _address from
-	camel-internet-address.c to camel-internet-address.h
-	(hopefully this doesn't break anything...)
-	* providers/smtp/camel-smtp-transport.c: (_send): now
-	populates the recipient list with To, Cc, and Bcc addresses.
-	Should now be able to use this module.
-
-2000-05-09  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_by_uid):
-	one more refcounting fix I missed before.
-
-2000-05-08  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: no longer frees memory it
-	shouldn't, updated to reflect camel-stream changes involving
-	CamelException (perhaps it should use a different CamelException
-	variable than is passed to the camel smtp module?)
-
-2000-05-08  Dan Winship  <danw@helixcode.com>
-
-	* camel-stream.c (camel_stream_read, camel_stream_write,
-	camel_stream_flush, camel_stream_reset, camel_stream_printf,
-	camel_stream_write_to_stream): Use CamelException to signal
-	failure.
-	(camel_stream_write_strings): Remove. camel_stream_printf is more
-	useful in most of the places that used this.
-	(camel_stream_write_string): Change from macro to function to
-	prevent problems with double-evaluation.
-
-	* camel-seekable-stream.c (camel_seekable_stream_seek,
-	camel_seekable_stream_set_bounds): Use CamelException.
-	(reset): Update.
-
-	* camel-seekable-substream.c, camel-stream-buffer.c,
-	camel-stream-filter.c, camel-stream-fs.c, camel-stream-mem.c:
-	Update.
-
-	* camel-stream-fs.c: Remove the virtual init functions and move
-	the code into the creator functions. Add CamelExceptions to
-	creation functions that could fail.
-
-	* camel-data-wrapper.c (camel_data_wrapper_write_to_stream): Use
-	CamelException.
-	* camel-mime-message.c, camel-mime-part.c, camel-multipart.c
-	(write_to_stream): Update.
-
-	* camel-mime-parser.c: add an exception to the mime parser private
-	data and pass that to stream functions as needed.
-	
-	* gmime-content-field.c, md5-utils.c: Update (badly) for stream
-	changes.
-	
-	* camel-exception.h (camel_exception_is_set): convenience macro.
-
-	* providers/Makefile.am: disable SMTP for now
-
-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Pass
-	CamelException to the functions that now need it. Check the
-	exception after calling camel_stream_flush, and fail if it fails.
-	(mbox_get_message_by_uid): More updates.
-
-	* providers/pop/camel-pop3-folder.c,
-	providers/pop/camel-pop3-store.c,
-	providers/sendmail/camel-sendmail/transport.c: Update.
-
-
-2000-05-08  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.c (process_header): Format From and Reply-To
-	to at least a decoded string.  Should probably store them as an
-	camelinternetaddress.
-
-	* Merged NEW_SUMMARY branch back to trunk, and resolved conflicts.
-	
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_update):
-	Return status.
-	(camel_mbox_summary_expunge): Force an update of the summary
-	before we do anything.
-	(camel_mbox_summary_expunge): Build new xev line in xevnew, and
-	free that, and consify xev.
-	(camel_mbox_summary_load): If we are rebuilding from scratch, make
-	sure we clear the summary content.
-
-	* camel-stream-filter.c (do_close): We NEED a stream close.
-
-2000-05-07  Dan Winship  <danw@helixcode.com>
-
-	Make camel not leak like a sieve.
-
-	* camel-object.c: New subclass of GtkObject which is now the base
-	of the Camel object hierarchy. Currently the only difference
-	between CamelObject and GtkObject is that CamelObjects don't start
-	out floating.
-
-	* *.h: Move a bunch of typedefs to camel-types.h. Standardize on
-	using <camel/foo.h> in header files rather than <foo.h>, "foo.h",
-	or "camel/foo.h". Remove some unneeded includes.
-
-	* camel-address.c, camel-data-wrapper.c, camel-folder-search.c,
-	camel-folder-summary.c, camel-folder.c, camel-mime-filter.c,
-	camel-mime-parser.c, camel-service.c, camel-session.c,
-	camel-stream.c: These are now subclasses of CamelObject.
-
-	* camel-data-wrapper.c (set_output_stream):
-	* camel-medium.c (set_content_object):
-	* camel-seekable-substream.c
-	(init_with_seekable_stream_and_bounds):
-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_by_uid): 
-	remove gtk_object_sink calls.
-
-	* camel-stream-buffer.c (init_vbuf): 
-	* camel-stream-filter.c (camel_stream_filter_new_with_stream):
-	ref the original stream.
-
-	* camel-folder-summary.c (camel_folder_summary_finalise): unref
-	the filters when finalizing.
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser,
-	camel_mime_part_construct_content_from_parser):
-	* camel-mime-part.c (camel_mime_part_set_content): Unref objects
-	that are created only to be handed off to other objects. If
-	they're going to be needed later, they will have been additionally
-	ref'ed by the object that needs them.
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_number):
-	unref the message stream after creating the data from it.
-
-	* camel-stream.c, camel-stream-buffer.c, camel-stream-filter.c,
-	camel-stream-fs.c, camel-stream-mem.c: Remove camel_stream_close,
-	since its semantics are dubious (what happens when you close a
-	stream other people still have references on?).
-
-	* providers/nntp/camel-nntp-store.c:
-	* providers/smtp/camel-smtp-transport.c:
-	* providers/pop3/camel-pop3-store.c:
-	replace camel_stream_close calls with gtk_object_unref.
-
-	* providers/mbox/camel-mbox-folder.c:
-	* providers/nntp/camel-nntp-folder.c:
-	* providers/sendmail/camel-sendmail-transport.c:
-	replace camel_stream_close with camel_stream_flush +
-	gtk_object_unref
-
-2000-05-06  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (query_auth_types): A machine
-	which serves neither POP nor KPOP is not a POP server.
-
-	* providers/smtp/camel-smtp-provider.c: Note in the description
-	that this provider is not yet tested.
-
-2000-05-08    <notzed@helixcode.com>
-
-	* camel-mime-part.c (write_to_stream): Free the filter stream when
-	done.
-
-	* camel-mime-parser.c (folder_seek): Make sure we add the \n
-	terminal when we seek as well (frob!).
-
-	* camel-mime-utils.c (header_decode_addrspec): Plug minor memleak.
-
-	* camel-mime-part.c (finalize): Free header tables once finished.
-
-	* camel-folder-summary.c (camel_folder_summary_remove): Dont try
-	to access info after its free'd.
-
-2000-05-07  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c (write_to_stream): Apply encoding to content
-	part, when writing to a stream *sigh*.
-
-	* camel-stream-filter.c (do_write): implement write for the
-	filtering stream.  Writes shouldn't be mixed with reads.
-	(do_flush): Implemented flush.  Again write/flush shouldn't be
-	mixed with reads.  Only flushes if the last op was write.
-	(do_close): Force flush on close.
-
-	* camel-mime-filter.c (filter_run): Oops, make sure we include the
-	backlen in the total length before passing onto the filter.
-
-	* camel-mime-filter-from.c: New filter, munges 'From ' lines into
-	'>From ', for mbox.
-
-	* camel-mime-parser.c (camel_mime_parser_header_remove): New
-	function to remove the parser's raw header, rather than
-	manipulating the header directly (wich doesn't work with
-	mempools).
-
-	* camel-mime-utils.c (header_address_list_clear): Fixed some
-	broken(tm) logic, which would leak entries on multivalued lists.
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_load):
-	Use ibex_save() to save the ibex.  Makes a big difference to
-	startup times for very large mailboxes.
-	(camel_mbox_summary_expunge): Dum de dum, reimplemented.  Designed
-	to be much more robust, and to stop immediately if anything awry
-	happens.
-	(copy_block): Utility function to copy n bytes from one fd to
-	another.
-	(header_write): Utility function to write out raw headers to an
-	fd.
-	(camel_mbox_summary_update): Incremental summary updater.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_by_uid):
-	Dont unref the stream, because of the broken(tm) ref model of gtk
-	widget that for some odd reason is being perpetuated in camel.	
-	(mbox_expunge): Reenable expunge again.
-	(mbox_append_message): Removed the optimised mbox append.  If its
-	an issue, it can go back later.  Cleaned up a lot, checks error
-	returns, and automagically translates 'From ' into '>From' as
-	necessary.
-
-2000-05-07    <notzed@helixcode.com>
-
-	* camel-mime-filter.c (filter_run): Oops, forgot to add the
-	backlen to the pre-buffer (*poof*).
-
-2000-05-07  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.c (construct_from_parser): Allow
-	HSCAN_FROM_END to terminate the processing of a message.
-
-	* camel-folder-summary.c (perform_content_info_load): Ick, dont
-	try and append a node onto its own list.
-	(camel_folder_summary_clear): Actually clear the indexes after
-	we've removed the messages.
-	(camel_folder_summary_clear): Set dirty if it changes.
-	(camel_folder_summary_load): Clear dirty.
-	(camel_folder_summary_save): Only save if dirty.
-
-	* providers/mbox/camel-mbox-summary.c (summary_header_load): Oops,
-	remember to call that parent class first ...
-	(summary_header_save): Here too.
-	(camel_mbox_summary_load): Do more checking to verify the index
-	contents as well as teh summary contents, against the mbox
-	contents.
-	(camel_mbox_summary_load): Removed some fo that checking, it needs
-	more code to work reliably.
-
-2000-05-07    <notzed@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_load):
-	Set the size and mtime of the mbox we indexed once done.
-
-	* camel-folder-summary.c (camel_folder_summary_set_index): Dont
-	write the index if it changes - let the claler fix it (uh, kind of
-	impacts performance).
-	(camel_folder_summary_load): close in.
-
-	* camel-folder-summary.c (summary_format_string): Check header
-	exists before trying to strip its leading spaces.
-
-2000-05-06  NotZed  <NotZed@HelixCode.com>
-
-	* camel-folder.h: Removed summary info from here, and include
-	camel-folder-summary.h as well.
-	
-	* camel-mime-parser.c (camel_mime_parser_step): Allow it to accept
-	a NULL databuffer.
-
-	* providers/mbox/camel-mbox-summary.c: Totally new file, now
-	subclasses camel-folder-summary.
-
-	* camel-folder-summary.c (message_info_load): Load the uid as a
-	string.
-	(message_info_save): And save too.
-	(camel_folder_summary_clear): New function, clears the contents of
-	the summary.
-
-	* providers/mbox/camel-mbox-folder.c: Fixes for	summary changes.
-	(mbox_get_message_by_uid): Completely redone.  Now cross-checks
-	the summary information to make sure we get a real message.
-	(mbox_append_message): Disabled the copy version of append for
-	now.
-	(mbox_expunge): Temporarily disabled the expunge function, until
-	it is put back in camel-mbox-summary.c
-
-2000-05-05  NotZed  <NotZed@HelixCode.com>
-
-	* camel-folder-summary.c: And same here ...
-	(camel_folder_summary_encode_fixed_int32): Ugh, fwrite doesn't
-	return -1 on error ..
-	(camel_folder_summary_decode_fixed_int32): Neither deos fread.
-	(camel_folder_summary_encode_token): Fix here too.
-	(summary_build_content_info): Use start-headers to get the pos of
-	the message, not parser_tell(), which might not be what we
-	expected because of parser_unstep().
-	(camel_folder_summary_encode_token): Use bserch() to tokenise the
-	values, rather than a linear search.
-
-	* camel-mime-utils.c: Defined out some memory profiling stuff I
-	left there by mistake.
-	(header_decode_mailbox): Dont try to append the word part of a
-	local address if we ran out of words.
-
-	* camel-mime-parser.c (folder_scan_content): Apply the fix from
-	the header scanner to here too.
-	(folder_scan_header): Only check for end of header if we have
-	space for it (didn't end the read with a newline)
-	(folder_scan_header): inptr is the only real thing we need
-	registerised for performance.  Try to help the compiler be smart
-	about it ..
-	(folder_scan_header): Simplified the save header case a tad.
-
-	Commented out some memory profiling stuff.
-
-2000-05-05    <notzed@helixcode.com>
-
-	* camel-mime-utils.c (header_decode_mailbox): Plug a memory leak.
-	(header_decode_text): Fixed memory leaks with g_string_append().
-	(header_encode_string): And here too, and a few other places.  The
-	glib api is so awful ...
-	(header_content_type_decode): More memory leaks.
-
-2000-05-05    <notzed@helixcode.com>
-
-	* camel-mime-parser.c (folder_scan_init_with_fd): Make sure we
-	init the end of buffer sentinal!
-	(folder_scan_init_with_stream): And here too ...
-
-2000-05-04  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (summary_get_message_info):
-	Maxcount is minimum of the max and the requested count, not the
-	maximum :)
-
-	* camel-mime-parser.c (folder_scan_content): Properly set midline,
-	so we dont falsely catch offset boundary markers (i.e. From inside
-	content).
-	(folder_read): Set a sentinal on the end of the read data (\n) so
-	we dont have to check the buffer boundary in the inner loop.
-	(mempool_*): New experimental memory management routines, speed
-	up simple structure parsing by about 25% ... not compiled in by
-	default.  Something similar may be needed for camel-mime-utils to
-	address performance issues with g_malloc and friends.
-
-	* camel-mime-utils.c: Added a macro w(x) used to wrap all warnings
-	about mime/rfc violations, so they can be turned off.
-
-	* camel-folder-summary.c (summary_build_content_info): Step after
-	the end of a message ...
-	Turn into a stand-alone program for testing and profiling.
-
-2000-05-04  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Don't fall
-	back to plaintext passwords if APOP fails, since it should also
-	fail.
-
-2000-05-04  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.c (camel_session_list_providers): New function to
-	replace camel_provider_scan. Returns a list of either (a) all
-	currently-loaded providers, or (b) all available providers.
-
-	* camel-url.[ch]: Add an "empty" flag to CamelURL (indicating that
-	it contains only a protocol).
-
-	* camel-service.c (camel_service_query_auth_types): Make this take
-	a CamelException (since it may have to try to connect to the
-	server, and it might not able to.)
-
-	* providers/pop3/camel-pop3-store.c: add KPOP (Kerberized POP)
-	support. This is mostly so I have two kinds of authmech to play
-	with instead of just one. (But it does actually work.)
-
-	* providers/smtp/camel-smtp-transport.c (query_auth_types): update
-	for prototype change, but disable the functionality, since it
-	doesn't really support any auth types yet.
-	(camel_smtp_transport_get_type): add an object init function to
-	set the service url_flags.
-
-2000-05-04  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c: Yes, and anotherone.
-
-	* camel-mime-utils.c: And another one.
-
-	* camel-mime-part.c: And another one.
-
-	* camel-mime-part-utils.c: And another one.
-
-	* camel-folder-search.c: And another one.
-
-	* camel-mime-parser.c: Reverted a change wihtout a ChangeLog entry.
-
-2000-05-04  NotZed  <NotZed@HelixCode.com>
-
-	* camel-folder-summary.[hc]: Yes, CamelFolderSummary is back ...
-	... re-usable class to summarise and index any stream or message
-	and to manage/load/save the created summaries.
-	
-	* camel-folder.c: Include string.h to kill a warning.
-
-2000-05-03  Jason Leach  <leach@wam.umd.edu>
-
-	* Makefile.am (INCLUDES): add $(UNICODE_CFLAGS) to the INCLUDES,
-	people who installed libunicde in non-standard include paths need
-	this.
-
-2000-05-03  NotZed  <NotZed@HelixCode.com>
-
-	* camel-folder.h: Added pos/bodypos/endpos to the basic message
-	content info object.  Size to be removed?  Moved the
-	messageconentinfo and messageinfo back to camel-folder-summary.h.
-
-	* camel-mime-filter-index.c (camel_mime_filter_index_set_ibex):
-	New function to (re)set the index to use on a filter.
-
-	* camel-mime-parser.c (camel_mime_parser_scan_from): Whole bunch
-	of inline docs.
-	(camel_mime_parser_drop_step): New function to drop a state from
-	the parser.  Needs more testing.
-
-	* camel-mime-utils.c (rfc2047_decode_word): If the iconv handle is
-	-1, then dont try and convert (crashes unicode_iconv?).
-	(rfc2047_decode_word): Use alloca for variables instead of
-	g_malloc - by the rfc they should always be short.
-	(rfc2047_decode_word): If we can't do the charset conversion, undo
-	the quoted-printable/base64 at least?  Should probably convert
-	unknown characters to the utf-8 unknown character.
-
-2000-05-02  Larry Ewing  <lewing@helixcode.com>
-
-	* camel-mime-utils.c (header_decode_date): fix typo when
-	dereferencing saveoffset.
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* camel-folder-search.c: Added some header doco.
-
-	* camel.h: REmove gmime-utils.h from here.
-
-	* providers/mbox/camel-mbox-search.[ch]: Removed.  Functionally
-	redundant.
-
-	* providers/mbox/camel-mbox-folder.c (mbox_search_by_expression):
-	Use the new CamelFolderSearch class to do the actual searching,
-	just setup the search here.
-
-	* camel-folder-search.[ch]: A helper class that providers may
-	subclass to provide their own search functionality, or they can
-	simply use as is, it supports body searches if an ibex is
-	supplied, and header searches if a summary is supplied.
-
-2000-05-02  Matt Loper  <matt@helixcode.com>
-
-	* Makefile.am: set G_LOG_DOMAIN.
-	* providers/MH/Makefile.am: same.
-	* providers/maildir/Makefile.am: same.
-	* providers/mbox/Makefile.am: same.
-	* providers/nntp/Makefile.am: same.
-	* providers/pop3/Makefile.am: same.
-	* providers/sendmail/Makefile.am: same.	
-	* providers/smtp/Makefile.am: same.		
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-search.c
-	(camel_mbox_folder_search_by_expression): Dont store/remove
-	current search from the search list.
-	
-	* providers/mbox/camel-mbox-folder.h: Removed searches list,
-	searches are all sync now.
-
-	* gmime-utils.[ch]: What the hell, remove it.  This will break the
-	nntp provider.  The mime parser can be used instead though.
-	Removed from all code including it (but none were using it).
-
-	* gmime-utils.c (_store_header_pair_from_string): Removed bizarre
-	string_dichotomy version of this.  This code is somewhat redundant
-	now, and is headed for death anyway.
-
-	* gstring-util.c (g_string_dichotomy): Same with this one.
-	(g_string_clone): Removed a memory leak, g_string_new() allocates
-	its own memory.
-	(g_string_append_g_string): Allow to append an empty gstring onto
-	another gstring, dont abort()!
-
-	* string-utils.c (string_dichotomy): Removed this incredibly weird
-	function.
-
-	* camel-folder.c (_create): Replaced the rather obtuse use of
-	"string_dichotomy" function with a simple strrchr().  Still not
-	sure it'll work.
-
-	* camel-folder-summary.c: cvs removed a long-removed file.
-
-	* camel-mime-parser.c (folder_scan_header): Fix the previous
-	overflow problem properly (can happen in 2 places).
-	(header_append): A new macro to include the code changed above, so
-	it only appears in one place.
-	(folder_scan_step): Change the content type to text/plain if the
-	multipart is broken.  Doesn't actually change the header though.
-	(header_append): Also move the header-start tracking stuff here.
-	Could be a static function to save code.
-
-2000-05-02    <notzed@helixcode.com>
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): Dont use autofill on
-	these fucking long function anmes!!!!!!
-
-2000-05-02  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_expunge): Fix the offset for the summary when
-	an item is expunged to take account of the From line.
-
-2000-05-01  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.h (CamelMboxFolder): Removed
-	search_id.
-
-	* providers/mbox/camel-mbox-search.c
-	(camel_mbox_folder_search_cancel): Remove.d
-	(camel_mbox_folder_search_complete): Removed.
-	(camel_mbox_folder_search_by_expression): Changed back to sync
-	api.
-	(struct _searchcontext): Removed cancelled flag.
-	(find_context): Removed.
-	(func_header_contains): Debug out some search stuff.
-
-	* providers/mbox/camel-mbox-search.h
-	(camel_mbox_folder_search_by_expression): Moved back to sync api.
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_set_flags_by_uid): New function to update the
-	flags in the summary.
-	(camel_mbox_summary_expunge): Expunge messages from a folder.
-	(offset_content): Re-align offsets of summary when messages
-	added/removed to an existing summary.
-	(camel_mbox_summary_remove_uid): Remove a message summary entry by
-	uid.
-	(index_folder): Restore flags from X-Evolution header, if they are set.
-	(index_folder): Make sure we index using a decimal uid, since
-	thats what everything else indexes off (oops).
-	Upped SUMMARY_VERSION as a result.
-	(camel_mbox_summary_expunge): Oops, my wrong, use the string uid
-	to unindex on.
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid):
-	Connect to the message_changed signal.
-	(_init): Set permanent flags to something reasonable.  No user
-	flags yet ...
-	(message_changed): If the flags of the message change, update the
-	flags in the summary.
-	(mbox_expunge): Implement the expunge.
-	(camel_mbox_folder_class_init): Renamed all leading _'s to mbox_'s
-	(mbox_expunge): Emit a folder_changed signal on expunge (uh, even
-	if it didn't ...)
-
-	* camel-folder.c (_finalize): Uh, dont free permanent_flags
-	anymore (this wouldn't failed anyway, it was a GList !!!)
-	(camel_folder_search_complete): Removed.
-	(camel_folder_search_cancel): Removed.
-	(camel_folder_expunge): Changed to only allow expunge on an open
-	folder.  It doesn't make sense for mbox, otherwise (?)
-	(camel_folder_class_init): Added a folder_changed signal.
-
-	* camel-folder.h (struct _CamelFolder): Change permanent_flags to
-	a bitfield.
-	(list_permanent_flags): Renamed to get_permanent_flags, and
-	returns a bitfield.
-	(camel_folder_expunge): Changed expunge to a void type.  The
-	messages would no longer be useful after they have been removed
-	...
-	(CamelFolderClass): New function summary_get_by_uid() to get a single
-	summary.
-	(*search*): Moved back to synchronous search api ... *sigh*
-	
-	* camel-folder.h: Removed CamelSearchFunc.
-
-	* camel-mime-message.c (set_flag): Removed.
-	(camel_mime_message_set_flag): Removed.
-	(get_flag): Removed.
-	(camel_mime_message_get_flag): Removed.
-	(add_flag_to_list): Removed.
-	(get_flag_list): Removed.
-	(camel_mime_message_get_flag_list): Removed.
-	(camel_mime_message_get_flags): New interface to get system flags.
-	(camel_mime_message_set_flags):  " to set ".
-	(camel_mime_message_get_user_flag): To get a user flag.
-	(camel_mime_message_set_user_flag): To set a user flag.
-	(finalize): Hmm, the old one free'd the key and data, not good
-	when the data is a boolean ...
-
-2000-04-30  Dan Winship  <danw@helixcode.com>
-
-	* camel-provider.h: Tweak the definition of CamelProvider. Among
-	other things, a provider may now be both a store and a transport.
-
-	* camel-provider.c: Remove a lot of code we had no intention of
-	using. This now only contains two functions: camel_provider_init
-	to read the installed .urls files, and camel_provider_load to
-	load and register a new provider.
-
-	* camel-session.c: Remove more unused code and simplify some of
-	the remaining code. The list of available provider modules is now
-	stored in the session, and it handles calling camel_provider_load
-	to load them as needed. Provider registration is now done by
-	calling back from the module init routine, which allows a single
-	module to register providers for multiple URL types.
-
-	* providers/*: Update provider structures and init routines for
-	the new stuff. Add a .urls file to each provider specifying what
-	urls it handles, and install that with the library.
-
-	* providers/nntp/camel-nntp-provider.c: Add hints towards
-	supporting both news: and nntp: URLs, and using nntp as both a
-	store and a transport.
-
-2000-04-29  Dan Winship  <danw@helixcode.com>
-
-	* camel-internet-address.c (camel_internet_address_get): const
-	poison
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser):
-	camel_mime_parser_tell() returns an offset from where it started
-	parsing, not necessarily from the start of data. Since we're
-	parsing a bounded seekable_stream, we need to add the stream's
-	starting bound to camel_mime_parser_tell's return value to
-	create the substream in the right place.
-
-	* camel-seekable-substream.c
-	(camel_seekable_substream_new_with_seekable_stream_and_bounds):
-	say CAMEL_STREAM_UNBOUND rather than -1 in doc.
-
-	* camel-seekable-stream.c (camel_seekable_stream_seek): Add more
-	info to docs.
-
-2000-04-28  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-parser.c (folder_scan_header): fix a bug that would
-	cause corruption with very long headers.
-
-2000-04-27  Ettore Perazzoli  <ettore@helixcode.com>
-
-	* providers/pop3/Makefile.am (INCLUDES): Add `-I$(srcdir)/../../..'
-	to pick the Camel includes.
-	* providers/sendmail/Makefile.am (INCLUDES): Likewise.
-
-	* camel.h: Don't #include <camel/data-wrapper-repository.h> anymore.
-
-2000-04-27  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c (check_header): Dont try and check a NULL
-	header.
-
-	* camel-recipient.[ch]: Dead.  Its not pining.
-
-	* camel-mime-message.h: Dont include recipients.h anymore.
-
-	* camel-mime-message.c (camel_mime_message_add_recipient): Accept
-	name/address separately, and store in an CamelInternetAddress.
-	(add_recipient): Removed.
-	(remove_recipient): Removed.
-	(remove_recipient_address): Renamed from remove_receipient, works
-	via address.
-	(camel_mime_message_remove_recipient_name): New function to remove
-	by name.
-	(get_recipients): Removed.
-	(camel_mime_message_get_recipients): Return a camel-internet-address.
-	(write_to_stream): No longer write receipients directly.
-	(write_recipients_to_stream): Removed.
-	(write_one_recipient_to_stream): Removed.
-	(camel_mime_message_init): Setup recipients hashtable, rather than
-	usign the recipients stuff.
-	(set_recipient_list_from_string): Killed, a violent and lengthy
-	death.
-	(process_header): Simplified recipient handling code a lot.
-	(received_date_str, sent_date_str, reply_to_str, subject_str,
-	from_str): Removed some oddly-defined global statics.
-	(camel_mime_message_class_init): Dont initialise above variables
-	anymore.
-	(init_header_name_table): Removed, use a table to init this, and
-	do it in class init (2 lines of code ...).
-
-	* camel-news-address.c: Class to represent news addresses -
-	currently empty, and not built.
-
-	* camel-internet-address.h: Class to represent internet (email)
-	addresses.
-
-	* camel-address.h: Abstract class to represent (lists of)
-	addresses.
-
-2000-04-27  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part.c (write_to_stream): Revert previous change. I
-	was confused.
-
-	* camel-url.[ch] (camel_url_encode, camel_url_decode): expose
-	these routines.
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part.c (write_to_stream): Only write a newline
-	between the headers and the content object if the content object
-	is not a CamelMedium. (If the content is a medium, it may have its
-	own headers, which then need to go before the blank line.)
-
-	* camel-mime-body-part.[ch]: Remove. We weren't using the fields
-	that made this different from camel-mime-part, so it basically
-	just forced us to do lots of gratuitous typecasting.
-
-	* camel-multipart.[ch]: Use CamelMimePart. Remove the multipart
-	parent stuff, since we weren't using that either.
-
-	* etc: update for CamelMimeBodyPart -> CamelMimePart
-
-2000-04-26  Dan Winship  <danw@helixcode.com>
-
-	* camel-medium.c (set_content_object): sink the content object
-	after referencing it.
-
-	* camel-mime-part.c: fix various little things in the handling
-	of CamelMedium methods. Change camel_mime_part_set_text to the
-	more generic camel_mime_part_set_content.
-
-	* camel.h: sync to current reality
-
-	* camel-folder-utils.[ch]: removed
-
-	* camel-mime-utils.c (header_format_date): fix format specifier
-	for time zone. Fix typo in month names array.
-
-2000-04-26  NotZed  <NotZed@HelixCode.com>
-
-	* camel-seekable-substream.c (stream_seek): Changed to have
-	absolute seek semantics, not relative to the bounds.
-
-	* camel-seekable-stream.c (reset): When we reset, seek to the
-	start of the bound, if there is one.
-	(stream_tell): Make tell virtual.
-
-	* camel-stream-filter.c (do_available): Removed.
-
-	* camel-stream-buffer.c: Remove leading _'s from static functions.
-	(stream_read): Renamed from read().  Fancy that conflicting!  (my
-	boo!)  Others too.
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_number):
-	Changed to stream_mem interface.
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): Fixed
-	for streamfs interface changes, and implement a failure case.
-	(_append_message): Changed for fs stream interface change.
-
-	* camel-multipart.c (print_part): Iterate rahter than callback.  I
-	hate glists's interface (hence, move this to write_to_stream).
-	(write_to_stream): Return an error (yuck, this is a royal PITA to
-	do with the stream write interface).
-
-	* camel-mime-message.c: Removed leading _ from static names.
-
-	* camel-mime-part.h: construct_from_parser() now returns an error
-	code.
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Changed to use a
-	camel-data-wrapper instead of a camel-simple-data-wrapper (no
-	change needed elsewhere?).
-	(simple_data_wrapper_construct_from_parser): Fixes for stream-mem
-	interface changes.
-
-	* camel-simple-data-wrapper.[ch],
-	camel-simple-data-wrapper-stream.[ch],
-	camel-stream-data-wrapper.[ch], removed.  Fixed including of these
-	files.
-	
-	* camel-mime-part.c (camel_mime_part_set_text): Remove the use of
-	the camel-simple-data-wrapper-stream, just use a mem stream.
-	(write_to_stream): Renamed from my_*
-	(construct_from_stream): Return an error on error.
-
-	* camel-stream-mem.c (camel_stream_mem_new*): Remove mode
-	parameter.
-
-	* camel-stream-mem.h (enum CamelStreamMemMode): Removed.  It
-	wasn't used at all.
-
-	* camel-data-wrapper.h: Add camel_data_wrapper_new() to create
-	these.
-	(write_to_stream, construct_from_stream): Return an error
-	indicator for success.  Fixed all methods to match (ICK).
-
-	* Makefile.am (libcamel_la_SOURCES): Remove
-	camel-simple-data-wrapper.c, camel-simple-data-wrapper-stream.c,
-	camel-stream-data-wrapper.c.  Obsoleted by code re-use!
-
-	* camel-data-wrapper.c (construct_from_stream): Change the default
-	implementation to just set the output stream == construction
-	stream.  Well, this lets me get rid of both simple-data-wrapper
-	and stream-data-wrapper (unused anyway), and
-	simple-data-wrapper-stream in one hit.  CamelDataWrapper is now
-	also a concrete class.
-	(write_to_stream): Use camel_stream_write_to_stream() to
-	calculate/return values (and save code).
-	Include <errno.h> for obvious reasons.
-
-	* camel-stream.c (eos): Provide a default implementation of .eos().
-	(camel_stream_write_to_stream): Make it return an error code on
-	error.
-	(camel_stream_printf): Changed to return the number of bytes
-	written/error.
-	(camel_stream_available): Removed.
-
-	* camel-stream-fs.h (enum CamelStreamFsMode): Removed.  Changed to
-	use unix modes and so forth (wasn't used for anything but new file
-	creation and didn't work well either).
-
-	* camel-stream-fs.c: Removed leading _'s for names.  And removed
-	some virtual method 'documentation'.
-	(destroy): Dont try and close a closed/error fd.  Only report
-	error if close returns -1.  Moved all the code to finalise(), and
-	killed this function.
-	(init_with_fd): Properly setup the seek offset, if it is a
-	valid and seekable file descriptor.
-	(init_with_fd_and_bounds): Use off_t for bounds, set bounds on the
-	seekable stream.
-	(init_with_name): Return error codes.
-	(init_with_name_and_bounds): Ditto.
-	(camel_stream_fs_new_with_name): REturn NULL object if it failed.
-	(camel_stream_fs_new_with_name_and_bounds): Return NULL object on
-	failure.  Changed with_name* api's to take unix open style args
-	and flags.
-	(read): The bounded stream bounds checking seemed off, simplified
-	code a bit.
-	(write): Implement bounds checking for writing, the comment was
-	wrong, it could make sense to bound writing.  Cleaned up a little.
-	(available): Gone.
-	(eos): Removed.  Use CamelStream's implementation now.
-	(close): Reset the fd to -1, provide a warning for bad usage.
-	(seek): Cleaned up.  Changed the behaviour a little, the returned
-	offset is the absolute position in the file, even in bounded
-	streams.	
-	(seek): Seek from end mirrors lseek() behaviour (reverse seeking).
-
-2000-04-25  NotZed  <NotZed@HelixCode.com>
-
-	* camel-stream-fs.h (struct _CamelStreamFs): Moved bounds and eof
-	indicator to other parent classes.
-
-	* camel-stream.c (camel_stream_printf): New utility
-	function.  Obvious use.
-
-	* camel-stream-mem.c: Removed leading _'s from static func's.
-	(camel_stream_mem_new_with_byte_array): Fixed for api changes, set
-	the owner for the byte array to us.
-	: Removed A bunch of gtk doc stuff for static (implementation) functions.
-	(available): Removed.
-	(write): Fixed the write implementation so that seek() works on a
-	seekable memory stream, as expected.  Seeking past the end of the
-	buffer has unix semantics (filling with 0).
-	(available): Removed.
-	(write): Implement seekable stream bounded stream.
-	(read): Implement seekable stream bounded stream.
-	(close): Dont free the stream_mem if we're not the owner.
-	(seek): Allow to seek beyond the end of memory area,
-	implement bounds checking.
-	(seek): Set errno on bad policy.
-
-	* camel-stream-mem.h (struct _CamelStreamMem): Changed position to off_t.
-	(new_with_buffer): Changed len to be a size_t.
-	(set_buffer, set_byte_array): New interface functions.
-	(struct _CamelStreamMem): Removed position, it is stored in the
-	superclass.
-
-	* camel-stream.h: Removed some of the seemingly random
-	whitespace.  Removed the available method (its not
-	impelemented/useful enough).
-
-	* camel-seekable-substream.c
-	(init_with_seekable_stream_and_bounds): Remove the data_available
-	stuff, it hasn't been properly implemented/finished, and may never
-	work (unfortunately *sigh).
-	(reemit_parent_signal): Removed part of the above change.
-	(set_bounds): Removed (moved to seekable-stream).
-	: Fixed up some of the generally unreadable indenting (sorry,
-	wrapping at 80 characters with
-	camels_really_long_function_names()
-	just_doesnt_work_very_well_does_it().
-	(available): Removed.
-	(stream_seek): Fixup for object changes.  Make sure we return -1
-	if the parent stream can't seek.
-
-	* camel-seekable-stream.c (ccamel_seekable_stream_set_bounds): New
-	function to bound any seekable stream.
-	: Removed _'s.
-	(camel_seekable_stream_class_init): Implement an init function, to
-	setup the stream bounds to unbound.
-
-	* camel-seekable-stream.h (CamelSeekableStreamClass): New virtual
-	method set_bounds for seekable streams.
-	(CAMEL_STREAM_UNBOUND): New define for no bound.
-
-	* camel-seekable-substream.h (struct _CamelSeekableSubstream):
-	Removed sup_bound and inf_bound, moved to CamelSeekableStream (and
-	renamed, and changed to off_t's).
-	(new_with_seekable_stream_and_bounds): Use off_t as the bounds.
-	(CamelSeekableSubstreamClass): Uh, why was the intialiser virtual?
-	Removed.
-
-	* camel-seekable-stream.[ch] (CamelSeekableStreamClass): Changed seek
-	to accept an off_t as the offset.
-	(struct _CamelSeekableStream): Renamed cur_pos to position and
-	changed it to an off_t type.
-	(enum CamelStreamSeekPolicy): Set to match the SEEK_* constants
-	from lseek().
-	(get_current_position): Renamed to tell().
-
-	* camel-stream-buffer.h: Commented out set_vbuf - never implemented.
-
-2000-04-25  Dan Winship  <danw@helixcode.com>
-
-	* camel-stream-buffer.c (_eos): only return TRUE if the parent is
-	at eos AND the buffer has been exhausted
-
-	* camel-mime-message.c: fix some incorrect macro usage that
-	resulted in bogus casts
-
-2000-04-24  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part-utils.c
-	(simple_data_wrapper_construct_from_parser): fix a cut-and-pasto.
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): ref
-	(and sink) the message stream if we're going to unref it later.
-	Otherwise it could get destroyed while there are still substreams
-	attached to it. This needs a cleaner solution.
-
-	* camel.h: remove data-wrapper-repository.h include(s)
-
-2000-04-24  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.c (construct_from_parser): Allow MESSAGE_END
-	_or_ EOF as valid termination conditions.
-
-	* providers/mbox/camel-mbox-summary.c (message_struct_new): Decode
-	and then re-encode the addresses, so they are consistently
-	formatted.
-
-	* camel-mime-utils.c (header_decode_mailbox): Store the address in
-	a _header_address.  And try to get a comment-stored name if there
-	is one.
-	(header_decode_address): Actually return an address.
-	(header_to_decode): Renamed to header_address_decode()
-	(header_mailbox_decode): New function to get a single mailbox.
-	(header_mime_decode): Return the major/minor value, as
-	appropriate.
-	(header_address_new, and friends): Whole bunch of utility
-	functions for working with the address thingies.
-	(header_decode_domain): Free the string header, and dont expand
-	'.' into ' . '.
-
-	* camel.c (camel_init): No longer call
-	data_wrapper_repository_init.
-
-	* camel-medium.c (write_to_stream): Moved (back) to
-	camel-mime-part.
-	(add_header):
-	(set_header):
-	(remove_header): 
-	(get_header): Make all these abstract, and spit warnings if
-	called.  I guess it could manage the list, but well, it doesn't.
-
-	* camel-medium.h (struct _CamelMedium): Dont store headers here,
-	the implementor is the only one who knows their format.
-	(CamelMediumClass): Changed header values to be void *'s.  They
-	need not be strings?
-
-	* camel-simple-data-wrapper.c (construct_from_stream): And we're
-	back.  Set the output stream.
-	(construct_from_parser): Moved to camel-mime-part-utils.
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_parser): Create the
-	contents of multipart and simple messages.
-	(camel_mime_part_construct_content_from_parser): Oops, this was
-	totally screwed up, try creating the right cotnent on the right
-	object.
-
-	* camel-multipart.c (construct_from_parser): Moved to
-	camel-mime-part-utils.
-	(separate_part): Removed.
-
-	* camel-mime-part.c (construct_from_stream): Back again!  This now
-	switches over to using a mime parser for any mime parts, only.
-	(my_write_to_stream): Write our headers and so forth here.
-	(add_header): Add header directly, parent class is abstract.
-	(remove_header): Ditto.
-	(set_header): Ditto.
-
-	* camel-data-wrapper.c (camel_data_wrapper_construct_from_stream):
-	Remade abstract.
-	(camel_data_wrapper_construct_from_parser): Moved to
-	camel_mime_part.
-
-	* camel-data-wrapper.h: Put back construct_from_stream.
-
-	* camel-mime-part.h: Put construct_from_parser in here, the
-	data-wrapper shouldn't know about mime.  Ok, so now to undo half
-	of the last hours changes ... duh.
-	
-2000-04-23  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (header_to_decode, header_mime_decode): fix
-	some obvious minor bugs noted by -Wall.
-
-2000-04-23  NotZed  <NotZed@HelixCode.com>
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_number): Use
-	construct_from_stream instead of set_input_stream().
-
-	* camel-simple-data-wrapper-stream.c
-	(camel_simple_data_wrapper_stream_construct): REmoved the destroy
-	callback code.
-	(wrapper_destroy_cb): Removed.
-
-	* camel-simple-data-wrapper.h: Add prototype for _construct()
-	method.
-
-	* camel.c: Include unicode.h to kill a warning.
-
-	* camel-data-wrapper.h (CameldataWrapperClass): Removed
-	construct_from_stream virtual method.
-	Removed get/set input stream.
-
-	* data-wrapper-repository.[ch]: Removed&from build.  Obsoleted?
-	The justification as is follows: It is mixing storage
-	protocol/format with message architecture.  It really just doesn't
-	serve any purpose, as each medium implementor will have to have its
-	own type->handler mapping, and the only current implementor,
-	mimepart has a very simple structure and no need for this.
-
-	* camel-medium.c (write_to_stream): Moved here from most of the
-	stuff in camel-mime-part.  Well, the MEDIUM is the one that knows
-	what the headers are, and the content is, let it write it out.
-
-	* camel-mime-part-utils.c (camel_mime_part_construct_content):
-	Copied from camel-mime-part.c, removed handling of message
-	followon state (moved to camel-mime-message).
-	(camel_mime_part_construct_content_from_parser): Renamed from
-	construct_content.
-	(camel_mime_part_construct_headers_from_stream):
-	(camel_mime_part_construct_content_from_stream):
-	(camel_mime_part_store_stream_in_buffer): Removed.  Replaced by
-	the new construct from parser stuff.
-
-	* camel-mime-message.c (construct_from_parser): Do
-	construct_from_parser for mime-message.
-	(_write_to_stream): Set the mime-version header for medium to
-	write out, rather than writing it out ourselves.
-
-	* camel-data-wrapper.c (set_mime_type_field): Ref the
-	content_field when we get it?
-	(construct_from_stream): Removed.
-	(camel_data_wrapper_construct_from_stream): Changed to a helper
-	function, creates a mime_parser, and constructs from that.
-	(set_input_stream): Removed.
-	(camel_data_wrapper_set_input_stream): Removed.
-	(get_input_stream): Removed.
-	(camel_data_wrapper_get_input_stream): Removed.
-
-	* camel-mime-parser.c (camel_mime_parser_unstep): New function.
-	Cause a subsequent call to mime_parser_step() to return the same
-	state over again.
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid):
-	Initial test code using the mime parser to construct the message.
-	(_get_message_by_uid): Use construct_from_stream() instead of
-	creating our own parser.
-
-	* camel-mime-part.c (construct_from_parser): part constructor.
-	(camel_mime_part_construct_content): Basically a simpler
-	replacement for the datawrapper repository.
-	(camel_mime_part_init): Set the default type to text/plain.
-	(camel_mime_part_construct_content): Removed to
-	camel-mime-part-utils.c
-	(my_get_output_stream): Removed.  The streeam is in the
-	data-wrapper.
-	(my_get_content_object): Removed.  The content object is stored in
-	the medium.  If none is there, the object wasn't created properly.
-	(my_write_content_to_stream): Removed.  The content object is the
-	one that knows how to write itself out!!!!!!!!
-	(my_write_to_stream): Remove the base header writing stuff - has
-	been moved to camel-medium, where it belongs.  This can just be
-	used to check for mandatory headers.
-	(my_construct_from_stream): Removed.
-	(my_set_input_stream): What the hell, i'll remove this too.
-	Nobody seems to understand how it differs from create from stream,
-	and they both seem to serve the same purpose ...
-
-	* camel-simple-data-wrapper.c (construct_from_parser): Initial
-	implementation of a content constructor.
-	(construct_from_stream): Removed!  Job taken over by
-	construct_from_parser.
-
-	* camel-multipart.c (construct_from_parser): Multipart
-	construction routine.
-	(camel_multipart_init): Set the default multipart type to
-	multipart/mixed.  Duh, no subtype is not allowed anyway.
-	(set_input_stream): REmoved.  Replaced by construct_from_parser.
-
-2000-04-22  Dan Winship  <danw@helixcode.com>
-
-	* camel-multipart.[ch]: clean, document, etc.
-	(camel_multipart_init): pick a prettier default boundary. Still
-	need to deal with the larger problem
-
-2000-04-22  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-message.h (struct _CamelMimeMessage): Removed
-	send_date, and received_date, and replaced it with a time_t
-	'date' (this is what the header is called), and date_offset to
-	store the GMT offset of the date.
-
-	* camel-mime-message.c (camel_mime_message_set_from): Update raw
-	header as we go.
-	(_set_from): Removed.
-	(_get_from): Removed.
-	(camel_mime_message_get_from): Moved implementation here.
-	(camel_mime_message_get_subject): Move implementation here.
-	(_get_subject): Nuked.
-	(camel_mime_message_set_subject): Handle utf-8 input, and also
-	update raw header when changed.
-	(_set_subject): Removed.
-	(_set_received_date): Removed.
-	(camel_mime_message_set_received_date): Removed.
-	(_get_received_date): Removed.
-	(camel_mime_message_get_received_date): Removed.
-	(_get_sent_date): Removed.
-	(camel_mime_message_get_sent_date): Removed.
-	(camel_mime_message_get_date): New function to get the date as a
-	time_t/offset.
-	(camel_mime_message_set_date): Set the date as a time_t/offset.
-	(camel_mime_message_get_date_string): Get the date as a string.
-	(camel_mime_message_init): Initialise the current date as
-	'CMAEL_MESSAGE_DATE_CURRENT'.
-	(_set_reply_to): Removed.
-	(camel_mime_message_set_reply_to): Moved implementation here.
-	This is still broken, reply-to can have multiple addresses.
-	(_get_reply_to): Removed.
-	(_set_field): Removed, no longer used anywhere.
-	(_get_field): Also removed.
-	(_init_header_name_table): Add the Date header.
-	(process_header): Also handle snooping of Date header here.
-
-	* camel-stream-filter.c (finalise): Unref the source stream on
-	finalise, and also call the parent class (oops).
-
-	* camel-mime-parser.c (camel_mime_parser_state): New function to
-	get the current parser state.
-	(camel_mime_parser_stream): Allow you to get the stream back from
-	the mime_parser.
-	(camel_mime_parser_fd): Alternative to allow you to get the fd
-	back from the mime_parser.
-	(folder_scan_init_with_stream): Properly ref/unref the stream.
-	(folder_scan_close): Properly unref the stream/close the fd on
-	exit.
-	(folder_scan_init_with_fd): Close the old fd if there is one.
-
-	* camel-data-wrapper.c (camel_data_wrapper_construct_from_parser):
-	New method, construct a data wrapper from an initialised parser.
-	(construct_from_parser): Empty implementation.
-	
-	* providers/mbox/camel-mbox-summary.c (message_struct_new):
-	Convert subject line to unicode, before storing in the summary.
-	(strdup_trim): Removed, no longer needed.
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): Ref
-	the folder after setting it in the new message.
-
-	* camel-mime-part.c (my_set_content_object): Have the headers
-	follow the content-type change here too.
-	(my_write_to_stream): Dont write content-type here, automatically
-	stored in the headers ...
-	(my_write_to_stream): Use header_disposition_format() to format
-	the content-disposition header.
-	(my_write_to_stream): Removed old code, all headers are now stored
-	in the camel-medium level, always.  Need to do the same with
-	camel-mime-message i suppose ...
-	(my_write_to_stream): Write the content using the parent class,
-	not some weird function.
-	(camel_mime_part_class_init): Dont override get_output_stream.
-	(camel_mime_part_encoding_from_string): Bleh, make it
-	case-insensitive.
-
-	* camel-mime-utils.c (header_content_type_is): Handle empty types.
-	(header_encode_string): Start of an implementation of the rfc2047
-	encoder.  It does iso-8859-1, and us-ascii, and utf-8 (others get
-	tricky *sigh*)
-	(rfc2047_encode_word): Convert a single word/string into rfc2047
-	encoding.
-	(quoted_encode): Different quoted-printable encoding for rfc2047
-	encoding of headers.
-
-	* gmime-content-field.c (gmime_content_field_write_to_stream): Use
-	header_content_type_format() to format it.
-
-2000-04-21  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.h: Add prototype for header_param_list_free.
-
-	* camel-recipient.c: New function to remove all the types of a
-	recipient list.  I think this whole object needs a major review.
-
-	* camel-mime-message.c (camel_mime_message_class_init): Removed
-	parse_header_pair override, override add_header instead.
-	(_parse_header_pair): Renamed to add_header.
-	(remove_header): Add this method, to make sure we keep upto date
-	with removed headers too.
-	(_set_field): If given a NULL value, clear it out.
-	(_set_recipient_list_from_string): Constify.
-	(set_header): Override set_header from camel_medium.
-	(process_header): Local function to handle set/add/remove of each
-	header we know about.
-
-	* camel-mime-part.c (camel_mime_part_class_init): Removed
-	parse_header_pair setup.
-	(my_parse_header_pair): Moved into add_header(), removed.
-	(my_set_disposition): Allow a NULL disposition to clear it.
-	(my_set_content_id): Allow NULL content id to clear it.
-	(remove_header): Track removed headers.
-	(my_set_description): Allow NULL description to clear it.
-	(my_set_content_MD5): Make sure we copy the md5 value, and allow a
-	NULL value to reset it.
-	(my_set_filename): Copy the filename.
-	(my_set_header_lines): Removed.  Nothing uses it, it doesn't
-	actually serve any purpose.
-	(camel_mime_part_set_header_lines): Ditto.
-	(my_get_header_lines): Ditto.
-	(camel_mime_part_get_header_lines): Ditto.
-	(camel_mime_part_class_init): Remove *_header_lines setup.
-	(camel_mime_part_init): Remove header_lines init.
-	(my_finalize): Remove header_lines finalise.
-	(my_write_to_stream): Write the headers here.  This is just WRONG,
-	camel_medium should be doing this.
-	(my_get_output_stream): Kill a warning.
-	(camel_mime_part_encoding_to_string): Ditto.
-	(camel_mime_part_set_description): Unvirtualiase, use add_header()
-	to do the processing.
-	(my_set_description): Removed.
-	(set_disposition): Renamed from my_set_disposition.
-	(camel_mime_part_get_description): Get the descriptionf rom the
-	get_header method.
-	(my_get_description): Removed.
-	(my_set_filename): Removed.
-	(camel_mime_part_get_filename): Get the parameter from the
-	disposition.
-	(camel_mime_part_encoding_from_string): Handle NULL string.
-	(camel_mime_part_init): Remove reference to filename.
-	(my_finalize): Dont free filename.
-
-	* camel-mime-part.h (CamelMimePartClass): Removed
-	parse_header_pair() method, it doesn't add anything that
-	add_header() can't be used for.
-	(CamelMimePartClass): Remove *_header_lines methods.
-	(struct _CamelMimePart): Remove header_lines list.
-	(struct _CamelMimePart): Removed filename attribute.
-
-	* camel-medium.c (camel_medium_init): Init headers to null, not a
-	hashtable.
-	(add_header): Append the headers as a list.
-	(remove_header): Remove headers as a list.
-	(get_header): Likewise for lookup.
-	(free_header): Removed, no longer needed.
-	(finalize): Free headers using header_raw_clear().
-	(camel_medium_set_header): New function, to reset and override all
-	values of a header with a new value.
-
-	* camel-medium.h (struct _CamelMedium): Changed to use a
-	header_raw struct rather than a hash table, to store headers
-	(many headers can occur multiple times).
-
-	* camel-mime-utils.c (header_raw_find_next): New function, allows
-	you to find multi-valued header fields.
-	(header_disposition_format): New function to format/create
-	content-disposition header string.
-	(header_param_list_format_append): Function to format parameter
-	lists into a GString.
-	(header_content_type_format): Function to format content-type into
-	a usable format.
-	(header_set_param): allow NULL value to remove the parameter.
-	(decode_token): Renamed from header_decode_token.
-	(header_decode_token): New interface for external use.
-	(quoted_decode): Made static to kill annoying warnings.
-	(g_strdup_len): Killed, replaced with calls to g_strndup().
-	(rfc2047_decode_word): Made static to kill warnings.
-	(decode_coded_string): Terminated.
-	(g_string_append_len): Made static to kill warnings.
-	(header_decode_text): Made static to kill warnings.
-	(header_decode_text): Constify.
-	(rfc2047_decode_word): Constify.
-	(header_param): Constify.
-	(header_content_type_new): Copy the type/subtype strings.
-	(header_param_list_decode): Made static.
-	(header_param_list_format_append): Made static.
-	(quoted_decode): Constify.
-	(g_string_append_len): Constify.
-	(header_token_decode): New function to decode a single token.
-
-	* providers/mbox/camel-mbox-summary.c (header_write): Append a
-	trailing \n when writing headers.
-	(strdup_trim): Killed a warning.
-	(camel_mbox_summary_set_uid): Make sure the next uid is at least 1
-	higher than any existing one.
-	(header_evolution_decode): Use header_token_decode to get the
-	token.
-
-	* camel-mime-parser.c (folder_scan_header): Strip the trailing \n
-	of the end of all header lines.
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-utils.[ch]: Removed.
-
-	* providers/mbox/camel-mbox-parser.[ch]: Removed.  Removed
-	references to it.
-
-2000-04-20  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-utils.c (rfc2047_decode_word): use libunicode iconv
-	functions rather than libc ones (since libc might not have them).
-	(header_decode_date): add autoconfiscation on timezone code
-
-	* camel.c (camel_init): call unicode_init ()
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c (message_struct_new): Trim
-	leading/trailing spaces off the raw headers.
-
-	* MERGE NEW_PARSER branch into HEAD, fixed conflicts.
-	
-	* gmime-content-field.c (_print_parameter): Duh, removed again
-	(@@#$@ cvs merge).
-
-	* camel-mime-utils.c (header_content_type_is): Constify.
-	(header_content_type_unref): Killed a couple warnings.
-
-	* camel-folder.c (_init): Removed more log crap.
-
-	* providers/Makefile.am (SUBDIRS): Removed nntp, pending fixes for
-	summary changes.
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_number):
-	Fixed for new summary interface.  Added a warning for using this
-	broken api.
-	(_get_message_by_uid): Fixed for message new with session
-	vanishing.
-
-2000-04-19  Dan Winship  <danw@helixcode.com>
-
-	* camel-simple-data-wrapper-stream.c
-	(camel_simple_data_wrapper_stream_get_type): This is a subtype of
-	CamelSeekableStream, not CamelStream.
-
-	* camel-seekable-substream.c: clean up a lot.
-	(eos): When testing for end-of-stream, reset the parent position
-	before testing if it is at end-of-stream, since either (a) it may
-	have been seek'ed to eos by someone else, or (b) we may have been
-	seek'ed away from eos and it hasn't been synced yet.
-
-	* camel-medium.[ch] (camel_medium_add_header): const poison.
-	(Belatedly goes with my change of 2000-02-23.)
-	(camel_medium_init): Use g_strcase_{hash,equal} on the header
-	array.
-	
-2000-04-18  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-part.c (my_set_input_stream): 
-	* camel-data-wrapper.c (set_input_stream, set_output_stream): do
-	better reference counting of streams so they actually go away
-	when they should.
-
-	* camel-log.[ch], *: Nuke camel log stuff. Replace calls to
-	CAMEL_LOG_WARNING with calls to g_warning.
-
-	* camel-data-wrapper.[ch]:
-	* camel-simple-data-wrapper.[ch]:
-	* camel-medium.[ch]: Clean, polish, document. Most of the gtk-doc
-	comments added to camel-data-wrapper.c note serious problems that
-	need to be fixed.
-
-2000-04-17  Dan Winship  <danw@helixcode.com>
-
-	* camel-mime-message.[ch]: Remove the "session" field from
-	CamelMimeMessage. Nothing uses it, about half of the existing
-	calls to camel_mime_message_new_with_session pass NULL, and
-	there's no obvious reason for it to be there.
-
-	* providers/MH/camel-mh-folder.c:
-	* providers/maildir/camel-maildir-folder.c:
-	* providers/mbox/camel-mbox-folder.c:
-	* providers/mbox/camel-mbox-utils.c:
-	* providers/nntp/camel-nntp-folder.c:
-	* providers/pop3/camel-pop3-folder.c: Use camel_mime_message_new
-	instead of camel_mime_message_new_with_session.
-
-	* camel-session.c (get_store_for_protocol_with_url): Set the
-	exception if no provider is found.
-
-	* camel-url.c: Add code to encode and decode %-escapes in URLs,
-	and do some additional correctness-checking on URL syntax. From
-	Tiago Ant�o with modifications by me.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/Makefile.am (SUBDIRS): add nntp
-
-2000-04-14  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c: Fix switch statement.
-
-2000-04-14  Chris Toshok  <toshok@helixcode.com>
-
-	* providers/nntp/camel-nntp-folder.c (_exists): always return TRUE
-	for now.  we need to check the server response to make sure the
-	group exists.
-	(_get_message_by_uid): make sure to account for the \n we add to
-	the string after every line.
-
-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): function
-	to get the headers using the XOVER command.
-	(get_HEAD_headers): function to get the headers using the HEAD
-	command on each message. slooooooow.
-	(camel_nntp_get_headers): make this function use either XOVER or HEAD
-	versions depending on whether or not the server extension is present.
-
-2000-04-14  Dan Winship  <danw@helixcode.com>
-
-	* camel-formatter.[ch]: This didn't belong in Camel. Move to mail/
-
-	* Makefile.am, camel-types.h: remove references to
-	camel-formatter.
-
-2000-04-12  Matt Loper  <matt@helixcode.com>
-
-	* camel-folder-pt-proxy.c (_folder_open_cb): Print warning message
-	for broken function.
-	(_folder_close_cb): Same.
-
-2000-04-12  Miguel de Icaza  <miguel@gnu.org>
-
-	* Makefile.am (pthread_SRC): Use correct names for the pthread
-	source variables.
-
-2000-04-10  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): fix various
-	bugs in APOP code (still untested) and some of the error cases.
-
-	* camel-provider.h: Clarify what provider.protocol, provider.name,
-	and provider.description should be.
-
-	* providers/mbox/camel-mbox-provider.c: 
-	* providers/pop3/camel-pop3-provider.c: 
-	* providers/sendmail/camel-sendmail-provider.c: 
-	* providers/smtp/camel-smtp-provider.c: update protocols, names,
-	and descriptions
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_number):
-	implement get_message_by_number for the mail fetch code.
-
-2000-04-09  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: reformatted to fit
-	the standard indent format used by helix code
-
-2000-04-09  Dan Winship  <danw@helixcode.com>
-
-	* camel-movemail.c: New file with new function to dot-lock an mbox
-	file and copy it to a safe private directory.
-
-2000-04-08  Christopher James Lahey  <clahey@helixcode.com>
-
-	* providers/smtp/.cvsignore: Added a .cvsignore file.
-
-2000-04-08  Dan Winship  <danw@helixcode.com>
-
-	* providers/sendmail/camel-sendmail-transport.c (_send_internal):
-	actually record the pid returned by fork(). Noticed by clahey.
-
-	* providers/smtp/camel-smtp-transport.c: #include <sys/param.h>
-	for MAXHOSTNAMELEN. (This is a stopgap: some of the uses of
-	MAXHOSTNAMELEN are wrong anyway...)
-
-2000-04-07  Jeffrey Stedfast  <fejj@stampede.org>
-
-	* providers/smtp/camel-smtp-transport.c: fixes to numerous bugs;
-	should now build fine.
-	* providers/Makefile.am: Readded smtp now that smtp builds without
-	error.
-
-2000-04-20  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.c
-	(camel_mbox_summary_next_uid): Public function to get the next
-	uid, makes sure its saved to disk too.
-
-	* camel-mime-part.c (my_finalize): Fix disposition crap with a
-	real disposition.
-	(my_set_disposition): Likewise.
-	(my_get_disposition): And here.
-	(my_write_to_stream): And here, needs more cleanup.
-
-	* providers/mbox/camel-mbox-folder.c (_append_message): Assign a
-	new uid at this point.
-
-	* gmime-content-field.c (gmime_content_field_write_to_stream):
-	Make something up if we have an invalid/missing content type
-	(i.e. text/plain).
-
-2000-04-19  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (_delete): Fixed completely
-	broken switch() syntax, only compiled because errno is a macro on
-	some systems.
-	(_list_subfolders): Likewise.
-
-2000-04-18  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-parser.c (folder_scan_init): init stream to null.
-
-	* providers/mbox/camel-mbox-summary.c
-	(CAMEL_MBOX_SUMMARY_VERSION): Moved to .c file, incremented.
-	(index_folder): Changed to have index passed via the summary.
-	(decode_string): Do a sanity check on the string size, so we dont
-	visit g_malloc()'s friendly abort().
-
-	* camel-folder-pt-proxy.c (camel_folder_pt_proxy_class_init):
-	Removed reference to set_name.
-	(_set_name): Removed.
-
-	* providers/mbox/camel-mbox-utils.c
-	(parsed_information_to_mbox_summary): Removed.  Most of this file
-	is about to be binned.
-
-	* providers/mbox/camel-mbox-search.c (func_header_contains): Fixes
-	for changes to summary interface.
-	(struct _searchcontext): Remove pointer to message info, get it
-	straight from the mboxsummary.
-	(camel_mbox_folder_search_by_expression): New summary interface.
-	(camel_mbox_folder_search_by_expression): Uh, the summary is not
-	an object anymore (well not yet).
-
-	* providers/mbox/camel-mbox-folder.c
-	(camel_mbox_folder_class_init): Removed set_name init.
-	(_set_name): Removed.
-	(_open): Call new summary interface.
-	(_close): Use new summary interface.
-	(_create): Removed a summary object leak.
-	(_get_message_count): New summary interface.
-	(_get_uid_list): Use new summary interface. FIXME: this is leaky.
-	(_get_message_by_uid): Use the new summary interface, some
-	cleanup.
-	(_append_message): Totally changed, basically just appends the
-	message directly, ignores the summary (for now), the summary will
-	fix itself up if it needs to.
-	(_check_get_or_maybe_generate_summary_file): Bye bye old code.
-	(summary_get_message_info): Implement get_message_info again, for
-	folder.
-
-	* camel-folder.c (camel_folder_class_init): Removed set_name
-	setup.
-	(_set_name): Moved contents into _init.
-	(_init): Perform the old functions of set_name here.
-
-	* camel-folder.h: Removed the set_name internal interface.
-
-2000-04-14  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-summary.[ch]: Completely replaced with
-	new code.
-
-	* Makefile.am (libcamel_la_SOURCES): Removed
-	camel-folder-summary.[ch].
-
-	* camel-folder.h (struct _CamelFolder): Removed summary.
-	(struct _CamelFolder): Changed flags to be 1 bit bitfields.
-
-	* camel-folder-summary.[ch]: Class removed entirely.
-
-	* camel-folder.c (camel_folder_get_summary): Removed.
-	(camel_folder_summary_get_message_info): Moved from
-	camel-folder-summary.c
-	(camel_folder_summary_get_subfolder_info): Moved from
-	camel-folder-summary.c
-
-	* camel-mime-parser.c (folder_scan_step): Store the start of
-	headers and start of from in the scan state.
-	(camel_mime_parser_tell_start_headers): Query the start of the
-	headers.
-	(camel_mime_parser_tell_start_from): Query the cached start of
-	from marker.
-
-2000-04-13  NotZed  <NotZed@HelixCode.com>
-
-	* gmime-content-field.c (gmime_content_field_free): Removed this
-	function.  If its too dangerous to use, it shouldn't be here.
-	(gmime_content_field_ref): Also ref the embedded content-type.
-	(gmime_content_field_unref): Ditto to unref it.
-
-	* camel-mime-utils.h: Add a refcount for content-type header.
-
-	* camel-mime-utils.c (header_content_type_unref): Implement unref
-	for content-type.
-	(header_content_type_ref): Implement ref for header content type.
-
-2000-04-12  NotZed  <NotZed@HelixCode.com>
-
-	* gmime-content-field.h: Changed to use a _header_content_type.
-	Added type/subtype back for compatability with clients.
-	
-	* gmime-content-field.c: Basically a total rewrite, and now just a
-	thin wrapper ontop of header_content_type.
-	(_free_parameter): Got rid of it.
-	(gmime_content_field_new): Use header_content_type_* functions.
-	(gmime_content_field_set_parameter): Likewise.
-	(_print_parameter): Blow away.
-	(gmime_content_field_write_to_stream): Get details from the
-	content_type field.  Should check if it needs to escape chars in
-	the paramter value.
-	(gmime_content_field_get_mime_type): Likewise.
-	(___debug_print_parameter): Get rid of this rather annoyingly
-	named function.
-	(gmime_content_field_get_parameter): Simplified function.
-	(gmime_content_field_construct_from_string): Fixed this to use a
-	real parser.
-	(gmime_content_field_is_type): New function to test if a type matches.
-	(gmime_content_field_construct_from_string): Track type/subtype
-	from subordinate content_type header struct.
-
-	* gmime-rfc2047.[ch]: Removed.  Unused.
-
-	* camel-stream-b64.[ch]: Blown away more duplicated code.
-
-	* Makefile.am: Removed camel-stream-b64.[ch], and
-	gmime-base64.[ch].
-
-	* camel-mime-part.c (my_get_content_object): Replaced
-	camel-stream-b64 with camel-stream-filter/camel-mime-filter-basic.
-	(my_write_content_to_stream): Replaced camel-stream-b64 with the
-	camel-stream-filter with an encoder.
-	(my_get_content_object): Also implement quoted-printable decoding.
-	(my_write_content_to_stream): Also implement quoted-printable
-	encoding.
-	(my_get_output_stream): Took out stream-b64 code (nothing's being
-	executed yet anyway).
-
-	* gmime-base64.[ch]: Blown away.  Not used, dont need it.
-
-	* camel-mime-utils.h: Added offset for this header.  Records where
-	it is in the source.
-
-	* camel-mime-utils.c (header_raw_append_parse): Add offset
-	parameter, to store where the header is stored in the stream.
-	(header_raw_append): Added offset param.
-	(header_raw_find): Return offset, if a pointer supplied for it.
-	(header_raw_replace): Add offset param.
-	(header_content_type_new): New function, to create an empty
-	content type.
-	(header_content_type_set_param): Set a parameter in the
-	content-type.
-	(header_set_param): Generic header parameter setting function.
-	(header_decode_string): Handle NULL input.
-
-	* camel-mime-parser.c (camel_mime_parser_headers_raw): New
-	function to get access to all the raw headers.
-	(folder_scan_header): Keep track of the header start position, and
-	store it when saving the header.
-
-2000-04-11  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-utils.c: Moved a bunch of printf's to debug.
-
-	* camel-mime-parser.c: Moved a bunch of printf's to debug.
-	(folder_scan_header): Detect end of each header line using the
-	last scanned char, and not the last scanned position.
-
-	* camel-mime-filter-index.[ch]: Indexing filter.  Indexes unicode
-	sequences into ibex files.
-
-2000-04-09  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c: Dont include gmime-base64.h
-
-	* camel-mime-filter-charset.c (complete): Implement the completion
-	function.
-
-	* camel-mime-parser.c (folder_scan_step): If we get to the end of
-	the body data, check any filters for outstanding completion data.
-	(camel_mime_parser_scan_from): Set whether we scan for "From "
-	headers or not.
-
-	* camel-stream-filter.c (do_read): If we get to end of stream on
-	the source, then call the filtering completion function to see if
-	we have any more data to return.
-
-	* camel-mime-filter-basic.c (filter): Implement quoted printable
-	encoding and decoding filters.
-	(complete): And the complete function as well.
-
-	* camel-mime-utils.c (base64_encode_close): Also take an input
-	buffer, allow closing of filters.
-	(quoted_encode_step): First cut, simple quoted-printable encoder.
-	Doesn't handle trailing spaces/tabs on end of line properly yet.
-	(quoted_encode_close): Complete a quoted-encoding.
-	(is_qpsafe): New type check, for quoted-printable safe characters
-	(that do not need encoding).  Thats all bits used in the type
-	table!  Rebuilt the types table.
-	(header_content_type_is): Checks a content type against at
-	type/subtype match.
-	(header_content_type_param): Handle NULL content type pointer.
-
-2000-04-08  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-filter-basic.c (filter): Implement the base64
-	encoder.  Problem is, there is no way to know when to close it.
-	Close/Reset will have to provide the same args as filter, so it can
-	flush remaining data *sigh*
-
-	* camel-mime-utils.c (base64_encode_step): A rather complex base64
-	encoder, fast?
-	(base64_step_close): Companion function to finish off the base64
-	sequence.
-
-	* camel-mime-part.c (my_write_content_to_stream): Changed to use
-	camel_stream_write_to_stream().
-
-	* camel-stream.[ch] (camel_stream_write_to_stream): From
-	camel_stream_b64_write_to_stream().  Fixed some infinite loop
-	bugs with error conditions.
-
-	* camel-stream-b64.[ch] (camel_stream_b64_write_to_stream): Removed.
-	This has nothing to do with stream-b64, so i've moved it to
-	CamelStream.
-
-	* camel-mime-utils.h: Add a comment about refcounting
-	header_content_type struct.
-
-	* Makefile.am: Added camel-stream-filter*.[ch].
-
-	* camel-stream-filter.[ch]: Class to implement a generic
-	(multipass) filter ontop of a stream.  Only implements a read-only
-	stream.
-
-	* camel-mime-parser.c (camel_mime_parser_filter_add): Ref the
-	filter we just added.
-
-	* Makefile.am: Added camel-mime-filter*.[ch].
-
-	* camel-mime-filter-charset.[ch]: A filter to preform character set
-	conversion (uses unicode_iconv).
-
-	* camel-mime-filter-save.[ch]: A simple filter which will save all
-	data directly to a file or file descriptor.
-
-	* camel-mime-filter-basic.[ch]: Implements the basic mime filters,
-	base64 and quoted-printable decoding (encoding not implemented yet).
-
-	* camel-mime-filter.[ch]: A filtering class, which can filter streams
-	of data without having to copy them.  Simpler than stream classes,
-	and can be plugged into a single stream class (when i write it).
-
-2000-04-07  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Clarify error
-	messages.
-	(finalize): fix a bug in camel_exception usage
-	(pop3_connect): Remember the password after asking for it the
-	first time.
-
-2000-04-07  NotZed  <NotZed@HelixCode.com>
-
-	* Makefile.am: Added camel-mime-parser/camel-mime-utils.
-
-	* camel-mime-parser.c: Fast mime parser.
-
-	* camel-mime-utils.c: Mime utility functions, and email header
-	parsers.
-
-2000-04-07  NotZed  <NotZed@HelixCode.com>
-
-	* providers/Makefile.am: Removed smtp for now, its a long way from
-	building.
-	* providers/smtp/Makefile.in: Removed file that shouldn't have been
-	checked in.
-
-2000-04-06  Matt Loper  <matt@helixcode.com>
-
-	* camel-folder-pt-proxy.c (_get_full_name): Remove exception param
-	from get_full_name() called, since get_full_name() was changed to
-	not have an exception in the last param (see dan's notes below).
-	(_get_name): same.
-
-2000-04-06  Dan Winship  <danw@helixcode.com>
-
-	* camel-store.[ch]: Reorganize the folder-fetching methods and
-	implement a folder cache so that multiple requests for the same
-	folder will yield the same CamelFolder object (as long as it
-	remains active). Includes some code to remove no-longer-active
-	folders from the cache, but it doesn't get used since nothing is
-	ever unref'ed in Camel right now...
-	
-	* providers/mbox/camel-mbox-store.c:
-	* providers/pop3/camel-pop3-store.c: update for CamelStore
-	changes.
-
-	* camel-folder.[ch]: Remove the (unused) CamelException argument
-	from camel_folder_get_name and camel_folder_get_full_name.
-	(camel_folder_set_name): make this go away since changing a
-	folder's name after it has been created could result in it
-	conflicting with a separately-issued folder.
-	
-2000-04-05  Dan Winship  <danw@helixcode.com>
-
-	* g_url_new really wanted to take a CamelException. So, rename
-	Gurl to CamelURL, g_url_* to camel_url_* (with camel_url_new
-	taking an exception), and url-util.[ch] to camel-url.[ch]. Also
-	force url->port to be numeric and remove camel_service_getport. (I
-	was confused before: the URL RFC says the port must be numeric, so
-	we don't want to do getportbyname.)
-
-2000-04-01  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c
-	(_check_get_or_maybe_generate_summary_file): Compare
-	mbox_file_size and mbox_modtime to the results of stat()ing the
-	mbox file, not the summary file. Duh.
-	(_close): Update the summary's mbox_file_size and mbox_modtime
-	before writing it to disk.
-
-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_save,
-	camel_mbox_summary_load): Wow. I must have been tired when I wrote
-	this code. First, the comparison bug above. Second, it was using
-	ntohs and htons instead of ntohl and htonl. Third, I was reading
-	the status flag byte in two different places and thus getting out
-	of sync. Fourth, it was writing out field_length bytes of each
-	header field after having converted field_length to network byte
-	order, resulting in lots of random crap being appended, and the
-	summary files being huge. (Fortunately, since the size/modtime
-	comparison was biffed, the garbage summary read from disk was
-	always immediately discarded.)
-
-	* providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): fix
-	an off-by-one error that caused the last-used UID to be reused if
-	the summary file was regenerated. (That one wasn't my fault. :-)
-
-2000-03-31  Dan Winship  <danw@helixcode.com>
-
-	* camel-stream-mem.c: implement unimplemented methods
-
-	* gmime-content-field.c
-	(gmime_content_field_construct_from_string):
-	* data-wrapper-repository.c
-	(data_wrapper_repository_get_data_wrapper_type):
-	* camel-simple-data-wrapper.c (my_write_to_stream):
-	* camel-mime-part.c (my_set_input_stream):
-	remove debugging printf()s that no longer seem useful.
-
-2000-03-31  Matt Loper  <matt@helixcode.com>
-
-	* camel-formatter.c (text_to_html): Added "convert_newlines_to_br"
-	boolean param, to give the option of not converting '\n's to <br>
-	tags. This way, when we stick stuff in a <pre> tag, newlines stay
-	newlines.
-
-2000-03-30  Matt Loper  <matt@helixcode.com>
-
-	* camel-formatter.c (handle_text_plain): Use <pre> tag to force
-	the use of monospaced fonts.
-
-2000-03-30  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (camel_service_getport): Add a htons in the
-	default_number case, and document the fact that the function
-	returns the port in network byte order.
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Revert
-	Miguel's change. The port number bug was actually somewhere
-	else, and the IP address copying code was fine already.
-	
-2000-03-29  Miguel de Icaza  <miguel@gnu.org>
-
-	* providers/pop3/camel-pop3-store.c (pop3_connect): Add htons
-	(port), and only copy 4 bytes for the IP address to prevent a DNS
-	attack. 
-
-2000-03-28  Dan Winship  <danw@helixcode.com>
-
-	* camel-seekable-substream.c
-	(camel_seekable_substream_new_with_seekable_stream_and_bounds):
-	make this return a CamelStream rather than a
-	CamelSeekableSubstream, because that's the way Gtk objects tend to
-	work.
-
-	* camel-service.c (camel_service_gethost,
-	camel_service_getport): convenience functions to canonicalize
-	the host and port values of a service's URL.
-	* providers/pop3/camel-pop3-store.c: use them
-
-	* providers/mbox/camel-mbox-folder.c
-	(_check_get_or_maybe_generate_summary_file): Make this work when
-	the inbox file doesn't yet exist.
-
-2000-03-27  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (_append_message): uncomment
-	the call to unlink the temp file: there's no way to tell
-	camel_stream_fs to truncate a file, so reusing the same file was
-	resulting in junk at the ends of messages.
-
-	* camel-folder.[ch]: add delete_message_by_{number,uid}.
-
-	* providers/pop3/camel-pop3-folder.[ch]: implement
-	delete_message_by_uid. Add a close method to do expunging
-	of deleted messages if requested.
-
-	* providers/pop3/camel-pop3-store.[ch]: support for
-	CamelPop3Folder::close. (You have to close the connection
-	in order to expunge the folder, thus the store may be
-	connected in the CamelService::is_connected sense when it
-	is not actually connected to the server.) Also some bugfixes.
-
-2000-03-27  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-folder.c (_append_message): Unref the
-	output_stream when done, close doesn't do it.
-	(_append_message): Clear all uid's from the appending messages, so
-	they are reassigned proper unique id's.
-
-	* gmime-utils.c (get_header_array_from_stream): Actually free the
-	header, it is copied elsewhere.
-
-2000-03-26  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): Added
-	folder parameter to function.  Fixed callers.
-	(index_message): Index a message as it is assigned a unique id.
-
-	* camel-mime-part.c (my_set_content_id): Make sure we malloc and
-	copy the content_id, otherwise *poof*
-
-2000-03-25  NotZed  <NotZed@HelixCode.com>
-
-	* camel-medium.c (_finalize): Another leak, unref the content if
-	finished with it.
-
-	* camel-recipient.c (camel_recipient_table_free): Plug another
-	memory leak - actually free the recipient table.
-
-	* camel-mime-message.c (_finalize): Plugged a memory leak with the
-	flags table.
-
-	* gmime-utils.c (_store_header_pair_from_string): A simpler, more
-	debuggable and functionally identical header extraction function.
-
-2000-03-24  NotZed  <NotZed@HelixCode.com>
-
-	* gmime-content-field.c (gmime_content_field_set_parameter):
-	Remove the hash table entry before freeing its key and data.
-
-2000-03-27  Dan Winship  <danw@helixcode.com>
-
-	* providers/Makefile.am (SUBDIRS): Add pop3.
-
-	* providers/pop3/camel-pop3-store.c: keep separate input and
-	output streams so the output doesn't end up being buffered.
-
-	* providers/pop3/camel-pop3-folder.c (get_message_by_number):
-	finish implementing this.
-
-2000-03-27  Michael Meeks  <michael@helixcode.com>
-
-	* camel-mime-part.c (my_set_disposition): fix so less broken.
-	(my_finalize): remove dodgy disposition free.
-
-	* camel-data-wrapper.c (my_set_mime_type_field): unref instead of
-	free on mime_type.
-
-2000-03-27  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (camel_service_free_auth_types): new routine to
-	free the data allocated by camel_service_query_auth_types.
-
-	* providers/pop3/camel-pop3-store.c (free_auth_types): implement
-
-	* camel-stream-mem.c (camel_stream_mem_new_with_buffer): rename
-	camel_stream_mem_new_with_buffer to ..._with_byte_array and add a
-	new ..._with_buffer that takes a char * rather than a GByteArray.
-
-	* Remove CamelStreamBufferedFs, since CamelStreamBuffer makes it
-	redundant.
-
-2000-03-25  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder-summary.[ch]: change the CamelFolderSummary
-	interfaces to allow partial summary queries (for dealing
-	with very large folders). Remove the "extended_fields" from
-	CamelFolderInfo and CamelMessageInfo: this is better dealt
-	with by subtyping.
-
-	* providers/mbox/camel-mbox-summary.[ch]: Make CamelMboxSummary a
-	subclass of CamelFolderSummary. Update interfaces for that. Remove
-	the internal/external summary distinction. Remove the (unused) md5
-	checksum in the folder summary. Change the summary file format
-	(primarily to make it no longer byte-order dependent) and add a
-	version number to it so it will be easier to change in the future.
-	
-	* providers/mbox/camel-mbox-folder.[ch]
-	* providers/mbox/camel-mbox-search.c
-	* providers/mbox/camel-mbox-utils.c: update for summary changes
-
-	* camel-exception-list.def: add
-	CAMEL_EXCEPTION_FOLDER_SUMMARY_INVALID
-	
-2000-03-23  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-provider.c: Added flag to provider
-	initialisation, to match changed structure.
-
-2000-03-22  NotZed  <NotZed@HelixCode.com>
-
-	* camel-folder.[ch]: Added async search api.
-
-	* providers/mbox/camel-mbox-search.c
-	(camel_mbox_folder_search_by_expression): Changed to use an
-	asynchronous interface.
-	(camel_mbox_folder_search_cancel): Cancel function for async
-	interface.
-
-2000-03-23  Dan Winship  <danw@helixcode.com>
-
-	* camel-stream-buffer.c (camel_stream_buffer_read_line): Function
-	to read one line of any size from a stream and return it in
-	allocated memory.
-
-2000-03-22  Dan Winship  <danw@helixcode.com>
-
-	* camel-service.c (camel_service_query_auth_types): New function
-	to query a service for the authentication protocols it supports.
-	* providers/pop3/camel-pop3-store.c (query_auth_types): implement
-
-	* camel-provider.c (camel_provider_scan): New function to
-	scan the provider dir and return a list of all providers.
-
-	* providers/pop3/camel-pop3-folder.c: fill this in partially
-	* providers/pop3/camel-pop3-store.c: make camel_pop3_command
-	return the text after "+OK"/"-ERR" and add a separate
-	camel_pop3_get_additional_data to get the message body or
-	whatever. Also make them take a CamelPop3Store rather than
-	a CamelStreamBuffer.
-
-2000-03-22  Matt Loper  <matt@helixcode.com>
-
-	* camel-formatter.c (debug): Disabled some useless debug
-	messaging.
-
-2000-03-21  Dan Winship  <danw@helixcode.com>
-
-	* providers/pop3: some initial bits of the POP3 provider, to
-	make Matt happy. Incomplete, untested, etc.
-
-2000-03-21  bertrand  <bertrand@helixcode.com>
-
-	* providers/mbox/camel-mbox-summary.c 
-	(camel_mbox_summary_append_internal_to_external): copy the size field
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): initialize 
-	message_info to NULL
-
-	* camel-folder-summary.h: added the size field.
-
-	* providers/mbox/camel-mbox-summary.h: 
-	added the received_date field.
-
-	* providers/mbox/camel-mbox-summary.c:
-	documented all functions.
-
-	* camel-folder-summary.h: name change and 
-	new fields.
-
-	* providers/mbox/camel-mbox-search.c: update to 
-	conform to name change in the summary fields.
-
-2000-03-10  bertrand  <bertrand@helixcode.com>
-
-	* camel-service.h: cosmetic changes.
-
-2000-03-09  Dan Winship  <danw@helixcode.com>
-
-	* s/HelixCode/Helix Code, Inc./ in the copyrights
-
-2000-03-07  bertrand  <bertrand@helixcode.com>
-
-	* camel-formatter.c (handle_mime_part): 
-	plug mem leaks due to bad documentation
-	of camel_content_field_get_mime_type
-	(print_camel_body_part): idem
-	(handle_multipart_alternative): idem
-
-	* gmime-content-field.c (gmime_content_field_get_mime_type): 
-	documentation fix.
-
-
-	* camel-mime-part.c (my_finalize): unref the 
-	content_input_stream if any. 
-
-2000-03-06  bertrand  <bertrand@helixcode.com>
-
-	* camel-stream-fs.c (_seek): fix a bogus calculation
-	in the return position.
-
-2000-03-05  bertrand  <bertrand@helixcode.com>
-
-	* camel-session.h: cosmetic fixes.
-
-	* camel-stream-fs.c (_read): 
-	(_seek): fixed the current position so that it refers
-	to the current position in the stream, not in its parent.
-
-2000-03-04  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-search.c
-	(camel_mbox_folder_search_by_expression): Ref the summary
-	after we have got it.
-
-2000-03-04  bertrand  <bertrand@helixcode.com>
-
-	* camel-mime-part.c (my_write_content_to_stream): 
-	stream the raw content instead of nothing if the encoding
-	is not supported.
-
-	* camel-stream-fs.c (_seek): handle eos more
-	properly.
-
-	* camel-formatter.c (get_bonobo_tag_for_object): 
-	bonobo-goad-id is the good key to look for. 
-	(get_bonobo_tag_for_object): close the <object> tag.
-	(get_bonobo_tag_for_object): the correct syntax for the
-	to set a parameter inside an <object> tag is :
-	<object classid="..."> <param name="uid" value="..."> <param ...>
-	</object>
-
-2000-03-03  bertrand  <bertrand@helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): 
-	use set_input_stream instead of construct_from_stream
-	to feed the message object. 
-
-	* camel-data-wrapper.c (my_write_to_stream): reset output stream.
-	(my_set_input_stream): unref the previous input stream.
-	use the set_output_stream for default behaviour.
-	(my_set_output_stream): unref previous output stream.
-
-	* camel-mime-part.c (my_write_content_to_stream): reset content
-	object output stream.
-
-2000-03-03  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): Make
-	sure we open with create with a creation mask.
-
-2000-03-01  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_content_from_stream): DO NOT assert on
-	content type, we have fallback code 4 lines below it ... *sigh*
-
-2000-02-29  NotZed  <NotZed@HelixCode.com>
-
-	* Makefile.am (libcamelinclude_HEADERS): Added camel-stream-buffer
-	to build.
-
-	* camel-stream-buffer.[ch]: Generic buffer which can be applied to
-	any stream.
-
-2000-03-03  bertrand  <bertrand@helixcode.com>
-
-	* camel-formatter.c (handle_image): in the case
-	of images, put the content object output stream
-	in the url. This allows the message browser
-	to show inline images.
-
-	* camel-stream-b64.c (my_read_encode): fixed state
-	0 keep value. 
-
-2000-03-02  bertrand  <bertrand@helixcode.com>
-
-	* camel-stream-b64.c (my_read_encode): don't forget to 
-	set the state to 0 after 3.
-	(my_read_encode): don't forget to encode, even in state 3.
-
-	* camel-simple-data-wrapper.c: static functions are prefixed 
-	with my_ instead of _
-	* camel-multipart.c: static functions are prefixed 
-	with my_ instead of _
-	(my_write_to_stream): commented.
-	(my_write_to_stream): warning in case the boudary is set
-	but is a zero length string.
-
-	* camel-mime-part.c (camel_mime_part_encoding_from_string): 
-	remove debug trace. 
-	
-	* camel-mime-part.c: Replaced all static functions
-	with name begining with _ by the same name begining
-	with "my_" to prevent the possible conflicts 
-	with system symbols Dan warned us about. 
-	
-	* camel-stream-b64.c (camel_stream_b64_write_to_stream): 
-	use CamelStreamB64 type for the input stream.
-
-	* camel-mime-part.c (_get_content_object): remove 
-	debugging trace
-	(_write_content_to_stream): implement the b64 
-	encoding the new way (that is using camel_stream_b64)
-
-	* camel-data-wrapper.c (my_write_to_stream): 
-	fix implementation so that it writes properly
-	to the output stream even.
-
-	* camel-stream-b64.c (camel_stream_b64_write_to_stream): 
-	fix implementation. 
-
-2000-02-29  bertrand  <bertrand@helixcode.com>
-
-	* camel-stream-b64.c (camel_stream_b64_write_to_stream): new
-	utility function. 
-
-	* camel-data-wrapper.c (_write_to_stream): default
-	implementation. 
-
-	* gmime-utils.c (_store_header_pair_from_string): 
-	revert strange changes. 
-
-	* camel-stream-b64.c (my_read_decode): set eos to true when we
-	have read the whole input stream. 
-	(my_reset): set eos to FALSE.
-
-2000-02-28  NotZed  <NotZed@HelixCode.com>
-
-	* camel-mime-part.c (_parse_header_pair): Dont free this either.
-
-	* camel-medium.c (_remove_header): Ugh, dont free the header
-	before we actually remove it.
-	(_add_header): Ugh, dont free hashtable entries which may be
-	duplicated (hash_insert _will_ reference that memory).
-
-	* string-utils.c (string_trim): Trimming a 0-length string is not
-	an error.
-
-	* camel-mime-message.c (_parse_header_pair): Fixed very broken
-	memory handling of header_name/value.
-
-	* providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev):
-	Initialise end_of_last_message always.
-	(camel_mbox_copy_file_chunk): Stop trying to read if we run out of
-	data, rather than looping forever.
-	(camel_mbox_write_xev): Use an open flag when opening with create.
-
-	* camel-folder.c (camel_folder_search_by_expression): No, its not
-	a fatal error to search on a non-searchable folder, you just dont
-	get any matches.
-	(_open): Dont open an opened folder (i dont see why this is really
-	a bug, but what the hell ...)
-
-	* providers/mbox/camel-mbox-folder.c (_init): Set search cap on.
-	(_open): Call parent class to perform open.  Remove folder-open
-	check to parent instead.
-	(_create): open takes a creation mask, dont use umask to try and
-	set the open mode.
-	(_delete): Dont bother checking folder==NULL, its already been
-	checked on the external interface (changed to an assertion, this
-	would have to be a camel bug).
-	(_delete_messages): Likewise.
-	(_create): Ditto.
-	(_init): Dont go and clear all the paths and shit that the parent
-	open just setup for us.
-	(_delete_messages): Get rid of more umask stuff.
-	(_append_message): Make sure we pass file mode to open with create.
-	(_append_message): Cleaned up some indenting to make it readable.
-
-	* camel-stream-b64.c (my_read_encode): Fixed a typo.
-
-	* providers/mbox/camel-mbox-search.c: Changed to use e-sexp,
-	rather than filter-sexp.
-
-2000-02-28  bertrand  <bertrand@helixcode.com>
-
-	* camel-stream-b64.c (my_read_encode): encoding
-	filter.
-
-2000-02-23  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel-stream-b64.c: changed the __static 
-	suffix into a my_ prefix. 
-	(camel_stream_b64_set_mode): reset the persistent
-	status. 
-	(my_read_decode): remove superfluous %
-	
-	* providers/mbox/camel-mbox-utils.c (camel_mbox_copy_file_chunk): 
-	fix exception description message.
-
-2000-02-24  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.c: Add camel_session_get_transport_for_protocol.
-
-	* camel-transport.h:
-	* camel-transport.c: Add an abstract CamelTransport class.
-
-	* providers/sendmail/*: A CamelTransport that uses sendmail
-	to deliver mail.
-
-2000-02-24  Dan Winship  <danw@helixcode.com>
-
-	* camel-folder.c: use CamelExceptions for run-time errors, not
-	incorrect code. Don't bother validating that an object exists from
-	inside one of its methods, since you couldn't have gotten there if
-	it didn't. Fix some code style bugs.
-
-	(_init): Rename init_with_store to init and add parent_folder,
-	separator, and name arguments.
-	(_set_name): Get separator from self, not parent_store now.
-
-	* camel-store.h:
-	* camel-store.c: Remove get/set_separator.
-
-	* providers/mbox/: Update for above.
-
-2000-02-23  Dan Winship  <danw@helixcode.com>
-
-	* camel-medium.c (_finalize): Free the data in the headers hash
-	table.
-	(_add_header): g_strdup the header name and value when adding it.
-
-	* camel-mime-part-utils.c
-	(camel_mime_part_construct_headers_from_stream): Free the header
-	data after calling camel_medium_add_header, since it will have
-	g_strdup()ed it itself.
-
-2000-02-22  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-search.c: Dont compile by default.
-
-	* providers/mbox/Makefile.am: Fuck off the filter code.
-
-2000-02-22  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel-stream-b64.c (read_decode__static): 
-	don't read the char if we reached the length
-	of the output buffer. Hours lost on this
-	%$!@# bug : 3.5
-
-	* camel-folder.c (camel_folder_get_subfolder): 
-	(camel_folder_create): 
-	(camel_folder_delete): 
-	(camel_folder_delete_messages): 
-	(camel_folder_list_subfolders): 
-	(camel_folder_expunge): 
-	(camel_folder_get_message_by_number): 
-	(camel_folder_get_message_count): 
-	(camel_folder_append_message): 
-	(camel_folder_copy_message_to): 
-	(camel_folder_get_summary): 
-	(camel_folder_get_message_uid): 
-	(camel_folder_get_message_by_uid): 
-	(camel_folder_get_uid_list): 
-	Check folder state (open/close) and raise an
-	exception if it is not ok. 
-	
-	* providers/mbox/camel-mbox-folder.c (_create): 
-	create the file and the path with two different
-	names.
-
-	* camel-folder.c (_create): handle the case 
-	when the folder name starts with '/'
-
-	* camel-exception.c (camel_exception_new): use 
-	(void) instead of () in decl.
-
-	* camel-exception.h: cosmetic fixes.
-
-	* camel-exception.c (camel_exception_init): new routine.
-	Fix a bug in mail/message-list.c
-	
-
-	* camel-folder.h: cosmetic changes.
-
-	* camel-stream-b64.c (reset__static): added a
-	reset method. Thanks message-browser to find
-	so much bugs :)
-
-	* providers/mbox/Makefile.am (libcamelmbox_la_LIBADD): readd
-	Unicode libs.
-
-2000-02-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel-formatter.c (lookup_unique_id): 
-	awful hack to test get_output_stream.
-	* camel-stream-b64.[ch] :
-	b64 encoding/decoding is now implemented as
-	a stream. 
-	
-
-2000-02-21  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel-seekable-substream.c (_reemit_parent_signal): 
-	emit "data_available" when parent stream emits it. 
-
-
-2000-02-21  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/Makefile.am: Uh, fixed LIBADD again.  What was
-	there was never ever going to work, wasn't it tested?
-
-
-2000-02-21  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.h: (struct _CamelSession): Add authenticator.
-
-	* camel-session.c (camel_session_new): Add authenticator.
-	(camel_session_query_authenticator): New function to query the
-	session authenticator for password, etc, information.
-
-2000-02-21  Dan Winship  <danw@helixcode.com>
-
-	* camel-session.c: add CamelExceptions to several functions. Use
-	camel_session_new to initialize the session and URL fields of
-	created CamelStores as appropriate.
-
-	* camel-store.h:
-	* camel-store.c
-	* camel-service.h:
-	* camel-service.c: Move the session and url (and associated
-	functions) from CamelStore to CamelService. Add url_flags to
-	CamelService so subclasses can specify which URL components
-	are mandatory for them.	Add camel_session_new for
-	camel_session_get_store* to use.
-
-	* providers/mbox/camel-mbox-folder.c:
-	* providers/mbox/camel-mbox-store.c:
-	* providers/mbox/camel-mbox-store.h: Update for above changes.
-
-	* camel-exception-list.def: Once camel is being used for real,
-	exceptions won't be renumberable. So renumber them now to make
-	more room to add exceptions to the various categories later, and
-	add a big warning message.
-
-2000-02-20  Dan Winship  <danw@helixcode.com>
-
-	* providers/mbox/Makefile.am: add libibex back to
-	libcamelmbox_la_LIBADD
-
-2000-02-18  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/camel-mbox-search.h
-	(camel_mbox_folder_search_by_expression): Added exception to call,
-	and fixed caller.
-
-	* providers/mbox/camel-mbox-search.c
-	(camel_mbox_folder_search_by_expression): Major changes, to use
-	the sexp evaluator from filter/filter-sexp.c to implement the
-	searching.
-	(func_body_contains): Changed to support multiple strings in 1
-	command (results or'd together)
-
-	* url-util.c (g_url_new): Fixed a typo (colon == 0 isn't right),
-	and made it so full url's are absolute pathed (Dan, this is how it
-	has to work!).  Also, always include a path part, even if it is an
-	empty string.
-
-2000-02-18  Dan Winship  <danw@helixcode.com>
-
-	* camel/camel-types.h: New header with the typedefs for all camel
-	classes. Now the class headers can just include this and the
-	header for the parent type. This makes it possible for
-	CamelService to include a CamelSession without creating an
-	#include loop.
-
-	* camel/*:	
-	* composer/e-msg-composer-attachment-bar.h:
-	* mail/folder-browser.c:
-	* mail/message-list.c: frob #includes to match the new reality
-
-2000-02-17  Dan Winship  <danw@helixcode.com>
-
-	* camel/camel-service.h:
-	* camel/camel-service.c: Make camel-service us a Gurl internally.
-	Remove the login/password interfaces and instead provide
-	camel_service_connect_with_url. Add CamelExceptions
-
-2000-02-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-formatter.c (handle_text_plain): 
-	(handle_text_html): use camel_stream_reset instead
-	of seek. The formatter should be able to work 
-	with all streams, not only seekable streams. 
-	In the case where some provider implementation
-	would not be able to provide a reset method 
-	to their stream, implementors would have
-	to find a workaround.
-
-	* camel/camel-session.c (camel_session_new): use
-	(void) instean of () in function decl.
-
-	* camel/camel-folder.c: ifdef async operation 
-	related code. 
-
-	* camel/camel-seekable-stream.c (_seek): added a warning.
-	(_reset): default implementation of reset for seekable
-	stream.
-
-	* camel/camel-mime-message.h: set_received_date declaration fix.
-	cosmetic changes.
-
-	* camel/providers/mbox/camel-mbox-provider.c (camel_provider_module_init): 
-	use (void) instead of ().
-
-	* camel/camel-stream.c (camel_stream_reset): 
-	new method for CamelStream.
-
-2000-02-17  Dan Winship  <danw@helixcode.com>
-
-	* camel/url-util.c (g_url_to_string): New function to convert
-	a Gurl back into a char *.
-
-2000-02-17  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-formatter.c (handle_text_plain): 
-	revamped so that it uses the output stream
-	of the data wrapper
-	(handle_text_html): ditto.
-	
-	
-	* camel/camel-simple-data-wrapper.h: 
-	* camel/camel-simple-data-wrapper.c (camel_simple_data_wrapper_new): 
-	use (void) instead of ().
-	(_get_output_stream): simple implementation. 
-
-2000-02-16  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-data-wrapper.c (_set_input_stream): ref input stream
-	(_set_output_stream): ref output stream
-	(_finalize): unref input and output streams
-
-	* camel/camel-seekable-substream.c (_set_bounds): don't
-	seek the begining of the substream.
-	(_eos): fix eos condition testing. 
-	(_finalize): unref parent stream
-	(_init_with_seekable_stream_and_bounds): ref parent stream
-
-	* camel/gstring-util.c (g_string_equal_for_hash): 
-	(g_string_equal_for_glist): return type is int.
-
-	* camel/camel.h: 
-	* camel/camel.c (camel_init): use (void) 
-	instead of ().
-	
-2000-02-16  NotZed  <NotZed@HelixCode.com>
-
-	* providers/mbox/Makefile.am (libcamelmbox_la_LIBADD): Added
-	libfilter to link line (temporarily?).  Required for
-	filter-sexp.
-
-2000-02-15  bertrand  <bertrand@helixcode.com>
-
-	* camel/camel-multipart.c (_localize_part): 
-	this routine replaces the _read_part routine
-	and does not store the part in a buffer. 
-	(_set_input_stream): use the set_input_stream
-	instead of the construct_from_stream.
-	each bodypart is given an input stream. 
-
-	* camel/camel-mime-part-utils.c: 
-	include the data-wrapper-repository header. 
-	(camel_mime_part_construct_content_from_stream): 
-	use the set_input_stream instead of the 
-	construct_from_stream method. 
-
-	* camel/camel-seekable-substream.c (_set_bounds): 
-	cur position is set to 0 not to inf_bound.
-
-2000-02-15  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-mime-part.c: include gmime-base64.h
-	various compilation and runtime fixes.
-	(_set_input_stream): store the input substream 
-	for the content object.
-
-	* camel/camel-data-wrapper.h: declare the 
-	set/get function on input/output stream.
-
-	* camel/camel-mime-part.c (_get_content_object): 
-	don't use a temporary mem stream. 	
-
-	* camel/camel-seekable-substream.c (_seek): 
-	(_eos): 
-	(_read): the substream can be unlimited in length
-
-	* camel/camel-data-wrapper.c (camel_data_wrapper_class_init): 
-	set the get/set_input/output_stream methods. 	
-
-	* camel/camel-multipart.c (_construct_from_stream): 
-	camel_stream_seek -> camel_seekable_stream_seek
-
-2000-02-14  Miguel de Icaza  <miguel@gnu.org>
-
-	* camel/providers/mbox/Makefile.am (libcamelmbox_la_LIBADD): Add
-	the unicode libraries as well.
-
-	* camel/camel-provider.c (camel_provider_register_as_module): Add
-	error reporting here.  Desire to use Solaris increases.  Hair loss
-	in the last two hours: 5,400.
-
-	* camel/providers/mbox/camel-mbox-provider.c
-	(camel_mbox_get_provider): Renamed function.
-
-	* camel/camel.h: All include files use camel/ now here.
-
-	* camel/providers/mbox/Makefile.am: Drop all the dynamism from
-	Camel, and make this a standard library.
-
-2000-02-14  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/gmime-utils.c (get_header_array_from_stream): use the 
-	eos stream method. 
-	(gmime_read_line_from_stream): ditto.
-
-	* camel/camel-stream-fs.h (struct ): add the eof field
-	cosmetics changes. 
-
-	* camel/camel-stream-fs.c (camel_stream_fs_init): set eof.
-	(_read): set eof on end of file.
-	(_eos): implemented.
-
-	* camel/gmime-utils.c (get_header_array_from_stream): 
-	make a blocking version of the header parser. 
-	When the fs stream uses gnome-vfs, this should
-	be changed. 
-	(gmime_read_line_from_stream): ditto. 
-
-2000-02-11  bertrand  <Bertrand.Guiheneuf@aful.org>
-
-	* camel/camel-stream-fs.c: 
-	everywhere, when using the cur_pos field, do it
-	on the CamelSeekableStream object.
-	(_seek): small fix. 
-
-	* camel/camel-seekable-stream.c (camel_seekable_stream_seek): 
-	s/camel_stream_seek/camel_seekable_stream_seek/g
-
-	* camel/camel-seekable-stream.h: 
-	(struct ): added a field to store the
-	current position.
-
-	* camel/camel-seekable-stream.c (camel_seekable_stream_get_current_position): 
-	New function. Allows to get the current position 
-	of a seekable stream.
-	
-
-2000-02-13  NotZed  <notzed@zedzone.helixcode.com>
-
-	* providers/mbox/camel-mbox-search.c: New file, implements the
-	search api for mbox folders.
-
-	* providers/mbox/Makefile.am: Link with ibex.
-
-	* camel-folder.c (camel_folder_has_search_capability): Api
-	additions.
-	(camel_folder_search_by_expression): Ditto.
-
-2000-02-12  NotZed  <notzed@zedzone.helixcode.com>
-
-	* providers/mbox/camel-mbox-folder.c (_set_name): Setup index
-	filename as well.
-	(_init_with_store): Init index filename.  Hmm, none of these
-	names ever seem to get free'd (FIXME?)
-
-	* providers/mbox/camel-mbox-folder.h: Add index file name.
-
-2000-02-12  NotZed  <notzed@helixcode.com>
-
-	* camel-folder.h: Add folder search functions.
-
-	** Created ChangeLog just for camel **
-	 - refer to ../ChangeLog for changes prior to this date.
diff --git a/camel/Makefile.am b/camel/Makefile.am
deleted file mode 100644
index 9d5c23d6dd..0000000000
--- a/camel/Makefile.am
+++ /dev/null
@@ -1,135 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS = providers
-
-libcamelincludedir = $(includedir)/camel
-providerdir = $(libdir)/evolution/camel-providers/$(VERSION)
-
-lib_LTLIBRARIES = libcamel.la
-
-INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir)	 \
-	-I$(top_srcdir)/intl			 \
-	$(GLIB_CFLAGS)				 \
-	$(UNICODE_CFLAGS)			 \
-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \
-	-DG_LOG_DOMAIN=\"camel\"
-
-libcamel_la_SOURCES = 				\
-	broken-date-parser.c			\
-	camel-address.c				\
-	camel-data-wrapper.c			\
-	camel-exception.c			\
-	camel-folder-search.c			\
-	camel-folder-summary.c			\
-	camel-folder.c				\
-	camel-internet-address.c		\
-	camel-medium.c				\
-	camel-mime-filter-basic.c		\
-	camel-mime-filter-charset.c		\
-	camel-mime-filter-crlf.c		\
-	camel-mime-filter-from.c		\
-	camel-mime-filter-index.c		\
-	camel-mime-filter-linewrap.c		\
-	camel-mime-filter-save.c		\
-	camel-mime-filter.c			\
-	camel-mime-message.c			\
-	camel-mime-parser.c			\
-	camel-mime-part-utils.c			\
-	camel-mime-part.c			\
-	camel-mime-utils.c			\
-	camel-movemail.c			\
-	camel-multipart.c			\
-	camel-object.c				\
-	camel-provider.c			\
-	camel-remote-store.c			\
-	camel-seekable-stream.c			\
-	camel-seekable-substream.c		\
-	camel-service.c				\
-	camel-session.c				\
-	camel-store.c				\
-	camel-stream-buffer.c			\
-	camel-stream-filter.c			\
-	camel-stream-fs.c			\
-	camel-stream-mem.c			\
-	camel-stream.c				\
-	camel-transport.c			\
-	camel-uid-cache.c			\
-	camel-url.c				\
-	camel-charset-map.c			\
-	camel.c					\
-	gmime-content-field.c			\
-	gstring-util.c				\
-	hash-table-utils.c			\
-	md5-utils.c				\
-	string-utils.c
-
-libcamelinclude_HEADERS =			\
-	broken-date-parser.h			\
-	camel-address.h				\
-	camel-data-wrapper.h			\
-	camel-exception-list.def		\
-	camel-exception.h			\
-	camel-folder-search.h			\
-	camel-folder-summary.h			\
-	camel-folder.h				\
-	camel-internet-address.h		\
-	camel-medium.h				\
-	camel-mime-filter-basic.h		\
-	camel-mime-filter-charset.h		\
-	camel-mime-filter-crlf.h		\
-	camel-mime-filter-from.h		\
-	camel-mime-filter-index.h		\
-	camel-mime-filter-linewrap.h		\
-	camel-mime-filter-save.h		\
-	camel-mime-filter.h			\
-	camel-mime-message.h			\
-	camel-mime-parser.h			\
-	camel-mime-part-utils.h			\
-	camel-mime-part.h			\
-	camel-mime-utils.h			\
-	camel-movemail.h			\
-	camel-multipart.h			\
-	camel-object.h				\
-	camel-provider.h			\
-	camel-remote-store.h			\
-	camel-seekable-stream.h			\
-	camel-seekable-substream.h		\
-	camel-service.h				\
-	camel-session.h				\
-	camel-store.h				\
-	camel-stream-buffer.h			\
-	camel-stream-filter.h			\
-	camel-stream-fs.h			\
-	camel-stream-mem.h			\
-	camel-stream.h				\
-	camel-transport.h			\
-	camel-types.h				\
-	camel-uid-cache.h			\
-	camel-url.h				\
-	camel.h					\
-	gmime-content-field.h			\
-	gstring-util.h				\
-	hash-table-utils.h			\
-	md5-utils.h				\
-	string-utils.h
-
-libcamel_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-
-EXTRA_DIST =					\
-	README 
-
-#noinst_PROGRAMS =				\
-#	camel-mime-filter-from
-#
-#camel_mime_filter_from_SOURCES = 		\
-#	camel-mime-filter-from.c
-#
-#camel_mime_filter_from_LDADD = 		\
-#	../camel/libcamel.la			\
-#	../e-util/libeutil.la			\
-#	../libibex/libibex.la			\
-#	$(GNOME_LIBDIR)				\
-#	$(GNOMEUI_LIBS)				\
-#	$(INTLLIBS)				\
-#	$(PTHREAD_LIB)				\
-#	$(EXTRA_GNOME_LIBS)
diff --git a/camel/README b/camel/README
deleted file mode 100644
index f020174d5e..0000000000
--- a/camel/README
+++ /dev/null
@@ -1,57 +0,0 @@
-
-                                   CAMEL
-     
-
-			A generic Messaging Library
-
-
-                                   ----
-				
-
-Introduction:
--------------
-
-Camel will be a generic messaging library. It will evntually support 
-the standard messaging system for receiving and sending messages.
-It aims at being the backend for the future gnome-mailer system.
-
-The name "camel" stands for ... nothing. Open area of development there.
-You know, that "bazaar" thing. Maybe could we organize a big contest on
-gnome-list to find the best explanation :)
-
-Camel draws heavily from JavaMail and the IMAP4rev1 RFC. People
-wanting to hack on a provider should read the JavaMail API
-specification, but CMC and MAPI are of interest too.
-
-Please, before starting anything, wait for me to finish the abstract
-classes. Some parts are not definitive yet.
-
- 
-Organization:
--------------
-
-The library is roughly a set of abstract classes, some kind of generic
-"interfaces" (idl interfaces, not java interfaces ).
-
-Particular implementations are called providers.
-
-Here are the basic objects:
-
-* CamelService : an abstract class representing an access to a server.
-Handles the connection and authentication to any server.
-
-* CamelStore (CamelService): A hierarchy of folders on a server.
-
-* CamelFolder : An object containing messages. A folder is always
-associated with a store.
-
-* CamelMessage : An object contained in folders. Is defined by a set
-of attributes and a content. (Attributes include: the date it was
-received, the sender address, .....)
-
-* CamelTransport (CamelService): A way to send messages.
-
-....
-...
-
-
diff --git a/camel/README.COPYRIGHT b/camel/README.COPYRIGHT
deleted file mode 100644
index 91774e7339..0000000000
--- a/camel/README.COPYRIGHT
+++ /dev/null
@@ -1,47 +0,0 @@
-Important note for Camel hackers:
----------------------------------
-
-Camel has been a lot of work, and has been conceived to be general
-enough to be used outside the gnome-mailer. It is possible in the
-future that it is used in softwares with licenses incompatible with the
-LGPL. For this reason, the copyright has to be owned by a unique
-person.  Be sure, however, that Camel will always be available under
-the LGPL.  Significant authors will always be consulted before any
-special use of Camel. Moreover, in special situations, they may be
-given the authorization to use Camel with a license different than the
-LGPL.
-
-Thus, when adding code in Camel, always add the following lines at the
-begining of the file:
-
-/* 
- *
- * Copyright 199x, 200x Helix Code, Inc. (http://www.helixcode.com)
- * 
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-You may also want to add your name to the author name list after this
-header.
-
-Please contact me (Bertrand.Guiheneuf@aful.org) if you want to discuss
-this copyright issue.
-
-Happy hacking,
-
-Bertrand.
-
-
diff --git a/camel/README.HACKING b/camel/README.HACKING
deleted file mode 100644
index a4742ee7b8..0000000000
--- a/camel/README.HACKING
+++ /dev/null
@@ -1,14 +0,0 @@
-You want to hack on Camel ?
-
-Thanks. Camel aims at being the best messaging
-library for Linux and your help is welcome. 
-Please be sure to read the following files before
-commiting any change or sending any patch:
-
-CODING.STYLE
-README.COPYRIGHT
-
-
-Thanks.
-
-	Bertrand <Bertrand.Guiheneuf@aful.org>
-\ No newline at end of file
diff --git a/camel/broken-date-parser.c b/camel/broken-date-parser.c
deleted file mode 100644
index 544dc04e28..0000000000
--- a/camel/broken-date-parser.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include "broken-date-parser.h"
-
-/* prototypes for functions dealing with broken date formats */
-static GList *datetok (const gchar *date);
-static gint get_days_in_month (gint mon, gint year);
-static gint get_weekday (gchar *str);
-static gint get_month (gchar *str);
-
-static char *tz_months [] = {
-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-/*****************************************************************************
- * The following functions are here in the case of badly broken date formats *
- *                                                                           *
- * -- fejj@helixcode.com                                                     *
- *****************************************************************************/
-
-typedef struct {
-	gchar dow[6];   /* day of week (should only need 4 chars) */
-	gint day;
-	gint mon;       /* 1->12 or 0 if invalid */
-	gint year;
-	gint hour;
-	gint min;
-	gint sec;
-	gchar zone[6];  /* time zone */
-} date_t;
-
-static
-GList *datetok (const gchar *date)
-{
-	GList *tokens = NULL;
-	gchar *token, *start, *end;
-	
-	start = (gchar *) date;
-	while (*start) {
-		/* find the end of this token */
-		for (end = start; *end && *end != ' '; end++);
-		
-		token = g_strndup (start, (end - start));
-		
-		if (token && *token)
-			tokens = g_list_append (tokens, token);
-		else
-			g_free (token);
-
-		if (*end)
-			start = end + 1;
-		else
-			break;
-	}
-
-	return tokens;
-}
-
-static gint
-get_days_in_month (gint mon, gint year)
-{
-	switch (mon) {
-	case 1: case 3: case 5: case 7: case 8: case 10: case 12:
-		return 31;
-	case 4: case 6: case 9: case 11:
-		return 30;
-	case 2:
-		if ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0)
-			return 29;
-		return 28;
-	default:
-		return 30;
-	}
-}
-
-static gint
-get_weekday (gchar *str)
-{
-	g_return_val_if_fail ((str != NULL), 0);
-
-	if (strncmp (str, "Mon", 3) == 0) {
-		return 1;
-	} else if (strncmp (str, "Tue", 3) == 0) {
-		return 2;
-	} else if (strncmp (str, "Wed", 3) == 0) {
-		return 3;
-	} else if (strncmp (str, "Thu", 3) == 0) {
-		return 4;
-	} else if (strncmp (str, "Fri", 3) == 0) {
-		return 5;
-	} else if (strncmp (str, "Sat", 3) == 0) {
-		return 6;
-	} else if (strncmp (str, "Sun", 3) == 0) {
-		return 7;
-	}
-
-	return 0;  /* unknown week day */
-}
-
-static gint
-get_month (gchar *str)
-{
-	g_return_val_if_fail (str != NULL, 0);
-    
-	if (strncmp (str, "Jan", 3) == 0) {
-		return 1;
-	} else if (strncmp (str, "Feb", 3) == 0) {
-		return 2;
-	} else if (strncmp (str, "Mar", 3) == 0) {
-		return 3;
-	} else if (strncmp (str, "Apr", 3) == 0) {
-		return 4;
-	} else if (strncmp (str, "May", 3) == 0) {
-		return 5;
-	} else if (strncmp (str, "Jun", 3) == 0) {
-		return 6;
-	} else if (strncmp (str, "Jul", 3) == 0) {
-		return 7;
-	} else if (strncmp (str, "Aug", 3) == 0) {
-		return 8;
-	} else if (strncmp (str, "Sep", 3) == 0) {
-		return 9;
-	} else if (strncmp (str, "Oct", 3) == 0) {
-		return 10;
-	} else if (strncmp (str, "Nov", 3) == 0) {
-		return 11;
-	} else if (strncmp (str, "Dec", 3) == 0) {
-		return 12;
-	}
-    
-	return 0;  /* unknown month */
-}
-
-gchar *
-parse_broken_date (const gchar *datestr)
-{
-	GList *tokens;
-	date_t date;
-	gchar *token, *ptr, *newdatestr;
-	guint len, i, retval;
-	gdouble tz = 0.0;
-
-	memset ((void*)&date, 0, sizeof (date_t));
-	g_return_val_if_fail (datestr != NULL, NULL);
-	
-	tokens = datetok (datestr);
-	len = g_list_length (tokens);
-	for (i = 0; i < len; i++) {
-		token = g_list_nth_data (tokens, i);
-		
-		if ((retval = get_weekday (token))) {
-			strncpy (date.dow, datestr, 4);
-		} else if ((retval = get_month (token))) {
-			date.mon = retval;
-		} else if (strlen (token) <= 2) {
-			/* this could be a 1 or 2 digit day of the month */
-			for (retval = 1, ptr = token; *ptr; ptr++)
-				if (*ptr < '0' || *ptr > '9')
-					retval = 0;
-			
-			if (retval && atoi (token) <= 31 && !date.day)  /* probably should find a better way */
-				date.day = atoi (token);
-			else                                            /* fubar'd client using a 2-digit year */
-				date.year = atoi (token) < 69 ? 2000 + atoi (token) : 1900 + atoi (token);
-		} else if (strlen (token) == 4) {
-			/* this could be the year... */
-			for (retval = 1, ptr = token; *ptr; ptr++)
-				if (*ptr < '0' || *ptr > '9')
-					retval = 0;
-			
-			if (retval)
-				date.year = atoi (token);
-		} else if (strchr (token, ':')) {
-			/* this must be the time: hh:mm:ss */
-			sscanf (token, "%d:%d:%d", &date.hour, &date.min, &date.sec);
-		} else if (*token == '-' || *token == '+') {
-			tz = atoi (token) / 100.0;
-		}
-	}
-	
-	g_list_free (tokens);
-	
-	/* adjust times based on time zones */
-	
-	if (tz != 0) {
-		/* check for time-zone shift */
-		if (tz > 0) {
-			/* correct for positive hours off of UCT */
-			date.hour -= (tz / 100);
-			tz = (gint)tz % 100;
-			
-			if (tz > 0) /* correct for positive minutes off of UCT */
-				date.min -= (gint)(((gdouble) tz / 100.0) * 60.0);
-		} else {
-			if (tz < 0) {
-				/* correct for negative hours off of UCT */
-				tz = -tz;
-				date.hour += (tz / 100);
-				tz = -((gint)tz % 100);
-				
-				if (tz < 0)
-					date.min -= (gint)(((gdouble) tz / 100.0) * 60.0);
-			}
-		}
-		
-		/* adjust seconds to proper range */
-		if (date.sec > 59) {
-			date.min += (date.sec / 60);
-			date.sec = (date.sec % 60);
-		}
-		
-		/* adjust minutes to proper range */
-		if (date.min > 59) {
-			date.hour += (date.min / 60);
-			date.min = (date.min % 60);
-		} else {
-			if (date.min < 0) {
-				date.min = -date.min;
-				date.hour -= (date.min / 60) - 1;
-				date.min = 60 - (date.min % 60);
-			}
-		}
-		
-		/* adjust hours to the proper randge */
-		if (date.hour > 23) {
-			date.day += (date.hour / 24);
-			date.hour -= (date.hour % 24);
-		} else {
-			if (date.hour < 0) {
-				date.hour = -date.hour;
-				date.day -= (date.hour / 24) - 1;
-				date.hour = 24 - (date.hour % 60);
-			}
-		}
-		
-		/* adjust days to the proper range */
-		while (date.day > get_days_in_month (date.mon, date.year)) {
-			date.day -= get_days_in_month (date.mon, date.year);
-			date.mon++;
-			if (date.mon > 12) {
-				date.year += (date.mon / 12);
-				date.mon = (date.mon % 12);
-				if (date.mon == 0) {
-					/* month sanity check */
-					date.mon = 12;
-					date.year -= 1;
-				}
-			}
-		}
-		
-		while (date.day < 1) {
-			date.day += get_days_in_month (date.mon, date.year);
-			date.mon--;
-			if (date.mon < 1) {
-				date.mon = -date.mon;
-				date.year -= (date.mon / 12) - 1;
-				date.mon = 12 - (date.mon % 12);
-			}
-		}
-		
-		/* adjust months to the proper range */
-		if (date.mon > 12) {
-			date.year += (date.mon / 12);
-			date.mon = (date.mon % 12);
-			if (date.mon == 0) {
-				/* month sanity check */
-				date.mon = 12;
-				date.year -= 1;
-			}
-		} else {
-			if (date.mon < 1) {
-				date.mon = -date.mon;
-				date.year -= (date.mon / 12) - 1;
-				date.mon = 12 - (date.mon % 12);
-			}
-		}
-	}
-
-	/* now lets print this date into a string with the correct format */
-	newdatestr = g_strdup_printf ("%s, %d %s %d %s%d:%s%d:%s%d -0000",
-				      date.dow, date.day, tz_months[date.mon-1],
-				      date.year,
-				      date.hour > 10 ? "" : "0", date.hour,
-				      date.min > 10 ? "" : "0", date.min,
-				      date.sec > 10 ? "" : "0", date.sec);
-	
-	return newdatestr;
-}
-
-/*****************************************************************************
- * This ends the code for the broken date parser...                          *
- *                                                                           *
- * -- fejj@helixcode.com                                                     *
- *****************************************************************************/
diff --git a/camel/broken-date-parser.h b/camel/broken-date-parser.h
deleted file mode 100644
index 17000b3299..0000000000
--- a/camel/broken-date-parser.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2000 Helix Code, Inc. (www.helixcode.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <glib.h>
-#include <time.h>
-
-#include <ctype.h>
-
-/* prototypes for functions dealing with broken date formats */
-
-gchar *parse_broken_date (const gchar *datestr);
-
-
-
-
-
diff --git a/camel/camel-address.c b/camel/camel-address.c
deleted file mode 100644
index 8f7cea3d67..0000000000
--- a/camel/camel-address.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "camel-address.h"
-
-
-static void camel_address_class_init (CamelAddressClass *klass);
-static void camel_address_init       (CamelAddress *obj);
-static void camel_address_finalize   (CamelObject *obj);
-
-static CamelObjectClass *camel_address_parent;
-
-static void
-camel_address_class_init (CamelAddressClass *klass)
-{
-	camel_address_parent = camel_type_get_global_classfuncs (camel_object_get_type ());
-}
-
-static void
-camel_address_init (CamelAddress *obj)
-{
-	obj->addresses = g_ptr_array_new();
-}
-
-static void
-camel_address_finalize (CamelObject *obj)
-{
-	camel_address_remove((CamelAddress *)obj, -1);
-}
-
-CamelType
-camel_address_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (camel_object_get_type (), "CamelAddress",
-					    sizeof (CamelAddress),
-					    sizeof (CamelAddressClass),
-					    (CamelObjectClassInitFunc) camel_address_class_init,
-					    NULL,
-					    (CamelObjectInitFunc) camel_address_init,
-					    (CamelObjectFinalizeFunc) camel_address_finalize);
-	}
-	
-	return type;
-}
-
-/**
- * camel_address_new:
- *
- * Create a new CamelAddress object.
- * 
- * Return value: A new CamelAddress widget.
- **/
-CamelAddress *
-camel_address_new (void)
-{
-	CamelAddress *new = CAMEL_ADDRESS ( camel_object_new (camel_address_get_type ()));
-	return new;
-}
-
-
-/**
- * camel_address_decode:
- * @a: An address.
- * @raw: Raw address description.
- * 
- * Construct a new address from a raw address field.
- * 
- * Return value: Returns the number of addresses found,
- * or -1 if the addresses could not be parsed fully.
- **/
-int
-camel_address_decode	(CamelAddress *a, const char *raw)
-{
-	g_return_val_if_fail(IS_CAMEL_ADDRESS(a), -1);
-
-	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))->decode(a, raw);
-}
-
-/**
- * camel_address_encode:
- * @a: 
- * 
- * Encode an address in a format suitable for a raw header.
- * 
- * Return value: The encoded address.
- **/
-char *
-camel_address_encode	(CamelAddress *a)
-{
-	g_return_val_if_fail(IS_CAMEL_ADDRESS(a), NULL);
-
-	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))->encode(a);
-}
-
-/**
- * camel_address_remove:
- * @a: 
- * @index: The address to remove, use -1 to remove all address.
- * 
- * Remove an address by index, or all addresses.
- **/
-void
-camel_address_remove	(CamelAddress *a, int index)
-{
-	g_return_if_fail(IS_CAMEL_ADDRESS(a));
-
-	if (index == -1) {
-		for (index=a->addresses->len; index>-1; index--)
-			CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))->remove(a, index);
-	} else {
-		CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))->remove(a, index);
-	}
-}
diff --git a/camel/camel-address.h b/camel/camel-address.h
deleted file mode 100644
index a2d6fe34dd..0000000000
--- a/camel/camel-address.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  Copyright (C) 2000 Helix Code Inc.
- *
- *  Authors: Michael Zucchi <notzed@helixcode.com>
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public License
- *  as published by the Free Software Foundation; either version 2 of
- *  the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _CAMEL_ADDRESS_H
-#define _CAMEL_ADDRESS_H
-
-#include <camel/camel-object.h>
-
-#define CAMEL_ADDRESS(obj)         CAMEL_CHECK_CAST (obj, camel_address_get_type (), CamelAddress)
-#define CAMEL_ADDRESS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_address_get_type (), CamelAddressClass)
-#define IS_CAMEL_ADDRESS(obj)      CAMEL_CHECK_TYPE (obj, camel_address_get_type ())
-
-typedef struct _CamelAddressClass CamelAddressClass;
-
-struct _CamelAddress {
-	CamelObject parent;
-
-	GPtrArray *addresses;
-
-	struct _CamelAddressPrivate *priv;
-};
-
-struct _CamelAddressClass {
-	CamelObjectClass parent_class;
-
-	int   (*decode)		(CamelAddress *, const char *raw);
-	char *(*encode)		(CamelAddress *);
-
-	void  (*remove)		(CamelAddress *, int index);
-};
-
-guint		camel_address_get_type	(void);
-CamelAddress   *camel_address_new	(void);
-
-int	        camel_address_decode	(CamelAddress *, const char *);
-char	       *camel_address_encode	(CamelAddress *);
-
-void		camel_address_remove	(CamelAddress *, int index);
-
-#endif /* ! _CAMEL_ADDRESS_H */
diff --git a/camel/camel-charset-map-private.h b/camel/camel-charset-map-private.h
deleted file mode 100644
index 7a5acdfc26..0000000000
--- a/camel/camel-charset-map-private.h
+++ /dev/null
@@ -1,3880 +0,0 @@
-/* This file is automatically generated: DO NOT EDIT */
-
-static unsigned char m000[256] = {
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
-	0xff, 0xd0, 0xd0, 0xf2, 0xf7, 0xf2, 0xf0, 0xff, 
-	0xf7, 0xf0, 0xb0, 0xf0, 0xe0, 0xff, 0xf2, 0x94, 
-	0xf7, 0xf0, 0xf2, 0xf2, 0xd7, 0xd2, 0xd0, 0xf2, 
-	0xd7, 0xd0, 0x90, 0xe0, 0xd0, 0xf2, 0xd2, 0xc0, 
-	0xd2, 0xc7, 0xc7, 0xc6, 0xc7, 0xc4, 0xc4, 0xc3, 
-	0xc2, 0xc7, 0xc2, 0xc7, 0xc2, 0xc7, 0xc7, 0xc2, 
-	0x42, 0xc2, 0xe2, 0xc3, 0xc7, 0xc4, 0xc7, 0xc7, 
-	0xc4, 0xc2, 0xc7, 0xd6, 0xd7, 0x51, 0x50, 0x97, 
-	0x82, 0x87, 0x87, 0x86, 0x87, 0x84, 0x84, 0x83, 
-	0x82, 0x87, 0x82, 0x87, 0x82, 0x87, 0x87, 0x82, 
-	0x02, 0x82, 0x82, 0x93, 0x97, 0x94, 0x97, 0xd7, 
-	0x94, 0x92, 0x97, 0xd6, 0xd7, 0x51, 0x50, 0xf0, 
-};
-
-static unsigned char m001[256] = {
-	0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
-	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
-	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
-	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 
-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 
-	0x1f, 0x04, 0x44, 0x46, 0x00, 0x44, 0x00, 0x67, 
-	0x60, 0x1e, 0x04, 0x04, 0x44, 0x07, 0x06, 0x04, 
-	0x7d, 0x64, 0x1c, 0x04, 0x60, 0x04, 0x66, 0x1d, 
-	0x00, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x04, 
-	0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 
-	0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x07, 0x07, 
-	0x05, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x64, 
-	0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 0x05, 0x07, 
-	0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x06, 
-	0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x07, 0x07, 
-	0x05, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x7c, 
-	0x07, 0x06, 0x07, 0x07, 0x07, 0x07, 0x05, 0x06, 
-};
-
-static unsigned char m010[256] = {
-	0x04, 0x04, 0x01, 0x01, 0x05, 0x05, 0x01, 0x01, 
-	0x02, 0x02, 0x02, 0x02, 0x05, 0x05, 0x01, 0x01, 
-	0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x04, 0x04, 
-	0x05, 0x05, 0x01, 0x01, 0x02, 0x02, 0x82, 0x82, 
-	0x02, 0x02, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 
-	0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x04, 0x04, 
-	0x82, 0x82, 0x00, 0x00, 0x02, 0x02, 0x04, 0x04, 
-	0x04, 0x01, 0x01, 0x04, 0x04, 0x01, 0x01, 0x00, 
-	0x00, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x01, 
-	0x01, 0x00, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x04, 0x04, 
-	0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x83, 0x83, 
-	0x05, 0x05, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 
-	0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 
-	0x01, 0x01, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x01, 0x01, 0x03, 0x03, 0x05, 0x05, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m011[256] = {
-	0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x02, 0x02, 0x01, 0x01, 0x00, 0x00, 
-	0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 
-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x02, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 
-	0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 
-	0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x05, 0x05, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 
-	0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 
-	0x06, 0x00, 0x00, 0x00, 0x00, 0x05, 0x05, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m020[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x03, 0x07, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m030[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x00, 
-	0x20, 0x20, 0x20, 0x00, 0x20, 0x00, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m031[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m040[256] = {
-	0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-	0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x08, 0x08, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m041[256] = {
-	0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0x78, 0x78, 0x78, 0x78, 0x78, 0x68, 0x78, 0x78, 
-	0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 
-	0x00, 0x78, 0x00, 0x00, 0x10, 0x00, 0x10, 0x10, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m050[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 
-	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 
-	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 
-	0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m060[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 
-	0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
-	0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
-	0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m1e1[256] = {
-	0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m200[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x40, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m201[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x01, 0x60, 0x40, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x18, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x40, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m210[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m211[256] = {
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m221[256] = {
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x78, 0x00, 0x00, 0x60, 0x60, 0x20, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x18, 0x18, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m231[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m241[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m251[256] = {
-	0x78, 0x60, 0x78, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x60, 
-	0x78, 0x00, 0x00, 0x60, 0x78, 0x00, 0x00, 0x60, 
-	0x78, 0x00, 0x00, 0x60, 0x78, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x78, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x78, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x78, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x78, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x18, 0x08, 0x18, 0x08, 0x08, 0x18, 
-	0x18, 0x18, 0x18, 0x18, 0x08, 0x18, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0x18, 0x08, 0x08, 0x18, 0x18, 
-	0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x18, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
-	0x18, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
-	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x78, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m261[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m301[256] = {
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m321[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m331[256] = {
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x20, 0x20, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x20, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m4e1[256] = {
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x20, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x20, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m4f1[256] = {
-	0x20, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x20, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x20, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x20, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x20, 0x00, 0x20, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x20, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x60, 0x00, 0x00, 0x20, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x20, 
-};
-
-static unsigned char m501[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x20, 0x60, 
-	0x00, 0x60, 0x20, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x20, 0x60, 0x00, 0x00, 0x20, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m511[256] = {
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x20, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x20, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m521[256] = {
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x20, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x20, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x20, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m531[256] = {
-	0x20, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x20, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x20, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x20, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m541[256] = {
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x20, 
-};
-
-static unsigned char m551[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x20, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m561[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-};
-
-static unsigned char m571[256] = {
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 
-	0x20, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m581[256] = {
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x20, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m591[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x20, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x20, 0x00, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x20, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x20, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x20, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-};
-
-static unsigned char m5a1[256] = {
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m5b1[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x20, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x20, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x20, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m5c1[256] = {
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m5d1[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x20, 0x20, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m5e1[256] = {
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m5f1[256] = {
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x20, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x20, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x20, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-};
-
-static unsigned char m601[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x20, 0x00, 0x00, 
-	0x00, 0x60, 0x20, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x20, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m611[256] = {
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x20, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x20, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 
-};
-
-static unsigned char m621[256] = {
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x20, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m631[256] = {
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m641[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m651[256] = {
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m661[256] = {
-	0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x20, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x20, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x60, 
-	0x00, 0x20, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x20, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x20, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x20, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x20, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x20, 0x20, 0x60, 0x60, 0x60, 0x60, 
-};
-
-static unsigned char m671[256] = {
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x20, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x20, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m681[256] = {
-	0x00, 0x20, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x20, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x20, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x20, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x20, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m691[256] = {
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-};
-
-static unsigned char m6a1[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x20, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m6b1[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x20, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m6c1[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x20, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x20, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m6d1[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x20, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x20, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x20, 0x60, 0x60, 0x60, 0x20, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m6e1[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x20, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x20, 0x60, 0x00, 0x20, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m6f1[256] = {
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m701[256] = {
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x20, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m711[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x20, 0x60, 
-};
-
-static unsigned char m721[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x20, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m731[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x20, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m741[256] = {
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x20, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 
-	0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m751[256] = {
-	0x00, 0x20, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x20, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-};
-
-static unsigned char m761[256] = {
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x20, 0x20, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m771[256] = {
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m781[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x20, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m791[256] = {
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m7a1[256] = {
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x20, 
-	0x00, 0x00, 0x60, 0x20, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-};
-
-static unsigned char m7b1[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x20, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m7c1[256] = {
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m7d1[256] = {
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x20, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x20, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m7e1[256] = {
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x20, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m7f1[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m801[256] = {
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m811[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m821[256] = {
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-};
-
-static unsigned char m831[256] = {
-	0x00, 0x20, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x20, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-};
-
-static unsigned char m841[256] = {
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x20, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-};
-
-static unsigned char m851[256] = {
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x20, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x60, 0x20, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 
-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m861[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m871[256] = {
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-};
-
-static unsigned char m881[256] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 
-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 
-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 
-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x00, 0x00, 0x60, 0x60, 0x60, 0x20, 0x00, 0x00, 
-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 
-};
-
-static unsigned char m891[256] = {
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 
-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 
-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00,